Fix mass interrupting and focus handling on reset, see #399 and #418

phetsims · Oct 1, 2024 · a11b97c · a11b97c
1 parent 9415778
commit a11b97c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/js/common/model/Mass.ts b/js/common/model/Mass.ts
@@ -634,6 +634,8 @@ export default abstract class Mass extends PhetioObject {
    */
   public reset( resetInternalVisibleProperty = true ): void {
 
+    this.interruptedEmitter.emit();
+
     // Clear velocity and force on the p2 body
     this.body.velocity[ 0 ] = 0;
     this.body.velocity[ 1 ] = 0;

diff --git a/js/common/view/MassView.ts b/js/common/view/MassView.ts
@@ -225,8 +225,12 @@ export default abstract class MassView extends Disposable {
       } );
     }
     const resetListener = () => {
+
+      // After reset, do not assume the cursor is over an object. It will be updated the next time the cursor moves.
       this.isCursorOverProperty.reset();
-      this.isKeyboardFocusedProperty.reset();
+
+      // NOTE: Do not reset the focus state (isKeyboardFocusedProperty) because it may persist through a reset (like
+      // with global keyboard shortcuts) https://github.com/phetsims/density-buoyancy-common/issues/399
 
       this.grabDragInteraction && this.grabDragInteraction.reset();
     };