npm - @cornerstonejs/tools - Versions diffs - 0.9.0 → 0.9.3 - Mend

@cornerstonejs/tools 0.9.0 → 0.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (123) hide show

package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDown.js CHANGED Viewed

@@ -41,14 +41,14 @@ function mouseDown(evt) {
     const isMultiSelect = !!evt.detail.event.shiftKey;
     if (annotationToolsWithMoveableHandles.length > 0) {
         const { tool, annotation, handle } = getAnnotationForSelection(annotationToolsWithMoveableHandles);
-        toggleAnnotationSelection(annotation, isMultiSelect);
+        toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
         tool.handleSelectedCallback(evt, annotation, handle, 'Mouse');
         return;
     }
     const moveableAnnotationTools = (0, filterMoveableAnnotationTools_1.default)(element, annotationToolsWithAnnotations, canvasCoords, 'mouse');
     if (moveableAnnotationTools.length > 0) {
         const { tool, annotation } = getAnnotationForSelection(moveableAnnotationTools);
-        toggleAnnotationSelection(annotation, isMultiSelect);
+        toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
         tool.toolSelectedCallback(evt, annotation, 'Mouse');
         return;
     }
@@ -65,19 +65,19 @@ function getAnnotationForSelection(toolsWithMovableHandles) {
         toolsWithMovableHandles.find((item) => !(0, annotationLocking_1.isAnnotationLocked)(item.annotation))) ||
         toolsWithMovableHandles[0]);
 }
