Skip to content

Commit

Permalink
accessibleOrder -> pdomOrder, phetsims/scenery#997
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Feb 2, 2021
1 parent 6dc6232 commit 6cd446d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions js/common/view/BothHandsPDOMNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class BothHandsPDOMNode extends Node {
ariaLabel: ratioAndProportionStrings.a11y.bothHands.bothHands
}
}, config );
assert && assert( !config.accessibleOrder, 'BothHandsPDOMNode sets its own accessibleOrder.' );
assert && assert( !config.pdomOrder, 'BothHandsPDOMNode sets its own pdomOrder.' );

super();

Expand Down Expand Up @@ -136,7 +136,7 @@ class BothHandsPDOMNode extends Node {
this.addChild( interactiveNode );

// Make sure that any children inside the both hands interaction (like individual hands) come before the both hands interaction in the PDOM.
this.accessibleOrder = [ dynamicDescription, ...interactiveNode.children, null ];
this.pdomOrder = [ dynamicDescription, ...interactiveNode.children, null ];

interactiveNode.setAccessibleAttribute( 'aria-roledescription', sceneryPhetStrings.a11y.grabDrag.movable );

Expand Down
4 changes: 2 additions & 2 deletions js/common/view/RAPScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,13 @@ class RAPScreenView extends ScreenView {
];

// accessible order (ratio first in nav order)
this.pdomPlayAreaNode.accessibleOrder = [
this.pdomPlayAreaNode.pdomOrder = [
bothHandsPDOMNode,
this.tickMarkViewRadioButtonGroup
];

// accessible order
this.pdomControlAreaNode.accessibleOrder = [
this.pdomControlAreaNode.pdomOrder = [
this.resetAllButton
];

Expand Down
2 changes: 1 addition & 1 deletion js/create/view/CreateScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class CreateScreenView extends RAPScreenView {
this.addChild( tickMarkRangeComboBoxParent );

// pdom
this.pdomPlayAreaNode.accessibleOrder = this.pdomPlayAreaNode.accessibleOrder.concat( [
this.pdomPlayAreaNode.pdomOrder = this.pdomPlayAreaNode.pdomOrder.concat( [
this.tickMarkRangeComboBoxNode,
tickMarkRangeComboBoxParent,
myChallengeAccordionBox,
Expand Down
2 changes: 1 addition & 1 deletion js/discover/view/ChallengeRatioComboBoxNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class ChallengeRatioComboBoxNode extends Node {
this.comboBox
];

this.accessibleOrder = [ comboBoxHeading, this.comboBox ];
this.pdomOrder = [ comboBoxHeading, this.comboBox ];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion js/discover/view/DiscoverScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class DiscoverScreenView extends RAPScreenView {
// the dimensions of the scalingUILayerNode to make it too big. Discovered in https://github.com/phetsims/ratio-and-proportion/issues/273
this.addChild( comboBoxListBoxParent );

this.pdomPlayAreaNode.accessibleOrder = this.pdomPlayAreaNode.accessibleOrder.concat( [ this.comboBoxContainer, comboBoxListBoxParent ] );
this.pdomPlayAreaNode.pdomOrder = this.pdomPlayAreaNode.pdomOrder.concat( [ this.comboBoxContainer, comboBoxListBoxParent ] );

// set this after the supertype has initialized the view code needed to create the screen summary
this.setScreenSummaryContent( new DiscoverScreenSummaryNode(
Expand Down

0 comments on commit 6cd446d

Please sign in to comment.