Merge pull request #1771 from xeokit/fix/XEOK-171

XEOK-171: CameraControl stops reacting when using system shortcuts
xeokit · Jan 3, 2025 · 3ee2a14 · 3ee2a14
2 parents 98913a0 + 2da2769
commit 3ee2a14
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/viewer/scene/CameraControl/lib/handlers/KeyboardPanRotateDollyHandler.js b/src/viewer/scene/CameraControl/lib/handlers/KeyboardPanRotateDollyHandler.js
@@ -39,6 +39,14 @@ class KeyboardPanRotateDollyHandler {
             }
         });
 
+        document.addEventListener("visibilitychange", this._onVisibilityChange = () => {
+            keyDownMap.splice(0);
+        })
+
+        window.addEventListener("blur", this._onBlur = () => {
+            keyDownMap.splice(0);
+        })
+
         this._onTick = scene.on("tick", (e) => {
 
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
@@ -168,6 +176,8 @@ class KeyboardPanRotateDollyHandler {
 
         this._scene.input.off(this._onSceneMouseMove);
         this._scene.input.off(this._onSceneKeyDown);
+        document.removeEventListener("visibilitychange", this._onVisibilityChange);
+        window.removeEventListener("blur", this._onBlur);
         this._scene.input.off(this._onSceneKeyUp);
     }
 }

diff --git a/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js b/src/viewer/scene/CameraControl/lib/handlers/MousePanRotateDollyHandler.js
@@ -77,6 +77,14 @@ class MousePanRotateDollyHandler {
             keyDown[keyCode] = false;
         });
 
+        document.addEventListener("visibilitychange", this._onVisibilityChange = () => {
+            keyDown.splice(0);
+        })
+
+        window.addEventListener("blur", this._onBlur = () => {
+            keyDown.splice(0);
+        })
+
         function setMousedownState(pick = true) {
             setMousedownPositions();
             if (pick) {
@@ -355,6 +363,8 @@ class MousePanRotateDollyHandler {
 
         document.removeEventListener("keydown", this._documentKeyDownHandler);
         document.removeEventListener("keyup", this._documentKeyUpHandler);
+        document.removeEventListener("visibilitychange", this._onVisibilityChange);
+        window.removeEventListener("blur", this._onBlur);
         canvas.removeEventListener("mousedown", this._mouseDownHandler);
         document.removeEventListener("mousemove", this._documentMouseMoveHandler);
         canvas.removeEventListener("mousemove", this._canvasMouseMoveHandler);