handle focus for RewardDialog, OopsDialog, AmplitudeKeypadDialog, #194

phetsims · Sep 28, 2021 · b9a25a2 · b9a25a2
1 parent 6fe97a0
commit b9a25a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/js/common/view/AmplitudeNumberDisplay.js b/js/common/view/AmplitudeNumberDisplay.js
@@ -101,6 +101,7 @@ class AmplitudeNumberDisplay extends VBox {
             }
           }
         );
+        amplitudeKeypadDialog.focusCloseButton();
       },
       tandem: options.tandem.createTandem( 'pressListener' ),
       phetioEnabledPropertyInstrumented: true

diff --git a/js/discrete/view/DiscreteScreenView.js b/js/discrete/view/DiscreteScreenView.js
@@ -272,7 +272,10 @@ class DiscreteScreenView extends ScreenView {
       visiblePropertyOptions: { phetioReadOnly: true },
       tandem: options.tandem.createTandem( 'oopsSawtoothWithCosinesDialog' )
     } );
-    model.oopsSawtoothWithCosinesEmitter.addListener( () => oopsSawtoothWithCosinesDialog.show() );
+    model.oopsSawtoothWithCosinesEmitter.addListener( () => {
+      oopsSawtoothWithCosinesDialog.show();
+      oopsSawtoothWithCosinesDialog.focusCloseButton();
+    } );
 
     //------------------------------------------------------------------------------------------------------------------
     // Layout

diff --git a/js/waveGame/view/WaveGameLevelNode.js b/js/waveGame/view/WaveGameLevelNode.js
@@ -444,6 +444,7 @@ class WaveGameLevelNode extends Node {
         // The score has reached the magic number where a reward is display.
         gameAudioPlayer.gameOverPerfectScore();
         rewardDialog.show();
+        rewardDialog.focusCloseButton();
       }
       else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,6 +101,7 @@ class AmplitudeNumberDisplay extends VBox { @@
                 }
               }
             );
+            amplitudeKeypadDialog.focusCloseButton();
           },
           tandem: options.tandem.createTandem( 'pressListener' ),
           phetioEnabledPropertyInstrumented: true
@@ Expand Down @@