diff --git a/package.json b/package.json index 4b18948..7b5d1f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "onenotepicker", - "version": "3.0.9", + "version": "3.0.10", "files": [ "dist/**/*" ], diff --git a/src/components/notebookRenderStrategy.tsx b/src/components/notebookRenderStrategy.tsx index 6ebca72..d125c12 100644 --- a/src/components/notebookRenderStrategy.tsx +++ b/src/components/notebookRenderStrategy.tsx @@ -64,7 +64,7 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy { : ); @@ -77,7 +77,7 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy { treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> : ); return [...createNewSection, ...sections, ...sectionGroups]; diff --git a/src/components/recentSections/recentSectionHeaderRenderStrategy.tsx b/src/components/recentSections/recentSectionHeaderRenderStrategy.tsx index 10e4bc0..5418011 100644 --- a/src/components/recentSections/recentSectionHeaderRenderStrategy.tsx +++ b/src/components/recentSections/recentSectionHeaderRenderStrategy.tsx @@ -38,6 +38,7 @@ export class RecentSectionHeaderRenderStrategy extends RecentSectionsCommonPrope key={renderStrategy.getId() + 'recent-section'} id={renderStrategy.getId()} ariaSelected={this.props.ariaSelectedId ? renderStrategy.isAriaSelected() : false} + selected={renderStrategy.isSelected()} level={childrenLevel} setsize={this.sections.length} posinset={i + 1}>); return [...sections]; diff --git a/src/components/sectionGroupRenderStrategy.tsx b/src/components/sectionGroupRenderStrategy.tsx index 3f26257..caf0396 100644 --- a/src/components/sectionGroupRenderStrategy.tsx +++ b/src/components/sectionGroupRenderStrategy.tsx @@ -60,7 +60,7 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy : ); @@ -72,7 +72,7 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> : ); return [...createNewSection, ...sections, ...sectionGroups]; diff --git a/src/components/sectionRenderStrategy.tsx b/src/components/sectionRenderStrategy.tsx index 4c0e98f..fda616d 100644 --- a/src/components/sectionRenderStrategy.tsx +++ b/src/components/sectionRenderStrategy.tsx @@ -40,7 +40,7 @@ export class SectionRenderStrategy implements ExpandableNodeRenderStrategy { const pages = pageRenderStrategies && pageRenderStrategies.map(renderStrategy => ); + ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}/>); return pages || [] as JSX.Element[]; } diff --git a/src/components/sharedNotebookRenderStrategy.tsx b/src/components/sharedNotebookRenderStrategy.tsx index f35e33c..29902f1 100644 --- a/src/components/sharedNotebookRenderStrategy.tsx +++ b/src/components/sharedNotebookRenderStrategy.tsx @@ -93,7 +93,7 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> : ); const sectionGroupRenderStrategies = this.notebook.apiProperties.spSectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals)); @@ -102,7 +102,7 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg : ); diff --git a/src/components/treeView/commonNodeProps.ts b/src/components/treeView/commonNodeProps.ts index 65f3d13..e0ac0d4 100644 --- a/src/components/treeView/commonNodeProps.ts +++ b/src/components/treeView/commonNodeProps.ts @@ -8,6 +8,8 @@ export interface CommonNodeProps { setsize?: number; posinset?: number; + selected?: boolean; + // For VoiceOver accessibility, there must always be one aria-selected item. // If there's no actual selected item, this should be the first item. ariaSelected: boolean; diff --git a/src/components/treeView/expandableNode.tsx b/src/components/treeView/expandableNode.tsx index 7d7dbbe..d1d3677 100644 --- a/src/components/treeView/expandableNode.tsx +++ b/src/components/treeView/expandableNode.tsx @@ -112,7 +112,7 @@ export class ExpandableNode extends React.Component {this.props.children || this.props.node.element()} diff --git a/src/components/treeView/leafNode.tsx b/src/components/treeView/leafNode.tsx index 8ba3b7f..ebe26d1 100644 --- a/src/components/treeView/leafNode.tsx +++ b/src/components/treeView/leafNode.tsx @@ -51,7 +51,7 @@ export class LeafNode extends React.Component { + aria-selected={this.props.selected} aria-setsize={this.props.setsize} aria-posinset={this.props.posinset}> {this.props.node.element()} );