use KeyboardUtils.SHIFT_KEYS when possible, #1053

phetsims · Jul 19, 2021 · dc13ea8 · dc13ea8
1 parent c663213
commit dc13ea8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/js/accessibility/KeyStateTrackerTests.js b/js/accessibility/KeyStateTrackerTests.js
@@ -26,8 +26,8 @@ const spaceKeyDownEvent = new KeyboardEvent( 'keydown', { code: KeyboardUtils.KE
 const spaceKeyUpEvent = new KeyboardEvent( 'keyup', { code: KeyboardUtils.KEY_SPACE } );
 const shiftTabKeyDownEvent = new KeyboardEvent( 'keydown', { code: KeyboardUtils.KEY_TAB, shiftKey: true } );
 const shiftTabKeyUpEvent = new KeyboardEvent( 'keyup', { code: KeyboardUtils.KEY_TAB, shiftKey: true } );
-const shiftKeyDownEvent = new KeyboardEvent( 'keydown', { code: KeyboardUtils.KEY_SHIFT_LEFT } );
-const shiftKeyUpEvent = new KeyboardEvent( 'keyup', { code: KeyboardUtils.KEY_SHIFT_LEFT } );
+const shiftKeyLeftDownEvent = new KeyboardEvent( 'keydown', { code: KeyboardUtils.KEY_SHIFT_LEFT } );
+const shiftKeyLeftUpEvent = new KeyboardEvent( 'keyup', { code: KeyboardUtils.KEY_SHIFT_LEFT } );
 
 const testTracker = new KeyStateTracker();
 
@@ -85,17 +85,17 @@ QUnit.test( 'tracking of shift key', assert => {
   testTracker.keydownUpdate( shiftTabKeyDownEvent );
   assert.ok( testTracker.shiftKeyDown, 'tab key with shift modifier should produce a keystate with shift key down' );
 
-  testTracker.keydownUpdate( shiftKeyDownEvent );
+  testTracker.keydownUpdate( shiftKeyLeftDownEvent );
   testTracker.keydownUpdate( shiftTabKeyDownEvent );
   assert.ok( testTracker.isKeyDown( tabKeyDownEvent.code ), 'tab key should be down in tracker' );
-  assert.ok( testTracker.isKeyDown( shiftKeyDownEvent.code ), 'shift key should be down in tracker' );
+  assert.ok( testTracker.isKeyDown( shiftKeyLeftDownEvent.code ), 'shift key should be down in tracker' );
   assert.ok( testTracker.shiftKeyDown, 'shift key should be down in tracker getter' );
 
-  testTracker.keyupUpdate( shiftKeyUpEvent );
+  testTracker.keyupUpdate( shiftKeyLeftUpEvent );
   testTracker.keyupUpdate( tabKeyUpEvent );
 
 
-  assert.ok( !testTracker.isKeyDown( shiftKeyUpEvent.code ), 'shift key should not be down in tracker' );
+  assert.ok( !testTracker.isKeyDown( shiftKeyLeftUpEvent.code ), 'shift key should not be down in tracker' );
   assert.ok( !testTracker.shiftKeyDown, 'shift key should not be down in tracker getter' );
   assert.ok( !testTracker.isKeyDown( tabKeyUpEvent.code ), 'tab key should not be down in tracker' );
 
@@ -107,7 +107,7 @@ QUnit.test( 'tracking of shift key', assert => {
 
   // KeyStateTracker should correctly update when modifier keys like "shift" are attached to the event - if shift
   // is down on keyUpUpdate, shift should be considered down
-  assert.ok( testTracker.isKeyDown( shiftKeyDownEvent.code ), 'shift key should update from modifier' );
+  assert.ok( testTracker.isKeyDown( shiftKeyLeftDownEvent.code ), 'shift key should update from modifier' );
   assert.ok( testTracker.shiftKeyDown, 'shift key should update from modifier getter' );
 } );
 

diff --git a/js/listeners/KeyboardDragListener.js b/js/listeners/KeyboardDragListener.js
@@ -663,7 +663,7 @@ class KeyboardDragListener {
    * @public
    */
   shiftKeyDown() {
-    return this.keyInListDown( [ KeyboardUtils.KEY_SHIFT_LEFT, KeyboardUtils.KEY_SHIFT_RIGHT ] );
+    return this.keyInListDown( KeyboardUtils.SHIFT_KEYS );
   }
 
   /**