@ohif/app 3.13.0-beta.88 → 3.13.0-beta.89

package/dist/{7166.bundle.0a84efe4f3e6d0ddcbec.js → 7166.bundle.eeeda537770d73736e46.js}

@@ -142,7 +142,7 @@ function useActiveViewportSegmentationRepresentations() {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
 /* harmony import */ var _ohif_core_src__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 _utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(62739);
 
 
 
@@ -196,7 +196,7 @@ function useMeasurementTracking({
     }
     const viewport = cornerstoneViewportService?.getCornerstoneViewport(viewportId);
     const SeriesInstanceUID = backgroundDisplaySet.SeriesInstanceUID;
-    if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport) {
+    if ((0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_3__/* .isVolumeViewportType */ .rX)(viewport)) {
       const currentImageId = viewport?.getCurrentImageId();
       if (!currentImageId) {
         setIsTracked(false);
@@ -819,7 +819,9 @@ function useViewportDisplaySets(viewportId, options) {
 /* 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 _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);
+/* harmony import */ var _utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(62739);
+/* harmony import */ var _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(93813);
+
 
 
 
@@ -828,13 +830,13 @@ function useViewportDisplaySets(viewportId, options) {
 
 const getPosition = location => {
   switch (location) {
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.LeftMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_6__/* .ButtonLocation */ .ij.LeftMiddle:
       return 'left';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.RightMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_6__/* .ButtonLocation */ .ij.RightMiddle:
       return 'right';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.BottomMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_6__/* .ButtonLocation */ .ij.BottomMiddle:
       return 'bottom';
-    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_5__/* .ButtonLocation */ .ij.TopMiddle:
+    case _ohif_core_src_services_ToolBarService_ToolbarService__WEBPACK_IMPORTED_MODULE_6__/* .ButtonLocation */ .ij.TopMiddle:
       return 'top';
     default:
       return 'bottom';
@@ -872,7 +874,7 @@ function useViewportRendering(viewportId, options) {
   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 [is3DVolume, setIs3DVolume] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)((0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isVolume3DViewportType */ .Ov)(viewport));
   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)();
@@ -957,7 +959,7 @@ function useViewportRendering(viewportId, options) {
     if (!viewport) {
       return;
     }
-    if (!(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
+    if (!(0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isVolumeViewportType */ .rX)(viewport)) {
       return;
     }
     const volumeIds = viewport.getAllVolumeIds();
@@ -994,7 +996,7 @@ function useViewportRendering(viewportId, options) {
     return activePresetData.presets;
   }, [allWindowLevelPresets, activeDisplaySetInstanceUID]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
-    setIs3DVolume(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.VolumeViewport3D);
+    setIs3DVolume((0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isVolume3DViewportType */ .Ov)(viewport));
     if (!viewport || !activeDisplaySetInstanceUID) {
       return;
     }
@@ -1236,7 +1238,7 @@ function useViewportRendering(viewportId, options) {
     });
   }, [commandsManager, validateActiveDisplaySet, viewport, viewportId]);
   const setOpacity = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(opacityValue => {
-    if (!viewport || !(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
+    if (!viewport || !(0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isVolumeViewportType */ .rX)(viewport)) {
       return;
     }
 
@@ -1273,7 +1275,7 @@ function useViewportRendering(viewportId, options) {
     setOpacity(actualOpacity);
   }, [linearToOpacity, setOpacity]);
   const setThreshold = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(thresholdValue => {
-    if (!viewport || !(viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.BaseVolumeViewport)) {
+    if (!viewport || !(0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isVolumeViewportType */ .rX)(viewport)) {
       return;
     }
     setThresholdState(thresholdValue);
@@ -1301,7 +1303,7 @@ function useViewportRendering(viewportId, options) {
       if (!viewport) {
         return null;
       }
-      if (viewport instanceof _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_3__.StackViewport) {
+      if ((0,_utils_getLegacyViewportType__WEBPACK_IMPORTED_MODULE_5__/* .isStackViewportType */ .TF)(viewport)) {
         const {
           colormap
         } = viewport.getProperties();
@@ -1708,8 +1710,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 + 80 modules
-var dicom_image_loader_dist_esm = __webpack_require__(76318);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/index.js + 81 modules
+var dicom_image_loader_dist_esm = __webpack_require__(88589);
 ;// ../../../extensions/cornerstone/src/initWADOImageLoader.js
 
 
@@ -1902,11 +1904,14 @@ const OverlayPlaneModuleProvider = {
 // Needs to be higher priority than default provider
 esm.metaData.addProvider(OverlayPlaneModuleProvider.get, 10_000);
 /* harmony default export */ const tools_OverlayPlaneModuleProvider = (OverlayPlaneModuleProvider);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/getLegacyViewportType.ts
+var getLegacyViewportType = __webpack_require__(62739);
 ;// ../../../extensions/cornerstone/src/tools/ImageOverlayViewerTool.tsx
 
 
 
 
+
 /**
  * Image Overlay Viewer tool is not a traditional tool that requires user interactin.
  * But it is used to display Pixel Overlays. And it will provide toggling capability.
@@ -1959,7 +1964,7 @@ class ImageOverlayViewerTool extends dist_esm.AnnotationDisplayTool {
     };
   }
   getReferencedImageId(viewport) {
-    if (viewport instanceof esm.VolumeViewport) {
+    if ((0,getLegacyViewportType/* isOrthographicViewportType */.tO)(viewport)) {
       return;
     }
     const targetId = this.getTargetId(viewport);
@@ -6962,8 +6967,8 @@ var useLutPresentationStore = __webpack_require__(10182);
 var usePositionPresentationStore = __webpack_require__(44646);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/stores/useSegmentationPresentationStore.ts + 1 modules
 var useSegmentationPresentationStore = __webpack_require__(2847);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 47 modules
-var esm_utilities = __webpack_require__(85343);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 42 modules
+var esm_utilities = __webpack_require__(18636);
 ;// ../../../extensions/cornerstone/src/utils/initWebWorkerProgressHandler.ts
 
 
@@ -7137,7 +7142,11 @@ async function init({
     ...esm.getConfiguration(),
     rendering: {
       ...esm.getConfiguration().rendering,
-      strictZSpacingForVolumeViewport: appConfig.strictZSpacingForVolumeViewport
+      strictZSpacingForVolumeViewport: appConfig.strictZSpacingForVolumeViewport,
+      // Opt-in: route legacy viewport types through the new GenericViewport render
+      // paths while keeping the legacy public API via compatibility adapters.
+      // No-op on cornerstone builds that predate the GenericViewport architecture.
+      useGenericViewport: Boolean(appConfig.useGenericViewport)
     }
   });
 
@@ -9441,6 +9450,7 @@ var html2canvas_esm = __webpack_require__(91037);
 
 
 
+
 const {
   downloadUrl
 } = src/* utils */.Wp;
@@ -9554,10 +9564,10 @@ const CornerstoneViewportDownloadForm = ({
       const properties = viewport.getProperties();
       const viewPresentation = viewport.getViewPresentation?.();
       const viewRef = viewport.getViewReference?.();
-      if (downloadViewport instanceof esm.StackViewport) {
+      if ((0,getLegacyViewportType/* isStackViewportType */.TF)(downloadViewport)) {
         const imageId = viewport.getCurrentImageId();
         await downloadViewport.setStack([imageId]);
-      } else if (downloadViewport instanceof esm.BaseVolumeViewport) {
+      } else if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(downloadViewport)) {
         const volumeIds = viewport.getAllVolumeIds();
         await downloadViewport.setVolumes([{
           volumeId: volumeIds[0]
@@ -10464,7 +10474,13 @@ async function createSegmentationForViewport(servicesManager, {
   const viewport = viewports.get(targetViewportId);
 
   // Todo: add support for multiple display sets
-  const displaySetInstanceUID = options.displaySetInstanceUID || viewport.displaySetInstanceUIDs[0];
+  // Guard against the grid not having this viewport yet (a transient race when
+  // "Add segmentation" runs before the viewport is registered in the grid). Bail
+  // gracefully instead of throwing, which would surface an uncaught error overlay.
+  const displaySetInstanceUID = options.displaySetInstanceUID || viewport?.displaySetInstanceUIDs?.[0];
+  if (!displaySetInstanceUID) {
+    return undefined;
+  }
   const segs = segmentationService.getSegmentations();
   const label = options.label || `${i18n_src/* default */.A.t('Tools:Segmentation')} ${segs.length + 1}`;
   const segmentationId = options.segmentationId || `${esm.utilities.uuidv4()}`;
@@ -10513,6 +10529,7 @@ var segmentation = __webpack_require__(55126);
 
 
 
+
 
 
 const {
@@ -10778,7 +10795,7 @@ function commandsModule({
 
         const segmentationType =
         // Todo: check if PMAP modality should be handled such as SEG
-        displaySet.Modality !== 'SEG' ? esm_enums.SegmentationRepresentations.Contour : viewport.type === esm.Enums.ViewportType.VOLUME_3D ? esm_enums.SegmentationRepresentations.Surface : esm_enums.SegmentationRepresentations.Labelmap;
+        displaySet.Modality !== 'SEG' ? esm_enums.SegmentationRepresentations.Contour : (0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(viewport) ? esm_enums.SegmentationRepresentations.Surface : esm_enums.SegmentationRepresentations.Labelmap;
         commandsManager.runCommand('updateStoredSegmentationPresentation', {
           displaySet,
           type: segmentationType
@@ -11352,7 +11369,7 @@ function commandsModule({
         lower,
         upper
       } = esm.utilities.windowLevel.toLowHighRange(windowWidthNum, windowCenterNum);
-      if (viewport instanceof esm.BaseVolumeViewport) {
+      if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(viewport)) {
         const volumeId = actions.getVolumeIdForDisplaySet({
           viewportId,
           displaySetInstanceUID
@@ -11429,7 +11446,11 @@ function commandsModule({
       displaySetInstanceUID
     }) => {
       const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-      if (viewport instanceof esm.BaseVolumeViewport) {
+      // `instanceof BaseVolumeViewport` is false for GenericViewport compat adapters,
+      // so use the capability guard instead (cornerstone 5.x generic-viewport guide).
+      // A stack-mode adapter passes the guard but getAllVolumeIds() returns [], so the
+      // result is the same null as before on stacks.
+      if (esm.utilities.viewportSupportsVolumeId(viewport)) {
         const volumeIds = viewport.getAllVolumeIds();
         const volumeId = volumeIds.find(id => id.includes(displaySetInstanceUID));
         return volumeId;
@@ -11720,7 +11741,7 @@ function commandsModule({
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.StackViewport) {
+      if ((0,getLegacyViewportType/* isStackViewportType */.TF)(viewport)) {
         if (direction) {
           const {
             parallelScale
@@ -11755,9 +11776,9 @@ function commandsModule({
       // Get number of slices
       // -> Copied from cornerstone3D jumpToSlice\_getImageSliceData()
       let numberOfSlices = 0;
-      if (viewport instanceof esm.StackViewport) {
+      if ((0,getLegacyViewportType/* isStackViewportType */.TF)(viewport)) {
         numberOfSlices = viewport.getImageIds().length;
-      } else if (viewport instanceof esm.VolumeViewport) {
+      } else if ((0,getLegacyViewportType/* isOrthographicViewportType */.tO)(viewport)) {
         numberOfSlices = esm.utilities.getImageSliceDataForVolumeViewport(viewport).numberOfSlices;
       } else {
         throw new Error('Unsupported viewport type');
@@ -11813,12 +11834,12 @@ function commandsModule({
         ...colormap,
         opacity: hpOpacity || opacity
       };
-      if (viewport instanceof esm.StackViewport) {
+      if ((0,getLegacyViewportType/* isStackViewportType */.TF)(viewport)) {
         viewport.setProperties({
           colormap
         });
       }
-      if (viewport instanceof esm.VolumeViewport) {
+      if ((0,getLegacyViewportType/* isOrthographicViewportType */.tO)(viewport)) {
         if (!displaySetInstanceUID) {
           const {
             viewports
@@ -12692,7 +12713,7 @@ function commandsModule({
       orientation
     }) => {
       const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-      if (!viewport || viewport.type !== esm.Enums.ViewportType.ORTHOGRAPHIC) {
+      if (!viewport || !(0,getLegacyViewportType/* isOrthographicViewportType */.tO)(viewport)) {
         console.warn('Orientation can only be set on volume viewports');
         return;
       }
@@ -12772,7 +12793,7 @@ function commandsModule({
       const {
         viewport
       } = enabledElement;
-      if (viewport instanceof esm.BaseVolumeViewport) {
+      if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(viewport)) {
         const camera = viewport.getCamera();
         const rotAngle = rotation * Math.PI / 180;
         const rotMat = gl_matrix_esm/* mat4.identity */.pB.identity(new Float32Array(16));
@@ -19167,6 +19188,7 @@ function isAnyDisplaySetCommon(sourceDisplaySetUIDs, targetDisplaySetUIDs) {
 
 
 
+
 const {
   createSynchronizer
 } = dist_esm.SynchronizerManager;
@@ -19236,7 +19258,7 @@ const segmentationRepresentationModifiedCallback = async (synchronizerInstance,
   }
 
   // Ensure the segmentation representation aligns with the target viewport type.
-  const type = viewport.type === esm.Enums.ViewportType.VOLUME_3D ? dist_esm.Enums.SegmentationRepresentations.Surface : segmentationRepresentationType ?? dist_esm.Enums.SegmentationRepresentations.Labelmap;
+  const type = (0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(viewport) ? dist_esm.Enums.SegmentationRepresentations.Surface : segmentationRepresentationType ?? dist_esm.Enums.SegmentationRepresentations.Labelmap;
   await segmentationService.addSegmentationRepresentation(targetViewportId, {
     segmentationId,
     type,
@@ -19535,6 +19557,7 @@ var _SegmentationService;
 
 
 
+
 const {
   DefaultHistoryMemo: SegmentationService_DefaultHistoryMemo
 } = esm.utilities.HistoryMemo;
@@ -19820,7 +19843,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
     }
     const colorLUTIndex = this._segmentationIdToColorLUTIndexMap.get(segmentationId);
     let isConverted = false;
-    const defaultRepresentationType = csViewport.type === dist_esm_enums.ViewportType.VOLUME_3D ? SURFACE : LABELMAP;
+    const defaultRepresentationType = (0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(csViewport) ? SURFACE : LABELMAP;
     let representationTypeToUse = type || defaultRepresentationType;
     if (representationTypeToUse === LABELMAP) {
       const {
@@ -20793,7 +20816,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
     }, isVisible);
   }
   determineViewportAndSegmentationType(csViewport, segmentation) {
-    const isVolumeViewport = csViewport.type === dist_esm_enums.ViewportType.ORTHOGRAPHIC || csViewport.type === dist_esm_enums.ViewportType.VOLUME_3D;
+    const isVolumeViewport = (0,getLegacyViewportType/* isVolumeViewportType */.rX)(csViewport);
     const isVolumeSegmentation = 'volumeId' in segmentation.representationData[LABELMAP];
     return {
       isVolumeViewport,
@@ -20814,7 +20837,7 @@ class SegmentationService extends src/* PubSubService */.Rc {
     };
   }
   async handleVolumeViewportCase(csViewport, segmentation, isVolumeSegmentation) {
-    if (csViewport.type === dist_esm_enums.ViewportType.VOLUME_3D) {
+    if ((0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(csViewport)) {
       return {
         representationTypeToUse: SURFACE,
         isConverted: false
@@ -21555,6 +21578,7 @@ function getCornerstoneOrientation(orientation) {
 
 
 
+
 const Viewport_STACK = 'stack';
 const DEFAULT_TOOLGROUP_ID = 'default';
 
@@ -21569,7 +21593,7 @@ const dataContains = ({
   if (imageId && data.isCompositeStack && data.imageIds) {
     return !!data.imageIds.find(dataId => dataId === imageId);
   }
-  if (imageId && (data.volumeId || viewport instanceof esm.VolumeViewport)) {
+  if (imageId && (data.volumeId || (0,getLegacyViewportType/* isOrthographicViewportType */.tO)(viewport))) {
     const isAcquisition = !!viewport.getCurrentImageId();
     if (!isAcquisition) {
       return false;
@@ -21810,15 +21834,25 @@ var _CornerstoneViewportService;
 
 
 
+
 const CornerstoneViewportService_EVENTS = {
   VIEWPORT_DATA_CHANGED: 'event::cornerstoneViewportService:viewportDataChanged',
   VIEWPORT_VOLUMES_CHANGED: 'event::cornerstoneViewportService:viewportVolumesChanged'
 };
 const MIN_STACK_VIEWPORTS_TO_ENQUEUE_RESIZE = 12;
 const MIN_VOLUME_VIEWPORTS_TO_ENQUEUE_RESIZE = 6;
+
+// Actor class names that represent a primary volume binding in a viewport.
+// Legacy ORTHOGRAPHIC / VOLUME_3D render the source volume as a 'vtkVolume'
+// actor. Under the GenericViewport-backed compat path (useGenericViewport),
+// the MPR slice render path emits 'vtkImageSlice' actors instead, so the
+// volume-set-vs-add optimization below must recognize both. (3D still uses
+// 'vtkVolume'.) Without this, the optimization silently no-ops and a full
+// setVolumes() teardown blanks MPR during SEG hydration.
+const VOLUME_ACTOR_CLASS_NAMES = new Set(['vtkVolume', 'vtkImageSlice']);
 function getVolumeActorReferencedIds(viewport) {
   const actors = viewport.getActors?.() ?? [];
-  return actors.filter(ac => ac.actor?.getClassName?.() === 'vtkVolume').map(ac => ac.referencedId).filter(Boolean);
+  return actors.filter(ac => VOLUME_ACTOR_CLASS_NAMES.has(ac.actor?.getClassName?.() ?? '')).map(ac => ac.referencedId).filter(Boolean);
 }
 function volumeIdPrefixesMatch(existingIds, prefixLen, targetIds) {
   if (prefixLen > targetIds.length) {
@@ -21837,7 +21871,7 @@ function volumeIdPrefixesMatch(existingIds, prefixLen, targetIds) {
  */
 function viewportMatchesDesiredVolumePresentation(viewport, desiredViewportInfo) {
   const desiredType = desiredViewportInfo.getViewportType();
-  if (viewport.type !== desiredType) {
+  if ((0,getLegacyViewportType/* getLegacyViewportType */.Gj)(viewport) !== desiredType) {
     return false;
   }
   return desiredType === esm.Enums.ViewportType.ORTHOGRAPHIC || desiredType === esm.Enums.ViewportType.VOLUME_3D;
@@ -22100,7 +22134,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     const viewportInfo = this.viewportsById.get(viewportId);
     return {
       viewportType: viewportInfo.getViewportType(),
-      viewReference: csViewport instanceof esm.VolumeViewport3D ? null : csViewport.getViewReference(),
+      viewReference: (0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(csViewport) ? null : csViewport.getViewReference(),
       viewPresentation: csViewport.getViewPresentation({
         pan: true,
         zoom: true
@@ -22125,7 +22159,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       }
       return properties;
     };
-    const properties = csViewport instanceof esm.BaseVolumeViewport ? new Map() : cleanProperties(csViewport.getProperties());
+    const properties = (0,getLegacyViewportType/* isVolumeViewportType */.rX)(csViewport) ? new Map() : cleanProperties(csViewport.getProperties());
     if (properties instanceof Map) {
       const volumeIds = csViewport.getAllVolumeIds();
       volumeIds?.forEach(volumeId => {
@@ -22540,10 +22574,16 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
   }
   async _setOtherViewport(viewport, viewportData, viewportInfo, _presentations = {}) {
     const [displaySet] = viewportData.data;
-    return viewport.setDataIds(displaySet.imageIds, {
-      groupId: displaySet.displaySetInstanceUID,
-      viewReference: viewportInfo.getViewReference()
+    // CS3D's "redo viewports" replaced setDataIds with the generic
+    // setDisplaySets({ displaySetId }) API; the legacy adapters key off
+    // imageIds[0] as the displaySetId, so do the same here.
+    await viewport.setDisplaySets({
+      displaySetId: displaySet.imageIds[0]
     });
+    const viewReference = viewportInfo.getViewReference();
+    if (viewReference) {
+      viewport.setViewReference(viewReference);
+    }
   }
   async _setStackViewport(viewport, viewportData, viewportInfo, presentations = {}) {
     const displaySetOptions = viewportInfo.getDisplaySetOptions();
@@ -22836,7 +22876,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
           if (backgroundDisplaySet.length !== 1) {
             throw new Error('Background display set not found');
           }
-          if (viewport.type === esm.Enums.ViewportType.VOLUME_3D) {
+          if ((0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(viewport)) {
             timeoutViewportCallback(() => {
               viewportGridService.setDisplaySetsForViewport({
                 viewportId: viewport.id,
@@ -22972,7 +23012,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     const viewport = this.getCornerstoneViewport(viewportId);
     const viewportCamera = viewport.getCamera();
     let displaySetPromise;
-    if (viewport instanceof esm.VolumeViewport || viewport instanceof esm.VolumeViewport3D) {
+    if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(viewport)) {
       displaySetPromise = this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
         if (keepCamera) {
           viewport.setCamera(viewportCamera);
@@ -22980,7 +23020,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         }
       });
     }
-    if (viewport instanceof esm.StackViewport) {
+    if ((0,getLegacyViewportType/* isStackViewportType */.TF)(viewport)) {
       displaySetPromise = this._setStackViewport(viewport, viewportData, viewportInfo);
     }
     displaySetPromise.then(() => {
@@ -22991,13 +23031,13 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     });
   }
   _setDisplaySets(viewport, viewportData, viewportInfo, presentations = {}) {
-    if (viewport instanceof esm.StackViewport) {
+    if ((0,getLegacyViewportType/* isStackViewportType */.TF)(viewport)) {
       return this._setStackViewport(viewport, viewportData, viewportInfo, presentations);
     }
-    if ([esm.VolumeViewport, esm.VolumeViewport3D].some(type => viewport instanceof type)) {
+    if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(viewport)) {
       return this._setVolumeViewport(viewport, viewportData, viewportInfo, presentations);
     }
-    if (viewport instanceof esm.ECGViewport) {
+    if ((0,getLegacyViewportType/* getLegacyViewportType */.Gj)(viewport) === esm.Enums.ViewportType.ECG) {
       return this._setEcgViewport(viewport, viewportData);
     }
     return this._setOtherViewport(viewport, viewportData, viewportInfo, presentations);
@@ -23133,7 +23173,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     const {
       properties
     } = lutPresentation;
-    if (viewport instanceof esm.BaseVolumeViewport) {
+    if ((0,getLegacyViewportType/* isVolumeViewportType */.rX)(viewport)) {
       if (properties instanceof Map) {
         properties.forEach((propertiesEntry, volumeId) => {
           viewport.setProperties(propertiesEntry, volumeId);
@@ -23179,7 +23219,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         Labelmap,
         Surface
       } = dist_esm.Enums.SegmentationRepresentations;
-      const isVolume3D = viewport.type === esm.Enums.ViewportType.VOLUME_3D;
+      const isVolume3D = (0,getLegacyViewportType/* isVolume3DViewportType */.Ov)(viewport);
 
       // Determine the appropriate segmentation representation for the viewport.
       // If the current type is Surface but the viewport is not 3D, fallback to Labelmap.
@@ -24783,9 +24823,13 @@ const ViewportWindowLevel = ({
   const displaySets = (0,src/* useActiveViewportDisplaySets */.BZ)();
   const getViewportsWithVolumeIds = (0,react.useCallback)(volumeIds => {
     const renderingEngine = cornerstoneViewportService.getRenderingEngine();
-    const viewports = renderingEngine.getVolumeViewports();
+    // getVolumeViewports() was removed in the GenericViewport architecture
+    // (a PLANAR_NEXT viewport can be volume-capable without being a VolumeViewport).
+    // Official replacement: getViewports() + the viewportSupportsVolumeCompatibility
+    // capability guard (cornerstone codemod cornerstone3d/5/generic-viewport).
+    const viewports = renderingEngine.getViewports().filter(esm.utilities.viewportSupportsVolumeCompatibility);
     return viewports.filter(vp => {
-      const viewportVolumeIds = vp instanceof esm.BaseVolumeViewport ? vp.getAllVolumeIds() : [];
+      const viewportVolumeIds = vp.getAllVolumeIds();
       return volumeIds.length === viewportVolumeIds.length && volumeIds.every(volumeId => viewportVolumeIds.includes(volumeId));
     });
   }, [cornerstoneViewportService]);
@@ -24849,7 +24893,7 @@ const ViewportWindowLevel = ({
     if (!viewport) {
       return;
     }
-    const viewportVolumeIds = viewport instanceof esm.BaseVolumeViewport ? viewport.getAllVolumeIds() : [];
+    const viewportVolumeIds = esm.utilities.viewportSupportsVolumeId(viewport) ? viewport.getAllVolumeIds() : [];
     const viewports = getViewportsWithVolumeIds(viewportVolumeIds);
     viewports.forEach(vp => {
       vp.setProperties({
@@ -27381,6 +27425,68 @@ function getDataIdForViewport(viewport, displaySetInstanceUID) {
   return volumeIds.length > 0 ? volumeIds.find(id => id.includes(displaySetInstanceUID)) ?? undefined : undefined;
 }
 
+/***/ },
+
+/***/ 62739
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Gj: () => (/* binding */ getLegacyViewportType),
+/* harmony export */   Ov: () => (/* binding */ isVolume3DViewportType),
+/* harmony export */   TF: () => (/* binding */ isStackViewportType),
+/* harmony export */   rX: () => (/* binding */ isVolumeViewportType),
+/* harmony export */   tO: () => (/* binding */ isOrthographicViewportType)
+/* harmony export */ });
+/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15327);
+
+const {
+  ViewportType
+} = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.Enums;
+/**
+ * Returns the legacy/requested viewport type, transparent across GenericViewport
+ * compatibility remapping.
+ *
+ * When `rendering.useGenericViewport` is enabled, a viewport requested as
+ * `STACK` or `ORTHOGRAPHIC` has runtime `viewport.type === PLANAR_NEXT`, and a
+ * `VOLUME_3D` request has `VOLUME_3D_NEXT`. The rendering engine records the
+ * original request on `viewport.requestedType`, which this reads. Falls back to
+ * `viewport.type` for legacy/non-remapped viewports (and older cornerstone builds
+ * that do not populate `requestedType`).
+ *
+ * Use this instead of `viewport instanceof StackViewport/VolumeViewport/...` or
+ * raw `viewport.type === ViewportType.X` when branching on the legacy viewport
+ * type. For "does this viewport support operation X" questions, prefer the
+ * cornerstone capability guards (`utilities.viewportSupports*`) instead.
+ */
+function getLegacyViewportType(viewport) {
+  const vp = viewport;
+  return vp?.requestedType ?? vp?.type;
+}
+
+/** Legacy STACK viewport (image stack). Replaces `instanceof StackViewport`. */
+function isStackViewportType(viewport) {
+  return getLegacyViewportType(viewport) === ViewportType.STACK;
+}
+
+/** Legacy ORTHOGRAPHIC (MPR) viewport. Replaces `instanceof VolumeViewport`. */
+function isOrthographicViewportType(viewport) {
+  return getLegacyViewportType(viewport) === ViewportType.ORTHOGRAPHIC;
+}
+
+/** Legacy VOLUME_3D viewport. Replaces `instanceof VolumeViewport3D`. */
+function isVolume3DViewportType(viewport) {
+  return getLegacyViewportType(viewport) === ViewportType.VOLUME_3D;
+}
+
+/**
+ * Legacy ORTHOGRAPHIC or VOLUME_3D viewport (i.e. a `BaseVolumeViewport`).
+ * Replaces `instanceof BaseVolumeViewport`.
+ */
+function isVolumeViewportType(viewport) {
+  const legacyType = getLegacyViewportType(viewport);
+  return legacyType === ViewportType.ORTHOGRAPHIC || legacyType === ViewportType.VOLUME_3D;
+}
+
 /***/ }
 
 }]);