fix: merge master

cognitedata · Jun 26, 2023 · c70cbbc · c70cbbc
2 parents a65957c + e6130fa
commit c70cbbc
Show file tree

Hide file tree

Showing 11 changed files with 468 additions and 534 deletions.
diff --git a/examples/src/utils/CustomCameraManager.ts b/examples/src/utils/CustomCameraManager.ts
@@ -48,7 +48,12 @@ export class CustomCameraManager implements CameraManager {
     const target =
       state.target ??
       (state.rotation
-        ? CameraManagerHelper.calculateNewTargetFromRotation(this._camera, state.rotation, this._controls.target)
+        ? CameraManagerHelper.calculateNewTargetFromRotation(
+            this._camera,
+            state.rotation,
+            this._controls.target,
+            position
+          )
         : this._controls.target);
 
     this._camera.position.copy(position);

diff --git a/react-components/package.json b/react-components/package.json
@@ -28,13 +28,13 @@
     "@cognite/cogs.js": "^9.17.0",
     "@cognite/reveal": "4.3.4",
     "@cognite/sdk": "^8.2.0",
-    "@storybook/addon-essentials": "7.0.22",
-    "@storybook/addon-interactions": "7.0.22",
-    "@storybook/addon-links": "7.0.22",
-    "@storybook/blocks": "7.0.22",
-    "@storybook/react": "7.0.22",
-    "@storybook/react-webpack5": "7.0.22",
-    "@storybook/testing-library": "0.1.0",
+    "@storybook/addon-essentials": "7.0.23",
+    "@storybook/addon-interactions": "7.0.23",
+    "@storybook/addon-links": "7.0.23",
+    "@storybook/blocks": "7.0.23",
+    "@storybook/react": "7.0.23",
+    "@storybook/react-webpack5": "7.0.23",
+    "@storybook/testing-library": "0.2.0",
     "@types/lodash": "^4.14.190",
     "@types/react": "18.2.7",
     "@types/styled-components": "5.1.26",
@@ -43,7 +43,7 @@
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "storybook": "7.0.22",
+    "storybook": "7.0.23",
     "styled-components": "5.3.11",
     "three": "0.152.2",
     "ts-loader": "9.4.3",