Merge master into hflatval/bump-4.4.2

cognitedata · Aug 29, 2023 · 3194f79 · 3194f79
2 parents 667eb7f + 1dae829
commit 3194f79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/viewer/package.json b/viewer/package.json
@@ -90,7 +90,7 @@
     "@types/jsdom": "21.1.2",
     "@types/lodash": "4.14.197",
     "@types/mixpanel-browser": "2.47.1",
-    "@types/node": "18.17.9",
+    "@types/node": "18.17.11",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",

diff --git a/viewer/packages/tools/src/Measurement/MeasurementTool.ts b/viewer/packages/tools/src/Measurement/MeasurementTool.ts
@@ -378,10 +378,12 @@ export class MeasurementTool extends Cognite3DViewerToolBase {
   }
 
   private async onPointerClick(event: MouseEvent): Promise<void> {
-    if (event.target === this._viewer.canvas) {
-      event.stopPropagation();
+    if (event.target !== this._viewer.canvas) {
+      return;
     }
 
+    event.stopPropagation();
+
     const { offsetX, offsetY } = event;
 
     const intersection = await this._viewer.getIntersectionFromPixel(offsetX, offsetY);

diff --git a/viewer/yarn.lock b/viewer/yarn.lock