simplify usages of keydown input listener, phetsims/scenery#1445 phet…

…sims/scenery#1483
phetsims · Oct 21, 2022 · 3e880bb · 3e880bb
1 parent 15ea99e
commit 3e880bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/js/Dialog.ts b/js/Dialog.ts
@@ -18,7 +18,7 @@ import optionize from '../../phet-core/js/optionize.js';
 import StrictOmit from '../../phet-core/js/types/StrictOmit.js';
 import StringUtils from '../../phetcommon/js/util/StringUtils.js';
 import CloseButton from '../../scenery-phet/js/buttons/CloseButton.js';
-import { AlignBox, FocusManager, FullScreen, HBox, KeyboardUtils, Node, PDOMPeer, PDOMUtils, SceneryEvent, TColor, VBox } from '../../scenery/js/imports.js';
+import { AlignBox, FocusManager, FullScreen, HBox, KeyboardUtils, Node, PDOMPeer, PDOMUtils, TColor, TInputListener, VBox } from '../../scenery/js/imports.js';
 import TSoundPlayer from '../../tambo/js/TSoundPlayer.js';
 import generalCloseSoundPlayer from '../../tambo/js/shared-sound-players/generalCloseSoundPlayer.js';
 import generalOpenSoundPlayer from '../../tambo/js/shared-sound-players/generalOpenSoundPlayer.js';
@@ -405,8 +405,8 @@ export default class Dialog extends Popupable( Panel, 1 ) {
     }
 
     // pdom - close the dialog when pressing "escape"
-    const escapeListener = {
-      keydown: ( event: SceneryEvent ) => {
+    const escapeListener: TInputListener = {
+      keydown: event => {
         const domEvent = event.domEvent; // {DOMEvent|null}
 
         if ( KeyboardUtils.isKeyEvent( event.domEvent, KeyboardUtils.KEY_ESCAPE ) ) {

diff --git a/js/accessibility/AccessibleNumberSpinner.ts b/js/accessibility/AccessibleNumberSpinner.ts
@@ -104,7 +104,7 @@ const AccessibleNumberSpinner = <SuperType extends Constructor>( Type: SuperType
 
       // handle all accessible event input
       const accessibleInputListener: TInputListener = {
-        keydown: ( event: SceneryEvent<KeyboardEvent> ) => {
+        keydown: event => {
           if ( ( this as unknown as Node ).enabledProperty.get() ) {
 
             // check for relevant keys here
@@ -133,7 +133,7 @@ const AccessibleNumberSpinner = <SuperType extends Constructor>( Type: SuperType
             }
           }
         },
-        keyup: ( event: SceneryEvent<KeyboardEvent> ) => {
+        keyup: event => {
 
           const key = KeyboardUtils.getEventCode( event.domEvent );
 
@@ -150,7 +150,7 @@ const AccessibleNumberSpinner = <SuperType extends Constructor>( Type: SuperType
             this.handleKeyUp( event );
           }
         },
-        blur: ( event: SceneryEvent<FocusEvent> ) => {
+        blur: event => {
 
           // if a key is currently down when focus leaves the spinner, stop callbacks and emit that the
           // key is up