add stopwatchNode to pdomOrder, #213

phetsims · Mar 19, 2024 · 931cc16 · 931cc16
1 parent f4b2048
commit 931cc16
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/js/common/view/CollisionCounterNode.ts b/js/common/view/CollisionCounterNode.ts
@@ -53,7 +53,9 @@ export default class CollisionCounterNode extends Node {
       // NodeOptions
       cursor: 'pointer',
       visibleProperty: collisionCounter.visibleProperty,
-      isDisposable: false
+      isDisposable: false,
+      tagName: 'div', // for KeyboardDragListener
+      focusable: true // for KeyboardDragListener
     }, providedOptions );
 
     const wallCollisionsText = new Text( GasPropertiesStrings.wallCollisionsStringProperty, {
@@ -152,9 +154,7 @@ export default class CollisionCounterNode extends Node {
 
     // The background include the bezel and rectangle.
     const backgroundNode = new Node( {
-      children: [ bezelNode, rectangleNode ],
-      tagName: 'div', // for KeyboardDragListener
-      focusable: true // for KeyboardDragListener
+      children: [ bezelNode, rectangleNode ]
     } );
 
     content.center = backgroundNode.center;
@@ -211,7 +211,7 @@ export default class CollisionCounterNode extends Node {
       start: onPress,
       tandem: options.tandem.createTandem( 'dragListener' )
     } ) );
-    backgroundNode.addInputListener( new RichKeyboardDragListener( {
+    this.addInputListener( new RichKeyboardDragListener( {
       positionProperty: collisionCounter.positionProperty,
       dragBoundsProperty: dragBoundsProperty,
       start: onPress,

diff --git a/js/common/view/IdealGasLawScreenView.ts b/js/common/view/IdealGasLawScreenView.ts
@@ -79,6 +79,7 @@ export default class IdealGasLawScreenView extends BaseScreenView {
   protected readonly thermometerNode: Node;
   protected readonly pressureGaugeNode: Node;
   protected readonly collisionCounterNode?: Node;
+  protected readonly stopwatchNode: Node;
 
   protected constructor( model: IdealGasLawModel,
                          particleTypeProperty: StringUnionProperty<ParticleType>,
@@ -295,10 +296,11 @@ export default class IdealGasLawScreenView extends BaseScreenView {
     }
 
     // Stopwatch
-    toolsParent.addChild( new GasPropertiesStopwatchNode( model.stopwatch, {
+    const stopwatchNode = new GasPropertiesStopwatchNode( model.stopwatch, {
       dragBoundsProperty: this.visibleBoundsProperty,
       tandem: tandem.createTandem( 'stopwatchNode' )
-    } ) );
+    } );
+    toolsParent.addChild( stopwatchNode );
 
     // Show how the collision detection space is partitioned into regions
     let regionsNode = null;
@@ -356,6 +358,7 @@ export default class IdealGasLawScreenView extends BaseScreenView {
     this.thermometerNode = thermometerNode;
     this.pressureGaugeNode = pressureGaugeNode;
     this.collisionCounterNode = collisionCounterNode;
+    this.stopwatchNode = stopwatchNode;
   }
 
   protected override reset(): void {

diff --git a/js/diffusion/view/DiffusionScreenView.ts b/js/diffusion/view/DiffusionScreenView.ts
@@ -167,6 +167,7 @@ export default class DiffusionScreenView extends BaseScreenView {
     // Control Area focus order, see https://github.com/phetsims/gas-properties/issues/213.
     this.pdomControlAreaNode.pdomOrder = [
       //TODO https://github.com/phetsims/gas-properties/issues/213
+      stopwatchNode,
       dataAccordionBox,
       controlPanel,
       this.timeControlNode,

diff --git a/js/energy/view/EnergyScreenView.ts b/js/energy/view/EnergyScreenView.ts
@@ -135,6 +135,7 @@ export default class EnergyScreenView extends IdealGasLawScreenView {
     this.pdomControlAreaNode.pdomOrder = [
       //TODO https://github.com/phetsims/gas-properties/issues/213
       leftPanels,
+      this.stopwatchNode,
       this.returnLidButton,
       this.containerNode,
       this.thermometerNode,

diff --git a/js/explore/view/ExploreScreenView.ts b/js/explore/view/ExploreScreenView.ts
@@ -72,6 +72,7 @@ export default class ExploreScreenView extends IdealGasLawScreenView {
     this.pdomControlAreaNode.pdomOrder = [
       //TODO https://github.com/phetsims/gas-properties/issues/213
       this.collisionCounterNode!,
+      this.stopwatchNode,
       this.returnLidButton,
       this.containerNode,
       this.thermometerNode,

diff --git a/js/ideal/view/IdealScreenView.ts b/js/ideal/view/IdealScreenView.ts
@@ -119,6 +119,7 @@ export default class IdealScreenView extends IdealGasLawScreenView {
     this.pdomControlAreaNode.pdomOrder = [
       //TODO https://github.com/phetsims/gas-properties/issues/213
       this.collisionCounterNode!,
+      this.stopwatchNode,
       this.returnLidButton,
       this.containerNode,
       this.thermometerNode,