-function toggleAnnotationSelection(annotation, isMultiSelect = false) {
+function toggleAnnotationSelection(annotationUID, isMultiSelect = false) {
     if (isMultiSelect) {
-        if ((0, annotationSelection_1.isAnnotationSelected)(annotation)) {
-            (0, annotationSelection_1.setAnnotationSelected)(annotation, false);
+        if ((0, annotationSelection_1.isAnnotationSelected)(annotationUID)) {
+            (0, annotationSelection_1.setAnnotationSelected)(annotationUID, false);
         }
         else {
             const preserveSelected = true;
-            (0, annotationSelection_1.setAnnotationSelected)(annotation, true, preserveSelected);
+            (0, annotationSelection_1.setAnnotationSelected)(annotationUID, true, preserveSelected);
         }
     }
     else {
         const preserveSelected = false;
-        (0, annotationSelection_1.setAnnotationSelected)(annotation, true, preserveSelected);
+        (0, annotationSelection_1.setAnnotationSelected)(annotationUID, true, preserveSelected);
     }
 }
 //# sourceMappingURL=mouseDown.js.map

package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDown.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mouseDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDown.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,uCAAwC;AAOxC,8FAG8D;AAE9D,0FAAwF;AAGxF,gHAAwF;AACxF,4HAAoG;AACpG,8GAAsF;AACtF,sGAA8E;AAC9E,8GAAsF;AAEtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAS,CAAC;AAyBtC,SAAwB,SAAS,CAAC,GAAkC;IAElE,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC;IAInD,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,oBAAoB,KAAK,UAAU,EAAE;QACvE,MAAM,aAAa,GAAG,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAE3D,IAAI,aAAa,EAAE;YACjB,OAAO;SACR;KACF;IAGD,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;IACtD,MAAM,2BAA2B,GAAG,IAAA,wCAA8B,EAChE,GAAG,EACH,CAAC,MAAM,CAAC,EACR,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,CAAC;IACF,MAAM,wCAAwC,GAAG,cAAc;QAC7D,CAAC,CAAC,IAAA,wCAA8B,EAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAChD,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,eAAe,GAAG;QACtB,GAAG,CAAC,2BAA2B,IAAI,EAAE,CAAC;QACtC,GAAG,CAAC,wCAAwC,IAAI,EAAE,CAAC;KACpD,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAGhC,MAAM,8BAA8B,GAAG,IAAA,8CAAoC,EACzE,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC;IAKtD,MAAM,kCAAkC,GAAG,IAAA,wCAA8B,EACvE,OAAO,EACP,8BAA8B,EAC9B,YAAY,EACZ,OAAO,CACR,CAAC;IAGF,MAAM,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAIlD,IAAI,kCAAkC,CAAC,MAAM,GAAG,CAAC,EAAE;QACjD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,yBAAyB,CAC5D,kCAAkC,CACP,CAAC;QAE9B,yBAAyB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;~~QACrD~~,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAE9D,OAAO;KACR;IAID,MAAM,uBAAuB,GAAG,IAAA,uCAA6B,EAC3D,OAAO,EACP,8BAA8B,EAC9B,YAAY,EACZ,OAAO,CACR,CAAC;IAIF,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,yBAAyB,CACpD,uBAAuB,CACxB,CAAC;QAEF,yBAAyB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;~~QACrD~~,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAEpD,OAAO;KACR;IAGD,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,qBAAqB,KAAK,UAAU,EAAE;QACxE,MAAM,aAAa,GAAG,UAAU,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAE5D,IAAI,aAAa,EAAE;YAEjB,OAAO;SACR;KACF;AAGH,CAAC;AAvGD,4BAuGC;AAQD,SAAS,yBAAyB,CAChC,uBAA6C;IAE7C,OAAO,CACL,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC;QACjC,uBAAuB,CAAC,IAAI,CAC1B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAA,sCAAkB,EAAC,IAAI,CAAC,UAAU,CAAC,CAC/C,CAAC;QACJ,uBAAuB,CAAC,CAAC,CAAC,CAC3B,CAAC;AACJ,CAAC;AASD,SAAS,yBAAyB,CAChC,~~UAAsB~~,~~EACtB~~,aAAa,GAAG,KAAK;IAErB,IAAI,aAAa,EAAE;QACjB,IAAI,IAAA,0CAAoB,EAAC,~~UAAU~~,CAAC,EAAE;~~YACpC~~,IAAA,2CAAqB,EAAC,~~UAAU~~,EAAE,KAAK,CAAC,CAAC;~~SAC1C~~;aAAM;YACL,MAAM,gBAAgB,GAAG,IAAI,CAAC;YAC9B,IAAA,2CAAqB,EAAC,~~UAAU~~,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;~~SAC3D~~;KACF;SAAM;QACL,MAAM,gBAAgB,GAAG,KAAK,CAAC;QAC/B,IAAA,2CAAqB,EAAC,~~UAAU~~,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;~~KAC3D~~;AACH,CAAC"}
1	+ {"version":3,"file":"mouseDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDown.ts"],"names":[],"mappings":"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"}

package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDownActivate.js CHANGED Viewed

@@ -19,7 +19,7 @@ function mouseDownActivate(evt) {
     }
     if (activeTool.addNewAnnotation) {
         const annotation = activeTool.addNewAnnotation(evt, 'mouse');
-        (0, annotationSelection_1.setAnnotationSelected)(annotation);
+        (0, annotationSelection_1.setAnnotationSelected)(annotation.annotationUID);
     }
 }
 exports.default = mouseDownActivate;

package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDownActivate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sGAA8E;AAC9E,8FAA6F;AAU7F,SAAwB,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,UAAU,CAAC,gBAAgB,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAA,2CAAqB,EAAC,UAAU,CAAC,CAAC;~~KACnC~~;AACH,CAAC;AAtBD,oCAsBC"}
1	+ {"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sGAA8E;AAC9E,8FAA6F;AAU7F,SAAwB,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,UAAU,CAAC,gBAAgB,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAA,2CAAqB,EAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KACjD;AACH,CAAC;AAtBD,oCAsBC"}

package/dist/cjs/stateManagement/annotation/annotationSelection.d.ts CHANGED Viewed

