Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessibility: update accessibility for the main tabs #6182

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/survey-creator-angular/src/creator.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
<div class="svc-creator__content-holder svc-flex-column">
<ng-container *ngFor="let tab of creator.tabs">
<div class="svc-creator-tab" *ngIf="creator.viewType == tab.id && tab.visible"
role="tabpanel"
[attr.id]="'scrollableDiv-' + tab.id"
[attr.aria-labelledby]="'tab-' + tab.id"
[class.svc-creator__toolbox--right]="creator.toolboxLocation == 'right'">
<ng-template
[component]="{ name: tab.componentContent, data: { model: tab.data.model } }"></ng-template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
<ng-template #template>
<div [class]="model.getRootCss()" (click)="model.action()" [key2click]>
<div
[class]="model.getRootCss()"
(click)="model.action()"
[key2click]
role="tab"
[attr.id]="'tab-' + model.id"
[attr.aria-selected]="model.active"
[attr.aria-controls]="'scrollableDiv-' + model.id"
>
<span *ngIf="model.hasTitle" [class]="model.getTitleCss()">
{{model.title}}
{{ model.title }}
</span>
<svg *ngIf="model.hasIcon" [iconName]="model.iconName" [size]="'auto'" [class]="model.getIconCss()"
[title]="model.tooltip || model.title" sv-ng-svg-icon></svg>
<svg
*ngIf="model.hasIcon"
[iconName]="model.iconName"
[size]="'auto'"
[class]="model.getIconCss()"
[title]="model.tooltip || model.title"
sv-ng-svg-icon
></svg>
</div>
</ng-template>
</ng-template>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ng-template #template>
<div class="svc-tabbed-menu" #container>
<div class="svc-tabbed-menu" #container role="tablist">
<ng-container *ngFor="let action of model.renderedActions">
<svc-tabbed-menu-item-wrapper [model]="action"></svc-tabbed-menu-item-wrapper>
</ng-container>
Expand Down
3 changes: 2 additions & 1 deletion packages/survey-creator-knockout/src/survey-creator.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
<!-- ko foreach: creator.tabs -->
<!-- ko if: $parent.creator.viewType == id && ($data.visible === undefined || $data.visible) -->
<div class="svc-creator-tab"
data-bind="attr: { id: 'scrollableDiv-' + id }, css: { 'svc-creator__toolbox--right': $parent.creator.toolboxLocation == 'right' }">
role="tabpanel"
data-bind="attr: { id: 'scrollableDiv-' + id, 'aria-labelledby': 'tab-' + id }, css: { 'svc-creator__toolbox--right': $parent.creator.toolboxLocation == 'right' }">
<!-- ko component: { name: componentContent, params: { creator: $parent.creator, data: data } } -->
<!-- /ko -->
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<div class="svc-tabbed-menu-item" data-bind="click: action, key2click, css: getRootCss()">
<div
class="svc-tabbed-menu-item"
data-bind="click: action, key2click, css: getRootCss(), attr: {id: 'tab-' + id, 'aria-controls': 'scrollableDiv-' + id, 'aria-selected': active}"
role="tab"
>
<!-- ko if: hasTitle -->
<span data-bind="text: title, css: getTitleCss()"></span>
<!-- /ko -->
<!-- ko if: hasIcon -->
<!-- ko component: { name: 'sv-svg-icon', params: { iconName: $data.iconName, size: "auto", css: getIconCss(), title: $data.tooltip || $data.title } } -->
<!-- /ko -->
<!-- /ko -->
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="svc-tabbed-menu">
<div class="svc-tabbed-menu" role="tablist">
<!-- ko foreach: renderedActions -->
<span
class="svc-tabbed-menu-item-container"
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-creator-react/src/SurveyCreator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,10 @@ export class SurveyCreatorComponent extends SurveyElementBase<
const className = "svc-creator-tab" + (creator.toolboxLocation == "right" ? " svc-creator__toolbox--right" : "");
return (
<div
role="tabpanel"
key={tab.id}
id={"scrollableDiv-" + tab.id}
aria-labelledby={"tab-" + tab.id}
className={className}
>
{component}
Expand Down
9 changes: 8 additions & 1 deletion packages/survey-creator-react/src/TabbedMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,14 @@ export class TabbedMenuItemComponent extends SurveyElementBase<
render(): React.JSX.Element {
const item = this.item;
return (attachKey2click(
<div className={item.getRootCss()} onClick={() => item.action(item)}>
<div
role="tab"
id={"tab-" + item.id}
aria-selected={item.active}
aria-controls={"scrollableDiv-" + item.id}
className={item.getRootCss()}
onClick={() => item.action(item)}
>
{item.hasTitle ? <span className={item.getTitleCss()}>{item.title}</span> : null}
{item.hasIcon ? <SvgIcon iconName={item.iconName} className={item.getIconCss()} size={"auto"} title={item.tooltip || item.title}></SvgIcon> : null}
</div>
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-creator-vue/src/Creator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@
<div class="svc-creator__content-holder svc-flex-column">
<template v-for="tab in model.tabs">
<div
role="tabpanel"
class="svc-creator-tab"
v-bind:key="tab.id"
v-if="model.viewType == tab.id && tab.visible"
:aria-labelledby="'tab-' + tab.id"
:id="'scrollableDiv-' + tab.id"
:class="{
'svc-creator__toolbox--right':
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-creator-vue/src/tabbed-menu/TabbedMenu.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="svc-tabbed-menu" ref="container">
<div class="svc-tabbed-menu" ref="container" role="tablist">
<template v-for="action in model.renderedActions" :key="action.id">
<SvComponent
:is="'svc-tabbed-menu-item-wrapper'"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<div
role="tab"
:id="'tab-' + item.id"
:aria-selected="item.active"
:aria-controls="'scrollableDiv-' + item.id"
class="svc-tabbed-menu-item"
:class="item.getRootCss()"
@click="item.action"
Expand Down
Loading