Skip to content
This repository was archived by the owner on Sep 9, 2025. It is now read-only.

Commit 10f9916

Browse files
MADLinsenMADLinsen
authored
Merge pull request #173 from OneNoteDev/linswu/fixAriaSelected
Fix ariaSelected behavior
2 parents b321ffd + 1e55c58 commit 10f9916

File tree

9 files changed

+13
-10
lines changed

9 files changed

+13
-10
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "onenotepicker",
3-
"version": "3.0.9",
3+
"version": "3.0.10",
44
"files": [
55
"dist/**/*"
66
],

‎src/components/notebookRenderStrategy.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
6464
<ExpandableNode
6565
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
6666
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
67-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
67+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
6868
setsize={setsize} posinset={this.notebook.sections.length + i + 1} /> :
6969
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
7070
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
@@ -77,7 +77,7 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
7777
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
7878
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
7979
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
80-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
80+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
8181
setsize={setsize} posinset={i + 1} />);
8282

8383
return [...createNewSection, ...sections, ...sectionGroups];

‎src/components/recentSections/recentSectionHeaderRenderStrategy.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export class RecentSectionHeaderRenderStrategy extends RecentSectionsCommonPrope
3838
key={renderStrategy.getId() + 'recent-section'}
3939
id={renderStrategy.getId()}
4040
ariaSelected={this.props.ariaSelectedId ? renderStrategy.isAriaSelected() : false}
41+
selected={renderStrategy.isSelected()}
4142
level={childrenLevel} setsize={this.sections.length} posinset={i + 1}></LeafNode>);
4243

4344
return [...sections];

‎src/components/sectionGroupRenderStrategy.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy
6060
<ExpandableNode
6161
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
6262
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
63-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
63+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
6464
setsize={setsize} posinset={this.sectionGroup.sections.length + i + 1} /> :
6565
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
6666
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
@@ -72,7 +72,7 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy
7272
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
7373
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
7474
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
75-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
75+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
7676
setsize={setsize} posinset={i + 1} />);
7777

7878
return [...createNewSection, ...sections, ...sectionGroups];

‎src/components/sectionRenderStrategy.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class SectionRenderStrategy implements ExpandableNodeRenderStrategy {
4040
const pages = pageRenderStrategies && pageRenderStrategies.map(renderStrategy =>
4141
<LeafNode treeViewId={Constants.TreeView.id} node={renderStrategy} globals={this.globals}
4242
id={renderStrategy.getId()} level={childrenLevel}
43-
ariaSelected={renderStrategy.isAriaSelected()} />);
43+
ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}/>);
4444

4545
return pages || [] as JSX.Element[];
4646
}

‎src/components/sharedNotebookRenderStrategy.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg
9393
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
9494
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
9595
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
96-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
96+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
9797
setsize={setsize} posinset={i + 1} />);
9898

9999
const sectionGroupRenderStrategies = this.notebook.apiProperties.spSectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
@@ -102,7 +102,7 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg
102102
<ExpandableNode
103103
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
104104
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
105-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}
105+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} selected={renderStrategy.isSelected()}
106106
setsize={setsize} posinset={this.notebook.apiProperties!.spSections.length + i + 1} /> :
107107
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
108108
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);

‎src/components/treeView/commonNodeProps.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ export interface CommonNodeProps {
88
setsize?: number;
99
posinset?: number;
1010

11+
selected?: boolean;
12+
1113
// For VoiceOver accessibility, there must always be one aria-selected item.
1214
// If there's no actual selected item, this should be the first item.
1315
ariaSelected: boolean;

‎src/components/treeView/expandableNode.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class ExpandableNode extends React.Component<ExpandableNodeProps, Expanda
112112
<a id={this.descendentId()} className='picker-row' onClick={this.onClick.bind(this)} onKeyDown={this.onKeyDown.bind(this)}
113113
data-treeviewid={this.props.treeViewId} data-id={this.props.id}
114114
tabIndex={this.props.ariaSelected ? 0 : -1} role='treeitem' aria-labelledby={this.descendentId()}
115-
aria-expanded={this.props.node.isExpanded()} aria-selected={this.props.ariaSelected}
115+
aria-expanded={this.props.node.isExpanded()} aria-selected={this.props.selected}
116116
aria-level={this.level()} aria-setsize={this.props.setsize} aria-posinset={this.props.posinset}>
117117
{this.props.children || this.props.node.element()}
118118
</a>

‎src/components/treeView/leafNode.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class LeafNode extends React.Component<LeafNodeProps, {}> {
5151
<a id={this.descendentId()} className='picker-row' onClick={this.onClick.bind(this)} onKeyDown={this.onKeyDown.bind(this)}
5252
data-treeviewid={this.props.treeViewId} data-id={this.props.id} tabIndex={this.props.ariaSelected ? 0 : -1}
5353
role='treeitem' aria-labelledby={this.descendentId()} aria-level={this.level()}
54-
aria-selected={this.props.ariaSelected} aria-setsize={this.props.setsize} aria-posinset={this.props.posinset}>
54+
aria-selected={this.props.selected} aria-setsize={this.props.setsize} aria-posinset={this.props.posinset}>
5555
{this.props.node.element()}
5656
</a>
5757
</li>);

0 commit comments

Comments
 (0)