@ohif/app 3.13.0-beta.7 → 3.13.0-beta.70

package/dist/{3081.bundle.a91d88fbfb53b4f77ee4.js → 7166.bundle.5ac3827d0b367fe6bd6e.js}

@@ -1,8 +1,8 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[3081],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[7166],{
 
-/***/ 38007:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 38007
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
 // EXPORTS
@@ -25,8 +25,8 @@ var useSegmentations = __webpack_require__(73421);
 var useViewportSegmentations = __webpack_require__(79063);
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3075 modules
-var src = __webpack_require__(12517);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3085 modules
+var src = __webpack_require__(564);
 ;// ../../../extensions/cornerstone/src/hooks/useViewportHover.ts
 
 
@@ -109,15 +109,15 @@ var useViewportRendering = __webpack_require__(47488);
 
 
 
-/***/ }),
+/***/ },
 
-/***/ 9234:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 9234
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   c: () => (/* binding */ useActiveViewportSegmentationRepresentations)
 /* harmony export */ });
-/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12517);
+/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(564);
 /* harmony import */ var _useViewportSegmentations__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(79063);
 
 
@@ -131,10 +131,10 @@ function useActiveViewportSegmentationRepresentations() {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ 84535:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 84535
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   R: () => (/* binding */ useMeasurementTracking)
@@ -238,10 +238,10 @@ function useMeasurementTracking({
 }
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (useMeasurementTracking)));
 
-/***/ }),
+/***/ },
 
-/***/ 19214:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 19214
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   d: () => (/* binding */ useMeasurements)
@@ -348,10 +348,10 @@ function useMeasurements({
   return displayMeasurements;
 }
 
-/***/ }),
+/***/ },
 
-/***/ 73421:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 73421
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   j: () => (/* binding */ useSegmentations)
@@ -483,10 +483,10 @@ function useSegmentations(options) {
   return segmentations;
 }
 
-/***/ }),
+/***/ },
 
-/***/ 10225:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 10225
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
 // EXPORTS
@@ -498,8 +498,8 @@ __webpack_require__.d(__webpack_exports__, {
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../core/src/index.ts + 69 modules
 var src = __webpack_require__(42356);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3075 modules
-var ui_next_src = __webpack_require__(12517);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3085 modules
+var ui_next_src = __webpack_require__(564);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
 var esm = __webpack_require__(15327);
 ;// ../../../extensions/cornerstone/src/components/ViewportDataOverlaySettingMenu/utils.ts
@@ -805,10 +805,10 @@ function useViewportDisplaySets(viewportId, options) {
   return result;
 }
 
-/***/ }),
+/***/ },
 
-/***/ 47488:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 47488
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__),
@@ -818,7 +818,9 @@ function useViewportDisplaySets(viewportId, options) {
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42356);
 /* harmony import */ var _useViewportDisplaySets__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10225);
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15327);
-/* harmony import */ var _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(93813);
+/* harmony import */ var _utils_getDataIdForViewport__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(67142);
+/* harmony import */ var _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(93813);
+
 
 
 
@@ -826,13 +828,13 @@ function useViewportDisplaySets(viewportId, options) {
 
 const getPosition = location => {
   switch (location) {
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_4__/* .ButtonLocation */ .ij.LeftMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.LeftMiddle:
       return 'left';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_4__/* .ButtonLocation */ .ij.RightMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.RightMiddle:
       return 'right';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_4__/* .ButtonLocation */ .ij.BottomMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.BottomMiddle:
       return 'bottom';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_4__/* .ButtonLocation */ .ij.TopMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.TopMiddle:
       return 'top';
     default:
       return 'bottom';
@@ -846,13 +848,6 @@ const linearToOpacity = linearValue => {
 const opacityToLinear = opacityValue => {
   return Math.pow(opacityValue, 1.0 / GAMMA);
 };
-const is3DViewport = ({
-  viewportId,
-  cornerstoneViewportService
-}) => {
-  const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-  return viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.VolumeViewport3D;
-};
 
 /**
  * Hook to access window level functionality for a specific viewport
@@ -871,14 +866,13 @@ function useViewportRendering(viewportId, options) {
     colorbarService,
     customizationService
   } = servicesManager.services;
-  const [is3DVolume, setIs3DVolume] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(is3DViewport({
-    viewportId,
-    cornerstoneViewportService
-  }));
   const [hasColorbar, setHasColorbar] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(colorbarService.hasColorbar(viewportId));
   const [colorbarPosition, setColorbarPosition] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(options?.location ? getPosition(options.location) : 'bottom');
   const [voiRange, setVoiRange] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)();
   const voiRangeRef = react__WEBPACK_IMPORTED_MODULE_0__.useRef();
+  // Viewport from service; kept in state so we can subscribe to VIEWPORT_DATA_CHANGED when null and re-run effects when it becomes available
+  const [viewport, setViewport] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(() => viewportId ? cornerstoneViewportService.getCornerstoneViewport(viewportId) ?? null : null);
+  const [is3DVolume, setIs3DVolume] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.VolumeViewport3D);
   const [opacity, setOpacityState] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)();
   const [opacityLinear, setOpacityLinearState] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)();
   const [threshold, setThresholdState] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)();
@@ -922,6 +916,35 @@ function useViewportRendering(viewportId, options) {
     }) || [];
   }, [viewportDisplaySets, presets]);
 
+  // Keep viewport in state; when not available, subscribe to VIEWPORT_DATA_CHANGED so we set it when the viewport is ready
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
+    if (!viewportId) {
+      setViewport(null);
+      return;
+    }
+    const vp = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+    setViewport(vp ?? null);
+    if (vp) {
+      return;
+    }
+    const {
+      unsubscribe
+    } = cornerstoneViewportService.subscribe(cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED, ({
+      viewportId: eventViewportId
+    }) => {
+      if (eventViewportId !== viewportId) {
+        return;
+      }
+      const next = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+      if (next) {
+        setViewport(next);
+      }
+    });
+    return () => {
+      unsubscribe();
+    };
+  }, [viewportId, cornerstoneViewportService]);
+
   // Calculate pixel value range for the active display set
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
     if (!activeDisplaySetInstanceUID) {
@@ -931,21 +954,20 @@ function useViewportRendering(viewportId, options) {
     if (!selectedDisplaySet?.imageIds?.length) {
       return;
     }
-    const csViewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-    if (!csViewport) {
+    if (!viewport) {
       return;
     }
-    if (!(csViewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
+    if (!(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
       return;
     }
-    const volumeIds = csViewport.getAllVolumeIds();
+    const volumeIds = viewport.getAllVolumeIds();
     const volumeId = volumeIds.find(id => id.includes(activeDisplaySetInstanceUID));
     if (!volumeId) {
       return;
     }
 
     // only handle volume viewports for now
-    const imageData = csViewport.getImageData(volumeId);
+    const imageData = viewport.getImageData(volumeId);
     if (!imageData) {
       return;
     }
@@ -958,7 +980,7 @@ function useViewportRendering(viewportId, options) {
       min: range[0],
       max: range[1]
     });
-  }, [activeDisplaySetInstanceUID, displaySetService, cornerstoneViewportService, viewportId]);
+  }, [activeDisplaySetInstanceUID, displaySetService, viewport]);
 
   // Get the presets specifically for the active display set
   const activeDisplaySetPresets = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => {
@@ -972,52 +994,33 @@ function useViewportRendering(viewportId, options) {
     return activePresetData.presets;
   }, [allWindowLevelPresets, activeDisplaySetInstanceUID]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
-    setIs3DVolume(is3DViewport({
-      viewportId,
-      cornerstoneViewportService
-    }));
-    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-
-    // Initialize the VOI range from the viewport
-    if (viewport && activeDisplaySetInstanceUID) {
-      try {
-        let properties;
-        if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.StackViewport) {
-          properties = viewport.getProperties();
-          if (properties.voiRange) {
-            setVoiRange(properties.voiRange);
-            voiRangeRef.current = properties.voiRange;
-          }
-        } else if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport) {
-          // For volume viewports, find the actor for the active display set
-          const volumeIds = viewport.getAllVolumeIds();
-          const volumeId = volumeIds.find(id => id.includes(activeDisplaySetInstanceUID));
-          if (volumeId) {
-            properties = viewport.getProperties(volumeId);
-            if (properties?.voiRange) {
-              setVoiRange(properties.voiRange);
-              voiRangeRef.current = properties.voiRange;
-            }
-
-            // Get opacity from colormap if available
-            if (properties?.colormap?.opacity !== undefined) {
-              const isArray = Array.isArray(properties.colormap.opacity);
-              const opacity = isArray ? properties.colormap.opacity.reduce((max, current) => Math.max(max, current), 0) : properties.colormap.opacity;
-              setOpacityState(opacity);
-              setOpacityLinearState(opacityToLinear(opacity));
-            }
-
-            // Get threshold from colormap if available
-            if (properties?.colormap && properties.colormap.threshold !== undefined) {
-              setThresholdState(properties.colormap.threshold);
-            }
-          }
-        }
-      } catch (error) {
-        console.error('Error initializing VOI range:', error);
+    setIs3DVolume(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.VolumeViewport3D);
+    if (!viewport || !activeDisplaySetInstanceUID) {
+      return;
+    }
+    try {
+      const dataId = (0,_utils_getDataIdForViewport__WEBPACK_IMPORTED_MODULE_4__/* .getDataIdForViewport */ .V)(viewport, activeDisplaySetInstanceUID);
+      const properties = dataId != null ? viewport.getProperties(dataId) : viewport.getProperties();
+      if (!properties) {
+        return;
       }
+      if (properties.voiRange) {
+        setVoiRange(properties.voiRange);
+        voiRangeRef.current = properties.voiRange;
+      }
+      if (properties.colormap?.opacity !== undefined) {
+        const opacityVal = properties.colormap.opacity;
+        const opacity = Array.isArray(opacityVal) ? opacityVal.reduce((max, current) => Math.max(max, current), 0) : opacityVal;
+        setOpacityState(opacity);
+        setOpacityLinearState(opacityToLinear(opacity));
+      }
+      if (properties.colormap?.threshold !== undefined) {
+        setThresholdState(properties.colormap.threshold);
+      }
+    } catch (error) {
+      console.error('Error initializing VOI range:', error);
     }
-  }, [cornerstoneViewportService, viewportId, activeDisplaySetInstanceUID]);
+  }, [activeDisplaySetInstanceUID, viewport]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
     if (!viewportId) {
       return;
@@ -1035,17 +1038,10 @@ function useViewportRendering(viewportId, options) {
     };
   }, [colorbarService, viewportId]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
-    if (!viewportId || !activeDisplaySetInstanceUID) {
-      return;
-    }
-    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-    if (!viewport) {
+    if (!activeDisplaySetInstanceUID || !viewport?.element) {
       return;
     }
     const element = viewport.element;
-    if (!element) {
-      return;
-    }
     const updateVOI = eventDetail => {
       const {
         range
@@ -1085,7 +1081,7 @@ function useViewportRendering(viewportId, options) {
       element.removeEventListener(_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.Enums.Events.VOI_MODIFIED, updateVOI);
       element.removeEventListener(_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.Enums.Events.COLORMAP_MODIFIED, updateColormap);
     };
-  }, [viewportId, activeDisplaySetInstanceUID, cornerstoneViewportService, opacityToLinear]);
+  }, [activeDisplaySetInstanceUID, viewport, opacityToLinear]);
   const validateActiveDisplaySet = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(() => {
     if (!activeDisplaySetInstanceUID) {
       throw new Error('No active display set instance UID is available');
@@ -1238,12 +1234,8 @@ function useViewportRendering(viewportId, options) {
       },
       context: 'CORNERSTONE'
     });
-  }, [commandsManager, viewportId, validateActiveDisplaySet]);
+  }, [commandsManager, validateActiveDisplaySet, viewport, viewportId]);
   const setOpacity = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(opacityValue => {
-    if (!viewportId) {
-      return;
-    }
-    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
     if (!viewport || !(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
       return;
     }
@@ -1274,17 +1266,13 @@ function useViewportRendering(viewportId, options) {
       colormap: updatedColormap
     }, volumeId);
     viewport.render();
-  }, [cornerstoneViewportService, viewportId, validateActiveDisplaySet, opacityToLinear]);
+  }, [validateActiveDisplaySet, opacityToLinear, viewport]);
   const setOpacityLinear = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(linearValue => {
     // Convert linear UI value to actual opacity value and apply it
     const actualOpacity = linearToOpacity(linearValue);
     setOpacity(actualOpacity);
   }, [linearToOpacity, setOpacity]);
   const setThreshold = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(thresholdValue => {
-    if (!viewportId) {
-      return;
-    }
-    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
     if (!viewport || !(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
       return;
     }
@@ -1302,15 +1290,14 @@ function useViewportRendering(viewportId, options) {
       }
     }, volumeId);
     viewport.render();
-  }, [cornerstoneViewportService, viewportId, validateActiveDisplaySet]);
+  }, [validateActiveDisplaySet, viewport]);
 
   // Get the current colormap for the active display set
   const colormap = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(() => {
-    if (!viewportId || !activeDisplaySetInstanceUID || !viewportDisplaySets?.length) {
+    if (!activeDisplaySetInstanceUID || !viewportDisplaySets?.length) {
       return null;
     }
     try {
-      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
       if (!viewport) {
         return null;
       }
@@ -1339,7 +1326,7 @@ function useViewportRendering(viewportId, options) {
       console.error('Error getting viewport colormap:', error);
       return colorbarProperties?.colormaps?.find(c => c.Name === 'Grayscale') || colorbarProperties?.colormaps?.[0];
     }
-  }, [cornerstoneViewportService, viewportId, activeDisplaySetInstanceUID, viewportDisplaySets, colorbarProperties?.colormaps]);
+  }, [activeDisplaySetInstanceUID, viewportDisplaySets, colorbarProperties?.colormaps, viewport]);
 
   // 3D volume rendering functions
   const setVolumeRenderingPreset = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(preset => {
@@ -1405,7 +1392,10 @@ function useViewportRendering(viewportId, options) {
     setWindowLevel,
     setVOIRange,
     voiRange,
-    windowLevel: _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.utilities.windowLevel.toWindowLevel(voiRange?.lower, voiRange?.upper),
+    windowLevel: voiRange ? _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.utilities.windowLevel.toWindowLevel(voiRange?.lower, voiRange?.upper) : {
+      windowCenter: null,
+      windowWidth: null
+    },
     // Colorbar functions
     hasColorbar,
     toggleColorbar,
@@ -1473,10 +1463,10 @@ function getCustomizationData(customizationService) {
   };
 }
 
-/***/ }),
+/***/ },
 
