From 3b0c2e404792dd5d815988c009d8ae9ff95ca4f8 Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabians@speckle.systems>
Date: Wed, 3 Sep 2025 13:30:50 +0300
Subject: [PATCH] fix(fe): prevent selection when measuring (#5372)

---
 .../frontend-2/lib/viewer/composables/setup/measurements.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-2/lib/viewer/composables/setup/measurements.ts b/packages/frontend-2/lib/viewer/composables/setup/measurements.ts
index 0cf08f1c7..7f670d966 100644
--- a/packages/frontend-2/lib/viewer/composables/setup/measurements.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup/measurements.ts
@@ -7,7 +7,8 @@ import type { Measurement } from '@speckle/viewer'
 import {
   MeasurementEvent,
   MeasurementsExtension,
-  MeasurementState
+  MeasurementState,
+  SelectionExtension
 } from '@speckle/viewer'
 import { onKeyStroke, watchTriggerable } from '@vueuse/core'
 import { useInjectedViewerState } from '~/lib/viewer/composables/setup'
@@ -35,6 +36,7 @@ export const useMeasurementsPostSetup = () => {
   const { reset, removeActiveMeasurement } = useMeasurementUtilities()
 
   const measurementsInstance = () => instance.getExtension(MeasurementsExtension)
+  const selectionInstance = () => instance.getExtension(SelectionExtension)
 
   // state -> viewer
   const { trigger: triggerEnabledWatch } = watchTriggerable(
@@ -42,6 +44,7 @@ export const useMeasurementsPostSetup = () => {
     (newVal, oldVal) => {
       if (newVal !== oldVal) {
         measurementsInstance().enabled = newVal
+        selectionInstance().enabled = !newVal
       }
     }
   )