fix(react-components): don't select objects when clicking in measurem…

…ent (#4544) * fix(react-components): don't select objects when clicking in measurement * chore: add utility methods to ToolController * chore: remove unused import
cognitedata · May 28, 2024 · 0842ac7 · 0842ac7
1 parent 2856f3a
commit 0842ac7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/react-components/src/architecture/base/renderTarget/ToolController.ts b/react-components/src/architecture/base/renderTarget/ToolController.ts
@@ -37,6 +37,14 @@ export class ToolControllers extends PointerEvents {
     return this._activeTool;
   }
 
+  public get defaultTool(): BaseTool | undefined {
+    return this._defaultTool;
+  }
+
+  public get isDefaultToolActive(): boolean {
+    return this.activeTool === this.defaultTool;
+  }
+
   // ================================================
   // OVERRIDES of PointerEvents
   // ================================================

diff --git a/react-components/src/hooks/useClickedNode.tsx b/react-components/src/hooks/useClickedNode.tsx
@@ -17,7 +17,7 @@ import { usePointCloudAnnotationMappingForAssetId } from '../components/CachePro
 import { type PointCloudAnnotationMappedAssetData } from './types';
 import { MOUSE, Vector2 } from 'three';
 import { type DmsUniqueIdentifier, type Source } from '../utilities/FdmSDK';
-import { useReveal } from '../components/RevealCanvas/ViewerContext';
+import { useRenderTarget, useReveal } from '../components/RevealCanvas/ViewerContext';
 
 export type AssetMappingDataResult = {
   cadNode: Node3D;
@@ -39,6 +39,7 @@ export type ClickedNodeData = {
 
 export const useClickedNodeData = (): ClickedNodeData | undefined => {
   const viewer = useReveal();
+  const renderTarget = useRenderTarget();
 
   const [intersection, setIntersection] = useState<AnyIntersection | undefined>(undefined);
 
@@ -49,7 +50,7 @@ export const useClickedNodeData = (): ClickedNodeData | undefined => {
   useEffect(() => {
     const callback = (event: PointerEventData): void => {
       void (async () => {
-        if (event.button !== MOUSE.LEFT) {
+        if (event.button !== MOUSE.LEFT || !renderTarget.toolController.isDefaultToolActive) {
           return;
         }