Update usages of KeyboardListener and KeyboardDragListener after chan…

…ges from phetsims/scenery#1570
phetsims · Apr 25, 2024 · 4088003 · 4088003
1 parent aa7b3a6
commit 4088003
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/js/quadrilateral/view/QuadrilateralMovableNode.ts b/js/quadrilateral/view/QuadrilateralMovableNode.ts
@@ -100,7 +100,7 @@ export default class QuadrilateralMovableNode extends Voicing( Node ) {
     // Voicing - speak all content about this component when you press enter or spacebar
     this.addInputListener( new KeyboardListener( {
       keys: [ 'enter', 'space' ],
-      callback: () => {
+      fire: () => {
         this.voicingSpeakFullResponse();
       }
     } ) );

diff --git a/js/quadrilateral/view/QuadrilateralNode.ts b/js/quadrilateral/view/QuadrilateralNode.ts
@@ -180,25 +180,17 @@ export default class QuadrilateralNode extends Voicing( Node ) {
     //---------------------------------------------------------------------------------------------------------------
 
     // When the shift key is down, Vertices snap to finer intervals
-    this.addInputListener( new KeyboardListener( {
-      keys: [ 'shift' ],
-      listenerFireTrigger: 'both',
-      callback: ( event, keysPressed, listener ) => {
-        this.model.minorIntervalsFromGlobalKeyProperty.value = listener.keysDown;
-      },
-      cancel: listener => {
-
-        // not locking until next press
-        this.model.minorIntervalsFromGlobalKeyProperty.value = false;
-      },
-      global: true
-    } ) );
+    const shiftKeyListener = KeyboardListener.createGlobal( this, {
+      keys: [ 'shift' ]
+    } );
+    shiftKeyListener.isPressedProperty.link( isPressed => {
+      this.model.minorIntervalsFromGlobalKeyProperty.value = isPressed;
+    } );
 
     // Global key listeners
-    this.addInputListener( new KeyboardListener( {
+    KeyboardListener.createGlobal( this, {
       keys: [ 'alt+shift+r', 'alt+c' ],
-      global: true,
-      callback: ( event, keysPressed, listener ) => {
+      fire: ( event, keysPressed, listener ) => {
         if ( keysPressed === 'alt+c' ) {
 
           // command to check shape, Voicing the current shape name or its Properties depending on name visibility
@@ -213,7 +205,7 @@ export default class QuadrilateralNode extends Voicing( Node ) {
           Voicing.alertUtterance( this.voicingUtterance );
         }
       }
-    } ) );
+    } );
 
     this.vertexNodes = [ vertexANode, vertexBNode, vertexCNode, vertexDNode ];
     this.sideNodes = [ sideABNode, sideBCNode, sideCDNode, sideDANode ];

diff --git a/js/quadrilateral/view/QuadrilateralSideNode.ts b/js/quadrilateral/view/QuadrilateralSideNode.ts
@@ -159,8 +159,8 @@ class QuadrilateralSideNode extends QuadrilateralMovableNode {
       dragDelta: this.largeViewDragDelta,
       shiftDragDelta: this.smallViewDragDelta,
       transform: modelViewTransform,
-      drag: ( vectorDelta: Vector2 ) => {
-        this.moveVerticesFromModelDelta( vectorDelta );
+      drag: ( event, listener ) => {
+        this.moveVerticesFromModelDelta( listener.vectorDelta );
       },
 
       moveOnHoldDelay: 750,

diff --git a/js/quadrilateral/view/QuadrilateralVertexNode.ts b/js/quadrilateral/view/QuadrilateralVertexNode.ts
@@ -100,8 +100,8 @@ export default class QuadrilateralVertexNode extends QuadrilateralMovableNode {
       shiftDragDelta: this.smallViewDragDelta,
 
       transform: modelViewTransform,
-      drag: ( modelDelta: Vector2 ) => {
-        const proposedPosition = quadrilateralModel.getClosestGridPositionInDirection( vertex.positionProperty.value, modelDelta );
+      drag: ( event, listener ) => {
+        const proposedPosition = quadrilateralModel.getClosestGridPositionInDirection( vertex.positionProperty.value, listener.vectorDelta );
 
         // constrain to model bounds
         const inBoundsPosition = quadrilateralModel.vertexDragBounds.closestPointTo( proposedPosition );