@@ -1,9 +1,7 @@
-import { Annotation } from '../../types';
-declare function setAnnotationSelected(annotation: Annotation, selected?: boolean, preserveSelected?: boolean): void;
-declare function deselectAnnotation(annotation?: Annotation): void;
-declare function getAnnotationsSelected(): Array<Annotation>;
-declare function getAnnotationSelected(annotationUID: string): Annotation;
-declare function getAnnotationsSelectedByToolName(toolName: string): Array<Annotation>;
-declare function isAnnotationSelected(annotation: Annotation): boolean;
+declare function setAnnotationSelected(annotationUID: string, selected?: boolean, preserveSelected?: boolean): void;
+declare function deselectAnnotation(annotationUID?: string): void;
+declare function getAnnotationsSelected(): Array<string>;
+declare function getAnnotationsSelectedByToolName(toolName: string): Array<string>;
+declare function isAnnotationSelected(annotationUID: string): boolean;
 declare function getAnnotationsSelectedCount(): number;
-export { setAnnotationSelected, getAnnotationsSelected, getAnnotationSelected, getAnnotationsSelectedByToolName, getAnnotationsSelectedCount, deselectAnnotation, isAnnotationSelected, };
+export { setAnnotationSelected, getAnnotationsSelected, getAnnotationsSelectedByToolName, getAnnotationsSelectedCount, deselectAnnotation, isAnnotationSelected, };

package/dist/cjs/stateManagement/annotation/annotationSelection.js CHANGED Viewed

@@ -1,64 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAnnotationSelected = exports.deselectAnnotation = exports.getAnnotationsSelectedCount = exports.getAnnotationsSelectedByToolName = exports.getAnnotationSelected = exports.getAnnotationsSelected = exports.setAnnotationSelected = void 0;
+exports.isAnnotationSelected = exports.deselectAnnotation = exports.getAnnotationsSelectedCount = exports.getAnnotationsSelectedByToolName = exports.getAnnotationsSelected = exports.setAnnotationSelected = void 0;
 const core_1 = require("@cornerstonejs/core");
 const enums_1 = require("../../enums");
