@cornerstonejs/tools 4.15.23 → 4.15.25

package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDown.js

@@ -21,14 +21,11 @@ export default function mouseDown(evt) {
             return;
         }
     }
-    const isPrimaryClick = evt.detail.event.buttons === 1;
-    const activeToolsWithEventBinding = getToolsWithModesForMouseEvent(evt, [Active], evt.detail.event.buttons);
-    const passiveToolsIfEventWasPrimaryMouseButton = isPrimaryClick
-        ? getToolsWithModesForMouseEvent(evt, [Passive])
-        : undefined;
+    const allActiveTools = getToolsWithModesForMouseEvent(evt, [Active]);
+    const allPassiveTools = getToolsWithModesForMouseEvent(evt, [Passive]);
     const applicableTools = [
-        ...(activeToolsWithEventBinding || []),
-        ...(passiveToolsIfEventWasPrimaryMouseButton || []),
+        ...(allActiveTools || []),
+        ...(allPassiveTools || []),
     ];
     const actionExecuted = mouseDownAnnotationAction(evt);
     if (actionExecuted) {

package/dist/esm/eventDispatchers/touchEventHandlers/touchStart.js

@@ -20,15 +20,11 @@ export default function touchStart(evt) {
             return;
         }
     }
-    const isPrimaryClick = Object.keys(evt.detail.event.touches).length === 1;
-    const activeToolsWithEventBinding = getToolsWithModesForTouchEvent(evt, [Active], Object.keys(evt.detail.event.touches).length);
-    const passiveToolsIfEventWasPrimaryTouchButton = isPrimaryClick
-        ? getToolsWithModesForTouchEvent(evt, [Passive])
-        : undefined;
+    const allActiveTools = getToolsWithModesForTouchEvent(evt, [Active]);
+    const allPassiveTools = getToolsWithModesForTouchEvent(evt, [Passive]);
     const applicableTools = [
-        ...(activeToolsWithEventBinding || []),
-        ...(passiveToolsIfEventWasPrimaryTouchButton || []),
-        activeTool,
+        ...(allActiveTools || []),
+        ...(allPassiveTools || []),
     ];
     const eventDetail = evt.detail;
     const { element } = eventDetail;

package/dist/esm/tools/base/AnnotationTool.js

@@ -8,8 +8,8 @@ import { triggerAnnotationModified } from '../../stateManagement/annotation/help
 import ChangeTypes from '../../enums/ChangeTypes';
 import { setAnnotationSelected } from '../../stateManagement/annotation/annotationSelection';
 import { addContourSegmentationAnnotation } from '../../utilities/contourSegmentation';
+import { safeStructuredClone } from '../../utilities/safeStructuredClone';
 const { DefaultHistoryMemo } = csUtils.HistoryMemo;
-const { PointsManager } = csUtils;
 class AnnotationTool extends AnnotationDisplayTool {
     static createAnnotationForViewport(viewport, ...annotationBaseData) {
         return this.createAnnotation({ metadata: viewport.getViewReference() }, ...annotationBaseData);
@@ -161,26 +161,11 @@ class AnnotationTool extends AnnotationDisplayTool {
     }
     static createAnnotationState(annotation, deleting) {
         const { data, annotationUID } = annotation;
-        const cloneData = {
-            ...data,
-            cachedStats: {},
-        };
-        delete cloneData.contour;
-        delete cloneData.spline;
-        const state = {
+        return {
             annotationUID,
-            data: structuredClone(cloneData),
+            data: safeStructuredClone(data),
             deleting,
         };
-        const contour = data.contour;
-        if (contour) {
-            state.data.contour = {
-                ...contour,
-                polyline: null,
-                pointsManager: PointsManager.create3(contour.polyline.length, contour.polyline),
-            };
-        }
-        return state;
     }
     static createAnnotationMemo(element, annotation, options) {
         if (!annotation) {

package/dist/esm/utilities/index.d.ts

@@ -39,6 +39,7 @@ import { getPixelValueUnits, getPixelValueUnitsImageId } from './getPixelValueUn
 import * as geometricSurfaceUtils from './geometricSurfaceUtils';
 import setAnnotationLabel from './setAnnotationLabel';
 import { moveAnnotationToViewPlane } from './moveAnnotationToViewPlane';
+import { safeStructuredClone } from './safeStructuredClone';
 import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction';
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, getOrCreateImageVolume, };
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, };

package/dist/esm/utilities/index.js

@@ -39,6 +39,7 @@ import { getPixelValueUnits, getPixelValueUnitsImageId, } from './getPixelValueU
 import * as geometricSurfaceUtils from './geometricSurfaceUtils';
 import setAnnotationLabel from './setAnnotationLabel';
 import { moveAnnotationToViewPlane } from './moveAnnotationToViewPlane';
+import { safeStructuredClone } from './safeStructuredClone';
 import getOrCreateImageVolume from './segmentation/getOrCreateImageVolume';
 import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/utils/fanExtraction';
-export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, getOrCreateImageVolume, };
+export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, };

package/dist/esm/utilities/safeStructuredClone.d.ts

@@ -0,0 +1 @@
+export declare function safeStructuredClone<T>(value: T): T;

package/dist/esm/utilities/safeStructuredClone.js

@@ -0,0 +1,53 @@
+import { utilities as csUtils } from '@cornerstonejs/core';
+const { PointsManager } = csUtils;
+function cloneContourValue(_key, value) {
+    if (value == null || typeof value !== 'object' || !('polyline' in value)) {
+        return value;
+    }
+    const contour = value;
+    return {
+        ...contour,
+        polyline: null,
+        pointsManager: PointsManager.create3(contour.polyline.length, contour.polyline),
+    };
+}
+const OMIT_KEYS = new Map([
+    ['pointsInVolume', null],
+    ['projectionPoints', null],
+    ['contour', cloneContourValue],
+    ['spline', null],
+]);
+function omitUncloneableKeys(obj) {
+    const result = {};
+    for (const [key, value] of Object.entries(obj)) {
+        if (OMIT_KEYS.has(key)) {
+            const handler = OMIT_KEYS.get(key);
+            if (handler) {
+                result[key] = handler(key, value);
+            }
+            continue;
+        }
+        if (value === null || value === undefined || typeof value !== 'object') {
+            result[key] = value;
+        }
+        else if (Array.isArray(value)) {
+            result[key] = value.map((value) => safeStructuredClone(value));
+        }
+        else {
+            result[key] = omitUncloneableKeys(value);
+        }
+    }
+    return result;
+}
+export function safeStructuredClone(value) {
+    if (value === null || value === undefined) {
+        return value;
+    }
+    if (typeof value !== 'object') {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map((item) => safeStructuredClone(item));
+    }
+    return omitUncloneableKeys(value);
+}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.23";
+export declare const version = "4.15.25";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.23';
+export const version = '4.15.25';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.23",
+  "version": "4.15.25",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.23",
+    "@cornerstonejs/core": "4.15.25",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "993b2ea724b4e8ef03fb5a710ee8a106d151f2a9"
+  "gitHead": "7609d25e3506ef4c15ffa82e1e35afcc1082863e"
 }