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.

Sign up for GitHub

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

Jump to bottom

AccessibilityProvider getPosInSet and getSetSize #29118

Merged
merged 1 commit into from
Jun 21, 2017
Merged

AccessibilityProvider getPosInSet and getSetSize #29118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ export class AccessibilityProvider implements IAccessibilityProvider {

return model.accessibilityProvider && model.accessibilityProvider.getAriaLabel(element);
}

public getPosInSet(tree: ITree, element: any): string {
const model = this.modelProvider.getModel();
return String(model.entries.indexOf(element) + 1);
}

public getSetSize(): string {
const model = this.modelProvider.getModel();
return String(model.entries.length);
}
}

export class Filter implements IFilter {
Expand Down
4 changes: 4 additions & 0 deletions src/vs/base/parts/tree/browser/tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,10 @@ export interface IAccessibilityProvider {
* See also: https://www.w3.org/TR/wai-aria/states_and_properties#aria-label
*/
getAriaLabel(tree: ITree, element: any): string;

getPosInSet?(tree: ITree, element: any): string;

getSetSize?(): string;
}

export /* abstract */ class ContextMenuEvent {
Expand Down
7 changes: 6 additions & 1 deletion src/vs/base/parts/tree/browser/treeView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,15 @@ export class ViewItem implements IViewItem {

// ARIA
this.element.setAttribute('role', 'treeitem');
const ariaLabel = this.context.accessibilityProvider.getAriaLabel(this.context.tree, this.model.getElement());
const accessibility = this.context.accessibilityProvider;
const ariaLabel = accessibility.getAriaLabel(this.context.tree, this.model.getElement());
if (ariaLabel) {
this.element.setAttribute('aria-label', ariaLabel);
}
if (accessibility.getPosInSet && accessibility.getSetSize) {
this.element.setAttribute('aria-setsize', accessibility.getSetSize());
this.element.setAttribute('aria-posinset', accessibility.getPosInSet(this.context.tree, this.model.getElement()));
}
if (this.model.hasTrait('focused')) {
const base64Id = strings.safeBtoa(this.model.id);

Expand Down