-const selectedAnnotations = new Set();
-function setAnnotationSelected(annotation, selected = true, preserveSelected = false) {
+const annotationState_1 = require("./annotationState");
+const selectedAnnotationUIDs = new Set();
+function setAnnotationSelected(annotationUID, selected = true, preserveSelected = false) {
     if (selected) {
-        selectAnnotation(annotation, preserveSelected);
+        selectAnnotation(annotationUID, preserveSelected);
     }
     else {
-        deselectAnnotation(annotation);
+        deselectAnnotation(annotationUID);
     }
 }
 exports.setAnnotationSelected = setAnnotationSelected;
-function selectAnnotation(annotation, preserveSelected = false) {
+function selectAnnotation(annotationUID, preserveSelected = false) {
     const detail = makeEventDetail();
     if (!preserveSelected) {
-        clearSelectionSet(selectedAnnotations, detail);
+        clearSelectionSet(selectedAnnotationUIDs, detail);
     }
-    if (annotation && !selectedAnnotations.has(annotation)) {
-        selectedAnnotations.add(annotation);
-        detail.added.push(annotation);
+    if (annotationUID && !selectedAnnotationUIDs.has(annotationUID)) {
+        selectedAnnotationUIDs.add(annotationUID);
+        detail.added.push(annotationUID);
     }
-    publish(detail, selectedAnnotations);
+    publish(detail, selectedAnnotationUIDs);
 }
-function deselectAnnotation(annotation) {
+function deselectAnnotation(annotationUID) {
     const detail = makeEventDetail();
-    if (annotation) {
-        if (selectedAnnotations.delete(annotation)) {
-            detail.removed.push(annotation);
+    if (annotationUID) {
+        if (selectedAnnotationUIDs.delete(annotationUID)) {
+            detail.removed.push(annotationUID);
         }
     }
     else {
-        clearSelectionSet(selectedAnnotations, detail);
+        clearSelectionSet(selectedAnnotationUIDs, detail);
     }
-    publish(detail, selectedAnnotations);
+    publish(detail, selectedAnnotationUIDs);
 }
 exports.deselectAnnotation = deselectAnnotation;
 function getAnnotationsSelected() {
-    return Array.from(selectedAnnotations);
+    return Array.from(selectedAnnotationUIDs);
 }
 exports.getAnnotationsSelected = getAnnotationsSelected;
-function getAnnotationSelected(annotationUID) {
-    return getAnnotationsSelected().find((annotation) => {
-        return annotation.annotationUID === annotationUID;
-    });
-}
-exports.getAnnotationSelected = getAnnotationSelected;
 function getAnnotationsSelectedByToolName(toolName) {
-    return getAnnotationsSelected().filter((annotation) => {
+    return getAnnotationsSelected().filter((annotationUID) => {
+        const annotation = (0, annotationState_1.getAnnotation)(annotationUID);
         return annotation.metadata.toolName === toolName;
     });
 }
 exports.getAnnotationsSelectedByToolName = getAnnotationsSelectedByToolName;
-function isAnnotationSelected(annotation) {
-    return selectedAnnotations.has(annotation);
+function isAnnotationSelected(annotationUID) {
+    return selectedAnnotationUIDs.has(annotationUID);
 }
 exports.isAnnotationSelected = isAnnotationSelected;
 function getAnnotationsSelectedCount() {
-    return selectedAnnotations.size;
+    return selectedAnnotationUIDs.size;
 }
 exports.getAnnotationsSelectedCount = getAnnotationsSelectedCount;
 function makeEventDetail() {

package/dist/cjs/stateManagement/annotation/annotationSelection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":";;;AAAA,8CAAgE;AAChE,uCAAqC;~~AAQrC~~,MAAM,~~mBAAmB~~,~~GAAoB~~,IAAI,GAAG,EAAE,CAAC;~~AAiBvD~~,SAAS,qBAAqB,CAC5B,~~UAAsB~~,~~EACtB~~,QAAQ,GAAG,IAAI,EACf,gBAAgB,GAAG,KAAK;IAExB,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,~~UAAU~~,EAAE,gBAAgB,CAAC,CAAC;~~KAChD~~;SAAM;QACL,kBAAkB,CAAC,~~UAAU~~,CAAC,CAAC;~~KAChC~~;AACH,CAAC;~~AAmIC~~,sDAAqB;~~AAxHvB~~,SAAS,gBAAgB,CACvB,~~UAAsB~~,~~EACtB~~,gBAAgB,GAAG,KAAK;IAExB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,CAAC,gBAAgB,EAAE;QACrB,iBAAiB,CAAC,~~mBAAmB~~,EAAE,MAAM,CAAC,CAAC;~~KAChD~~;IACD,IAAI,~~UAAU~~,IAAI,CAAC,~~mBAAmB~~,CAAC,GAAG,CAAC,~~UAAU~~,CAAC,EAAE;~~QACtD~~,~~mBAAmB~~,CAAC,GAAG,CAAC,~~UAAU~~,CAAC,CAAC;~~QACpC~~,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,~~UAAU~~,CAAC,CAAC;~~KAC/B~~;IACD,OAAO,CAAC,MAAM,EAAE,~~mBAAmB~~,CAAC,CAAC;~~AACvC~~,CAAC;AAQD,SAAS,kBAAkB,CAAC,~~UAAuB~~;~~IACjD~~,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,~~UAAU~~,EAAE;~~QACd~~,IAAI,~~mBAAmB~~,CAAC,MAAM,CAAC,~~UAAU~~,CAAC,EAAE;~~YAC1C~~,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,~~UAAU~~,CAAC,CAAC;~~SACjC~~;KACF;SAAM;QACL,iBAAiB,CAAC,~~mBAAmB~~,EAAE,MAAM,CAAC,CAAC;~~KAChD~~;IACD,OAAO,CAAC,MAAM,EAAE,~~mBAAmB~~,CAAC,CAAC;~~AACvC~~,CAAC;~~AA8FC~~,gDAAkB;~~AAxFpB~~,SAAS,sBAAsB;IAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,~~mBAAmB~~,CAAC,CAAC;~~AACzC~~,CAAC;~~AAkFC~~,wDAAsB;~~AA1ExB~~,SAAS,~~qBAAqB~~,CAAC,~~aAAqB~~;~~IAClD~~,OAAO,sBAAsB,EAAE,CAAC,~~IAAI~~,CAAC,CAAC,~~UAAU~~,EAAE,EAAE;~~QAClD~~,~~OAAO~~,UAAU,~~CAAC~~,~~aAAa~~,~~KAAK~~,aAAa,CAAC~~;IACpD~~,CAAC~~,CAAC,CAAC~~;~~AACL~~,~~CAAC;AAuEC,sDAAqB;AAhEvB,SAAS,gCAAgC,CAAC,QAAgB;IACxD,~~OAAO,~~sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC,~~UAAU,~~EAAE,EAAE;QACpD,OAAO,UAAU,~~CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC;~~AA6DC~~,4EAAgC;~~AArDlC~~,SAAS,oBAAoB,CAAC,~~UAAsB~~;~~IAClD~~,OAAO,~~mBAAmB~~,CAAC,GAAG,CAAC,~~UAAU~~,CAAC,CAAC;~~AAC7C~~,CAAC;~~AAsDC~~,oDAAoB;~~AAhDtB~~,SAAS,2BAA2B;IAClC,OAAO,~~mBAAmB~~,CAAC,IAAI,CAAC;~~AAClC~~,CAAC;~~AA4CC~~,kEAA2B;~~AAtC7B~~,SAAS,eAAe;IACtB,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CACxB,~~YAA6B~~,~~EAC7B~~,MAA4C;IAE5C,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7B,IAAI,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,OAAO,CACd,MAA4C,EAC5C,~~YAA6B~~;~~IAE7B~~,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACxD,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,IAAA,mBAAY,EAAC,kBAAW,EAAE,cAAM,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;KACvE;AACH,CAAC"}
1	+ {"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"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"}

package/dist/cjs/stateManagement/annotation/annotationState.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ declare function getDefaultAnnotationManager(): import("./FrameOfReferenceSpecif
 declare function getViewportSpecificAnnotationManager(element?: Types.IEnabledElement | HTMLDivElement): import("./FrameOfReferenceSpecificAnnotationManager").default;
 declare function getAnnotations(element: HTMLDivElement, toolName: string): Annotations;
 declare function addAnnotation(element: HTMLDivElement, annotation: Annotation): void;
-declare function removeAnnotation(element: HTMLDivElement, annotationUID: string): void;
+declare function removeAnnotation(annotationUID: string, element?: HTMLDivElement): void;
 declare function getAnnotation(annotationUID: string, element?: HTMLDivElement): Annotation;
 export { getAnnotations, addAnnotation, getAnnotation, removeAnnotation, getViewportSpecificAnnotationManager, getDefaultAnnotationManager, };

package/dist/cjs/stateManagement/annotation/annotationState.js CHANGED Viewed

@@ -37,18 +37,17 @@ function addAnnotation(element, annotation) {
     (0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
 }
 exports.addAnnotation = addAnnotation;
-function removeAnnotation(element, annotationUID) {
-    const annotationManager = getViewportSpecificAnnotationManager(element);
+function removeAnnotation(annotationUID, element) {
+    let annotationManager = getDefaultAnnotationManager();
+    if (element) {
+        annotationManager = getViewportSpecificAnnotationManager(element);
+    }
     const annotation = annotationManager.getAnnotation(annotationUID);
     annotationManager.removeAnnotation(annotationUID);
-    const enabledElement = (0, core_1.getEnabledElement)(element);
-    const { renderingEngine } = enabledElement;
-    const { viewportId } = enabledElement;
     const eventType = enums_1.Events.ANNOTATION_REMOVED;
     const eventDetail = {
         annotation,
-        viewportId,
-        renderingEngineId: renderingEngine.id,
+        annotationManagerUID: annotationManager.uid,
     };
     (0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
 }

package/dist/cjs/stateManagement/annotation/annotationState.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAC7B,uCAAqC;AAErC,2GAA+G;AAY/G,SAAS,2BAA2B;IAClC,OAAO,4FAAgD,CAAC;AAC1D,CAAC;~~AA2HC~~,kEAA2B;~~AAnH7B~~,SAAS,oCAAoC,CAC3C,OAAgD;IAQhD,OAAO,4FAAgD,CAAC;AAC1D,CAAC;~~AAwGC~~,oFAAoC;~~AA9FtC~~,SAAS,cAAc,CACrB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,cAAc,CAAC;IAE/C,OAAO,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;~~AAgFC~~,wCAAc;~~AAvEhB~~,SAAS,aAAa,CAAC,OAAuB,EAAE,UAAsB;IACpE,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IAExE,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;QAC1C,UAAU,CAAC,aAAa,GAAG,gBAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,cAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,WAAW,GAA+B;QAC9C,UAAU;QACV,UAAU;QACV,iBAAiB,EAAE,eAAe,CAAC,EAAE;KACtC,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;~~AAkDC~~,sCAAa;~~AA3Cf~~,SAAS,gBAAgB,CACvB,~~OAAuB~~,~~EACvB~~,~~aAAqB~~;~~IAErB~~,~~MAAM~~,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;~~IAExE~~,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAClE,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAGlD,MAAM,~~cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,~~SAAS,GAAG,cAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,~~UAAU;QACV~~,~~iBAAiB,~~EAAE,~~eAAe~~,CAAC,~~EAAE~~;~~KACtC~~,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAsBC,4CAAgB;AAdlB,SAAS,aAAa,CACpB,aAAqB,EACrB,OAAwB;IAExB,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAElE,OAAO,UAAU,CAAC;AACpB,CAAC;AAKC,sCAAa"}
1	+ {"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAC7B,uCAAqC;AAErC,2GAA+G;AAY/G,SAAS,2BAA2B;IAClC,OAAO,4FAAgD,CAAC;AAC1D,CAAC;AAyHC,kEAA2B;AAjH7B,SAAS,oCAAoC,CAC3C,OAAgD;IAQhD,OAAO,4FAAgD,CAAC;AAC1D,CAAC;AAsGC,oFAAoC;AA5FtC,SAAS,cAAc,CACrB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,cAAc,CAAC;IAE/C,OAAO,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AA8EC,wCAAc;AArEhB,SAAS,aAAa,CAAC,OAAuB,EAAE,UAAsB;IACpE,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IAExE,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;QAC1C,UAAU,CAAC,aAAa,GAAG,gBAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,cAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,WAAW,GAA+B;QAC9C,UAAU;QACV,UAAU;QACV,iBAAiB,EAAE,eAAe,CAAC,EAAE;KACtC,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAgDC,sCAAa;AAzCf,SAAS,gBAAgB,CACvB,aAAqB,EACrB,OAAwB;IAExB,IAAI,iBAAiB,GAAG,2BAA2B,EAAE,CAAC;IACtD,IAAI,OAAO,EAAE;QACX,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;KACnE;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAClE,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAGlD,MAAM,SAAS,GAAG,cAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,oBAAoB,EAAE,iBAAiB,CAAC,GAAG;KAC5C,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAsBC,4CAAgB;AAdlB,SAAS,aAAa,CACpB,aAAqB,EACrB,OAAwB;IAExB,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAElE,OAAO,UAAU,CAAC;AACpB,CAAC;AAKC,sCAAa"}

package/dist/cjs/stateManagement/annotation/config/getState.js CHANGED Viewed

@@ -7,7 +7,7 @@ function getState(annotation) {
     if (annotation) {
         if (annotation.data && annotation.highlighted)
             return enums_1.AnnotationStyleStates.Highlighted;
-        if ((0, annotationSelection_1.isAnnotationSelected)(annotation))
+        if ((0, annotationSelection_1.isAnnotationSelected)(annotation.annotationUID))
             return enums_1.AnnotationStyleStates.Selected;
         if ((0, annotationLocking_1.isAnnotationLocked)(annotation))
             return enums_1.AnnotationStyleStates.Locked;

package/dist/cjs/stateManagement/annotation/config/getState.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":";;AACA,4DAA0D;AAC1D,gEAA8D;AAC9D,0CAAuD;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,6BAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,IAAA,0CAAoB,EAAC,UAAU,CAAC;~~YAAE~~,OAAO,6BAAqB,CAAC,QAAQ,CAAC;~~QAC5E~~,IAAI,IAAA,sCAAkB,EAAC,UAAU,CAAC;YAAE,OAAO,6BAAqB,CAAC,MAAM,CAAC;KACzE;IAED,OAAO,6BAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,kBAAe,QAAQ,CAAC"}
1	+ {"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":";;AACA,4DAA0D;AAC1D,gEAA8D;AAC9D,0CAAuD;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,6BAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,IAAA,0CAAoB,EAAC,UAAU,CAAC,aAAa,CAAC;YAChD,OAAO,6BAAqB,CAAC,QAAQ,CAAC;QAGxC,IAAI,IAAA,sCAAkB,EAAC,UAAU,CAAC;YAAE,OAAO,6BAAqB,CAAC,MAAM,CAAC;KACzE;IAED,OAAO,6BAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,kBAAe,QAAQ,CAAC"}

package/dist/cjs/store/ToolGroupManager/ToolGroup.js CHANGED Viewed

@@ -59,6 +59,8 @@ class ToolGroup {
             viewportId,
             renderingEngineId: renderingEngineUIDToUse,
         });
+        const activeToolName = this.getActivePrimaryMouseButtonTool();
+        this.setViewportsCursorByToolName(activeToolName);
     }
     removeViewports(renderingEngineId, viewportId) {
         const indices = [];

package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":";;AAAA,uCAAuD;AACvD,8CAA8E;AAC9E,oCAAiC;AAGjC,2CAA4D;AAC5D,+DAAgE;AAEhE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,iBAAS,CAAC;AAczD,MAAqB,SAAS;IAM5B,YAAY,EAAU;QAJtB,kBAAa,GAAG,EAAE,CAAC;QACnB,gBAAW,GAAG,EAAE,CAAC;QACjB,mBAAc,GAAG,EAAE,CAAC;QAGlB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAMD,cAAc;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAOD,eAAe,CAAC,QAAgB;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,0CAA0C,CAAC,CAAC;YACrE,OAAO;SACR;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAWD,OAAO,CAAC,QAAgB,EAAE,aAAa,GAAG,EAAE;QAC1C,MAAM,cAAc,GAAG,aAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,OAAO,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,EAAE,CAAC;QACvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,IAAI,CACV,sDAAsD,EACtD,aAAa,CACd,CAAC;YACF,OAAO;SACR;QAED,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,uCAAuC,CAAC,CAAC;YAClE,OAAO;SACR;QAED,IAAI,iBAAiB,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,IAAI,QAAQ,yCAAyC,IAAI,CAAC,EAAE,GAAG,CAChE,CAAC;YACF,OAAO;SACR;QAID,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;QAEhD,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,IAAI,CAAC,EAAE;YACpB,aAAa;SACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;QAIlD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;IACnD,CAAC;IAYD,WAAW,CAAC,UAAkB,EAAE,iBAA0B;QACxD,MAAM,gBAAgB,GAAG,IAAA,0BAAmB,GAAE,CAAC;QAE/C,IAAI,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;SACH;QAED,MAAM,uBAAuB,GAAG,iBAAiB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,UAAU;YACV,iBAAiB,EAAE,uBAAuB;SAC3C,CAAC,CAAC;~~IACL~~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~~AAxXD~~,~~4BAwXC~~"}
1	+ {"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"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"}

package/dist/cjs/store/removeEnabledElement.js CHANGED Viewed

@@ -59,7 +59,7 @@ const _removeAllToolsForElement = function (element) {
     const toolsWithData = (0, filterToolsWithAnnotationsForElement_1.default)(element, tools);
     toolsWithData.forEach(({ annotations }) => {
         annotations.forEach((annotation) => {
-            (0, stateManagement_1.removeAnnotation)(element, annotation.annotationUID);
+            (0, stateManagement_1.removeAnnotation)(annotation.annotationUID, element);
         });
     });
 };

package/dist/cjs/store/removeEnabledElement.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"removeEnabledElement.js","sourceRoot":"","sources":["../../../src/store/removeEnabledElement.ts"],"names":[],"mappings":";;;;;AAAA,8CAA+D;AAC/D,sDAI2B;AAC3B,0DAO6B;AAG7B,kHAA0F;AAC1F,mCAAgC;AAChC,2GAAmF;AACnF,oCAAqC;AACrC,wDAAsD;AACtD,oHAA4F;AAC5F,yGAAiF;AACjF,kFAAiF;AAEjF,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAE5C,SAAS,oBAAoB,CAC3B,kBAAyD;IAGzD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC;IAE1D,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAG5B,MAAM,YAAY,GAAG,OAAO,CAAC;IAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,gBAAgB,EAAE,CAAC,CAAC;IAE9E,IAAI,QAAQ,EAAE;QACZ,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KAC5C;IAGD,mDAAyB,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAG5D,oCAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,mCAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,iCAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAIlC,+CAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,gDAA6B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,wDAAqC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD,2CAAwB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,8CAA2B,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAK7C,gCAAgC,CAAC,OAAO,CAAC,CAAC;IAC1C,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAGtC,qBAAqB,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,gCAAgC,GAAG,CAAC,OAAuB,EAAE,EAAE;IACnE,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,IAAA,qCAA2B,EAC/C,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,OAAuB,EAAE,EAAE;IAC/D,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAErE,MAAM,SAAS,GAAG,IAAA,iCAAuB,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAEzE,IAAI,SAAS,EAAE;QACb,SAAS,CAAC,eAAe,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC1D;AACH,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,UAAU,OAAO;IACjD,MAAM,KAAK,GAAG,IAAA,qCAA2B,EAAC,OAAO,EAAE;QACjD,iBAAS,CAAC,MAAM;QAChB,iBAAS,CAAC,OAAO;KAClB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAA,8CAAoC,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3E,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;QACxC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,IAAA,kCAAgB,EAAC,~~OAAO,EAAE,~~UAAU,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,kBAAkB,CAAC,OAAuB;IACjD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GACtE,OAAO,CAAC,OAAO,CAAC;IAClB,MAAM,WAAW,GAAG,GAAG,UAAU,IAAI,iBAAiB,EAAE,CAAC;IAEzD,OAAO,aAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;AACzC,CAAC;AAMD,MAAM,qBAAqB,GAAG,UAAU,OAAuB;IAC7D,MAAM,iBAAiB,GAAG,aAAK,CAAC,eAAe,CAAC,SAAS,CACvD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,OAAO,CACvB,CAAC;IAEF,IAAI,iBAAiB,GAAG,CAAC,CAAC,EAAE;QAC1B,aAAK,CAAC,eAAe,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;KACpD;AACH,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
1	+ {"version":3,"file":"removeEnabledElement.js","sourceRoot":"","sources":["../../../src/store/removeEnabledElement.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/CrosshairsTool.js CHANGED Viewed

@@ -79,7 +79,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
             let annotations = (0, annotationState_1.getAnnotations)(element, CrosshairsTool.toolName);
             annotations = this.filterInteractableAnnotationsForElement(element, annotations);
             if (annotations.length) {
-                (0, annotationState_1.removeAnnotation)(element, annotations[0].annotationUID);
+                (0, annotationState_1.removeAnnotation)(annotations[0].annotationUID, element);
             }
             const annotation = {
                 highlighted: false,