-/***/ 79063:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 79063
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   L: () => (/* binding */ useViewportSegmentations)
@@ -1494,7 +1484,8 @@ const excludedModalities = ['SM', 'OT', 'DOC', 'ECG'];
 function mapSegmentationToDisplay(segmentation, customizationService) {
   const {
     label,
-    segments
+    segments,
+    fallbackLabel
   } = segmentation;
 
   // Get the readable text mapping once
@@ -1555,6 +1546,7 @@ function mapSegmentationToDisplay(segmentation, customizationService) {
   return {
     ...segmentation,
     label,
+    fallbackLabel,
     segments: updatedSegments
   };
 }
@@ -1657,74 +1649,36 @@ function useViewportSegmentations({
   return segmentationsWithRepresentations;
 }
 
-/***/ }),
+/***/ },
 
-/***/ 63081:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 87166
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  AccordionGroup: () => (/* reexport */ AccordionGroup),
-  CloneChildren: () => (/* reexport */ CloneChildren),
-  Colorbar: () => (/* reexport */ Colorbar),
-  Colormap: () => (/* reexport */ Colormap),
-  CornerstoneViewportDownloadForm: () => (/* reexport */ utils_CornerstoneViewportDownloadForm),
-  DYNAMIC_VOLUME_LOADER_SCHEME: () => (/* reexport */ DYNAMIC_VOLUME_LOADER_SCHEME),
-  DicomUpload: () => (/* reexport */ DicomUpload_DicomUpload),
-  Enums: () => (/* reexport */ enums),
-  ImageOverlayViewerTool: () => (/* reexport */ tools_ImageOverlayViewerTool),
-  MeasumentsMenu: () => (/* reexport */ MeasumentsMenu),
-  MeasurementOrAdditionalFindingSets: () => (/* reexport */ MeasurementOrAdditionalFindingSets),
-  MeasurementsOrAdditionalFindings: () => (/* reexport */ MeasurementsOrAdditionalFindings),
-  OHIFCornerstoneViewport: () => (/* binding */ OHIFCornerstoneViewport),
-  PanelMeasurement: () => (/* reexport */ PanelMeasurement),
-  PanelSegmentation: () => (/* reexport */ PanelSegmentation),
-  PlanarFreehandROI: () => (/* reexport */ measurementServiceMappings_PlanarFreehandROI),
-  RectangleROI: () => (/* reexport */ measurementServiceMappings_RectangleROI),
-  SeriesMeasurementTrigger: () => (/* reexport */ SeriesMeasurementTrigger),
-  SeriesMeasurements: () => (/* reexport */ SeriesMeasurements),
-  StudyMeasurements: () => (/* reexport */ StudyMeasurements),
-  StudyMeasurementsActions: () => (/* reexport */ StudyMeasurementsActions),
-  StudySummaryFromMetadata: () => (/* reexport */ StudySummaryFromMetadata),
-  Types: () => (/* reexport */ types_namespaceObject),
-  VOLUME_LOADER_SCHEME: () => (/* reexport */ VOLUME_LOADER_SCHEME),
-  VolumeLighting: () => (/* reexport */ VolumeLighting),
-  VolumeRenderingOptions: () => (/* reexport */ VolumeRenderingOptions),
-  VolumeRenderingPresets: () => (/* reexport */ VolumeRenderingPresets),
-  VolumeRenderingQuality: () => (/* reexport */ VolumeRenderingQuality),
-  VolumeShade: () => (/* reexport */ VolumeShade),
-  VolumeShift: () => (/* reexport */ VolumeShift),
-  WindowLevel: () => (/* reexport */ WindowLevel),
-  WindowLevelActionMenu: () => (/* reexport */ WindowLevelActionMenu),
-  WindowLevelActionMenuContent: () => (/* reexport */ WindowLevelActionMenuContent),
-  WindowLevelActionMenuWrapper: () => (/* reexport */ WindowLevelActionMenuWrapper),
+  _I: () => (/* reexport */ AccordionGroup),
+  fX: () => (/* reexport */ enums),
+  CP: () => (/* reexport */ MeasurementsOrAdditionalFindings),
+  R9: () => (/* binding */ OHIFCornerstoneViewport),
+  re: () => (/* reexport */ PanelMeasurement),
+  rE: () => (/* reexport */ PanelSegmentation),
+  V: () => (/* reexport */ SeriesMeasurements),
+  B9: () => (/* reexport */ StudyMeasurements),
+  _9: () => (/* reexport */ StudyMeasurementsActions),
+  x3: () => (/* reexport */ StudySummaryFromMetadata),
+  Rj: () => (/* reexport */ VOLUME_LOADER_SCHEME),
   "default": () => (/* binding */ cornerstone_src),
-  dicomLoaderService: () => (/* reexport */ utils_dicomLoaderService),
-  findNearbyToolData: () => (/* reexport */ findNearbyToolData),
-  getActiveViewportEnabledElement: () => (/* reexport */ getActiveViewportEnabledElement),
-  getEnabledElement: () => (/* reexport */ state/* getEnabledElement */.kJ),
-  getSOPInstanceAttributes: () => (/* reexport */ getSOPInstanceAttributes),
-  groupByDisplaySet: () => (/* reexport */ groupByDisplaySet),
-  groupByNamedSets: () => (/* reexport */ groupByNamedSets),
-  groupByStudy: () => (/* reexport */ groupByStudy),
-  measurementMappingUtils: () => (/* reexport */ utils_namespaceObject),
-  setEnabledElement: () => (/* reexport */ state/* setEnabledElement */.ye),
-  toolNames: () => (/* reexport */ toolNames),
-  useActiveViewportSegmentationRepresentations: () => (/* reexport */ useActiveViewportSegmentationRepresentations/* useActiveViewportSegmentationRepresentations */.c),
-  useLutPresentationStore: () => (/* reexport */ useLutPresentationStore/* useLutPresentationStore */.I),
-  useMeasurementTracking: () => (/* reexport */ useMeasurementTracking/* useMeasurementTracking */.R),
-  useMeasurements: () => (/* reexport */ useMeasurements/* useMeasurements */.d),
-  usePositionPresentationStore: () => (/* reexport */ usePositionPresentationStore/* usePositionPresentationStore */.q),
-  useSegmentationPresentationStore: () => (/* reexport */ useSegmentationPresentationStore/* useSegmentationPresentationStore */.v),
-  useSegmentations: () => (/* reexport */ useSegmentations/* useSegmentations */.j),
-  useSelectedSegmentationsForViewportStore: () => (/* reexport */ useSelectedSegmentationsForViewportStore),
-  useSynchronizersStore: () => (/* reexport */ useSynchronizersStore/* useSynchronizersStore */.U),
-  utils: () => (/* reexport */ src_utils)
+  HA: () => (/* reexport */ utils_dicomLoaderService),
+  J4: () => (/* reexport */ getSOPInstanceAttributes),
+  c3: () => (/* reexport */ useActiveViewportSegmentationRepresentations/* useActiveViewportSegmentationRepresentations */.c),
+  qu: () => (/* reexport */ usePositionPresentationStore/* usePositionPresentationStore */.q),
+  jo: () => (/* reexport */ useSegmentations/* useSegmentations */.j),
+  Wp: () => (/* reexport */ src_utils)
 });
 
+// UNUSED EXPORTS: CloneChildren, Colorbar, Colormap, CornerstoneViewportDownloadForm, DYNAMIC_VOLUME_LOADER_SCHEME, DicomUpload, ImageOverlayViewerTool, MeasumentsMenu, MeasurementOrAdditionalFindingSets, PlanarFreehandROI, RectangleROI, SeriesMeasurementTrigger, Types, VolumeLighting, VolumeRenderingOptions, VolumeRenderingPresets, VolumeRenderingQuality, VolumeShade, VolumeShift, WindowLevel, WindowLevelActionMenu, WindowLevelActionMenuContent, WindowLevelActionMenuWrapper, findNearbyToolData, getActiveViewportEnabledElement, getEnabledElement, groupByDisplaySet, groupByNamedSets, groupByStudy, measurementMappingUtils, setEnabledElement, toolNames, useLutPresentationStore, useMeasurementTracking, useMeasurements, useSegmentationPresentationStore, useSelectedSegmentationsForViewportStore, useSynchronizersStore
+
 // NAMESPACE OBJECT: ../../../extensions/cornerstone/src/enums.ts
 var enums_namespaceObject = {};
 __webpack_require__.r(enums_namespaceObject);
@@ -1734,22 +1688,6 @@ __webpack_require__.d(enums_namespaceObject, {
   Ay: () => (enums)
 });
 
-// NAMESPACE OBJECT: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/index.ts
-var utils_namespaceObject = {};
-__webpack_require__.r(utils_namespaceObject);
-__webpack_require__.d(utils_namespaceObject, {
-  getDisplayUnit: () => (utils_getDisplayUnit),
-  getFirstAnnotationSelected: () => (getFirstAnnotationSelected),
-  getHandlesFromPoints: () => (getHandlesFromPoints),
-  getSOPInstanceAttributes: () => (getSOPInstanceAttributes),
-  isAnnotationSelected: () => (isAnnotationSelected),
-  setAnnotationSelected: () => (setAnnotationSelected)
-});
-
-// NAMESPACE OBJECT: ../../../extensions/cornerstone/src/types/index.ts
-var types_namespaceObject = {};
-__webpack_require__.r(types_namespaceObject);
-
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
@@ -1770,8 +1708,8 @@ var src = __webpack_require__(42356);
 var loaders = __webpack_require__(19742);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/RequestType.js
 var RequestType = __webpack_require__(43213);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/index.js + 77 modules
-var dicom_image_loader_dist_esm = __webpack_require__(75524);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/index.js + 80 modules
+var dicom_image_loader_dist_esm = __webpack_require__(76318);
 ;// ../../../extensions/cornerstone/src/initWADOImageLoader.js
 
 
@@ -1810,8 +1748,8 @@ function destroy() {
 var ai_dist_esm = __webpack_require__(75165);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/polymorphic-segmentation/dist/esm/index.js + 14 modules
 var polymorphic_segmentation_dist_esm = __webpack_require__(56983);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 139 modules
-var default_src = __webpack_require__(39195);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 140 modules
+var default_src = __webpack_require__(62851);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(71353);
 ;// ../../../extensions/cornerstone/src/utils/getViewportEnabledElement.ts
@@ -1913,7 +1851,7 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
       reject('UIDialogService is not initiated');
       return;
     }
-    (0,default_src.callInputDialog)({
+    (0,default_src/* callInputDialog */.l5)({
       uiDialogService,
       title: 'Calibration',
       placeholder: 'Actual Physical distance (mm)',
@@ -2614,6 +2552,7 @@ function getHandlesFromPoints(points) {
   }), {});
 }
 ;// ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/selection.ts
+/* unused harmony import specifier */ var cs3dToolAnnotationUtils;
 
 
 /**
@@ -2622,7 +2561,7 @@ function getHandlesFromPoints(points) {
  * @returns boolean
  */
 function isAnnotationSelected(annotationUID) {
-  return dist_esm.annotation.selection.isAnnotationSelected(annotationUID);
+  return cs3dToolAnnotationUtils.selection.isAnnotationSelected(annotationUID);
 }
 
 /**
@@ -2634,7 +2573,7 @@ function setAnnotationSelected(annotationUID, selected) {
   const isCurrentSelected = isAnnotationSelected(annotationUID);
   // branch cut, avoid invoking imaging library unnecessarily.
   if (isCurrentSelected !== selected) {
-    dist_esm.annotation.selection.setAnnotationSelected(annotationUID, selected);
+    cs3dToolAnnotationUtils.selection.setAnnotationSelected(annotationUID, selected);
   }
 }
 function getFirstAnnotationSelected(element) {
@@ -6065,6 +6004,12 @@ const connectMeasurementServiceToTools = ({
     if (source?.name && source.name !== initMeasurementService_CORNERSTONE_3D_TOOLS_SOURCE_NAME) {
       return;
     }
+    // Cancel any active tool manipulation (e.g., Spline/Livewire) to avoid leaving the tool
+    // in a drawing state after deleting a not completed measurement, which can block viewport interactivity.
+    const element = getActiveViewportEnabledElement(viewportGridService)?.viewport?.element;
+    if (element) {
+      (0,dist_esm.cancelActiveManipulations)(element);
+    }
     const removedAnnotation = dist_esm.annotation.state.getAnnotation(removedMeasurementId);
     removeAnnotation(removedMeasurementId);
     // Ensure `removedAnnotation` is available before triggering the memo,
@@ -7463,7 +7408,8 @@ function _showCPURenderingModal(uiModalService, hangingProtocolService) {
   'viewportOverlay.topRight': [],
   'viewportOverlay.bottomLeft': [{
     id: 'WindowLevel',
-    inheritsFrom: 'ohif.overlayItem.windowLevel'
+    inheritsFrom: 'ohif.overlayItem.windowLevel',
+    title: 'Window Level'
   }, {
     id: 'ZoomLevel',
     inheritsFrom: 'ohif.overlayItem.zoomLevel',
@@ -7474,11 +7420,12 @@ function _showCPURenderingModal(uiModalService, hangingProtocolService) {
   }],
   'viewportOverlay.bottomRight': [{
     id: 'InstanceNumber',
-    inheritsFrom: 'ohif.overlayItem.instanceNumber'
+    inheritsFrom: 'ohif.overlayItem.instanceNumber',
+    title: 'Instance Number'
   }]
 });
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3075 modules
-var ui_next_src = __webpack_require__(12517);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3085 modules
+var ui_next_src = __webpack_require__(564);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(99993);
 ;// ../../../extensions/cornerstone/src/components/ExportSegmentationSubMenuItem.tsx
@@ -7501,37 +7448,13 @@ const ExportSegmentationSubMenuItem = ({
     className: "text-foreground"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-2"
-  }, t('Download & Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Download, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1"
-  }, t('Download'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.downloadCSVSegmentationReport(segmentationId);
     },
     disabled: !allowExport
   }, t('CSV Report')), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownload(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM SEG')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownloadRTSS(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM RTSS')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSeparator */.mBJ, null), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Export, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1 pt-1"
-  }, t('Export'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.storeSegmentation(segmentationId, 'SEG');
@@ -7608,16 +7531,6 @@ const CustomDropdownMenuContent = () => {
         context: 'CORNERSTONE'
       });
     },
