Skip to content

Commit 878addb

Browse files
mttwcmttwc
committed
Fix npm run start. Aria mispelling
1 parent b2bd1a7 commit 878addb

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎src/components/treeView/expandableNode.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,26 @@ export class ExpandableNode extends React.Component<ExpandableNodeProps, Expanda
7373
}
7474
}
7575

76-
private get level() {
76+
private level() {
7777
return this.props.level || 1;
7878
}
7979

80-
private get descendentId() {
80+
private descendentId() {
8181
return this.props.treeViewId + this.props.id;
8282
}
8383

8484
render() {
8585
return (
86-
<li aria-labelledby={this.descendentId} aria-expanded={this.state.expanded} role='treeitem' aria-level={this.level} aria-checked={this.props.node.isSelected()}
87-
id={this.descendentId} aria-selected={this.props.ariaSelected}>
86+
<li aria-labelledby={this.descendentId()} aria-expanded={this.state.expanded} role='treeitem' aria-level={this.level()} aria-checked={this.props.node.isSelected()}
87+
id={this.descendentId()} aria-selected={this.props.ariaSelected}>
8888
<a className='picker-row' onClick={this.onClick.bind(this)} onKeyDown={this.onKeyDown.bind(this)}
8989
data-treeviewid={this.props.treeViewId} data-id={this.props.id} tabIndex={this.props.tabbable ? 0 : -1}
9090
role='presentation'>
9191
{this.props.node.element()}
9292
</a>
9393
{this.state.expanded ?
9494
<ul role='group'>
95-
{this.props.node.getChildren(this.level + 1)}
95+
{this.props.node.getChildren(this.level() + 1)}
9696
</ul> : undefined}
9797
</li>);
9898
}

‎src/components/treeView/leafNode.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ export class LeafNode extends React.Component<LeafNodeProps, {}> {
3232
}
3333
}
3434

35-
private get level() {
35+
private level() {
3636
return this.props.level || 1;
3737
}
3838

39-
private get descendentId() {
39+
private descendentId() {
4040
return this.props.treeViewId + this.props.id;
4141
}
4242

4343
render() {
4444
return (
45-
<li aria-labelledby={this.descendentId} role='treeitem' aria-level={this.level} aria-checked={this.props.node.isSelected()}
46-
id={this.descendentId} aria-selected={this.props.ariaSelected}>
45+
<li aria-labelledby={this.descendentId()} role='treeitem' aria-level={this.level()} aria-checked={this.props.node.isSelected()}
46+
id={this.descendentId()} aria-selected={this.props.ariaSelected}>
4747
<a className='picker-row' onClick={this.props.node.onClickBinded} onKeyDown={this.onKeyDown.bind(this)}
4848
data-treeviewid={this.props.treeViewId} data-id={this.props.id} tabIndex={this.props.tabbable ? 0 : -1}
4949
role='presentation'>

‎src/oneNotePicker.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface OneNotePickerProps extends GlobalProps {
1818
}
1919

2020
export class OneNotePicker extends OneNotePickerBase<OneNotePickerProps, {}> {
21-
protected get rootNodes(): JSX.Element[] {
21+
protected rootNodes(): JSX.Element[] {
2222
const { notebooks, sharedNotebooks, globals } = this.props;
2323
const { focusOnMount, ariaSelectedId } = globals;
2424

@@ -33,21 +33,21 @@ export class OneNotePicker extends OneNotePickerBase<OneNotePickerProps, {}> {
3333
const notebookNodes = notebookRenderStrategies.map((renderStrategy, i) =>
3434
!!this.props.globals.callbacks.onSectionSelected || !!this.props.globals.callbacks.onPageSelected ?
3535
<ExpandableNode globals={this.props.globals} expanded={renderStrategy.isExpanded()} node={renderStrategy}
36-
treeViewId={this.treeViewId} key={renderStrategy.getId()}
36+
treeViewId={this.treeViewId()} key={renderStrategy.getId()}
3737
id={renderStrategy.getId()} tabbable={i === 0} focusOnMount={focusOnMount && i === 0}
3838
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : i === 0}></ExpandableNode> :
39-
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId} key={renderStrategy.getId()}
39+
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId()} key={renderStrategy.getId()}
4040
id={renderStrategy.getId()} tabbable={i === 0} focusOnMount={focusOnMount && i === 0}
4141
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : i === 0}></LeafNode>);
4242

4343
const sharedNotebookNodes = sharedNotebookRenderStrategies.map((renderStrategy, i) =>
4444
!!this.props.globals.callbacks.onSectionSelected || !!this.props.globals.callbacks.onPageSelected ?
4545
<ExpandableNode globals={this.props.globals} expanded={renderStrategy.isExpanded()} node={renderStrategy}
46-
treeViewId={this.treeViewId} key={renderStrategy.getId()}
46+
treeViewId={this.treeViewId()} key={renderStrategy.getId()}
4747
id={renderStrategy.getId()} tabbable={noPersonalNotebooks && i === 0}
4848
focusOnMount={focusOnMount && noPersonalNotebooks && i === 0}
4949
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : noPersonalNotebooks && i === 0}></ExpandableNode> :
50-
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId} key={renderStrategy.getId()}
50+
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId()} key={renderStrategy.getId()}
5151
id={renderStrategy.getId()} tabbable={noPersonalNotebooks && i === 0}
5252
focusOnMount={focusOnMount && noPersonalNotebooks && i === 0}
5353
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : noPersonalNotebooks && i === 0}></LeafNode>);

‎src/oneNotePickerBase.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ import { Strings } from './strings';
77
import { GlobalProps } from './props/globalProps';
88

99
export abstract class OneNotePickerBase<TState extends GlobalProps, TProps> extends React.Component<TState, TProps> {
10-
protected get treeViewId() {
10+
protected treeViewId() {
1111
return Constants.TreeView.id;
1212
}
1313

14-
protected get activeDescendentId() {
14+
protected activeDescendentId() {
1515
if (!this.props.globals.ariaSelectedId) {
1616
return '';
1717
}
18-
return this.treeViewId + this.props.globals.ariaSelectedId;
18+
return this.treeViewId() + this.props.globals.ariaSelectedId;
1919
}
2020

21-
protected abstract get rootNodes(): JSX.Element[];
21+
protected abstract rootNodes(): JSX.Element[];
2222

2323
render() {
2424
return (
2525
<div className='onenote-picker ms-fontColor-themePrimary'>
2626
<ul role='tree' aria-label={Strings.get('Accessibility.PickerTableName', this.props.globals.strings)}
27-
className='menu-list picker-list-header' aria-activedescendent={this.activeDescendentId}>
28-
{this.rootNodes}
27+
className='menu-list picker-list-header' aria-activedescendant={this.activeDescendentId()}>
28+
{this.rootNodes()}
2929
</ul>
3030
</div>
3131
);

‎src/oneNoteSingleNotebookPicker.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface OneNoteSingleNotebookPickerProps extends GlobalProps {
1818
}
1919

2020
export class OneNoteSingleNotebookPicker extends OneNotePickerBase<OneNoteSingleNotebookPickerProps, {}> {
21-
protected get rootNodes(): JSX.Element[] {
21+
protected rootNodes(): JSX.Element[] {
2222
const { sectionGroups, sections, globals } = this.props;
2323
const { focusOnMount, ariaSelectedId } = globals;
2424

@@ -32,18 +32,18 @@ export class OneNoteSingleNotebookPicker extends OneNotePickerBase<OneNoteSingle
3232

3333
const sectionGroupNodes = sectionGroupRenderStrategies.map((renderStrategy, i) =>
3434
<ExpandableNode globals={this.props.globals} expanded={renderStrategy.isExpanded()} node={renderStrategy}
35-
treeViewId={this.treeViewId} key={renderStrategy.getId()}
35+
treeViewId={this.treeViewId()} key={renderStrategy.getId()}
3636
id={renderStrategy.getId()} tabbable={i === 0} focusOnMount={focusOnMount && i === 0}
3737
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : i === 0}></ExpandableNode>);
3838

3939
const sectionNodes = sectionRenderStrategies.map((renderStrategy, i) =>
4040
!!this.props.globals.callbacks.onPageSelected ?
4141
<ExpandableNode globals={this.props.globals} expanded={renderStrategy.isExpanded()} node={renderStrategy}
42-
treeViewId={this.treeViewId} key={renderStrategy.getId()}
42+
treeViewId={this.treeViewId()} key={renderStrategy.getId()}
4343
id={renderStrategy.getId()} tabbable={noSectionGroups && i === 0}
4444
focusOnMount={focusOnMount && noSectionGroups && i === 0}
4545
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : noSectionGroups && i === 0}></ExpandableNode> :
46-
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId} key={renderStrategy.getId()}
46+
<LeafNode globals={this.props.globals} node={renderStrategy} treeViewId={this.treeViewId()} key={renderStrategy.getId()}
4747
id={renderStrategy.getId()} tabbable={noSectionGroups && i === 0}
4848
focusOnMount={focusOnMount && noSectionGroups && i === 0}
4949
ariaSelected={ariaSelectedId ? renderStrategy.isAriaSelected() : noSectionGroups && i === 0}></LeafNode>);

0 commit comments

Comments
 (0)