Merge branch 'master' into hflatval/avoid-infinite-rule-item-spinner

cognitedata · Aug 13, 2024 · b10abfc · b10abfc
2 parents df053f8 + a8264ec
commit b10abfc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/...oned_docs/version-4.x/api/@cognite/reveal/type-aliases/CameraControlsOptions.md b/...oned_docs/version-4.x/api/@cognite/reveal/type-aliases/CameraControlsOptions.md
diff --git a/viewer/packages/api/src/api-helpers/Image360ApiHelper.ts b/viewer/packages/api/src/api-helpers/Image360ApiHelper.ts
@@ -606,7 +606,7 @@ function moveCameraPositionTo(manager: FlexibleCameraManager, position: Vector3,
   };
 
   const tempPosition = new Vector3();
-  manager.controls.temporarlyDisableKeyboard = true;
+  manager.controls.temporarilyDisableKeyboard = true;
 
   new TWEEN.Tween(from)
     .to(to, duration)
@@ -617,11 +617,11 @@ function moveCameraPositionTo(manager: FlexibleCameraManager, position: Vector3,
     .easing(num => TWEEN.Easing.Quintic.InOut(num))
     .onStop(() => {
       manager.setPosition(tempPosition);
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
     })
     .onComplete(() => {
       manager.setPosition(position);
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
     })
     .start(TWEEN.now());
 }

diff --git a/viewer/packages/camera-manager/src/Flexible/FlexibleCameraManager.ts b/viewer/packages/camera-manager/src/Flexible/FlexibleCameraManager.ts
@@ -198,20 +198,20 @@ export class FlexibleCameraManager extends PointerEvents implements IFlexibleCam
     const from = { t: 0 };
     const to = { t: 1 };
     const animation = new TWEEN.Tween(from);
-    this.controls.temporarlyDisableKeyboard = true;
+    this.controls.temporarilyDisableKeyboard = true;
     const tween = animation
       .to(to, animationDuration)
       .onUpdate(() => {
         if (this.isDisposed) return;
         this.controls.rotateCameraTo(startDirection, endDirection, from.t);
       })
       .onStop(() => {
-        this.controls.temporarlyDisableKeyboard = false;
+        this.controls.temporarilyDisableKeyboard = false;
         if (this.isDisposed) return;
         this.controls.rotateCameraTo(startDirection, endDirection, 1);
       })
       .onComplete(() => {
-        this.controls.temporarlyDisableKeyboard = false;
+        this.controls.temporarilyDisableKeyboard = false;
         if (this.isDisposed) return;
         this.controls.rotateCameraTo(startDirection, endDirection, 1);
       })

diff --git a/viewer/packages/camera-manager/src/Flexible/FlexibleControls.ts b/viewer/packages/camera-manager/src/Flexible/FlexibleControls.ts
@@ -45,7 +45,7 @@ export class FlexibleControls {
   private _isEnabled: boolean = true;
   private _isInitialized: boolean = false;
   private _isStationary = false; // If true the options.controlsType should not be used. Camera cannot change position and zooms by fov
-  public temporarlyDisableKeyboard: boolean = false;
+  public temporarilyDisableKeyboard: boolean = false;
 
   private readonly _options: FlexibleControlsOptions;
   private readonly _domElement: HTMLElement;
@@ -80,7 +80,7 @@ export class FlexibleControls {
   //          , - ~ ~ ~ - ,
   //      , '               ' ,
   //    ,                       ,   In this state the camera rotating round the target
-  //   ,                         ,  which is in the center of the sceen.
+  //   ,                         ,  which is in the center of the screen.
   //  ,          Target           ,
   //  ,             *    <--------* CameraPosition
   //  ,               CameraVector,
@@ -928,7 +928,7 @@ export class FlexibleControls {
     if (!this._options.enableKeyboardNavigation) {
       return false;
     }
-    if (this.temporarlyDisableKeyboard) {
+    if (this.temporarilyDisableKeyboard) {
       return false;
     }
     let handled = false;

diff --git a/viewer/packages/camera-manager/src/Flexible/moveCamera.ts b/viewer/packages/camera-manager/src/Flexible/moveCamera.ts
@@ -44,7 +44,7 @@ export function moveCameraPositionAndTargetTo(
 
   const tempTarget = new Vector3();
   const tempPosition = new Vector3();
-  manager.controls.temporarlyDisableKeyboard = true;
+  manager.controls.temporarilyDisableKeyboard = true;
 
   const { tween, removeEventListeners } = createTweenAnimationWithStop(manager, from, to, duration);
 
@@ -58,12 +58,12 @@ export function moveCameraPositionAndTargetTo(
       manager.setPositionAndTarget(tempPosition, tempTarget);
     })
     .onStop(() => {
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
       removeEventListeners();
     })
     .onComplete(() => {
       manager.setPositionAndTarget(tempPosition, tempTarget);
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
       removeEventListeners();
     })
     .start(TWEEN.now());
@@ -92,7 +92,7 @@ export function moveCameraTargetTo(manager: FlexibleCameraManager, target: Vecto
   };
 
   const tempTarget = new Vector3();
-  manager.controls.temporarlyDisableKeyboard = true;
+  manager.controls.temporarilyDisableKeyboard = true;
 
   const { tween, removeEventListeners } = createTweenAnimationWithStop(manager, from, to, duration);
   tween
@@ -116,13 +116,13 @@ export function moveCameraTargetTo(manager: FlexibleCameraManager, target: Vecto
     })
     .onStop(() => {
       manager.controls.setTempTarget(undefined);
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
       removeEventListeners();
     })
     .onComplete(() => {
       manager.controls.setTempTarget(undefined);
       manager.setPositionAndTarget(manager.camera.position, tempTarget);
-      manager.controls.temporarlyDisableKeyboard = false;
+      manager.controls.temporarilyDisableKeyboard = false;
       removeEventListeners();
     })
     .start(TWEEN.now());