-    onSegmentationDownloadRTSS: segmentationId => {
-      commandsManager.run('downloadRTSS', {
-        segmentationId
-      });
-    },
-    onSegmentationDownload: segmentationId => {
-      commandsManager.run('downloadSegmentation', {
-        segmentationId
-      });
-    },
     downloadCSVSegmentationReport: segmentationId => {
       commandsManager.run('downloadCSVSegmentationReport', {
         segmentationId
@@ -7815,7 +7728,7 @@ function SegmentationToolConfig() {
     });
   };
   return /*#__PURE__*/react.createElement("div", {
-    className: "bg-muted flex flex-col gap-2 border-b border-b-[2px] border-black px-2 py-3"
+    className: "bg-muted flex flex-col gap-2 border-b border-b-[2px] border-background px-2 py-3"
   }, /*#__PURE__*/react.createElement("div", {
     className: "flex items-center gap-2"
   }, /*#__PURE__*/react.createElement(ui_next_src/* Switch */.dOG, {
@@ -8624,7 +8537,7 @@ const DicomUploadProgressItem = /*#__PURE__*/(0,react.memo)(({
   }, /*#__PURE__*/react.createElement("div", {
     className: "flex w-6 shrink-0 items-center justify-center"
   }, getStatusIcon()), /*#__PURE__*/react.createElement("div", {
-    className: "overflow-hidden text-ellipsis whitespace-nowrap text-white"
+    className: "text-foreground overflow-hidden text-ellipsis whitespace-nowrap"
   }, dicomFileUploader.getFileName())), failedReason && /*#__PURE__*/react.createElement("div", {
     className: "pl-10"
   }, failedReason)), /*#__PURE__*/react.createElement("div", {
@@ -8866,7 +8779,7 @@ function DicomUploadProgress({
   }, [numFilesCompleted]);
   const getNumCompletedAndTimeRemainingComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: "bg-muted flex h-14 items-center px-1 pb-4 text-lg text-white"
+      className: "bg-muted text-foreground flex h-14 items-center px-1 pb-4 text-lg"
     }, numFilesCompleted === dicomFileUploaderArr.length ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
       className: NO_WRAP_ELLIPSIS_CLASS_NAMES
     }, `${dicomFileUploaderArr.length} ${dicomFileUploaderArr.length > 1 ? 'files' : 'file'} completed.`), /*#__PURE__*/react.createElement(ui_next_src/* Button */.$nd, {
@@ -8916,7 +8829,7 @@ function DicomUploadProgress({
   return /*#__PURE__*/react.createElement("div", {
     className: "flex grow flex-col"
   }, getNumCompletedAndTimeRemainingComponent(), /*#__PURE__*/react.createElement("div", {
-    className: "flex grow flex-col overflow-hidden bg-black text-lg"
+    className: "flex grow flex-col overflow-hidden bg-background text-lg"
   }, getPercentCompleteComponent(), /*#__PURE__*/react.createElement("div", {
     className: "ohif-scrollbar h-1 grow overflow-y-scroll px-2"
   }, dicomFileUploaderArr.filter(dicomFileUploader => !showFailedOnly || dicomFileUploader.getStatus() === UploadStatus.Failed).map(dicomFileUploader => /*#__PURE__*/react.createElement(DicomUpload_DicomUploadProgressItem, {
@@ -8945,7 +8858,7 @@ function DicomUpload({
   onComplete,
   onStarted
 }) {
-  const baseClassNames = 'min-h-[375px] flex flex-col bg-black select-none rounded-lg overflow-hidden';
+  const baseClassNames = 'min-h-[375px] flex flex-col bg-background select-none rounded-lg overflow-hidden';
   const [dicomFileUploaderArr, setDicomFileUploaderArr] = (0,react.useState)([]);
   const onDrop = (0,react.useCallback)(async acceptedFiles => {
     onStarted();
@@ -9067,7 +8980,8 @@ function ViewportDownloadFormNew({
   onDimensionsChange,
   onEnableViewport,
   onDisableViewport,
-  onDownload
+  onDownload,
+  onCopyToClipboard
 }) {
   const [viewportElement, setViewportElement] = (0,react.useState)(null);
   const [showWarningMessage, setShowWarningMessage] = (0,react.useState)(true);
@@ -9094,7 +9008,7 @@ function ViewportDownloadFormNew({
     "data-viewport-uid": viewportId,
     ref: setViewportElement
   }, warningState.enabled && showWarningMessage && /*#__PURE__*/react.createElement("div", {
-    className: "text-foreground absolute left-1/2 bottom-[5px] z-[1000] -translate-x-1/2 whitespace-nowrap rounded bg-black p-3 text-xs font-bold",
+    className: "text-foreground absolute left-1/2 bottom-[5px] z-[1000] -translate-x-1/2 whitespace-nowrap rounded bg-background p-3 text-xs font-bold",
     style: {
       fontSize: '12px'
     }
@@ -9140,12 +9054,23 @@ function ViewportDownloadFormNew({
     className: "mt-2"
   }, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Right, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Secondary, {
     onClick: onClose
-  }, t('Common:Cancel')), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Primary, {
+  }, t('Common:Cancel')), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Secondary, {
+    onClick: async () => {
+      try {
+        await onCopyToClipboard();
+        ui_next_src/* toast */.oRP.success(t('Image copied to clipboard'));
+        onClose();
+      } catch (error) {
+        ui_next_src/* toast */.oRP.error(t('Failed to copy image to clipboard'));
+        console.error('Failed to copy to clipboard:', error);
+      }
+    }
+  }, t('Copy to Clipboard')), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Primary, {
     onClick: () => {
       onDownload(filename || DEFAULT_FILENAME, fileType);
       onClose();
     }
-  }, t('Common:Save')))))));
+  }, t('Save Image')))))));
 }
 /* harmony default export */ const captureViewportModalCustomization = ({
   'ohif.captureViewportModal': ViewportDownloadFormNew
@@ -9157,6 +9082,34 @@ function ViewportDownloadFormNew({
     value: 'Not For Diagnostic Use'
   }
 });
+;// ../../../extensions/cornerstone/src/customizations/viewportScrollbarCustomization.tsx
+/**
+ * Default customization values for viewport scrollbar behavior.
+ * The `progress` scrollbar variant is in full mode for stack viewports and
+ * acquisition-plane orthographic viewports.
+ * Otherwise, viewports using the `progress` scrollbar show only the indicator.
+ *
+ * - `viewportScrollbar.variant`: `'progress' | 'legacy'` (default: `'progress'`)
+ * - `viewportScrollbar.showLoadedEndpoints`: show loaded-range endpoint caps in full mode
+ * - `viewportScrollbar.showLoadedFill`: show loaded/cached fill in full mode
+ * - `viewportScrollbar.showViewedFill`: show viewed fill in full mode
+ * - `viewportScrollbar.showLoadingPattern`: show loading pattern in full mode while not fully loaded
+ * - `viewportScrollbar.viewedDwellMs`: delay before marking current image viewed in full mode (ms)
+ * - `viewportScrollbar.loadedBatchIntervalMs`: loaded-state version batch interval in full mode (ms)
+ * - `viewportScrollbar.indicator`: optional custom indicator config
+ */
+function getViewportScrollbarCustomization() {
+  return {
+    'viewportScrollbar.variant': 'progress',
+    'viewportScrollbar.showLoadedEndpoints': true,
+    'viewportScrollbar.showLoadedFill': true,
+    'viewportScrollbar.showViewedFill': true,
+    'viewportScrollbar.showLoadingPattern': true,
+    'viewportScrollbar.viewedDwellMs': 0,
+    'viewportScrollbar.loadedBatchIntervalMs': 200,
+    'viewportScrollbar.indicator': {}
+  };
+}
 ;// ../../../extensions/cornerstone/src/getCustomizationModule.tsx
 
 
@@ -9171,6 +9124,7 @@ function ViewportDownloadFormNew({
 
 
 
+
 function getCustomizationModule({
   commandsManager,
   servicesManager,
@@ -9195,7 +9149,8 @@ function getCustomizationModule({
       ...windowLevelPresetsCustomization,
       ...miscCustomization,
       ...captureViewportModalCustomization,
-      ...viewportDownloadWarningCustomization
+      ...viewportDownloadWarningCustomization,
+      ...getViewportScrollbarCustomization()
     }
   }];
 }
@@ -9563,17 +9518,39 @@ const CornerstoneViewportDownloadForm = ({
     } = activeViewportEnabledElement;
     const downloadViewport = renderingEngine.getViewport(VIEWPORT_ID);
     try {
+      // Capture current viewport state
+      // - properties: VOI, colormap, interpolation, etc.
+      // - viewPresentation: flip/rotate/zoom presentation state added for
+      //   saving flip and rotation for capture
+      // - viewReference: image/volume reference
+      const properties = viewport.getProperties();
+      const viewPresentation = viewport.getViewPresentation?.();
+      const viewRef = viewport.getViewReference?.();
       if (downloadViewport instanceof esm.StackViewport) {
         const imageId = viewport.getCurrentImageId();
-        const properties = viewport.getProperties();
         await downloadViewport.setStack([imageId]);
-        downloadViewport.setProperties(properties);
       } else if (downloadViewport instanceof esm.BaseVolumeViewport) {
         const volumeIds = viewport.getAllVolumeIds();
-        downloadViewport.setVolumes([{
+        await downloadViewport.setVolumes([{
           volumeId: volumeIds[0]
         }]);
       }
+
+      // Apply presentation state so captured image preserves flip/rotate
+      if (viewPresentation && downloadViewport.setViewPresentation) {
+        downloadViewport.setViewPresentation(viewPresentation);
+      }
+
+      // Apply viewport display properties
+      downloadViewport.setProperties(properties);
+
+      // Ensure correct image/volume reference
+      if (viewRef && downloadViewport.setViewReference) {
+        downloadViewport.setViewReference(viewRef);
+      }
+      downloadViewport.render();
+
+      // Re-apply segmentation overlays to the download viewport
       if (segmentationRepresentations?.length) {
         segmentationRepresentations.forEach(segRepresentation => {
           const {
@@ -9667,6 +9644,36 @@ const CornerstoneViewportDownloadForm = ({
       filename
     });
   };
+  const handleCopyToClipboard = async () => {
+    const divForDownloadViewport = document.querySelector(`div[data-viewport-uid="${VIEWPORT_ID}"]`);
+    if (!divForDownloadViewport) {
+      console.debug('No viewport found for copy');
+      return;
+    }
+    try {
+      const canvas = await (0,html2canvas_esm/* default */.A)(divForDownloadViewport);
+
+      // Clipboard API only supports PNG format in most browsers
+      const blob = await new Promise((resolve, reject) => {
+        canvas.toBlob(blob => {
+          if (blob) {
+            resolve(blob);
+          } else {
+            reject(new Error('Failed to create blob from canvas'));
+          }
+        }, 'image/png', 1.0);
+      });
+
+      // Copy to clipboard using the Clipboard API
+      await navigator.clipboard.write([new ClipboardItem({
+        'image/png': blob
+      })]);
+      console.log('Image copied to clipboard successfully');
+    } catch (error) {
+      console.error('Failed to copy image to clipboard:', error);
+      throw error;
+    }
+  };
   const ViewportDownloadFormNew = customizationService.getCustomization('ohif.captureViewportModal');
   return /*#__PURE__*/react.createElement(ViewportDownloadFormNew, {
     onClose: hide,
@@ -9680,6 +9687,7 @@ const CornerstoneViewportDownloadForm = ({
     onEnableViewport: handleEnableViewport,
     onDisableViewport: handleDisableViewport,
     onDownload: handleDownload,
+    onCopyToClipboard: handleCopyToClipboard,
     warningState: warningState
   });
 };
@@ -9942,6 +9950,51 @@ function generateSegmentationCSVReport(segmentationData, info) {
   });
 }
 ;// ../../../extensions/cornerstone/src/utils/hydrationUtils.ts
+/**
+ * After SEG hydration we must refresh every viewport that shows the referenced volume so
+ * presentations (including segmentation) apply to all MPR/3D tiles. Hanging-protocol matching
+ * can return only the active viewport when protocol definitions omit viewportId (e.g. 3D four-up)
+ * or when layout state diverges from the protocol; this merges in all grid panes that already
+ * list that volume in `displaySetInstanceUIDs`.
+ *
+ * Only exact displaySetInstanceUID matches are used (no Frame-of-Reference inference): sibling
+ * MPR planes must already share the same referenced volume UID in grid state, or HP matching
+ * must list them; otherwise forcing a different UID onto a volume viewport can leave it blank.
+ */
+function mergeVolumeSharingViewports(hangingProtocolUpdates, volumeUid, viewports) {
+  if (!volumeUid) {
+    return hangingProtocolUpdates ?? [];
+  }
+  const byId = new Map();
+  const add = (viewportId, uids) => {
+    if (!viewportId) {
+      return;
+    }
+    byId.set(viewportId, {
+      viewportId,
+      displaySetInstanceUIDs: uids
+    });
+  };
+  if (Array.isArray(hangingProtocolUpdates)) {
+    for (const entry of hangingProtocolUpdates) {
+      const vid = entry.viewportId ?? entry.viewportOptions?.viewportId;
+      if (vid) {
+        add(vid, entry.displaySetInstanceUIDs?.length ? entry.displaySetInstanceUIDs : [volumeUid]);
+      }
+    }
+  }
+  viewports.forEach(vp => {
+    const uids = vp.displaySetInstanceUIDs || [];
+    if (uids.includes(volumeUid)) {
+      add(vp.viewportId, [volumeUid]);
+    }
+  });
+  const merged = Array.from(byId.values());
+  if (merged.length === 0 && Array.isArray(hangingProtocolUpdates) && hangingProtocolUpdates.length > 0) {
+    return hangingProtocolUpdates;
+  }
+  return merged;
+}
 function getUpdatedViewportsForSegmentation({
   viewportId,
   servicesManager,
@@ -9952,7 +10005,8 @@ function getUpdatedViewportsForSegmentation({
     viewportGridService
   } = servicesManager.services;
   const {
-    isHangingProtocolLayout
+    isHangingProtocolLayout,
+    viewports
   } = viewportGridService.getState();
   const viewport = getTargetViewport({
     viewportId,
@@ -9960,7 +10014,10 @@ function getUpdatedViewportsForSegmentation({
   });
   const targetViewportId = viewport.viewportOptions.viewportId;
   const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(targetViewportId, displaySetInstanceUIDs[0], isHangingProtocolLayout);
-  return updatedViewports;
+  if (updatedViewports == null) {
+    return updatedViewports;
+  }
+  return mergeVolumeSharingViewports(updatedViewports, displaySetInstanceUIDs[0], viewports);
 }
 const getTargetViewport = ({
   viewportId,
@@ -10520,7 +10577,14 @@ function commandsModule({
   }
   function _getActiveViewportToolGroupId() {
     const viewport = _getActiveViewportEnabledElement();
-    return toolGroupService.getToolGroupForViewport(viewport.id);
+    const toolGroup = viewport && toolGroupService.getToolGroupForViewport(viewport.id);
+    return toolGroup?.id;
+  }
+  function _usesPrimaryActivation(bindings) {
+    if (!bindings?.length) {
+      return true;
+    }
+    return bindings.some(binding => binding.mouseButton === dist_esm.Enums.MouseBindings.Primary && binding.modifierKey == null && binding.numTouchPoints == null);
   }
   function _getActiveSegmentationInfo() {
     const viewportId = viewportGridService.getActiveViewportId();
@@ -10756,11 +10820,26 @@ function commandsModule({
         segmentIndex: targetIndex
       } = targetSegmentation;
 
+      // Check if the segment has voxels before computing bidirectional measurement
+      const uniqueSegmentIndices = dist_esm.utilities.segmentation.getUniqueSegmentIndices(targetId);
+      const hasVoxels = uniqueSegmentIndices.includes(targetIndex);
+      if (!hasVoxels) {
+        uiNotificationService.show({
+          title: i18n_src/* default */.A.t('SegmentationPanel:Segment Bidirectional'),
+          message: i18n_src/* default */.A.t('SegmentationPanel:Draw a segment before using bidirectional measurement'),
+          type: 'warning'
+        });
+        return;
+      }
+
       // Get bidirectional measurement data
       const bidirectionalData = await dist_esm.utilities.segmentation.getSegmentLargestBidirectional({
         segmentationId: targetId,
         segmentIndices: [targetIndex]
       });
+      if (!bidirectionalData.length) {
+        return;
+      }
       const activeViewportId = viewportGridService.getActiveViewportId();
 
       // Process each bidirectional measurement
@@ -10799,7 +10878,7 @@ function commandsModule({
       // get the active segmentIndex bidirectional annotation and jump to it
       const activeBidirectional = bidirectionalData.find(measurement => measurement.segmentIndex === targetIndex);
       commandsManager.run('jumpToMeasurement', {
-        uid: activeBidirectional.annotationUID
+        uid: activeBidirectional?.annotationUID
       });
     },
     interpolateLabelmap: () => {
@@ -10962,7 +11041,7 @@ function commandsModule({
         return;
       }
       if (!labelConfig) {
-        const label = await (0,default_src.callInputDialog)({
+        const label = await (0,default_src/* callInputDialog */.l5)({
           uiDialogService,
           title: i18n_src/* default */.A.t('Tools:Edit Measurement Label'),
           placeholder: measurement.label || i18n_src/* default */.A.t('Tools:Enter new label'),
@@ -10976,7 +11055,7 @@ function commandsModule({
         }
         return;
       }
-      const val = await (0,default_src.callInputDialogAutoComplete)({
+      const val = await (0,default_src/* callInputDialogAutoComplete */.fq)({
         measurement,
         uiDialogService,
         labelConfig,
@@ -11099,6 +11178,9 @@ function commandsModule({
       uid,
       displayMeasurements = []
     }) => {
+      if (!uid) {
+        return;
+      }
       measurementService.jumpToMeasurement(viewportGridService.getActiveViewportId(), uid);
       for (const measurement of displayMeasurements) {
         measurement.isActive = measurement.uid === uid;
@@ -11196,7 +11278,7 @@ function commandsModule({
       const labelConfig = customizationService.getCustomization('measurementLabels');
       const renderContent = customizationService.getCustomization('ui.labellingComponent');
       if (!labelConfig) {
-        const label = await (0,default_src.callInputDialog)({
+        const label = await (0,default_src/* callInputDialog */.l5)({
           uiDialogService,
           title: i18n_src/* default */.A.t('Tools:Edit Arrow Text'),
           placeholder: data?.data?.label || i18n_src/* default */.A.t('Tools:Enter new text'),
@@ -11205,7 +11287,7 @@ function commandsModule({
         callback?.(label);
         return;
       }
-      const value = await (0,default_src.callInputDialogAutoComplete)({
+      const value = await (0,default_src/* callInputDialogAutoComplete */.fq)({
         uiDialogService,
         labelConfig,
         renderContent
@@ -11369,31 +11451,46 @@ function commandsModule({
     toggleActiveDisabledToolbar({
       value,
       itemId,
-      toolGroupId
+      toolGroupId,
+      toolGroupIds
     }) {
       const toolName = itemId || value;
-      toolGroupId = toolGroupId ?? _getActiveViewportToolGroupId();
-      const toolGroup = toolGroupService.getToolGroup(toolGroupId);
-      if (!toolGroup || !toolGroup.hasTool(toolName)) {
-        return;
-      }
-      const toolIsActive = [dist_esm.Enums.ToolModes.Active, dist_esm.Enums.ToolModes.Enabled, dist_esm.Enums.ToolModes.Passive].includes(toolGroup.getToolOptions(toolName).mode);
-      toolIsActive ? toolGroup.setToolDisabled(toolName) : actions.setToolActive({
-        toolName,
-        toolGroupId
-      });
-
-      // we should set the previously active tool to active after we set the
-      // current tool disabled
-      if (toolIsActive) {
-        const prevToolName = toolGroup.getPrevActivePrimaryToolName();
-        if (prevToolName !== toolName) {
+      const resolvedToolGroupIds = toolGroupIds?.length ? toolGroupIds : [toolGroupId ?? _getActiveViewportToolGroupId()];
+      resolvedToolGroupIds.forEach(toolGroupId => {
+        const toolGroup = toolGroupService.getToolGroup(toolGroupId);
+        if (!toolGroup || !toolGroup.hasTool(toolName)) {
+          return;
+        }
+        const toolIsActive = [dist_esm.Enums.ToolModes.Active, dist_esm.Enums.ToolModes.Enabled, dist_esm.Enums.ToolModes.Passive].includes(toolGroup.getToolOptions(toolName).mode);
+        if (toolIsActive) {
+          toolGroup.setToolDisabled(toolName);
+          const bindings = toolGroupService.getToolBindings(toolGroupId, toolName);
+          if (_usesPrimaryActivation(bindings)) {
+            // we should set the previously active tool to active after we set the
+            // current tool disabled
+            const prevToolName = toolGroup.getPrevActivePrimaryToolName();
+            if (prevToolName !== toolName) {
+              actions.setToolActive({
+                toolName: prevToolName,
+                toolGroupId
+              });
+            }
+          }
+          return;
+        }
+        const bindings = toolGroupService.getToolBindings(toolGroupId, toolName);
+        if (_usesPrimaryActivation(bindings)) {
           actions.setToolActive({
-            toolName: prevToolName,
-            toolGroupId
+            toolName,
+            toolGroupId,
+            bindings
+          });
+        } else {
+          toolGroup.setToolActive(toolName, {
+            bindings
           });
         }
-      }
+      });
     },
     setToolActiveToolbar: ({
       value,
@@ -12101,7 +12198,7 @@ function commandsModule({
         segmentationService,
         viewportGridService
       } = servicesManager.services;
-      const displaySetInstanceUIDs = await (0,default_src.createReportAsync)({
+      const displaySetInstanceUIDs = await (0,default_src/* createReportAsync */.Vy)({
         servicesManager,
         getReport: () => commandsManager.runCommand('storeSegmentation', args),
         reportType: 'Segmentation'
@@ -12178,14 +12275,15 @@ function commandsModule({
      * @param props.segmentationId - The ID of the segmentation to remove
      */
     removeSegmentationFromViewportCommand: ({
-      segmentationId
+      segmentationId: displaySetInstanceUID
     }) => {
       const {
-        segmentationService,
         viewportGridService
       } = servicesManager.services;
-      segmentationService.removeSegmentationRepresentations(viewportGridService.getActiveViewportId(), {
-        segmentationId
+      const viewportId = viewportGridService.getActiveViewportId();
+      commandsManager.runCommand('removeDisplaySetLayer', {
+        viewportId,
+        displaySetInstanceUID
       });
     },
     /**
@@ -12213,7 +12311,7 @@ function commandsModule({
         return;
       }
       const segment = segmentation.segments[segmentIndex];
-      (0,default_src.callInputDialog)({
+      (0,default_src/* callInputDialog */.l5)({
         uiDialogService,
         title: i18n_src/* default */.A.t('Tools:Edit Segment Label'),
         placeholder: i18n_src/* default */.A.t('Tools:Enter new label'),
@@ -12236,7 +12334,7 @@ function commandsModule({
       const {
         label
       } = segmentation;
-      (0,default_src.callInputDialog)({
+      (0,default_src/* callInputDialog */.l5)({
         uiDialogService,
         title: i18n_src/* default */.A.t('Tools:Edit Segmentation Label'),
         placeholder: i18n_src/* default */.A.t('Tools:Enter new label'),
@@ -12266,7 +12364,7 @@ function commandsModule({
         a: color[3] / 255.0
       };
       uiDialogService.show({
-        content: default_src.colorPickerDialog,
+        content: default_src/* colorPickerDialog */.wS,
         title: i18n_src/* default */.A.t('Tools:Segment Color'),
         contentProps: {
           value: rgbaColor,
@@ -12545,6 +12643,15 @@ function commandsModule({
         servicesManager,
         displaySetInstanceUIDs
       });
+      if (!updatedViewports?.length) {
+        return;
+      }
+      updatedViewports.forEach(({
+        viewportId: csViewportId
+      }) => {
+        const csViewport = cornerstoneViewportService.getCornerstoneViewport(csViewportId);
+        csViewport?.setNeedsRender?.();
+      });
       actions.setDisplaySetsForViewports({
         viewportsToUpdate: updatedViewports.map(viewport => ({
           viewportId: viewport.viewportId,
@@ -13256,6 +13363,29 @@ const HYDRATE_SEG_SYNC_GROUP = {
     matchingRules: ['sameFOR']
   }
 };
+const viewportStructure = {
+  layoutType: 'grid',
+  properties: {
+    rows: 1,
+    columns: 3,
+    layoutOptions: [{
+      x: 0,
+      y: 0,
+      width: 1 / 3,
+      height: 1
+    }, {
+      x: 1 / 3,
+      y: 0,
+      width: 1 / 3,
+      height: 1
+    }, {
+      x: 2 / 3,
+      y: 0,
+      width: 1 / 3,
+      height: 1
+    }]
+  }
+};
 const mpr = {
   id: 'mpr',
   name: i18next/* default */.A.t('Hps:MPR'),
@@ -13286,29 +13416,7 @@ const mpr = {
   },
   stages: [{
     name: 'MPR 1x3',
-    viewportStructure: {
-      layoutType: 'grid',
-      properties: {
-        rows: 1,
-        columns: 3,
-        layoutOptions: [{
-          x: 0,
-          y: 0,
-          width: 1 / 3,
-          height: 1
-        }, {
-          x: 1 / 3,
-          y: 0,
-          width: 1 / 3,
-          height: 1
-        }, {
-          x: 2 / 3,
-          y: 0,
-          width: 1 / 3,
-          height: 1
-        }]
-      }
-    },
+    viewportStructure,
     viewports: [{
       viewportOptions: {
         viewportId: 'mpr-axial',
@@ -13352,36 +13460,82 @@ const mpr = {
         id: 'activeDisplaySet'
       }]
     }]
-  }]
-};
-;// ../../../extensions/cornerstone/src/hps/fourUp.ts
-
-
-const fourUp = {
-  id: 'fourUp',
-  locked: true,
-  name: i18next/* default */.A.t('Hps:3D four up'),
-  icon: 'layout-advanced-3d-four-up',
-  isPreset: true,
-  createdDate: '2023-03-15T10:29:44.894Z',
-  modifiedDate: '2023-03-15T10:29:44.894Z',
-  availableTo: {},
-  editableBy: {},
-  protocolMatchingRules: [],
-  imageLoadStrategy: 'interleaveCenter',
-  displaySetSelectors: {
-    activeDisplaySet: {
-      seriesMatchingRules: [{
-        weight: 1,
-        attribute: 'isReconstructable',
-        constraint: {
-          equals: {
-            value: true
-          }
-        },
-        required: true
-      }]
-    }
+  }, {
+    name: 'MPR Reformat 1x3',
+    viewportStructure,
+    viewports: [{
+      viewportOptions: {
+        viewportId: 'mpr-axial',
+        toolGroupId: 'mpr',
+        viewportType: 'volume',
+        orientation: 'axial_reformat',
+        initialImageOptions: {
+          preset: 'middle'
+        },
+        syncGroups: [VOI_SYNC_GROUP, HYDRATE_SEG_SYNC_GROUP]
+      },
+      displaySets: [{
+        id: 'activeDisplaySet'
+      }]
+    }, {
+      viewportOptions: {
+        viewportId: 'mpr-sagittal',
+        toolGroupId: 'mpr',
+        viewportType: 'volume',
+        orientation: 'sagittal_reformat',
+        initialImageOptions: {
+          preset: 'middle'
+        },
+        syncGroups: [VOI_SYNC_GROUP, HYDRATE_SEG_SYNC_GROUP]
+      },
+      displaySets: [{
+        id: 'activeDisplaySet'
+      }]
+    }, {
+      viewportOptions: {
+        viewportId: 'mpr-coronal',
+        toolGroupId: 'mpr',
+        viewportType: 'volume',
+        orientation: 'coronal_reformat',
+        initialImageOptions: {
+          preset: 'middle'
+        },
+        syncGroups: [VOI_SYNC_GROUP, HYDRATE_SEG_SYNC_GROUP]
+      },
+      displaySets: [{
+        id: 'activeDisplaySet'
+      }]
+    }]
+  }]
+};
+;// ../../../extensions/cornerstone/src/hps/fourUp.ts
+
+
+const fourUp = {
+  id: 'fourUp',
+  locked: true,
+  name: i18next/* default */.A.t('Hps:3D four up'),
+  icon: 'layout-advanced-3d-four-up',
+  isPreset: true,
+  createdDate: '2023-03-15T10:29:44.894Z',
+  modifiedDate: '2023-03-15T10:29:44.894Z',
+  availableTo: {},
+  editableBy: {},
+  protocolMatchingRules: [],
+  imageLoadStrategy: 'interleaveCenter',
+  displaySetSelectors: {
+    activeDisplaySet: {
+      seriesMatchingRules: [{
+        weight: 1,
+        attribute: 'isReconstructable',
+        constraint: {
+          equals: {
+            value: true
+          }
+        },
+        required: true
+      }]
+    }
   },
   stages: [{
     id: 'fourUpStage',
@@ -15342,6 +15496,9 @@ function ViewportDataOverlayMenu({
   } = (0,useViewportDisplaySets/* useViewportDisplaySets */.N)(viewportId);
   const [optimisticOverlayDisplaySets, setOptimisticOverlayDisplaySets] = (0,react.useState)(overlayDisplaySets);
   const [thresholdOpacityEnabled, setThresholdOpacityEnabled] = (0,react.useState)(false);
+  (0,react.useEffect)(() => {
+    setOptimisticOverlayDisplaySets(overlayDisplaySets);
+  }, [backgroundDisplaySet?.displaySetInstanceUID, overlayDisplaySets]);
 
   /**
    * Change the background display set
@@ -15648,7 +15805,8 @@ function ViewportDataOverlayMenu({
       }
     }
   }, /*#__PURE__*/react.createElement(ui_next_src/* SelectTrigger */.bqE, {
-    className: "flex-1"
+    className: "flex-1",
+    "data-cy": `overlay-background-ds-select-${viewportId}`
   }, /*#__PURE__*/react.createElement(ui_next_src/* SelectValue */.yvm, null, (backgroundDisplaySet?.SeriesDescription || backgroundDisplaySet?.label || 'background').toUpperCase())), /*#__PURE__*/react.createElement(ui_next_src/* SelectContent */.gCo, null, potentialBackgroundDisplaySets.map(displaySet => /*#__PURE__*/react.createElement(ui_next_src/* SelectItem */.ebT, {
     key: displaySet.displaySetInstanceUID,
     value: displaySet.displaySetInstanceUID,
@@ -15923,7 +16081,7 @@ function ViewportOrientationMenu({
   }) : null), /*#__PURE__*/react.createElement("div", {
     className: "flex-1 text-left"
   }, "Acquisition")), /*#__PURE__*/react.createElement("div", {
-    className: "mx-1 my-2 border-t border-white/20"
+    className: "border-input mx-1 my-2 border-t"
   }), /*#__PURE__*/react.createElement(ui_next_src/* Button */.$nd, {
     variant: "ghost",
     className: "flex h-7 w-full flex-shrink-0 items-center justify-start self-stretch px-1 py-0",
@@ -16264,7 +16422,7 @@ function VolumeRenderingPresetsContent({
     }
   }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.ByName, {
     name: preset.name,
-    className: selectedPreset?.name === preset.name ? 'border-highlight h-[75px] w-[95px] max-w-none rounded border-2' : 'hover:border-highlight h-[75px] w-[95px] max-w-none rounded border-2 border-black'
+    className: selectedPreset?.name === preset.name ? 'border-highlight h-[75px] w-[95px] max-w-none rounded border-2' : 'hover:border-highlight h-[75px] w-[95px] max-w-none rounded border-2 border-background'
   }), /*#__PURE__*/react.createElement("label", {
     className: "text-muted-foreground mt-1 text-left text-xs"
   }, formatLabel(preset.name, 11)))))), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu, {
@@ -17410,9 +17568,9 @@ function ModalityLoadBadge({
     if (!statusInfo.isHydrated) {
       return /*#__PURE__*/react.createElement("div", {
         "data-cy": `ModalityLoadBadge-${viewportId}`,
-        className: "flex h-6 cursor-default text-sm leading-6 text-white"
+        className: "text-foreground flex h-6 cursor-default text-sm leading-6"
       }, /*#__PURE__*/react.createElement("div", {
-        className: "bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
+        className: "bg-popover flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
       }, /*#__PURE__*/react.createElement(StatusIcon, null), /*#__PURE__*/react.createElement("span", {
         className: "ml-1"
       }, statusInfo.type)), statusInfo.type !== 'SR' && /*#__PURE__*/react.createElement(ui_next_src/* ViewportActionButton */.N8H, {
@@ -18339,6 +18497,36 @@ function getToolbarModule({
         isActive: isPrimaryActive
       };
     }
+  }, {
+    name: 'evaluate.cornerstoneTool.toggleWithModifier',
+    evaluate: ({
+      viewportId,
+      button,
+      disabledText,
+      toggledOnIcon,
+      defaultIcon
+    }) => {
+      const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
+      if (!toolGroup) {
+        return;
+      }
+      const toolName = toolbarService.getToolNameForButton(button);
+      if (!toolGroup.hasTool(toolName)) {
+        return getDisabledState(disabledText);
+      }
+      const {
+        mode
+      } = toolGroup.getToolOptions(toolName) ?? {};
+      const isToggled = mode === dist_esm.Enums.ToolModes.Passive || mode === dist_esm.Enums.ToolModes.Active || mode === dist_esm.Enums.ToolModes.Enabled;
+      const toolBindings = toolGroupService.getToolBindings(toolGroup.id, toolName);
+      const hasModifierKey = toolBindings?.some(binding => binding.modifierKey != null) ?? false;
+      return {
+        disabled: false,
+        isActive: false,
+        isToggled,
+        icon: isToggled && hasModifierKey && toggledOnIcon ? toggledOnIcon : defaultIcon ?? button.props.icon
+      };
+    }
   }, {
     name: 'evaluate.action',
     evaluate: () => {
@@ -18491,7 +18679,10 @@ class ToolGroupService {
     this.cornerstoneViewportService = void 0;
     this.viewportGridService = void 0;
     this.uiNotificationService = void 0;
+    this.customizationService = void 0;
     this.toolGroupIds = new Set();
+    this.toolBindingsMap = new Map();
+    this.defaultToolBindingsMap = new Map();
     /**
      * Service-specific
      */
@@ -18517,11 +18708,13 @@ class ToolGroupService {
     const {
       cornerstoneViewportService,
       viewportGridService,
-      uiNotificationService
+      uiNotificationService,
+      customizationService
     } = servicesManager.services;
     this.cornerstoneViewportService = cornerstoneViewportService;
     this.viewportGridService = viewportGridService;
     this.uiNotificationService = uiNotificationService;
+    this.customizationService = customizationService;
     this.listeners = {};
     this.EVENTS = ToolGroupService_EVENTS;
     Object.assign(this, src/* pubSubServiceInterface */.Ml);
@@ -18579,6 +18772,8 @@ class ToolGroupService {
   destroy() {
     dist_esm.ToolGroupManager.destroy();
     this.toolGroupIds = new Set();
+    this.toolBindingsMap.clear();
+    this.defaultToolBindingsMap.clear();
     esm.eventTarget.removeEventListener(dist_esm.Enums.Events.TOOL_ACTIVATED, this._onToolActivated);
   }
   destroyToolGroup(toolGroupId) {
@@ -18633,6 +18828,7 @@ class ToolGroupService {
     // this.changeConfigurationIfNecessary(toolGroup, volumeId);
     this._addTools(toolGroup, tools, configs);
     this._setToolsMode(toolGroup, tools);
+    this._loadPersistedBindings(toolGroupId);
   }
   createToolGroupAndAddTools(toolGroupId, tools) {
     const toolGroup = this.createToolGroup(toolGroupId);
@@ -18672,6 +18868,84 @@ class ToolGroupService {
   getActivePrimaryMouseButtonTool(toolGroupId) {
     return this.getToolGroup(toolGroupId)?.getActivePrimaryMouseButtonTool();
   }
+  getToolBindings(toolGroupId, toolName) {
+    return this.toolBindingsMap.get(toolGroupId)?.get(toolName);
+  }
+  setToolBindings(toolGroupId, toolName, bindings) {
+    if (!this.toolBindingsMap.has(toolGroupId)) {
+      this.toolBindingsMap.set(toolGroupId, new Map());
+    }
+    this.toolBindingsMap.get(toolGroupId).set(toolName, this._cloneToolBindings(bindings));
+  }
+  getDefaultToolBindings(toolGroupId, toolName) {
+    const defaultBindings = this.defaultToolBindingsMap.get(toolGroupId)?.get(toolName);
+    return defaultBindings ? this._cloneToolBindings(defaultBindings) : undefined;
+  }
+  persistToolBindings(toolGroupId, toolName, bindings) {
+    const persistedBindings = this._readPersistedToolBindings();
+    if (!persistedBindings[toolGroupId]) {
+      persistedBindings[toolGroupId] = {};
+    }
+    persistedBindings[toolGroupId][toolName] = bindings;
+    this._writePersistedToolBindings(persistedBindings);
+  }
+  removePersistedToolBindings(toolGroupId, toolName) {
+    const persistedBindings = this._readPersistedToolBindings();
+    if (!persistedBindings[toolGroupId]) {
+      return;
+    }
+    if (toolName) {
+      delete persistedBindings[toolGroupId][toolName];
+      if (!Object.keys(persistedBindings[toolGroupId]).length) {
+        delete persistedBindings[toolGroupId];
+      }
+    } else {
+      delete persistedBindings[toolGroupId];
+    }
+    this._writePersistedToolBindings(persistedBindings);
+  }
+
+  /**
+   * Applies the currently tracked bindings to the runtime tool instance.
+   *
+   * Note: this method may activate tools that are currently Passive or Enabled.
+   * Assigning bindings is treated as making the tool interactable.
+   */
+  applyToolBindings(toolGroupId, toolName, options = {}) {
+    const toolGroup = dist_esm.ToolGroupManager.getToolGroup(toolGroupId);
+    if (!toolGroup || !toolGroup.hasTool(toolName)) {
+      return;
+    }
+    const bindings = this.getToolBindings(toolGroupId, toolName);
+    if (!bindings) {
+      return;
+    }
+    const {
+      mode
+    } = toolGroup.getToolOptions(toolName);
+    if (mode === dist_esm.Enums.ToolModes.Active || mode === dist_esm.Enums.ToolModes.Passive || mode === dist_esm.Enums.ToolModes.Enabled) {
+      if (options.replaceExisting) {
+        // Opt-in behavior for callers that need replacement semantics.
+        toolGroup.setToolDisabled(toolName);
+      }
+      toolGroup.setToolActive(toolName, {
+        bindings
+      });
+    }
+  }
+  getAllToolBindings() {
+    const result = [];
+    for (const [toolGroupId, toolMap] of this.toolBindingsMap) {
+      for (const [toolName, bindings] of toolMap) {
+        result.push({
+          toolGroupId,
+          toolName,
+          bindings
+        });
+      }
+    }
+    return result;
+  }
   _setToolsMode(toolGroup, tools) {
     const {
       active,
@@ -18684,6 +18958,10 @@ class ToolGroupService {
         toolName,
         bindings
       }) => {
+        if (bindings) {
+          this.setToolBindings(toolGroup.id, toolName, bindings);
+          this._setDefaultToolBindingsIfMissing(toolGroup.id, toolName, bindings);
+        }
         toolGroup.setToolActive(toolName, {
           bindings
         });
@@ -18691,26 +18969,50 @@ class ToolGroupService {
     }
     if (passive) {
       passive.forEach(({
-        toolName
+        toolName,
+        bindings
       }) => {
+        if (bindings) {
+          this.setToolBindings(toolGroup.id, toolName, bindings);
+          this._setDefaultToolBindingsIfMissing(toolGroup.id, toolName, bindings);
+        }
         toolGroup.setToolPassive(toolName);
       });
     }
     if (enabled) {
       enabled.forEach(({
-        toolName
+        toolName,
+        bindings
       }) => {
+        if (bindings) {
+          this.setToolBindings(toolGroup.id, toolName, bindings);
+          this._setDefaultToolBindingsIfMissing(toolGroup.id, toolName, bindings);
+        }
         toolGroup.setToolEnabled(toolName);
       });
     }
     if (disabled) {
       disabled.forEach(({
-        toolName
+        toolName,
+        bindings
       }) => {
+        if (bindings) {
+          this.setToolBindings(toolGroup.id, toolName, bindings);
+          this._setDefaultToolBindingsIfMissing(toolGroup.id, toolName, bindings);
+        }
         toolGroup.setToolDisabled(toolName);
       });
     }
   }
+  _setDefaultToolBindingsIfMissing(toolGroupId, toolName, bindings) {
+    if (!this.defaultToolBindingsMap.has(toolGroupId)) {
+      this.defaultToolBindingsMap.set(toolGroupId, new Map());
+    }
+    const toolMap = this.defaultToolBindingsMap.get(toolGroupId);
+    if (!toolMap.has(toolName)) {
+      toolMap.set(toolName, this._cloneToolBindings(bindings));
+    }
+  }
   _addTools(toolGroup, tools) {
     const addTools = tools => {
       tools.forEach(({
@@ -18742,6 +19044,60 @@ class ToolGroupService {
       addTools(tools.disabled);
     }
   }
+  _loadPersistedBindings(toolGroupId) {
+    const toolGroupBindings = this._readPersistedToolBindings()[toolGroupId];
+    if (!toolGroupBindings) {
+      return;
+    }
+    const toolGroup = dist_esm.ToolGroupManager.getToolGroup(toolGroupId);
+    for (const [toolName, bindings] of Object.entries(toolGroupBindings)) {
+      this.setToolBindings(toolGroupId, toolName, bindings);
+      if (!toolGroup || !toolGroup.hasTool(toolName)) {
+        continue;
+      }
+      const {
+        mode
+      } = toolGroup.getToolOptions(toolName);
+      if (mode === dist_esm.Enums.ToolModes.Active) {
+        this.applyToolBindings(toolGroupId, toolName, {
+          replaceExisting: true
+        });
+      }
+    }
+  }
+  _readPersistedToolBindings() {
+    try {
+      const stored = localStorage.getItem(this._getToolBindingsStorageKey());
+      if (!stored) {
+        return {};
+      }
+      const parsed = JSON.parse(stored);
+      if (!parsed || typeof parsed !== 'object') {
+        return {};
+      }
+      return parsed;
+    } catch {
+      // ignore corrupt localStorage
+      return {};
+    }
+  }
+  _writePersistedToolBindings(bindings) {
+    const storageKey = this._getToolBindingsStorageKey();
+    if (!Object.keys(bindings).length) {
+      localStorage.removeItem(storageKey);
+      return;
+    }
+    localStorage.setItem(storageKey, JSON.stringify(bindings));
+  }
+  _cloneToolBindings(bindings) {
+    return bindings.map(binding => ({
+      ...binding
+    }));
+  }
+  _getToolBindingsStorageKey() {
+    const customizationValue = this.customizationService?.getCustomization('ohif.userPreferences.toolBindingsStorageKey');
+    return typeof customizationValue === 'string' && customizationValue.length > 0 ? customizationValue : 'user-preferred-tool-bindings';
+  }
 }
 _ToolGroupService = ToolGroupService;
 ToolGroupService.REGISTRATION = {
@@ -18829,7 +19185,12 @@ const segmentationRepresentationModifiedCallback = async (synchronizerInstance,
   const sourceDisplaySetUIDs = extractDisplaySetUIDs(sourceViewportInfo);
   const targetDisplaySetUIDs = extractDisplaySetUIDs(targetViewportInfo);
   const sharedDisplaySetExists = isAnyDisplaySetCommon(sourceDisplaySetUIDs, targetDisplaySetUIDs);
-  if (!sharedDisplaySetExists && !viewport.getFrameOfReferenceUID()) {
+  const targetFrameOfReferenceUID = viewport.getFrameOfReferenceUID();
+  const sourceFrameOfReferenceUID = (0,esm.getEnabledElementByViewportId)(sourceViewportId)?.viewport?.getFrameOfReferenceUID();
+  if (!sharedDisplaySetExists && !targetFrameOfReferenceUID) {
+    return;
+  }
+  if (!sharedDisplaySetExists && targetFrameOfReferenceUID !== sourceFrameOfReferenceUID) {
     return;
   }
   const targetViewportRepresentation = segmentationService.getSegmentationRepresentations(targetViewportId, {
@@ -19196,11 +19557,11 @@ class SegmentationService extends src/* PubSubService */.Rc {
     this.EVENTS = SegmentationService_EVENTS;
     this.destroy = () => {
       esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_MODIFIED, this._onSegmentationModifiedFromSource);
-      esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REMOVED, this._onSegmentationModifiedFromSource);
+      esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REMOVED, this._onSegmentationRemovedFromSource);
       esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_DATA_MODIFIED, this._onSegmentationDataModifiedFromSource);
       esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_MODIFIED, this._onSegmentationRepresentationModifiedFromSource);
       esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_ADDED, this._onSegmentationRepresentationModifiedFromSource);
-      esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_REMOVED, this._onSegmentationRepresentationModifiedFromSource);
+      esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_REMOVED, this._onSegmentationRepresentationRemovedFromSource);
       esm.eventTarget.removeEventListener(dist_esm.Enums.Events.SEGMENTATION_ADDED, this._onSegmentationAddedFromSource);
       this.reset();
     };
@@ -19261,6 +19622,16 @@ class SegmentationService extends src/* PubSubService */.Rc {
         viewportId
       });
     };
+    this._onSegmentationRepresentationRemovedFromSource = evt => {
+      const {
+        segmentationId,
+        viewportId
+      } = evt.detail;
+      this._broadcastEvent(this.EVENTS.SEGMENTATION_REPRESENTATION_REMOVED, {
+        segmentationId,
+        viewportId
+      });
+    };
     this._onSegmentationModifiedFromSource = evt => {
       const {
         segmentationId
@@ -19277,6 +19648,14 @@ class SegmentationService extends src/* PubSubService */.Rc {
         segmentationId
       });
     };
+    this._onSegmentationRemovedFromSource = evt => {
+      const {
+        segmentationId
+      } = evt.detail;
+      this._broadcastEvent(this.EVENTS.SEGMENTATION_REMOVED, {
+        segmentationId
+      });
+    };
     this._onAnnotationCutMergeProcessCompletedFromSource = evt => {
       const {
         segmentationId
@@ -19482,6 +19861,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
       },
       config: {
         label,
+        fallbackLabel: `S:${displaySet.SeriesNumber} ${displaySet.Modality}`,
         segments: options?.segments && Object.keys(options.segments).length > 0 ? options.segments : {
           1: {
             label: `${i18n_src/* default */.A.t('Segment')} 1`,
@@ -19613,6 +19993,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
       },
       config: {
         label: segDisplaySet.SeriesDescription,
+        fallbackLabel: `S:${segDisplaySet.SeriesNumber} ${segDisplaySet.Modality}`,
         segments
       }
     };
@@ -19673,7 +20054,8 @@ class SegmentationService extends src/* PubSubService */.Rc {
         }
       },
       config: {
-        label: rtDisplaySet.SeriesDescription
+        label: rtDisplaySet.SeriesDescription,
+        fallbackLabel: `S:${rtDisplaySet.SeriesNumber} ${rtDisplaySet.Modality}`
       }
     };
     const segments = {};
@@ -20170,14 +20552,14 @@ class SegmentationService extends src/* PubSubService */.Rc {
   }
   /**
    * Clears segmentation representations from the viewport.
-   * Unlike removeSegmentationRepresentations, this doesn't update
+   * Unlike removeRepresentationsFromViewport, this doesn't update
    * removed display set and representation maps.
    * We track removed segmentations manually to avoid re-adding them
    * when the display set is added again.
    * @param viewportId - The viewport ID to clear segmentation representations from.
    */
   clearSegmentationRepresentations(viewportId) {
-    this.removeSegmentationRepresentations(viewportId);
+    this.removeRepresentationsFromViewport(viewportId);
   }
 
   /**
@@ -20192,7 +20574,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
   }
 
   /**
-   * It removes the segmentation representations from the viewport.
+   * Removes segmentation representations from the viewport.
    * @param viewportId - The viewport id to remove the segmentation representations from.
    * @param specifier - The specifier to remove the segmentation representations.
    *
@@ -20202,7 +20584,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
    * If a type specifier is provided, only the segmentation representation with the specified type are removed.
    * If both a segmentationId and type specifier are provided, only the segmentation representation with the specified segmentationId and type are removed.
    */
-  removeSegmentationRepresentations(viewportId, specifier = {}) {
+  removeRepresentationsFromViewport(viewportId, specifier = {}) {
     dist_esm.segmentation.removeSegmentationRepresentations(viewportId, specifier);
   }
 
@@ -20558,6 +20940,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
       id: id,
       segmentationId,
       label: segmentation.label,
+      fallbackLabel: segmentation.fallbackLabel,
       active,
       type,
       visible,
@@ -20570,11 +20953,11 @@ class SegmentationService extends src/* PubSubService */.Rc {
   }
   _initSegmentationService() {
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_MODIFIED, this._onSegmentationModifiedFromSource);
-    esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REMOVED, this._onSegmentationModifiedFromSource);
+    esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REMOVED, this._onSegmentationRemovedFromSource);
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_DATA_MODIFIED, this._onSegmentationDataModifiedFromSource);
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_MODIFIED, this._onSegmentationRepresentationModifiedFromSource);
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_ADDED, this._onSegmentationRepresentationModifiedFromSource);
-    esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_REMOVED, this._onSegmentationRepresentationModifiedFromSource);
+    esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_REPRESENTATION_REMOVED, this._onSegmentationRepresentationRemovedFromSource);
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.SEGMENTATION_ADDED, this._onSegmentationAddedFromSource);
     esm.eventTarget.addEventListener(dist_esm.Enums.Events.ANNOTATION_CUT_MERGE_PROCESS_COMPLETED, this._onAnnotationCutMergeProcessCompletedFromSource);
   }
@@ -20780,6 +21163,7 @@ const ORTHOGRAPHIC = 'orthographic';
 const VOLUME_3D = 'volume3d';
 const VIDEO = 'video';
 const WHOLESLIDE = 'wholeslide';
+const ECG = 'ecg';
 function getCornerstoneViewportType(viewportType, displaySets) {
   const lowerViewportType = displaySets?.[0]?.viewportType?.toLowerCase() || viewportType.toLowerCase();
   if (lowerViewportType === STACK) {
@@ -20791,13 +21175,16 @@ function getCornerstoneViewportType(viewportType, displaySets) {
   if (lowerViewportType === WHOLESLIDE) {
     return esm.Enums.ViewportType.WHOLE_SLIDE;
   }
+  if (lowerViewportType === ECG) {
+    return esm.Enums.ViewportType.ECG;
+  }
   if (lowerViewportType === VOLUME || lowerViewportType === ORTHOGRAPHIC) {
     return esm.Enums.ViewportType.ORTHOGRAPHIC;
   }
   if (lowerViewportType === VOLUME_3D) {
     return esm.Enums.ViewportType.VOLUME_3D;
   }
-  throw new Error(`Invalid viewport type: ${viewportType}. Valid types are: stack, volume, video, wholeslide`);
+  throw new Error(`Invalid viewport type: ${viewportType}. Valid types are: stack, volume, video, wholeslide, ecg`);
 }
 ;// ../../../extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts
 var _CornerstoneCacheService;
@@ -21104,15 +21491,24 @@ function getCornerstoneBlendMode(blendMode) {
 const AXIAL = 'axial';
 const SAGITTAL = 'sagittal';
 const CORONAL = 'coronal';
+const AXIAL_REFORMAT = 'axial_reformat';
+const SAGITTAL_REFORMAT = 'sagittal_reformat';
+const CORONAL_REFORMAT = 'coronal_reformat';
 function getCornerstoneOrientation(orientation) {
   if (orientation) {
     switch (orientation.toLowerCase()) {
       case AXIAL:
         return esm.Enums.OrientationAxis.AXIAL;
+      case AXIAL_REFORMAT:
+        return esm.Enums.OrientationAxis.AXIAL_REFORMAT;
       case SAGITTAL:
         return esm.Enums.OrientationAxis.SAGITTAL;
+      case SAGITTAL_REFORMAT:
+        return esm.Enums.OrientationAxis.SAGITTAL_REFORMAT;
       case CORONAL:
         return esm.Enums.OrientationAxis.CORONAL;
+      case CORONAL_REFORMAT:
+        return esm.Enums.OrientationAxis.CORONAL_REFORMAT;
       default:
         return esm.Enums.OrientationAxis.ACQUISITION;
     }
@@ -21385,6 +21781,32 @@ const CornerstoneViewportService_EVENTS = {
 };
 const MIN_STACK_VIEWPORTS_TO_ENQUEUE_RESIZE = 12;
 const MIN_VOLUME_VIEWPORTS_TO_ENQUEUE_RESIZE = 6;
+function getVolumeActorReferencedIds(viewport) {
+  const actors = viewport.getActors?.() ?? [];
+  return actors.filter(ac => ac.actor?.getClassName?.() === 'vtkVolume').map(ac => ac.referencedId).filter(Boolean);
+}
+function volumeIdPrefixesMatch(existingIds, prefixLen, targetIds) {
+  if (prefixLen > targetIds.length) {
+    return false;
+  }
+  for (let i = 0; i < prefixLen; i++) {
+    if (existingIds[i] !== targetIds[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Returns true when the viewport type matches a volume-based presentation (ORTHOGRAPHIC or VOLUME_3D).
+ */
+function viewportMatchesDesiredVolumePresentation(viewport, desiredViewportInfo) {
+  const desiredType = desiredViewportInfo.getViewportType();
+  if (viewport.type !== desiredType) {
+    return false;
+  }
+  return desiredType === esm.Enums.ViewportType.ORTHOGRAPHIC || desiredType === esm.Enums.ViewportType.VOLUME_3D;
+}
 const WITH_NAVIGATION = {
   withNavigation: true,
   withOrientation: false
@@ -22072,6 +22494,15 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
   /**
    * Sets the image data for the given viewport.
    */
+  async _setEcgViewport(viewport, viewportData) {
+    const [displaySet] = viewportData.data;
+    const imageId = displaySet.imageIds?.[0];
+    if (!imageId) {
+      console.error('[CornerstoneViewportService] ECG display set has no imageId');
+      return;
+    }
+    return viewport.setEcg(imageId);
+  }
   async _setOtherViewport(viewport, viewportData, viewportInfo, _presentations = {}) {
     const [displaySet] = viewportData.data;
     return viewport.setDataIds(displaySet.imageIds, {
@@ -22140,32 +22571,25 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     if (initialImageIndexToUse === undefined || initialImageIndexToUse === null || initialImageIndexToUse < 0) {
       initialImageIndexToUse = this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
     }
-    return viewport.setStack(imageIds, initialImageIndexToUse).then(() => {
+    await viewport.setStack(imageIds, initialImageIndexToUse);
+    viewport.setProperties({
+      ...properties
+    });
+    this.setPresentations(viewport.id, presentations, viewportInfo);
+    await this._addOverlayRepresentations(overlayProcessingResults);
+    if (displayArea) {
+      viewport.setDisplayArea(displayArea);
+    }
+    if (rotation) {
       viewport.setProperties({
-        ...properties
+        rotation
       });
-      this.setPresentations(viewport.id, presentations, viewportInfo);
-      if (overlayProcessingResults?.length) {
-        overlayProcessingResults.forEach(overlayProcessingResult => {
-          if (overlayProcessingResult?.addOverlayFn) {
-            overlayProcessingResult.addOverlayFn();
-          }
-        });
-      }
-      if (displayArea) {
-        viewport.setDisplayArea(displayArea);
-      }
-      if (rotation) {
-        viewport.setProperties({
-          rotation
-        });
-      }
-      if (flipHorizontal) {
-        viewport.setCamera({
-          flipHorizontal: true
-        });
-      }
-    });
+    }
+    if (flipHorizontal) {
+      viewport.setCamera({
+        flipHorizontal: true
+      });
+    }
   }
   _getInitialImageIndexForViewport(viewportInfo, imageIds) {
     const initialImageOptions = viewportInfo.getInitialImageOptions();
@@ -22388,16 +22812,34 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         }
       });
     }
-    await viewport.setVolumes(volumeInputArray);
-    if (overlayProcessingResults?.length) {
-      overlayProcessingResults.forEach(({
-        addOverlayFn
-      }) => {
-        if (addOverlayFn) {
-          addOverlayFn();
+    const baseVolumeInputs = filteredVolumeInputArray.map(({
+      volumeInput
+    }) => volumeInput);
+    const nextBaseVolumeIds = baseVolumeInputs.map(v => v.volumeId);
+    const existingVolumeIds = getVolumeActorReferencedIds(viewport);
+    let skippedIdenticalBaseVolumes = false;
+    if (baseVolumeInputs.length) {
+      const singleBaseViewport = nextBaseVolumeIds.length === 1;
+
+      // Only skip setVolumes() when the viewport type already matches the desired OHIF type
+      // (ORTHOGRAPHIC / VOLUME_3D); otherwise a stack → MPR switch with the same volumeId
+      // would incorrectly skip rebuilding the viewport.
+      if (singleBaseViewport && existingVolumeIds.length >= nextBaseVolumeIds.length && volumeIdPrefixesMatch(existingVolumeIds, nextBaseVolumeIds.length, nextBaseVolumeIds) && viewportMatchesDesiredVolumePresentation(viewport, viewportInfo)) {
+        // Same primary volume already loaded (e.g. labelmap / extra actors after it) — avoid
+        // setVolumes(), which tears down all actors and blanks MPR during SEG hydrate.
+        skippedIdenticalBaseVolumes = true;
+      } else if (existingVolumeIds.length && nextBaseVolumeIds.length > existingVolumeIds.length && volumeIdPrefixesMatch(existingVolumeIds, existingVolumeIds.length, nextBaseVolumeIds) && typeof viewport.addVolumes === 'function') {
+        const toAdd = baseVolumeInputs.slice(existingVolumeIds.length);
+        if (toAdd.length) {
+          await viewport.addVolumes(toAdd);
         }
-      });
+      } else {
+        await viewport.setVolumes(baseVolumeInputs);
+      }
+    } else if (volumeInputArray.length) {
+      await viewport.setVolumes(volumeInputArray);
     }
+    await this._addOverlayRepresentations(overlayProcessingResults);
     viewport.render();
     volumesProperties.forEach(({
       properties,
@@ -22409,7 +22851,10 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       });
     });
     this.setPresentations(viewport.id, presentations);
-    if (!presentations.positionPresentation) {
+    // Presentations apply segmentation (hydrated labelmap etc.) after the render above — redraw so
+    // every orthographic/3D tile shows the updated scene (fixes MPR siblings blank after SEG hydrate).
+    viewport.render();
+    if (!presentations.positionPresentation && !skippedIdenticalBaseVolumes) {
       const imageIndex = this._getInitialImageIndexForViewport(viewportInfo);
       if (imageIndex !== undefined) {
         esm.utilities.jumpToSlice(viewport.element, {
@@ -22460,7 +22905,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     const {
       predecessorImageId
     } = displaySet;
-    segmentationService.addSegmentationRepresentation(viewport.id, {
+    const segmentationRepresentationPromise = segmentationService.addSegmentationRepresentation(viewport.id, {
       segmentationId,
       predecessorImageId,
       type: representationType,
@@ -22468,11 +22913,21 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         blendMode: viewport?.getBlendMode?.() === 1 ? dist_esm_enums.BlendModes.LABELMAP_EDGE_PROJECTION_BLEND : undefined
       }
     });
-
     // store the segmentation presentation id in the viewport info
     this.storePresentation({
       viewportId: viewport.id
     });
+    return segmentationRepresentationPromise;
+  }
+  async _addOverlayRepresentations(overlayProcessingResults) {
+    if (!overlayProcessingResults?.length) {
+      return;
+    }
+    for (const overlayProcessingResult of overlayProcessingResults) {
+      if (overlayProcessingResult?.addOverlayFn) {
+        await overlayProcessingResult.addOverlayFn();
+      }
+    }
   }
 
   // Todo: keepCamera is an interim solution until we have a better solution for
@@ -22507,6 +22962,9 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     if ([esm.VolumeViewport, esm.VolumeViewport3D].some(type => viewport instanceof type)) {
       return this._setVolumeViewport(viewport, viewportData, viewportInfo, presentations);
     }
+    if (viewport instanceof esm.ECGViewport) {
+      return this._setEcgViewport(viewport, viewportData);
+    }
     return this._setOtherViewport(viewport, viewportData, viewportInfo, presentations);
   }
 
@@ -22549,8 +23007,8 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     if (!displaySet) {
       return;
     }
-    if (displaySet.frameOfReferenceUID) {
-      return displaySet.frameOfReferenceUID;
+    if (displaySet.FrameOfReferenceUID) {
+      return displaySet.FrameOfReferenceUID;
     }
     if (displaySet.Modality === 'SEG') {
       const {
@@ -22728,6 +23186,8 @@ CornerstoneViewportService.REGISTRATION = {
   }
 };
 /* harmony default export */ const ViewportService_CornerstoneViewportService = (CornerstoneViewportService);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/getDataIdForViewport.ts
+var getDataIdForViewport = __webpack_require__(67142);
 ;// ../../../extensions/cornerstone/src/types/Colorbar.ts
 // Position options
 
@@ -22770,6 +23230,7 @@ var _ColorbarService;
 
 
 
+
 class ColorbarService extends src/* PubSubService */.Rc {
   constructor(servicesManager) {
     super(ColorbarService.EVENTS);
@@ -22793,23 +23254,6 @@ class ColorbarService extends src/* PubSubService */.Rc {
     this.servicesManager = servicesManager;
   }
 
-  /**
-   * Gets the appropriate data ID for a viewport and display set
-   * @param viewport - The viewport instance
-   * @param displaySetInstanceUID - The display set instance UID to identify data
-   * @returns The appropriate data ID for the viewport type (volumeId for volume viewports, undefined for stack)
-   */
-  getDataIdForViewport(viewport, displaySetInstanceUID) {
-    // For volume viewports, find the matching volumeId
-    if (viewport.getAllVolumeIds) {
-      const volumeIds = viewport.getAllVolumeIds() || [];
-      return volumeIds.length > 0 ? volumeIds.find(id => id.includes(displaySetInstanceUID)) || undefined : undefined;
-    }
-
-    // For other viewports, no specific dataId is needed for now
-    return undefined;
-  }
-
   /**
    * Adds a colorbar to a specific viewport identified by `viewportId`, using the provided `displaySetInstanceUIDs` and `options`.
    * This method prepares the colorbar state that will be used by the ViewportColorbarsContainer component.
@@ -22841,7 +23285,7 @@ class ColorbarService extends src/* PubSubService */.Rc {
       if (displaySet.isOverlayDisplaySet) {
         return;
       }
-      const dataId = this.getDataIdForViewport(viewport, displaySetInstanceUID);
+      const dataId = (0,getDataIdForViewport/* getDataIdForViewport */.V)(viewport, displaySetInstanceUID);
       const properties = dataId ? viewport.getProperties(dataId) : viewport.getProperties();
       const colormap = properties?.colormap;
       if (activeColormapName && !colormap) {
@@ -22979,7 +23423,7 @@ class ColorbarService extends src/* PubSubService */.Rc {
     }
 
     // Get the appropriate dataId for this viewport/displaySet combination
-    const dataId = this.getDataIdForViewport(viewport, displaySetInstanceUID);
+    const dataId = (0,getDataIdForViewport/* getDataIdForViewport */.V)(viewport, displaySetInstanceUID);
 
     // Set properties with or without dataId based on what the viewport supports
     viewport.setProperties({
@@ -23005,6 +23449,54 @@ ColorbarService.REGISTRATION = {
 ;// ../../../extensions/cornerstone/src/services/ColorbarService/index.ts
 
 /* harmony default export */ const services_ColorbarService = (ColorbarService);
+;// ../../../extensions/cornerstone/src/services/ViewedDataService/ViewedDataService.ts
+var _ViewedDataService;
+
+class ViewedDataService extends src/* PubSubService */.Rc {
+  constructor() {
+    super(ViewedDataService.EVENTS);
+    this.viewedDataIds = new Set();
+  }
+  markDataViewed(dataId) {
+    if (!dataId || this.viewedDataIds.has(dataId)) {
+      return;
+    }
+    this.viewedDataIds.add(dataId);
+    this._broadcastEvent(this.EVENTS.VIEWED_DATA_CHANGED, {
+      viewedDataId: dataId
+    });
+  }
+  isDataViewed(dataId) {
+    if (!dataId) {
+      return false;
+    }
+    return this.viewedDataIds.has(dataId);
+  }
+  clearViewedData() {
+    this.viewedDataIds.clear();
+    this._broadcastEvent(this.EVENTS.VIEWED_DATA_CHANGED, {
+      viewedDataCleared: true
+    });
+  }
+  subscribeViewedDataChanges(listener) {
+    return this.subscribe(this.EVENTS.VIEWED_DATA_CHANGED, listener);
+  }
+}
+_ViewedDataService = ViewedDataService;
+ViewedDataService.EVENTS = {
+  VIEWED_DATA_CHANGED: 'event::viewedDataChanged'
+};
+ViewedDataService.REGISTRATION = {
+  name: 'viewedDataService',
+  altName: 'ViewedDataService',
+  create: () => {
+    return new _ViewedDataService();
+  }
+};
+/* harmony default export */ const ViewedDataService_ViewedDataService = (ViewedDataService);
+;// ../../../extensions/cornerstone/src/services/ViewedDataService/index.ts
+
+/* harmony default export */ const services_ViewedDataService = (ViewedDataService_ViewedDataService);
 ;// ../../../extensions/cornerstone/src/types/Presentation.ts
 
 
@@ -23249,12 +23741,114 @@ const createFrameViewSynchronizer = synchronizerName => {
 
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
+;// ../../../extensions/cornerstone/src/utils/ecgMetadata.ts
+/**
+ * Decode a multiplexed Int16 buffer into per-channel arrays.
+ * Layout: sample0ch0, sample0ch1 ... sample0chN, sample1ch0, …
+ * Note: DICOM ECG data is canonically SS (signed short). The sampleInterpretation
+ * field is forwarded to ECGViewport for its own use; the raw buffer is always
+ * treated as Int16 because Cornerstone ECGViewport expects Int16Array[].
+ */
+function decodeInt16Multiplex(buffer, numberOfChannels, numberOfSamples) {
+  const src = new Int16Array(buffer);
+  const channels = [];
+  for (let ch = 0; ch < numberOfChannels; ch++) {
+    const out = new Int16Array(numberOfSamples);
+    for (let s = 0; s < numberOfSamples; s++) {
+      out[s] = src[s * numberOfChannels + ch];
+    }
+    channels.push(out);
+  }
+  return channels;
+}
+
+/**
+ * Decode a base64 InlineBinary string into a raw ArrayBuffer.
+ */
+function base64ToArrayBuffer(base64) {
+  const binaryStr = atob(base64);
+  const bytes = new Uint8Array(binaryStr.length);
+  for (let i = 0; i < binaryStr.length; i++) {
+    bytes[i] = binaryStr.charCodeAt(i);
+  }
+  return bytes.buffer;
+}
+/**
+ * Parse the naturalized DICOM instance's WaveformSequence and build the ecgModule
+ * that Cornerstone's ECGViewport.setEcg() expects via
+ * metaData.get(MetadataModules.ECG, imageId).
+ *
+ * Returns null if the instance has no WaveformSequence.
+ */
+function buildEcgModule(instance, userAuthenticationService) {
+  const waveformGroups = instance?.WaveformSequence;
+  if (!waveformGroups?.length) {
+    return null;
+  }
+
+  // Use the first (and typically only) multiplex group
+  const group = waveformGroups[0];
+  const numberOfChannels = group.NumberOfWaveformChannels ?? 0;
+  const numberOfSamples = group.NumberOfWaveformSamples ?? 0;
+  const samplingFrequency = group.SamplingFrequency ?? 1;
+  const bitsAllocated = group.WaveformBitsAllocated ?? 16;
+  const sampleInterpretation = group.WaveformSampleInterpretation ?? 'SS';
+  const multiplexGroupLabel = group.MultiplexGroupLabel ?? '';
+  const channelDefinitionSequence = (group.ChannelDefinitionSequence ?? []).map(ch => ({
+    channelSourceSequence: {
+      codeMeaning: ch?.ChannelSourceSequence?.[0]?.CodeMeaning ?? ch?.ChannelSourceSequence?.[0]?.codeMeaning ?? ''
+    }
+  }));
+  const retrieveBulkData = async () => {
+    const waveformData = group.WaveformData;
+    if (!waveformData) {
+      console.warn('[ECGViewport] No WaveformData found on instance');
+      return [];
+    }
+    let buffer;
+    if (waveformData.InlineBinary) {
+      buffer = base64ToArrayBuffer(waveformData.InlineBinary);
+    } else if (waveformData.BulkDataURI) {
+      const headers = {
+        Accept: 'application/octet-stream'
+      };
+      const authHeader = userAuthenticationService?.getAuthorizationHeader?.();
+      if (authHeader) {
+        Object.assign(headers, authHeader);
+      }
+      const response = await fetch(waveformData.BulkDataURI, {
+        headers
+      });
+      if (!response.ok) {
+        throw new Error(`[ECGViewport] Failed to fetch waveform BulkDataURI: ${response.status}`);
+      }
+      buffer = await response.arrayBuffer();
+    } else {
+      console.warn('[ECGViewport] WaveformData has no InlineBinary or BulkDataURI');
+      return [];
+    }
+    return decodeInt16Multiplex(buffer, numberOfChannels, numberOfSamples);
+  };
+  return {
+    numberOfWaveformChannels: numberOfChannels,
+    numberOfWaveformSamples: numberOfSamples,
+    samplingFrequency,
+    waveformBitsAllocated: bitsAllocated,
+    waveformSampleInterpretation: sampleInterpretation,
+    multiplexGroupLabel,
+    channelDefinitionSequence,
+    waveformData: {
+      retrieveBulkData
+    }
+  };
+}
 ;// ../../../extensions/cornerstone/src/getSopClassHandlerModule.js
 
 
 
 
 
+
 const {
   MetadataModules
 } = esm.Enums;
@@ -23265,9 +23859,9 @@ const {
   denaturalizeDataset
 } = dcmjs_es/* default.data */.Ay.data.DicomMetaDictionary;
 const {
-  transferDenaturalizedDataset,
-  fixMultiValueKeys
-} = default_src.dicomWebUtils;
+  /* transferDenaturalizedDataset */ "If": transferDenaturalizedDataset,
+  /* fixMultiValueKeys */ "Uk": fixMultiValueKeys
+} = default_src/* dicomWebUtils */.CA;
 const SOP_CLASS_UIDS = {
   VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.77.1.6'
 };
@@ -23393,8 +23987,92 @@ function getDicomMicroscopySopClassHandler({
     getDisplaySetsFromSeries
   };
 }
+
+/**
+ * DICOM Waveform SOP Class UIDs for ECG / cardiac electrophysiology.
+ * Reference: https://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_B.5.html
+ */
+const ECG_SOP_CLASS_UIDS = {
+  TWELVE_LEAD_ECG_WAVEFORM_STORAGE: '1.2.840.10008.5.1.4.1.1.9.1.1',
+  GENERAL_ECG_WAVEFORM_STORAGE: '1.2.840.10008.5.1.4.1.1.9.1.2',
+  AMBULATORY_ECG_WAVEFORM_STORAGE: '1.2.840.10008.5.1.4.1.1.9.1.3',
+  HEMODYNAMIC_WAVEFORM_STORAGE: '1.2.840.10008.5.1.4.1.1.9.2.1',
+  CARDIAC_ELECTROPHYSIOLOGY_WAVEFORM_STORAGE: '1.2.840.10008.5.1.4.1.1.9.3.1'
+};
+const ecgSopClassUids = Object.values(ECG_SOP_CLASS_UIDS);
+const DicomEcgSOPClassHandlerId = '@ohif/extension-cornerstone.sopClassHandlerModule.DicomEcgSopClassHandler';
+function _getEcgDisplaySetsFromSeries(instances, servicesManager) {
+  const {
+    userAuthenticationService
+  } = servicesManager.services;
+  return instances.map(instance => {
+    const {
+      Modality,
+      SOPInstanceUID
+    } = instance;
+    const {
+      SeriesDescription,
+      SeriesNumber,
+      SeriesDate
+    } = instance;
+    const {
+      SeriesInstanceUID,
+      StudyInstanceUID,
+      SOPClassUID
+    } = instance;
+    const imageId = instance.imageId;
+
+    // Register ECG metadata in the OHIF metadata provider so that
+    // Cornerstone's ECGViewport can retrieve it via metaData.get('ecgModule', imageId).
+    if (imageId) {
+      const ecgModule = buildEcgModule(instance, userAuthenticationService);
+      if (ecgModule) {
+        esm.utilities.genericMetadataProvider.addRaw(imageId, {
+          type: MetadataModules.ECG,
+          metadata: ecgModule
+        });
+      }
+    }
+    return {
+      Modality,
+      displaySetInstanceUID: getSopClassHandlerModule_utils.guid(),
+      SeriesDescription,
+      SeriesNumber,
+      SeriesDate,
+      SOPInstanceUID,
+      SeriesInstanceUID,
+      StudyInstanceUID,
+      SOPClassHandlerId: DicomEcgSOPClassHandlerId,
+      SOPClassUID,
+      referencedImages: null,
+      measurements: null,
+      viewportType: esm.Enums.ViewportType.ECG,
+      instances: [instance],
+      instance,
+      thumbnailSrc: null,
+      isDerivedDisplaySet: false,
+      isLoaded: false,
+      sopClassUids: ecgSopClassUids,
+      numImageFrames: 0,
+      numInstances: 1,
+      imageIds: imageId ? [imageId] : [],
+      supportsWindowLevel: false,
+      label: SeriesDescription || 'ECG'
+    };
+  });
+}
+function getDicomEcgSopClassHandler({
+  servicesManager
+}) {
+  const getDisplaySetsFromSeries = instances => _getEcgDisplaySetsFromSeries(instances, servicesManager);
+  return {
+    name: 'DicomEcgSopClassHandler',
+    sopClassUids: ecgSopClassUids,
+    getDisplaySetsFromSeries
+  };
+}
 function getSopClassHandlerModule(params) {
-  return [getDicomMicroscopySopClassHandler(params)];
+  return [getDicomMicroscopySopClassHandler(params), getDicomEcgSopClassHandler(params)];
 }
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/hooks/useActiveViewportSegmentationRepresentations.ts
 var useActiveViewportSegmentationRepresentations = __webpack_require__(9234);
@@ -23424,7 +24102,7 @@ function SegmentationUtilityButton(props) {
     isActive,
     id
   } = props;
-  const activeSegmentationUtility = (0,default_src.useUIStateStore)(store => store.uiState.activeSegmentationUtility);
+  const activeSegmentationUtility = (0,default_src/* useUIStateStore */.FS)(store => store.uiState.activeSegmentationUtility);
   const toolButtonClassName = (0,ui_next_src.cn)('w-7 h-7 text-primary hover:text-primary hover:!bg-primary/30', className, isActive && 'bg-primary/30');
   const handleMouseDownCapture = (0,react.useCallback)(event => {
     if (activeSegmentationUtility === id) {
@@ -23555,7 +24233,7 @@ function PanelSegmentation({
     segmentationsWithRepresentations,
     disabled
   } = (0,useActiveViewportSegmentationRepresentations/* useActiveViewportSegmentationRepresentations */.c)();
-  const setUIState = (0,default_src.useUIStateStore)(store => store.setUIState);
+  const setUIState = (0,default_src/* useUIStateStore */.FS)(store => store.setUIState);
 
   // useEffect for handling clicks on any of the non-active viewports.
   // The ViewportGrid stops the propagation of pointer/mouse events
@@ -23816,7 +24494,7 @@ function PanelSegmentation({
       IconContainer: components_SegmentationUtilityButton
     }, /*#__PURE__*/react.createElement("div", {
       className: "flex flex-wrap gap-[3px] bg-transparent pb-[2px] pl-[8px] pt-[6px]"
-    }, /*#__PURE__*/react.createElement(default_src.Toolbar, {
+    }, /*#__PURE__*/react.createElement(default_src/* Toolbar */.M7, {
       buttonSection: buttonSection
     })));
   };
@@ -24343,12 +25021,12 @@ function DefaultAccordion(props) {
   if (!allChildren || !groups) {
     return null;
   }
-  if (Boolean(asChild)) {
+  if (asChild) {
     return /*#__PURE__*/react.cloneElement(props.children, props);
   }
   return /*#__PURE__*/react.createElement(ui_next_src/* Accordion */.nD3, {
     type: grouping.type || 'multiple',
-    className: "text-white",
+    className: "text-foreground",
     defaultValue: defaultValue
   }, [...groups.entries()].map(([key, group]) => {
     return /*#__PURE__*/react.createElement(ui_next_src/* AccordionItem */.AsP, {
@@ -24826,7 +25504,7 @@ function PanelMeasurement(props) {
     return EmptyComponent ? /*#__PURE__*/react.createElement(EmptyComponent, {
       items: displayMeasurements
     }) : /*#__PURE__*/react.createElement("span", {
-      className: "text-white"
+      className: "text-foreground"
     }, "No Measurements");
   }
   if (children) {
@@ -24891,7 +25569,7 @@ const getPanelModule = ({
     } = (0,es/* useTranslation */.Bd)('SegmentationPanel');
     const tKey = `${props.segmentationRepresentationTypes?.[0] ?? 'Segmentation'} tools`;
     const tValue = t(tKey);
-    return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(default_src.Toolbox, {
+    return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(default_src/* Toolbox */.OO, {
       buttonSectionId: toolSectionMap[props.segmentationRepresentationTypes?.[0]],
       title: tValue
     }), /*#__PURE__*/react.createElement(PanelSegmentation, {
@@ -25245,7 +25923,7 @@ function promptHydrationDialog({
     customizationService
   } = servicesManager.services;
   const extensionManager = servicesManager._extensionManager;
-  const appConfig = extensionManager._appConfig;
+  const appConfig = extensionManager.appConfig;
 
   // Todo: make this use enum from the extension, we should move the enum
   const standardMode = appConfig?.measurementTrackingMode === 'standard';
@@ -25262,20 +25940,30 @@ function promptHydrationDialog({
       if (type === HydrationType.SEG) {
         // SEG needs setTimeout
         window.setTimeout(async () => {
-          const isHydrated = await hydrateCallback({
-            segDisplaySet: displaySet,
-            viewportId
-          });
-          resolve(isHydrated);
+          try {
+            const isHydrated = await hydrateCallback({
+              segDisplaySet: displaySet,
+              viewportId
+            });
+            resolve(isHydrated);
+          } catch (error) {
+            reject(error);
+          }
         }, 0);
       } else if (type === HydrationType.RTSTRUCT) {
         // RT hydration
-        const isHydrated = await hydrateCallback({
-          rtDisplaySet: displaySet,
-          viewportId,
-          servicesManager
-        });
-        resolve(isHydrated);
+        window.setTimeout(async () => {
+          try {
+            const isHydrated = await hydrateCallback({
+              rtDisplaySet: displaySet,
+              viewportId,
+              servicesManager
+            });
+            resolve(isHydrated);
+          } catch (error) {
+            reject(error);
+          }
+        }, 0);
       } else if (type === HydrationType.SR) {
         // SR has a different result structure
         const hydrationResult = await hydrateCallback(displaySet);
@@ -25368,7 +26056,8 @@ const setUpSegmentationEventHandlers = ({
   const {
     segmentationService,
     customizationService,
-    displaySetService
+    displaySetService,
+    viewportGridService
   } = servicesManager.services;
   const {
     unsubscribe: unsubscribeSegmentationDataModifiedHandler
@@ -25413,12 +26102,42 @@ const setUpSegmentationEventHandlers = ({
     };
     displaySetService.addDisplaySets(segmentationDisplaySet);
   });
+  const {
+    unsubscribe: unsubscribeSegmentationRemoved
+  } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENTATION_REMOVED, ({
+    segmentationId
+  }) => {
+    const displaySet = displaySetService.getDisplaySetByUID(segmentationId);
+
+    // Remove the display set layer from all viewports that have it
+    if (displaySet) {
+      const state = viewportGridService.getState();
+      const viewports = state.viewports;
+
+      // Find all viewports that contain this segmentation's display set as a layer
+      for (const [viewportId, viewport] of viewports.entries()) {
+        const displaySetInstanceUIDs = viewport.displaySetInstanceUIDs || [];
+        if (displaySetInstanceUIDs.includes(segmentationId)) {
+          // Remove the display set layer from this viewport
+          commandsManager.runCommand('removeDisplaySetLayer', {
+            viewportId,
+            displaySetInstanceUID: segmentationId
+          });
+        }
+      }
+
+      // Delete the display set from the service if it was made in client
+      if (displaySet.madeInClient) {
+        displaySetService.deleteDisplaySet(segmentationId);
+      }
+    }
+  });
   const {
     unsubscribeSelectedSegmentationsForViewportEvents
   } = setUpSelectedSegmentationsForViewportHandler({
     segmentationService
   });
-  const unsubscriptions = [unsubscribeSegmentationDataModifiedHandler, unsubscribeSegmentationModifiedHandler, unsubscribeSegmentationCreated, ...unsubscribeSelectedSegmentationsForViewportEvents];
+  const unsubscriptions = [unsubscribeSegmentationDataModifiedHandler, unsubscribeSegmentationModifiedHandler, unsubscribeSegmentationCreated, unsubscribeSegmentationRemoved, ...unsubscribeSelectedSegmentationsForViewportEvents];
   return {
     unsubscriptions
   };
@@ -25561,7 +26280,7 @@ function PanelAccordionTrigger(props) {
   }, /*#__PURE__*/react.createElement("button", {
     onClick: onClickDefault.bind(props)
   }, /*#__PURE__*/react.createElement("span", {
-    className: `inline-flex rounded-l border-r border-black ${isActive ? 'bg-highlight' : 'bg-muted'}`
+    className: `inline-flex rounded-l border-r border-background ${isActive ? 'bg-highlight' : 'bg-muted'}`
   }, count !== undefined ? /*#__PURE__*/react.createElement("span", {
     className: "px-2"
   }, count) : null, colorHex && /*#__PURE__*/react.createElement(ui_next_src/* ColorCircle */.cd8, {
@@ -25810,13 +26529,14 @@ function src_extends() { return src_extends = Object.assign ? Object.assign.bind
 
 
 
+
 
 
 const {
   imageRetrieveMetadataProvider
 } = esm.utilities;
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 147).then(__webpack_require__.bind(__webpack_require__, 30147));
+  return __webpack_require__.e(/* import() */ 3754).then(__webpack_require__.bind(__webpack_require__, 33754));
 });
 const OHIFCornerstoneViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -25909,9 +26629,10 @@ const cornerstoneExtension = {
     useLutPresentationStore/* useLutPresentationStore */.I.getState().clearLutPresentationStore();
     usePositionPresentationStore/* usePositionPresentationStore */.q.getState().clearPositionPresentationStore();
     useSynchronizersStore/* useSynchronizersStore */.U.getState().clearSynchronizersStore();
-    default_src.useToggleOneUpViewportGridStore.getState().clearToggleOneUpViewportGridStore();
+    default_src/* useToggleOneUpViewportGridStore */.Yd.getState().clearToggleOneUpViewportGridStore();
     useSegmentationPresentationStore/* useSegmentationPresentationStore */.v.getState().clearSegmentationPresentationStore();
     useSelectedSegmentationsForViewportStore.getState().clearSelectedSegmentationsForViewportStore();
+    servicesManager.services.viewedDataService?.clearViewedData();
     segmentationService.removeAllSegmentations();
   },
   /**
@@ -25929,6 +26650,7 @@ const cornerstoneExtension = {
     servicesManager.registerService(services_SegmentationService.REGISTRATION);
     servicesManager.registerService(services_CornerstoneCacheService.REGISTRATION);
     servicesManager.registerService(services_ColorbarService.REGISTRATION);
+    servicesManager.registerService(services_ViewedDataService.REGISTRATION);
     const {
       syncGroupService
     } = servicesManager.services;
@@ -26000,10 +26722,10 @@ const cornerstoneExtension = {
 
 /* harmony default export */ const cornerstone_src = (cornerstoneExtension);
 
-/***/ }),
+/***/ },
 
-/***/ 71353:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 71353
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   cL: () => (/* binding */ reset),
@@ -26042,10 +26764,10 @@ const reset = () => {
 };
 
 
-/***/ }),
+/***/ },
 
-/***/ 46026:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 46026
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   FG: () => (/* binding */ JOIN_STR),
@@ -26085,10 +26807,10 @@ const addUniqueIndex = (arr, key, viewports, isUpdatingSameViewport) => {
 };
 
 
-/***/ }),
+/***/ },
 
-/***/ 10182:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 10182
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   I: () => (/* binding */ useLutPresentationStore)
@@ -26200,10 +26922,10 @@ const useLutPresentationStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__/* .creat
   name: 'LutPresentationStore'
 }) : createLutPresentationStore);
 
-/***/ }),
+/***/ },
 
-/***/ 44646:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 44646
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   q: () => (/* binding */ usePositionPresentationStore)
@@ -26311,10 +27033,10 @@ const usePositionPresentationStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__/* .
   name: 'PositionPresentationStore'
 }) : createPositionPresentationStore);
 
-/***/ }),
+/***/ },
 
-/***/ 2847:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 2847
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
 // EXPORTS
@@ -26426,20 +27148,34 @@ const _getSegmentationPresentationId = ({
   if (!viewport?.viewportOptions || !viewport.displaySetInstanceUIDs?.length) {
     return;
   }
+  const {
+    displaySetService
+  } = servicesManager.services;
   const {
     displaySetInstanceUIDs,
     viewportOptions
   } = viewport;
+
+  // Match keys used by updateStoredSegmentationPresentation (referenced volume only).
+  // Including overlay UIDs (e.g. SEG) produced ids like "MR&SEG" while the store
+  // entry is under "MR", so hydrated segmentations never applied and viewports could mis-render.
+  const nonOverlayUIDs = displaySetInstanceUIDs.filter(uid => {
+    const ds = displaySetService.getDisplaySetByUID(uid);
+    return ds && !ds.isOverlayDisplaySet;
+  });
+  if (!nonOverlayUIDs.length) {
+    return;
+  }
   let orientation = viewportOptions.orientation;
   if (!orientation) {
     // Calculate orientation from the viewport sample image
-    const displaySet = servicesManager.services.displaySetService.getDisplaySetByUID(displaySetInstanceUIDs[0]);
-    const sampleImage = displaySet.images?.[0];
+    const displaySet = displaySetService.getDisplaySetByUID(nonOverlayUIDs[0]);
+    const sampleImage = displaySet?.images?.[0];
     const imageOrientationPatient = sampleImage?.ImageOrientationPatient;
     orientation = getViewportOrientationFromImageOrientationPatient(imageOrientationPatient);
   }
   const segmentationPresentationArr = [];
-  segmentationPresentationArr.push(...displaySetInstanceUIDs);
+  segmentationPresentationArr.push(...nonOverlayUIDs);
 
   // Uncomment if unique indexing is needed
   // addUniqueIndex(
@@ -26520,10 +27256,10 @@ const useSegmentationPresentationStore = (0,esm/* create */.vt)()(DEBUG_STORE ?
   name: 'Segmentation Presentation Store'
 }) : createSegmentationPresentationStore);
 
-/***/ }),
+/***/ },
 
-/***/ 68578:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 68578
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   U: () => (/* binding */ useSynchronizersStore)
@@ -26584,6 +27320,32 @@ const useSynchronizersStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__/* .create
   name: 'SynchronizersStore'
 }) : createSynchronizersStore);
 
-/***/ })
+/***/ },
+
+/***/ 67142
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   V: () => (/* binding */ getDataIdForViewport)
+/* harmony export */ });
+/**
+ * Resolves the data ID (e.g. volumeId) for a viewport and display set.
+ * For viewports with multiple volumes/actors, returns the id that matches the display set; otherwise undefined.
+ * Use this to call viewport.getProperties(dataId) in a viewport-type-agnostic way.
+ *
+ * @param viewport - Viewport instance (stack, volume, or future types with optional getAllVolumeIds)
+ * @param displaySetInstanceUID - Display set instance UID to match
+ * @returns volumeId (or equivalent) for multi-actor viewports, undefined for single-actor
+ */
+function getDataIdForViewport(viewport, displaySetInstanceUID) {
+  const vp = viewport;
+  if (typeof vp.getAllVolumeIds !== 'function') {
+    return undefined;
+  }
+  const volumeIds = vp.getAllVolumeIds() || [];
+  return volumeIds.length > 0 ? volumeIds.find(id => id.includes(displaySetInstanceUID)) ?? undefined : undefined;
+}
+
+/***/ }
 
 }]);