pdomOrder for Diffusion screen, #213

phetsims · Mar 18, 2024 · 7f400d3 · 7f400d3
1 parent dd554d7
commit 7f400d3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/js/common/view/BaseScreenView.ts b/js/common/view/BaseScreenView.ts
@@ -8,6 +8,7 @@
 
 import ScreenView, { ScreenViewOptions } from '../../../../joist/js/ScreenView.js';
 import optionize from '../../../../phet-core/js/optionize.js';
+import { Node } from '../../../../scenery/js/imports.js';
 import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js';
 import TimeControlNode from '../../../../scenery-phet/js/TimeControlNode.js';
 import Tandem from '../../../../tandem/js/Tandem.js';
@@ -26,8 +27,11 @@ export default abstract class BaseScreenView extends ScreenView {
 
   protected readonly model: BaseModel;
 
-  // subclass is responsible for position
-  protected readonly timeControlNode: TimeControlNode;
+  // subclass is responsible for position and pdomOrder
+  protected readonly timeControlNode: Node;
+
+  // subclass is responsible for pdomOrder
+  protected readonly resetAllButton: Node;
 
   protected constructor( model: BaseModel, tandem: Tandem, providedOptions?: BaseScreenViewOptions ) {
 
@@ -78,13 +82,13 @@ export default abstract class BaseScreenView extends ScreenView {
     this.addChild( this.timeControlNode );
 
     // Reset All button
-    const resetAllButton = new ResetAllButton( {
+    this.resetAllButton = new ResetAllButton( {
       listener: () => { this.reset(); },
       right: this.layoutBounds.maxX - GasPropertiesConstants.SCREEN_VIEW_X_MARGIN,
       bottom: this.layoutBounds.maxY - GasPropertiesConstants.SCREEN_VIEW_Y_MARGIN,
       tandem: tandem.createTandem( 'resetAllButton' )
     } );
-    this.addChild( resetAllButton );
+    this.addChild( this.resetAllButton );
   }
 
   protected reset(): void {

diff --git a/js/diffusion/view/DiffusionScreenView.ts b/js/diffusion/view/DiffusionScreenView.ts
@@ -141,6 +141,18 @@ export default class DiffusionScreenView extends BaseScreenView {
     this.addChild( particleFlowRateNode2 );
     this.addChild( stopwatchNode );
 
+    this.pdomPlayAreaNode.pdomOrder = [
+      //TODO https://github.com/phetsims/gas-properties/issues/213
+    ];
+
+    this.pdomControlAreaNode.pdomOrder = [
+      //TODO https://github.com/phetsims/gas-properties/issues/213
+      dataAccordionBox,
+      controlPanel,
+      this.timeControlNode,
+      this.resetAllButton
+    ];
+
     // Position the time controls
     this.timeControlNode.mutate( {
       left: controlPanel.left,