@ohif/app 3.13.0-beta.8 → 3.13.0-beta.81

package/dist/{9195.bundle.a749686750f08e4adf93.js → 2851.bundle.bbb7743b8a06e85a2d8b.js}

@@ -1,14 +1,14 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[9195],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[2851],{
 
-/***/ 52675:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 52675
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (/* binding */ MoreDropdownMenu)
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
-/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12517);
+/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(564);
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42356);
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 
@@ -110,10 +110,10 @@ function MoreDropdownMenu(bindProps) {
   return BoundMoreDropdownMenu;
 }
 
-/***/ }),
+/***/ },
 
-/***/ 40565:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 40565
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
 // EXPORTS
@@ -123,8 +123,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // 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);
 // EXTERNAL MODULE: ../../core/src/index.ts + 69 modules
 var core_src = __webpack_require__(42356);
 // EXTERNAL MODULE: ../../../node_modules/react-router-dom/dist/index.js
@@ -239,7 +239,7 @@ function PanelStudyBrowser({
       commandsManager,
       servicesManager,
       isHangingProtocolLayout,
-      appConfig: extensionManager._appConfig
+      appConfig: extensionManager.appConfig
     };
     const handlers = customHandler?.callbacks.map(callback => callback(setupArgs));
     for (const handler of handlers) {
@@ -491,7 +491,7 @@ function PanelStudyBrowser({
     updateActionIconValue: updateActionIconValue
   }), /*#__PURE__*/react.createElement(src/* Separator */.wvv, {
     orientation: "horizontal",
-    className: "bg-black",
+    className: "bg-background",
     thickness: "2px"
   })), /*#__PURE__*/react.createElement(src/* StudyBrowser */.M4o, {
     tabs: tabs,
@@ -609,16 +609,16 @@ function _findTabAndStudyOfDisplaySet(displaySetInstanceUID, tabs, currentTabNam
   }
 }
 
-/***/ }),
+/***/ },
 
-/***/ 3329:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 3329
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   T: () => (/* binding */ PanelStudyBrowserHeader)
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
-/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12517);
+/* harmony import */ var _ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(564);
 
 
 
@@ -656,15 +656,15 @@ function PanelStudyBrowserHeader({
     key: index,
     "aria-label": viewPreset.id,
     value: viewPreset.id,
-    className: "text-actions-primary"
+    className: "text-primary"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__/* .Icons */ .FI1[viewPreset.iconName] || _ohif_ui_next__WEBPACK_IMPORTED_MODULE_1__/* .Icons */ .FI1.MissingIcon)))))))));
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ 20528:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 20528
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   M: () => (/* binding */ Toolbar)
@@ -743,66 +743,41 @@ function Toolbar({
   }));
 }
 
-/***/ }),
+/***/ },
 
-/***/ 39195:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 62851
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  ContextMenuController: () => (/* reexport */ ContextMenuController),
-  CustomizableContextMenuTypes: () => (/* reexport */ types_namespaceObject),
-  MoreDropdownMenu: () => (/* reexport */ MoreDropdownMenu/* default */.A),
-  PanelStudyBrowserHeader: () => (/* reexport */ PanelStudyBrowserHeader/* PanelStudyBrowserHeader */.T),
-  StaticWadoClient: () => (/* reexport */ StaticWadoClient),
-  Toolbar: () => (/* reexport */ Toolbar/* Toolbar */.M),
-  Toolbox: () => (/* reexport */ Toolbox),
-  callInputDialog: () => (/* reexport */ callInputDialog),
-  callInputDialogAutoComplete: () => (/* reexport */ callInputDialogAutoComplete),
-  cleanDenaturalizedDataset: () => (/* reexport */ cleanDenaturalizedDataset),
-  colorPickerDialog: () => (/* reexport */ colorPickerDialog),
-  createReportAsync: () => (/* reexport */ Actions_createReportAsync),
-  createReportDialogPrompt: () => (/* reexport */ CreateReportDialogPrompt),
+  tm: () => (/* reexport */ StaticWadoClient),
+  M7: () => (/* reexport */ Toolbar/* Toolbar */.M),
+  OO: () => (/* reexport */ Toolbox),
+  l5: () => (/* reexport */ callInputDialog),
+  fq: () => (/* reexport */ callInputDialogAutoComplete),
+  wZ: () => (/* reexport */ cleanDenaturalizedDataset),
+  wS: () => (/* reexport */ colorPickerDialog),
+  Vy: () => (/* reexport */ Actions_createReportAsync),
+  tc: () => (/* reexport */ CreateReportDialogPrompt),
   "default": () => (/* binding */ default_src),
-  dicomWebUtils: () => (/* reexport */ utils_namespaceObject),
-  getStudiesForPatientByMRN: () => (/* reexport */ Panels_getStudiesForPatientByMRN),
-  promptLabelAnnotation: () => (/* reexport */ utils_promptLabelAnnotation),
-  promptSaveReport: () => (/* reexport */ utils_promptSaveReport),
-  requestDisplaySetCreationForStudy: () => (/* reexport */ Panels_requestDisplaySetCreationForStudy),
-  useDisplaySetSelectorStore: () => (/* reexport */ useDisplaySetSelectorStore),
-  useHangingProtocolStageIndexStore: () => (/* reexport */ useHangingProtocolStageIndexStore),
-  usePatientInfo: () => (/* reexport */ hooks_usePatientInfo),
-  useToggleHangingProtocolStore: () => (/* reexport */ useToggleHangingProtocolStore),
-  useToggleOneUpViewportGridStore: () => (/* reexport */ useToggleOneUpViewportGridStore),
-  useUIStateStore: () => (/* reexport */ useUIStateStore),
-  useViewportGridStore: () => (/* reexport */ useViewportGridStore),
-  useViewportsByPositionStore: () => (/* reexport */ useViewportsByPositionStore),
-  utils: () => (/* reexport */ src_utils_namespaceObject)
+  CA: () => (/* reexport */ utils_namespaceObject),
+  uR: () => (/* reexport */ utils_promptLabelAnnotation),
+  MP: () => (/* reexport */ utils_promptSaveReport),
+  Z: () => (/* reexport */ Panels_requestDisplaySetCreationForStudy),
+  Yd: () => (/* reexport */ useToggleOneUpViewportGridStore),
+  FS: () => (/* reexport */ useUIStateStore)
 });
 
-// NAMESPACE OBJECT: ../../../extensions/default/src/CustomizableContextMenu/types.ts
-var types_namespaceObject = {};
-__webpack_require__.r(types_namespaceObject);
+// UNUSED EXPORTS: ContextMenuController, CustomizableContextMenuTypes, MoreDropdownMenu, PanelStudyBrowserHeader, getStudiesForPatientByMRN, useDisplaySetSelectorStore, useHangingProtocolStageIndexStore, usePatientInfo, useToggleHangingProtocolStore, useViewportGridStore, useViewportsByPositionStore, utils
 
 // NAMESPACE OBJECT: ../../../extensions/default/src/DicomWebDataSource/utils/index.ts
 var utils_namespaceObject = {};
 __webpack_require__.r(utils_namespaceObject);
 __webpack_require__.d(utils_namespaceObject, {
-  cleanDenaturalizedDataset: () => (cleanDenaturalizedDataset),
-  fixBulkDataURI: () => (fixBulkDataURI),
-  fixMultiValueKeys: () => (fixMultiValueKeys),
-  transferDenaturalizedDataset: () => (transferDenaturalizedDataset)
-});
-
-// NAMESPACE OBJECT: ../../../extensions/default/src/utils/index.ts
-var src_utils_namespaceObject = {};
-__webpack_require__.r(src_utils_namespaceObject);
-__webpack_require__.d(src_utils_namespaceObject, {
-  Toolbox: () => (Toolbox),
-  addIcon: () => (addIcon)
+  wZ: () => (cleanDenaturalizedDataset),
+  Uk: () => (fixMultiValueKeys),
+  If: () => (transferDenaturalizedDataset)
 });
 
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
@@ -2735,12 +2710,97 @@ function retrieveBulkData(value, options = {}) {
 
 // EXTERNAL MODULE: ../../../node_modules/query-string/index.js
 var query_string = __webpack_require__(98985);
+;// ../../../extensions/default/src/utils/secureConfigFetch.js
+// @ts-nocheck
+
+function normalizeAllowedOrigins(allowedOrigins = []) {
+  if (!Array.isArray(allowedOrigins)) {
+    return [];
+  }
+  const configuredOrigins = allowedOrigins.filter(origin => typeof origin === 'string').map(origin => origin.trim()).filter(Boolean);
+  return configuredOrigins.map(origin => {
+    try {
+      const parsedOrigin = new URL(origin);
+      if (!['http:', 'https:'].includes(parsedOrigin.protocol)) {
+        console.error(`[secureConfigFetch] Ignoring misconfigured allowed origin "${origin}". ` + 'Entries must use http:// or https://.');
+        return null;
+      }
+      if (parsedOrigin.username || parsedOrigin.password || parsedOrigin.pathname !== '/' || parsedOrigin.search || parsedOrigin.hash) {
+        console.error(`[secureConfigFetch] Ignoring misconfigured allowed origin "${origin}". ` + 'Entries must be bare origins only (scheme + host + optional port), with no username/password, path, query, or hash.');
+        return null;
+      }
+      return parsedOrigin.origin;
+    } catch {
+      console.error(`[secureConfigFetch] Ignoring misconfigured allowed origin "${origin}". Entry is not a valid URL.`);
+      return null;
+    }
+  }).filter(Boolean);
+}
+function resolveConfigUrl(rawUrl) {
+  if (!rawUrl || typeof rawUrl !== 'string') {
+    throw new Error('Missing required "url" query parameter');
+  }
+  try {
+    return new URL(rawUrl, window.location.href);
+  } catch {
+    throw new Error('Invalid URL in "url" query parameter');
+  }
+}
+function resolveConfigFetchPolicy(rawUrl, policy = {}) {
+  const {
+    allowedOrigins = [],
+    userAuthenticationService
+  } = policy;
+  const parsedUrl = resolveConfigUrl(rawUrl);
+  const protocol = parsedUrl.protocol.toLowerCase();
+  const isSameOrigin = parsedUrl.origin === window.location.origin;
+  if (!['http:', 'https:'].includes(protocol)) {
+    throw new Error('Only HTTP(S) URLs are allowed for dynamic datasource configuration');
+  }
+  if (parsedUrl.hash) {
+    throw new Error('URL fragments are not allowed for dynamic datasource configuration');
+  }
+  if (parsedUrl.username || parsedUrl.password) {
+    throw new Error('URL userinfo is not allowed for dynamic datasource configuration');
+  }
+  const isAuthenticated = Boolean(userAuthenticationService?.getAuthorizationHeader?.()?.Authorization);
+  if (isAuthenticated && !isSameOrigin) {
+    const normalizedAllowedOrigins = normalizeAllowedOrigins(allowedOrigins);
+    if (!normalizedAllowedOrigins.length || !normalizedAllowedOrigins.includes(parsedUrl.origin)) {
+      throw new Error(`Blocked remote configuration origin "${parsedUrl.origin}" in authenticated environment`);
+    }
+  }
+  return {
+    parsedUrl,
+    normalizedUrl: parsedUrl.toString(),
+    isAuthenticated,
+    isSameOrigin
+  };
+}
+async function fetchConfigJson(normalizedPolicy) {
+  const {
+    normalizedUrl
+  } = normalizedPolicy;
+  const response = await fetch(normalizedUrl, {
+    method: 'GET',
+    mode: 'cors',
+    credentials: 'same-origin',
+    redirect: 'error',
+    referrerPolicy: 'no-referrer'
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch dynamic datasource configuration (${response.status})`);
+  }
+  return response.json();
+}
+
 ;// ../../../extensions/default/src/DicomJSONDataSource/index.js
 
 
 
 
 
+
 const DicomJSONDataSource_metadataProvider = src/* default.classes */.Ay.classes.MetadataProvider;
 const mappings = {
   studyInstanceUid: 'StudyInstanceUID',
@@ -2787,7 +2847,10 @@ const findStudies = (key, value) => {
   });
   return studies;
 };
-function createDicomJSONApi(dicomJsonConfig) {
+function createDicomJSONApi(dicomJsonConfig, servicesManager) {
+  const {
+    userAuthenticationService
+  } = servicesManager.services;
   const implementation = {
     initialize: async ({
       query,
@@ -2796,7 +2859,11 @@ function createDicomJSONApi(dicomJsonConfig) {
       if (!url) {
         url = query.get('url');
       }
-      let metaData = getMetaDataByURL(url);
+      const evaluatedUrl = resolveConfigFetchPolicy(url, {
+        allowedOrigins: dicomJsonConfig.dangerouslyAllowedOriginsForAuthenticatedEnvironments,
+        userAuthenticationService
+      });
+      let metaData = getMetaDataByURL(evaluatedUrl.normalizedUrl);
 
       // if we have already cached the data from this specific url
       // We are only handling one StudyInstanceUID to run; however,
@@ -2806,8 +2873,7 @@ function createDicomJSONApi(dicomJsonConfig) {
           return aStudy.StudyInstanceUID;
         });
       }
-      const response = await fetch(url);
-      const data = await response.json();
+      const data = await fetchConfigJson(evaluatedUrl);
       let StudyInstanceUID;
       let SeriesInstanceUID;
       data.studies.forEach(study => {
@@ -2837,10 +2903,10 @@ function createDicomJSONApi(dicomJsonConfig) {
         });
       });
       _store.urls.push({
-        url,
+        url: evaluatedUrl.normalizedUrl,
         studies: [...data.studies]
       });
-      _store.studyInstanceUIDMap.set(url, data.studies.map(study => study.StudyInstanceUID));
+      _store.studyInstanceUIDMap.set(evaluatedUrl.normalizedUrl, data.studies.map(study => study.StudyInstanceUID));
     },
     query: {
       studies: {
@@ -2975,6 +3041,8 @@ function createDicomJSONApi(dicomJsonConfig) {
         console.warn(' DICOMJson store dicom not implemented');
       }
     },
+    reject: {},
+    deleteStudyMetadataPromise: () => {},
     getImageIdsForDisplaySet(displaySet) {
       const images = displaySet.images;
       const imageIds = [];
@@ -3033,8 +3101,20 @@ function createDicomJSONApi(dicomJsonConfig) {
       query
     }) => {
       const url = query.get('url');
-      return _store.studyInstanceUIDMap.get(url);
-    }
+      if (!url) {
+        return;
+      }
+      try {
+        const evaluatedUrl = resolveConfigFetchPolicy(url, {
+          allowedOrigins: dicomJsonConfig.dangerouslyAllowedOriginsForAuthenticatedEnvironments,
+          userAuthenticationService
+        });
+        return _store.studyInstanceUIDMap.get(evaluatedUrl.normalizedUrl);
+      } catch {
+        return;
+      }
+    },
+    getConfig: () => dicomJsonConfig
   };
   return src/* IWebApiDataSource */.pt.create(implementation);
 }
@@ -3303,6 +3383,7 @@ function createDicomLocalApi(dicomLocalConfig) {
 
 
 
+
 /**
  * This datasource is initialized with a url that returns a JSON object with a
  * dicomWeb datasource configuration array present in a "servers" object.
@@ -3315,6 +3396,9 @@ function createDicomWebProxyApi(dicomWebProxyConfig, servicesManager) {
   const {
     name
   } = dicomWebProxyConfig;
+  const {
+    userAuthenticationService
+  } = servicesManager.services;
   let dicomWebDelegate = undefined;
   const implementation = {
     initialize: async ({
@@ -3325,8 +3409,11 @@ function createDicomWebProxyApi(dicomWebProxyConfig, servicesManager) {
       if (!url) {
         throw new Error(`No url for '${name}'`);
       } else {
-        const response = await fetch(url);
-        const data = await response.json();
+        const evaluatedUrl = resolveConfigFetchPolicy(url, {
+          allowedOrigins: dicomWebProxyConfig.dangerouslyAllowedOriginsForAuthenticatedEnvironments,
+          userAuthenticationService
+        });
+        const data = await fetchConfigJson(evaluatedUrl);
         if (!data.servers?.dicomWeb?.[0]) {
           throw new Error('Invalid configuration returned by url');
         }
@@ -3357,9 +3444,15 @@ function createDicomWebProxyApi(dicomWebProxyConfig, servicesManager) {
     store: {
       dicom: (...args) => dicomWebDelegate.store.dicom(...args)
     },
-    deleteStudyMetadataPromise: (...args) => dicomWebDelegate.deleteStudyMetadataPromise(...args),
-    getImageIdsForDisplaySet: (...args) => dicomWebDelegate.getImageIdsForDisplaySet(...args),
-    getImageIdsForInstance: (...args) => dicomWebDelegate.getImageIdsForInstance(...args),
+    reject: {
+      series: (...args) => dicomWebDelegate?.reject?.series?.(...args)
+    },
+    deleteStudyMetadataPromise: (...args) => dicomWebDelegate?.deleteStudyMetadataPromise?.(...args),
+    getImageIdsForDisplaySet: (...args) => dicomWebDelegate?.getImageIdsForDisplaySet?.(...args),
+    getImageIdsForInstance: (...args) => dicomWebDelegate?.getImageIdsForInstance?.(...args),
+    getConfig: (...args) => dicomWebDelegate?.getConfig?.(...args) ?? {
+      dicomUploadEnabled: false
+    },
     getStudyInstanceUIDs({
       params,
       query
@@ -3697,8 +3790,8 @@ var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// 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: ./state/index.js + 1 modules
 var state = __webpack_require__(45981);
 // EXTERNAL MODULE: ../../../node_modules/react-router-dom/dist/index.js
@@ -3811,7 +3904,7 @@ function HeaderPatientInfo({
   const formattedPatientName = formatWithEllipsis(patientInfo.PatientName, 27);
   const formattedPatientID = formatWithEllipsis(patientInfo.PatientID, 15);
   return /*#__PURE__*/react.createElement("div", {
-    className: "hover:bg-primary-dark flex cursor-pointer items-center justify-center gap-1 rounded-lg",
+    className: "hover:bg-muted flex cursor-pointer items-center justify-center gap-1 rounded-lg",
     onClick: handleOnClick
   }, isMixedPatients ? /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.MultiplePatients, {
     className: "text-primary"
@@ -3820,9 +3913,9 @@ function HeaderPatientInfo({
   }), /*#__PURE__*/react.createElement("div", {
     className: "flex flex-col justify-center"
   }, expanded ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
-    className: "self-start text-[13px] font-bold text-white"
+    className: "text-foreground self-start text-[13px] font-bold"
   }, formattedPatientName), /*#__PURE__*/react.createElement("div", {
-    className: "text-aqua-pale flex gap-2 text-[11px]"
+    className: "text-muted-foreground flex gap-2 text-[11px]"
   }, /*#__PURE__*/react.createElement("div", null, formattedPatientID), /*#__PURE__*/react.createElement("div", null, patientInfo.PatientSex), /*#__PURE__*/react.createElement("div", null, patientInfo.PatientDOB))) : /*#__PURE__*/react.createElement("div", {
     className: "text-primary self-center text-[13px]"
   }, isMixedPatients ? 'Multiple Patients' : 'Patient')), /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.ArrowLeft, {
@@ -3925,7 +4018,8 @@ function ViewerHeader({
       className: "text-primary flex cursor-pointer items-center"
     }, /*#__PURE__*/react.createElement(ui_next_src/* Button */.$nd, {
       variant: "ghost",
-      className: "hover:bg-primary-dark",
+      className: "hover:bg-muted",
+      "data-cy": "undo-btn",
       onClick: () => {
         commandsManager.run('undo');
       }
@@ -3933,7 +4027,8 @@ function ViewerHeader({
       className: ""
     })), /*#__PURE__*/react.createElement(ui_next_src/* Button */.$nd, {
       variant: "ghost",
-      className: "hover:bg-primary-dark",
+      className: "hover:bg-muted",
+      "data-cy": "redo-btn",
       onClick: () => {
         commandsManager.run('redo');
       }
@@ -4355,7 +4450,7 @@ function ViewerLayout_extends() { return ViewerLayout_extends = Object.assign ?
 
 
 
-const resizableHandleClassName = 'mt-[1px] bg-black';
+const resizableHandleClassName = 'mt-[1px] bg-background';
 function ViewerLayout({
   // From Extension Module Params
   extensionManager,
@@ -4398,10 +4493,10 @@ function ViewerLayout({
    * is sized to our viewport.
    */
   (0,react.useEffect)(() => {
-    document.body.classList.add('bg-black');
+    document.body.classList.add('bg-background');
     document.body.classList.add('overflow-hidden');
     return () => {
-      document.body.classList.remove('bg-black');
+      document.body.classList.remove('bg-background');
       document.body.classList.remove('overflow-hidden');
     };
   }, []);
@@ -4464,12 +4559,12 @@ function ViewerLayout({
     servicesManager: servicesManager,
     appConfig: appConfig
   }), /*#__PURE__*/react.createElement("div", {
-    className: "relative flex w-full flex-row flex-nowrap items-stretch overflow-hidden bg-black",
+    className: "relative flex w-full flex-row flex-nowrap items-stretch overflow-hidden bg-background",
     style: {
       height: 'calc(100vh - 52px'
     }
   }, /*#__PURE__*/react.createElement(react.Fragment, null, showLoadingIndicator && /*#__PURE__*/react.createElement(LoadingIndicatorProgress, {
-    className: "h-full w-full bg-black"
+    className: "h-full w-full bg-background"
   }), /*#__PURE__*/react.createElement(ui_next_src/* ResizablePanelGroup */.HKS, resizablePanelGroupProps, hasLeftPanels ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(ui_next_src/* ResizablePanel */.wVo, resizableLeftPanelProps, /*#__PURE__*/react.createElement(Components_SidePanelWithServices, ViewerLayout_extends({
     side: "left",
     isExpanded: !leftPanelClosedState,
@@ -4481,7 +4576,7 @@ function ViewerLayout({
   })) : null, /*#__PURE__*/react.createElement(ui_next_src/* ResizablePanel */.wVo, resizableViewportGridPanelProps, /*#__PURE__*/react.createElement("div", {
     className: "flex h-full flex-1 flex-col"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "relative flex h-full flex-1 items-center justify-center overflow-hidden bg-black",
+    className: "relative flex h-full flex-1 items-center justify-center overflow-hidden bg-background",
     onMouseEnter: handleMouseEnter
   }, /*#__PURE__*/react.createElement(ViewportGridComp, {
     servicesManager: servicesManager,
@@ -4688,7 +4783,8 @@ function CreateReportDialogPrompt({
   minSeriesNumber = 0,
   predecessorImageId,
   extensionManager,
-  servicesManager
+  servicesManager,
+  enableDownload = false
 }) {
   const {
     uiDialogService,
@@ -4708,6 +4804,7 @@ function CreateReportDialogPrompt({
         predecessorImageId,
         minSeriesNumber,
         modality,
+        enableDownload,
         onSave: async ({
           reportName,
           dataSource: selectedDataSource,
@@ -5180,7 +5277,6 @@ var dist_esm = __webpack_require__(15327);
 const {
   isImage,
   sortStudyInstances,
-  instancesSortCriteria,
   sopClassDictionary,
   isDisplaySetReconstructable: getSopClassHandlerModule_isDisplaySetReconstructable
 } = src/* utils */.Wp;
@@ -5225,12 +5321,17 @@ function getDisplaySetInfo(instances) {
     const instancesMap = new Map();
     let firstTimePointInstances;
     if (instances[0].NumberOfFrames > 1 && timePoints.length > 1) {
-      // handle multiframe dynamic volume
-      firstTimePointInstances = timePoints[0].map(imageId => dist_esm.metaData.get('instance', imageId));
+      // Handle multiframe dynamic volumes. Local file frame imageIds do not
+      // always resolve to a frame-level instance object, so keep resolved
+      // entries and fall back to the source multiframe instance when needed.
+      firstTimePointInstances = timePoints[0].map(imageId => dist_esm.metaData.get('instance', imageId)).filter(Boolean);
+      if (!firstTimePointInstances.length) {
+        firstTimePointInstances = [instances[0]];
+      }
     } else {
       // O(n) to convert it into a map and O(1) to find each instance
       instances.forEach(instance => instancesMap.set(instance.imageId, instance));
-      firstTimePointInstances = timePoint.map(imageId => instancesMap.get(imageId));
+      firstTimePointInstances = timePoint.map(imageId => instancesMap.get(imageId)).filter(Boolean);
     }
     displaySetInfo = getSopClassHandlerModule_isDisplaySetReconstructable(firstTimePointInstances, appConfig);
   } else {
@@ -5393,7 +5494,7 @@ function getDisplaySetsFromSeries(instances) {
   }
   return displaySets;
 }
-const getSopClassHandlerModule_sopClassUids = [sopClassDictionary.ComputedRadiographyImageStorage, sopClassDictionary.DigitalXRayImageStorageForPresentation, sopClassDictionary.DigitalXRayImageStorageForProcessing, sopClassDictionary.DigitalMammographyXRayImageStorageForPresentation, sopClassDictionary.DigitalMammographyXRayImageStorageForProcessing, sopClassDictionary.DigitalIntraOralXRayImageStorageForPresentation, sopClassDictionary.DigitalIntraOralXRayImageStorageForProcessing, sopClassDictionary.CTImageStorage, sopClassDictionary.EnhancedCTImageStorage, sopClassDictionary.LegacyConvertedEnhancedCTImageStorage, sopClassDictionary.UltrasoundMultiframeImageStorage, sopClassDictionary.MRImageStorage, sopClassDictionary.EnhancedMRImageStorage, sopClassDictionary.EnhancedMRColorImageStorage, sopClassDictionary.LegacyConvertedEnhancedMRImageStorage, sopClassDictionary.UltrasoundImageStorage, sopClassDictionary.UltrasoundImageStorageRET, sopClassDictionary.SecondaryCaptureImageStorage, sopClassDictionary.MultiframeSingleBitSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleByteSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleWordSecondaryCaptureImageStorage, sopClassDictionary.MultiframeTrueColorSecondaryCaptureImageStorage, sopClassDictionary.XRayAngiographicImageStorage, sopClassDictionary.EnhancedXAImageStorage, sopClassDictionary.XRayRadiofluoroscopicImageStorage, sopClassDictionary.EnhancedXRFImageStorage, sopClassDictionary.XRay3DAngiographicImageStorage, sopClassDictionary.XRay3DCraniofacialImageStorage, sopClassDictionary.BreastTomosynthesisImageStorage, sopClassDictionary.BreastProjectionXRayImageStorageForPresentation, sopClassDictionary.BreastProjectionXRayImageStorageForProcessing, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForPresentation, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForProcessing, sopClassDictionary.NuclearMedicineImageStorage, sopClassDictionary.VLEndoscopicImageStorage, sopClassDictionary.VideoEndoscopicImageStorage, sopClassDictionary.VLMicroscopicImageStorage, sopClassDictionary.VideoMicroscopicImageStorage, sopClassDictionary.VLSlideCoordinatesMicroscopicImageStorage, sopClassDictionary.VLPhotographicImageStorage, sopClassDictionary.VideoPhotographicImageStorage, sopClassDictionary.OphthalmicPhotography8BitImageStorage, sopClassDictionary.OphthalmicPhotography16BitImageStorage, sopClassDictionary.OphthalmicTomographyImageStorage,
+const getSopClassHandlerModule_sopClassUids = [sopClassDictionary.ComputedRadiographyImageStorage, sopClassDictionary.DigitalXRayImageStorageForPresentation, sopClassDictionary.DigitalXRayImageStorageForProcessing, sopClassDictionary.DigitalMammographyXRayImageStorageForPresentation, sopClassDictionary.DigitalMammographyXRayImageStorageForProcessing, sopClassDictionary.DigitalIntraOralXRayImageStorageForPresentation, sopClassDictionary.DigitalIntraOralXRayImageStorageForProcessing, sopClassDictionary.CTImageStorage, sopClassDictionary.EnhancedCTImageStorage, sopClassDictionary.LegacyConvertedEnhancedCTImageStorage, sopClassDictionary.UltrasoundMultiframeImageStorage, sopClassDictionary.MRImageStorage, sopClassDictionary.EnhancedMRImageStorage, sopClassDictionary.EnhancedMRColorImageStorage, sopClassDictionary.LegacyConvertedEnhancedMRImageStorage, sopClassDictionary.UltrasoundImageStorage, sopClassDictionary.UltrasoundImageStorageRET, sopClassDictionary.SecondaryCaptureImageStorage, sopClassDictionary.MultiframeSingleBitSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleByteSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleWordSecondaryCaptureImageStorage, sopClassDictionary.MultiframeTrueColorSecondaryCaptureImageStorage, sopClassDictionary.XRayAngiographicImageStorage, sopClassDictionary.EnhancedXAImageStorage, sopClassDictionary.XRayRadiofluoroscopicImageStorage, sopClassDictionary.EnhancedXRFImageStorage, sopClassDictionary.XRay3DAngiographicImageStorage, sopClassDictionary.XRay3DCraniofacialImageStorage, sopClassDictionary.BreastTomosynthesisImageStorage, sopClassDictionary.CornealTopographyMapStorage, sopClassDictionary.BreastProjectionXRayImageStorageForPresentation, sopClassDictionary.BreastProjectionXRayImageStorageForProcessing, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForPresentation, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForProcessing, sopClassDictionary.NuclearMedicineImageStorage, sopClassDictionary.VLEndoscopicImageStorage, sopClassDictionary.VideoEndoscopicImageStorage, sopClassDictionary.VLMicroscopicImageStorage, sopClassDictionary.VideoMicroscopicImageStorage, sopClassDictionary.VLSlideCoordinatesMicroscopicImageStorage, sopClassDictionary.VLPhotographicImageStorage, sopClassDictionary.VideoPhotographicImageStorage, sopClassDictionary.OphthalmicPhotography8BitImageStorage, sopClassDictionary.OphthalmicPhotography16BitImageStorage, sopClassDictionary.OphthalmicTomographyImageStorage,
 // Handled by another sop class module
 // sopClassDictionary.VLWholeSlideMicroscopyImageStorage,
 sopClassDictionary.PositronEmissionTomographyImageStorage, sopClassDictionary.EnhancedPETImageStorage, sopClassDictionary.LegacyConvertedEnhancedPETImageStorage, sopClassDictionary.RTImageStorage, sopClassDictionary.EnhancedUSVolumeStorage, sopClassDictionary.RTDoseStorage];
@@ -5555,7 +5656,7 @@ function ToolbarLayoutSelectorWithServices({
     disabled: preset.disabled,
     isPreset: true
   })))), /*#__PURE__*/react.createElement("div", {
-    className: "bg-muted flex flex-col gap-2.5 border-l-2 border-solid border-black p-2"
+    className: "bg-muted flex flex-col gap-2.5 border-l-2 border-solid border-background p-2"
   }, /*#__PURE__*/react.createElement("div", {
     className: "text-muted-foreground text-xs"
   }, t('Custom')), /*#__PURE__*/react.createElement(ui_next_src/* LayoutSelector */.sG4.GridSelector, {
@@ -5843,6 +5944,7 @@ function ToolButtonWrapper(props) {
 }
 
 ;// ../../../extensions/default/src/Toolbar/ToolbarDivider.tsx
+/* unused harmony import specifier */ var React;
 
 function ToolbarDivider() {
   return /*#__PURE__*/React.createElement("span", {
@@ -6315,7 +6417,7 @@ const RowComponent = ({
       ...style,
       ...rowStyle
     },
-    className: classnames_default()('hover:bg-secondary-main border-secondary-light text-foreground flex w-full flex-row items-center break-all bg-black text-base transition duration-300', lineHeightClassName),
+    className: classnames_default()('hover:bg-primary/25 border-input text-foreground flex w-full flex-row items-center break-all bg-background text-base', lineHeightClassName),
     key: keyPrefix
   }, isChildOrParent && /*#__PURE__*/react.createElement("div", {
     style: {
@@ -6345,34 +6447,34 @@ function ColumnHeaders({
   valueRef
 }) {
   return /*#__PURE__*/react.createElement("div", {
-    className: classnames_default()('bg-secondary-dark ohif-scrollbar flex w-full flex-row overflow-y-scroll'),
+    className: classnames_default()('bg-popover ohif-scrollbar flex w-full flex-row overflow-y-scroll'),
     style: rowVerticalPaddingStyle
   }, /*#__PURE__*/react.createElement("div", {
     className: "w-4/24 px-3"
   }, /*#__PURE__*/react.createElement("label", {
     ref: tagRef,
-    className: "flex flex-1 select-none flex-col pl-1 text-lg text-white"
+    className: "text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
   }, /*#__PURE__*/react.createElement("span", {
     className: "flex flex-row items-center focus:outline-none"
   }, "Tag"))), /*#__PURE__*/react.createElement("div", {
     className: "w-2/24 px-3"
   }, /*#__PURE__*/react.createElement("label", {
     ref: vrRef,
-    className: "flex flex-1 select-none flex-col pl-1 text-lg text-white"
+    className: "text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
   }, /*#__PURE__*/react.createElement("span", {
     className: "flex flex-row items-center focus:outline-none"
   }, "VR"))), /*#__PURE__*/react.createElement("div", {
     className: "w-6/24 px-3"
   }, /*#__PURE__*/react.createElement("label", {
     ref: keywordRef,
-    className: "flex flex-1 select-none flex-col pl-1 text-lg text-white"
+    className: "text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
   }, /*#__PURE__*/react.createElement("span", {
     className: "flex flex-row items-center focus:outline-none"
   }, "Keyword"))), /*#__PURE__*/react.createElement("div", {
     className: "w-5/24 grow px-3"
   }, /*#__PURE__*/react.createElement("label", {
     ref: valueRef,
-    className: "flex flex-1 select-none flex-col pl-1 text-lg text-white"
+    className: "text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
   }, /*#__PURE__*/react.createElement("span", {
     className: "flex flex-row items-center focus:outline-none"
   }, "Value"))));
@@ -6520,7 +6622,7 @@ function DicomTagTable({
     keywordRef: keywordRef,
     valueRef: valueRef
   }), /*#__PURE__*/react.createElement("div", {
-    className: "relative m-auto border-2 border-black bg-black",
+    className: "relative m-auto border-2 border-background bg-background",
     style: {
       height: '32rem'
     }
@@ -6635,7 +6737,7 @@ const DicomTagBrowser = ({
   }, /*#__PURE__*/react.createElement("div", {
     className: "mb-6 flex flex-row items-start pl-1"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "flex w-full flex-row items-start gap-4"
+    className: "flex w-full flex-row items-start gap-6"
   }, /*#__PURE__*/react.createElement("div", {
     className: "flex w-1/3 flex-col"
   }, /*#__PURE__*/react.createElement("span", {
@@ -6645,7 +6747,11 @@ const DicomTagBrowser = ({
     onValueChange: value => onSelectChange({
       value
     })
-  }, /*#__PURE__*/react.createElement(ui_next_src/* SelectTrigger */.bqE, null, displaySetList.find(ds => ds.value === selectedDisplaySetInstanceUID)?.label || 'Select Series'), /*#__PURE__*/react.createElement(ui_next_src/* SelectContent */.gCo, null, displaySetList.map(item => {
+  }, /*#__PURE__*/react.createElement(ui_next_src/* SelectTrigger */.bqE, {
+    "data-cy": "dicom-tag-series-select-trigger"
+  }, /*#__PURE__*/react.createElement(ui_next_src/* SelectValue */.yvm, {
+    "data-cy": "dicom-tag-series-select-value"
+  }, displaySetList.find(ds => ds.value === selectedDisplaySetInstanceUID)?.label || 'Select Series')), /*#__PURE__*/react.createElement(ui_next_src/* SelectContent */.gCo, null, displaySetList.map(item => {
     return /*#__PURE__*/react.createElement(ui_next_src/* SelectItem */.ebT, {
       key: item.value,
       value: item.value
@@ -6664,7 +6770,7 @@ const DicomTagBrowser = ({
     min: 1,
     max: activeDisplaySet?.images?.length,
     step: 1,
-    className: "pt-4"
+    className: "pt-3"
   })), /*#__PURE__*/react.createElement("div", {
     className: "ml-auto mr-1 flex w-1/3 flex-col"
   }, /*#__PURE__*/react.createElement("span", {
@@ -7223,8 +7329,14 @@ function configureViewportForLayerAddition(params) {
 
   // If a viewport type was already set do not reset it.
   if (!viewport.viewportOptions.viewportType) {
-    // Special handling for overlay display sets
-    if (requestedLayerDisplaySet.isOverlayDisplaySet) {
+    // If the live Cornerstone viewport is already orthographic (volume), keep it as
+    // 'volume'. Prevents accidentally downgrading a volume viewport to 'stack' when
+    // viewportOptions arrives without a viewportType (e.g. from the HP overlay path).
+    const csViewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+    if (csViewport?.type === 'orthographic') {
+      viewport.viewportOptions.viewportType = 'volume';
+      // Special handling for overlay display sets
+    } else if (requestedLayerDisplaySet.isOverlayDisplaySet) {
       // Do not force volume for SEG and RTSTRUCT if it and all the current display sets are for the same display set
       const isSameDisplaySet = currentDisplaySetUIDs.every(uid => {
         const currentDisplaySet = displaySetService.getDisplaySetByUID(uid);
@@ -7280,7 +7392,8 @@ function configureViewportForLayerRemoval(params) {
   if (!viewport.viewportOptions) {
     viewport.viewportOptions = {};
   }
-  viewport.viewportOptions.viewportType = 'volume';
+  const csViewportOrthographic = cornerstoneViewportService.getCornerstoneViewport(viewportId)?.type === 'orthographic';
+  viewport.viewportOptions.viewportType = csViewportOrthographic ? 'volume' : 'stack';
 
   // orientation
   if (!viewport.viewportOptions.orientation) {
@@ -7537,8 +7650,6 @@ const useToggleOneUpViewportGridStore = (0,zustand_esm/* create */.vt)(set => ({
   })
 }));
 ;// ../../../extensions/default/src/Actions/createReportAsync.tsx
-
-
 /**
  *
  * @param {*} servicesManager
@@ -7546,7 +7657,8 @@ const useToggleOneUpViewportGridStore = (0,zustand_esm/* create */.vt)(set => ({
 async function createReportAsync({
   servicesManager,
   getReport,
-  reportType = 'measurement'
+  reportType = 'Measurements',
+  successMessage
 }) {
   const {
     displaySetService,
@@ -7559,15 +7671,13 @@ async function createReportAsync({
       return;
     }
 
-    // The "Mode" route listens for DicomMetadataStore changes
-    // When a new instance is added, it listens and
-    // automatically calls makeDisplaySets
-    src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
+    // addInstances is called by the store command (storeMeasurements/storeSegmentation),
+    // so the display set should already exist at this point.
     const displaySet = displaySetService.getMostRecentDisplaySet();
     const displaySetInstanceUID = displaySet.displaySetInstanceUID;
     uiNotificationService.show({
       title: 'Create Report',
-      message: `${reportType} saved successfully`,
+      message: successMessage ?? `${reportType} saved successfully`,
       type: 'success'
     });
     return [displaySetInstanceUID];
@@ -7623,34 +7733,32 @@ async function promptSaveReport({
       predecessorImageId,
       minSeriesNumber: 3000,
       extensionManager,
-      servicesManager
+      servicesManager,
+      enableDownload: true
     });
     if (promptResult.action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
-      const dataSources = extensionManager.getDataSources(promptResult.dataSourceName);
-      const dataSource = dataSources[0];
       const {
         series,
         priorSeriesNumber,
-        value: reportName
+        value: reportName,
+        dataSourceName
       } = promptResult;
       const SeriesDescription = reportName || defaultSaveTitle;
-      const getReport = async () => {
-        return commandsManager.runCommand('storeMeasurements', {
-          measurementData,
-          dataSource,
-          additionalFindingTypes: ['ArrowAnnotate'],
-          options: {
-            SeriesDescription,
-            SeriesNumber: 1 + priorSeriesNumber,
-            predecessorImageId: series
-          }
-        }, 'CORNERSTONE_STRUCTURED_REPORT');
-      };
+      const getReport = async () => commandsManager.runCommand('storeMeasurements', {
+        measurementData,
+        dataSource: dataSourceName,
+        additionalFindingTypes: ['ArrowAnnotate'],
+        options: {
+          SeriesDescription,
+          SeriesNumber: 1 + priorSeriesNumber,
+          predecessorImageId: series
+        }
+      }, 'CORNERSTONE_STRUCTURED_REPORT');
       displaySetInstanceUIDs = await Actions_createReportAsync({
         servicesManager,
         getReport
       });
-    } else if (promptResult.action === RESPONSE.CANCEL) {
+    } else if (promptResult.action === PROMPT_RESPONSES/* default */.A.CANCEL) {
       // Do nothing
     }
     return {
@@ -7682,6 +7790,10 @@ function findPredecessorImageId(annotations) {
 ;// ../../../extensions/default/src/commandsModule.ts
 
 
+const {
+  downloadBlob
+} = src/* utils */.Wp;
+
 
 
 
@@ -7811,6 +7923,19 @@ const commandsModule = ({
         return;
       }
 
+      // Check if it's a segmentation and handle accordingly.
+      // Note that for the sake of hydrated segmentations, we remove the
+      // segmentation before checking if the display set is indeed in the viewport.
+      // This is because hydrated segmentations are not in the viewport per se
+      // {i.e. they are not layered) but are simply referenced by the display
+      // set in the viewport.
+      const isSegmentation = DERIVED_OVERLAY_MODALITIES.includes(displaySet.Modality);
+      if (isSegmentation) {
+        segmentationService.removeRepresentationsFromViewport(viewportId, {
+          segmentationId: displaySetInstanceUID
+        });
+      }
+
       // Get current display sets for the viewport
       const currentDisplaySetUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
 
@@ -7818,14 +7943,6 @@ const commandsModule = ({
       if (!currentDisplaySetUIDs.includes(displaySetInstanceUID)) {
         return;
       }
-
-      // Check if it's a segmentation and handle accordingly
-      const isSegmentation = DERIVED_OVERLAY_MODALITIES.includes(displaySet.Modality);
-      if (isSegmentation) {
-        segmentationService.removeSegmentationRepresentations(viewportId, {
-          segmentationId: displaySetInstanceUID
-        });
-      }
       const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportId, displaySetInstanceUID);
 
       // Configure each viewport for layer removal
@@ -8310,7 +8427,7 @@ const commandsModule = ({
       const {
         UIModalService
       } = servicesManager.services;
-      const defaultDisplaySetInstanceUID = displaySetInstanceUID || displaySetInstanceUIDs[0];
+      const defaultDisplaySetInstanceUID = displaySetInstanceUID || displaySetInstanceUIDs[0] || displaySets[0]?.displaySetInstanceUID;
       UIModalService.show({
         content: DicomTagBrowser_DicomTagBrowser,
         contentProps: {
@@ -8371,7 +8488,11 @@ const commandsModule = ({
       const activeDisplaySetIndex = currentDisplaySets.findIndex(displaySet => displaySetInstanceUIDs.includes(displaySet.displaySetInstanceUID));
       let displaySetIndexToShow;
       for (displaySetIndexToShow = activeDisplaySetIndex + direction; displaySetIndexToShow > -1 && displaySetIndexToShow < currentDisplaySets.length; displaySetIndexToShow += direction) {
-        if (!excludeNonImageModalities || !nonImageModalities.includes(currentDisplaySets[displaySetIndexToShow].Modality)) {
+        const nextDisplaySet = currentDisplaySets[displaySetIndexToShow];
+        if (nextDisplaySet.madeInClient) {
+          continue;
+        }
+        if (!excludeNonImageModalities || !nonImageModalities.includes(nextDisplaySet.Modality)) {
           break;
         }
       }
@@ -8397,6 +8518,74 @@ const commandsModule = ({
         viewportsToUpdate: updatedViewports
       });
       setTimeout(() => actions.scrollActiveThumbnailIntoView(), 0);
+    },
+    /**
+     * Creates a store function based on the data source type.
+     * @param dataSource - 'download', 'copyToClipboard', or a named data source
+     * @param defaultFileName - Default filename for download/clipboard
+     * @param defaultContentType - Default content type for clipboard
+     * @returns A store function, or null if no valid store exists
+     */
+    createStoreFunction: ({
+      dataSource,
+      defaultFileName,
+      defaultContentType
+    }) => {
+      if (dataSource === 'download') {
+        return async dicom => {
+          const instances = Array.isArray(dicom) ? dicom : [dicom];
+          src/* DicomMetadataStore */.H8.addInstances(instances, true);
+          if (instances.length !== 1) {
+            throw new Error('Download only supports a single DICOM instance');
+          }
+          const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(instances[0]);
+          downloadBlob(reportBlob, {
+            filename: defaultFileName || 'dicom.dcm'
+          });
+        };
+      }
+      if (dataSource === 'copyToClipboard') {
+        return async dicom => {
+          const instances = Array.isArray(dicom) ? dicom : [dicom];
+          src/* DicomMetadataStore */.H8.addInstances(instances, true);
+          if (instances.length !== 1) {
+            throw new Error('Copy to clipboard only supports a single DICOM instance');
+          }
+          const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(instances[0]);
+          const type = defaultContentType || 'application/dicom';
+          await navigator.clipboard.write([new ClipboardItem({
+            [type]: new Blob([reportBlob], {
+              type
+            })
+          })]);
+        };
+      }
+
+      // DICOM STOW path — resolve the named data source
+      const dataSources = extensionManager.getDataSources(dataSource);
+      const resolvedDataSource = dataSources?.[0];
+      if (!resolvedDataSource?.store?.dicom) {
+        return null;
+      }
+      return async (dicom, {
+        dicomDict
+      } = {}) => {
+        const instances = Array.isArray(dicom) ? dicom : [dicom];
+        const config = resolvedDataSource.getConfig?.();
+        if (config?.wadoRoot) {
+          instances.forEach(instance => {
+            instance.wadoRoot = config.wadoRoot;
+          });
+        }
+        src/* DicomMetadataStore */.H8.addInstances(instances, true);
+        for (const instance of instances) {
+          await resolvedDataSource.store.dicom(instance, null, dicomDict);
+        }
+        const studyUIDs = new Set(instances.map(i => i.StudyInstanceUID).filter(Boolean));
+        for (const uid of studyUIDs) {
+          resolvedDataSource.deleteStudyMetadataPromise(uid);
+        }
+      };
     }
   };
   const definitions = {
@@ -8428,7 +8617,8 @@ const commandsModule = ({
     updateViewportDisplaySet: actions.updateViewportDisplaySet,
     scrollActiveThumbnailIntoView: actions.scrollActiveThumbnailIntoView,
     addDisplaySetAsLayer: actions.addDisplaySetAsLayer,
-    removeDisplaySetLayer: actions.removeDisplaySetLayer
+    removeDisplaySetLayer: actions.removeDisplaySetLayer,
+    createStoreFunction: actions.createStoreFunction
   };
   return {
     actions,
@@ -9605,7 +9795,7 @@ function DataSourceSelector() {
   }, /*#__PURE__*/react.createElement("div", {
     className: "flex h-screen w-screen items-center justify-center"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "bg-secondary-dark mx-auto space-y-2 rounded-lg py-8 px-8 drop-shadow-md"
+    className: "bg-popover mx-auto space-y-2 rounded-lg py-8 px-8 drop-shadow-md"
   }, /*#__PURE__*/react.createElement("img", {
     className: "mx-auto block h-14",
     src: "./ohif-logo.svg",
@@ -9615,7 +9805,7 @@ function DataSourceSelector() {
   }, dsConfigs.filter(it => it.sourceName !== 'dicomjson' && it.sourceName !== 'dicomlocal').map(ds => /*#__PURE__*/react.createElement("div", {
     key: ds.sourceName
   }, /*#__PURE__*/react.createElement("h1", {
-    className: "text-white"
+    className: "text-foreground"
   }, ds.configuration?.friendlyName || ds.friendlyName), /*#__PURE__*/react.createElement(ui_src/* Button */.$n, {
     type: ui_src/* ButtonEnums.type */.Ny.NW.primary,
     className: classnames_default()('ml-2'),
@@ -9923,7 +10113,7 @@ function ItemListComponent({
   }), /*#__PURE__*/react.createElement(ui_next_src/* InputFilter */.zbB.ClearButton, {
     className: "text-primary mr-0.5 p-0.5"
   }))), /*#__PURE__*/react.createElement("div", {
-    className: "relative flex min-h-[1px] grow flex-col bg-black text-[14px]"
+    className: "relative flex min-h-[1px] grow flex-col bg-background text-[14px]"
   }, itemList == null ? /*#__PURE__*/react.createElement(LoadingIndicatorProgress, {
     className: 'h-full w-full'
   }) : itemList.length === 0 ? /*#__PURE__*/react.createElement("div", {
@@ -10015,16 +10205,16 @@ function DataSourceConfigurationModalComponent({
     };
   }, [selectedItems, configurationAPI, onHide, itemLabels, showFullConfig, currentSelectedItemIndex]);
   const getSelectedItemCursorClasses = itemIndex => itemIndex !== itemLabels.length - 1 && itemIndex < selectedItems.length ? 'cursor-pointer' : 'cursor-auto';
-  const getSelectedItemBackgroundClasses = itemIndex => itemIndex < selectedItems.length ? classnames_default()('bg-black/[.4]', itemIndex !== itemLabels.length - 1 ? 'hover:bg-transparent active:bg-secondary-dark' : '') : 'bg-transparent';
-  const getSelectedItemBorderClasses = itemIndex => itemIndex === currentSelectedItemIndex + 1 ? classnames_default()('border-2', 'border-solid', 'border-primary-light') : itemIndex < selectedItems.length ? 'border border-solid border-primary-active hover:border-primary-light active:border-white' : 'border border-dashed border-secondary-light';
-  const getSelectedItemTextClasses = itemIndex => itemIndex <= selectedItems.length ? 'text-primary-light' : 'text-primary';
+  const getSelectedItemBackgroundClasses = itemIndex => itemIndex < selectedItems.length ? classnames_default()('bg-background/[.4]', itemIndex !== itemLabels.length - 1 ? 'hover:bg-transparent active:bg-popover' : '') : 'bg-transparent';
+  const getSelectedItemBorderClasses = itemIndex => itemIndex === currentSelectedItemIndex + 1 ? classnames_default()('border-2', 'border-solid', 'border-highlight') : itemIndex < selectedItems.length ? 'border border-solid border-primary hover:border-highlight active:border-white' : 'border border-dashed border-input';
+  const getSelectedItemTextClasses = itemIndex => itemIndex <= selectedItems.length ? 'text-highlight' : 'text-primary';
   const getErrorComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
       className: "flex min-h-[1px] grow flex-col gap-4"
     }, /*#__PURE__*/react.createElement("div", {
-      className: "text-primary-light text-[20px]"
+      className: "text-highlight text-[20px]"
     }, t(`Error fetching ${itemLabels[selectedItems.length]} list`)), /*#__PURE__*/react.createElement("div", {
-      className: "grow bg-black p-4 text-[14px]"
+      className: "grow bg-background p-4 text-[14px]"
     }, errorMessage));
   };
   const getSelectedItemsComponent = () => {
@@ -10047,14 +10237,14 @@ function DataSourceConfigurationModalComponent({
       }), /*#__PURE__*/react.createElement("div", {
         className: classnames_default()(NO_WRAP_ELLIPSIS_CLASS_NAMES)
       }, t(itemLabel))), itemLabelIndex < selectedItems.length ? /*#__PURE__*/react.createElement("div", {
-        className: classnames_default()('text-[14px] text-white', NO_WRAP_ELLIPSIS_CLASS_NAMES)
+        className: classnames_default()('text-foreground text-[14px]', NO_WRAP_ELLIPSIS_CLASS_NAMES)
       }, selectedItems[itemLabelIndex].name) : /*#__PURE__*/react.createElement("br", null));
     }));
   };
   return /*#__PURE__*/react.createElement("div", {
     className: "flex h-[calc(100vh-300px)] select-none flex-col gap-4 pt-0.5"
   }, getSelectedItemsComponent(), /*#__PURE__*/react.createElement("div", {
-    className: "h-0.5 w-full shrink-0 bg-black"
+    className: "h-0.5 w-full shrink-0 bg-background"
   }), errorMessage ? getErrorComponent() : /*#__PURE__*/react.createElement(Components_ItemListComponent, {
     itemLabel: itemLabels[currentSelectedItemIndex + 1],
     itemList: itemList,
@@ -10137,7 +10327,7 @@ function DataSourceConfigurationComponent({
     }
   }, [configurationAPI, configuredItems, showConfigurationModal]);
   return configuredItems ? /*#__PURE__*/react.createElement("div", {
-    className: "text-aqua-pale flex items-center overflow-hidden"
+    className: "text-muted-foreground flex items-center overflow-hidden"
   }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Settings, {
     className: "mr-2.5 h-3.5 w-3.5 shrink-0 cursor-pointer",
     onClick: showConfigurationModal
@@ -10346,8 +10536,14 @@ function getDataSourceConfigurationCustomization({
 const {
   sortingCriteria
 } = src/* utils */.Wp;
+const {
+  seriesSortCriteria
+} = sortingCriteria;
+
+/** Stable series order for e2e (Playwright sets TEST_ENV=true via cross-env). */
+const sortingCriteriaFn =  false ? 0 : seriesSortCriteria.seriesInfoSortingCriteria;
 /* harmony default export */ const sortingCriteriaCustomization = ({
-  sortingCriteria: sortingCriteria.seriesSortCriteria.seriesInfoSortingCriteria
+  sortingCriteria: sortingCriteriaFn
 });
 ;// ../../../extensions/default/src/customizations/onDropHandlerCustomization.ts
 /* harmony default export */ const onDropHandlerCustomization = ({
@@ -10418,8 +10614,8 @@ function AboutModalDefault() {
     name
   } = (0,browser_detect_es5/* default */.A)();
   const browser = `${name[0].toUpperCase()}${name.substr(1)} ${version}`;
-  const versionNumber = "3.13.0-beta.8";
-  const commitHash = "4e9b5c2e228dabeb663df04e1a31e05dfa309588";
+  const versionNumber = "3.13.0-beta.81";
+  const commitHash = "2258c7957a18ed0f1a75d2bd5d379006797b2882";
   const [main, beta] = versionNumber.split('-');
   return /*#__PURE__*/react.createElement(ui_next_src/* AboutModal */.VTU, {
     className: "w-[400px]"
@@ -10450,16 +10646,50 @@ const {
   defaultLanguage,
   currentLanguage: currentLanguageFn
 } = i18n_src/* default */.A;
+const MODIFIER_OPTIONS = [{
+  value: '16',
+  label: 'Shift'
+}, {
+  value: '17',
+  label: 'Ctrl'
+}, {
+  value: '18',
+  label: 'Alt'
+}, {
+  value: '91',
+  label: 'Meta'
+}];
+const DEFAULT_TOOL_BINDINGS_STORAGE_KEY = 'user-preferred-tool-bindings';
+function getToolModifier(toolGroupService, toolGroupId, toolName, mouseButton) {
+  if (!toolGroupService) {
+    return null;
+  }
+  const bindings = toolGroupService.getToolBindings(toolGroupId, toolName);
+  if (!bindings?.length) {
+    return null;
+  }
+  const modifierBinding = bindings.find(binding => binding.mouseButton === mouseButton && binding.modifierKey != null && binding.numTouchPoints == null);
+  return modifierBinding?.modifierKey != null ? String(modifierBinding.modifierKey) : null;
+}
+function getModifierFromBindings(bindings, mouseButton) {
+  if (!bindings?.length) {
+    return null;
+  }
+  const modifierBinding = bindings.find(binding => binding.mouseButton === mouseButton && binding.modifierKey != null && binding.numTouchPoints == null);
+  return modifierBinding?.modifierKey != null ? String(modifierBinding.modifierKey) : null;
+}
 function UserPreferencesModalDefault({
   hide
 }) {
   const {
-    hotkeysManager
+    hotkeysManager,
+    servicesManager
   } = (0,src/* useSystem */.Jg)();
   const {
     t,
     i18n: i18nextInstance
   } = (0,es/* useTranslation */.Bd)('UserPreferencesModal');
+  const toolGroupService = servicesManager?.services?.toolGroupService;
   const {
     hotkeyDefinitions = {},
     hotkeyDefaults = {}
@@ -10476,9 +10706,12 @@ function UserPreferencesModalDefault({
   const resolvedHotkeyDefaults = Object.keys(hotkeyDefaults).length ? hotkeyDefaults : fallbackHotkeyDefinitions;
   const initialHotkeyDefinitions = Object.keys(hotkeyDefinitions).length ? hotkeyDefinitions : resolvedHotkeyDefaults;
   const currentLanguage = currentLanguageFn();
+  const initialCrosshairModifier = (0,react.useMemo)(() => getToolModifier(toolGroupService, 'mpr', 'Crosshairs', 1), [toolGroupService]);
+  const defaultCrosshairBindings = (0,react.useMemo)(() => toolGroupService?.getDefaultToolBindings?.('mpr', 'Crosshairs'), [toolGroupService]);
   const [state, setState] = (0,react.useState)({
     hotkeyDefinitions: initialHotkeyDefinitions,
-    languageValue: currentLanguage.value
+    languageValue: currentLanguage.value,
+    crosshairModifier: initialCrosshairModifier
   });
   const onLanguageChangeHandler = value => {
     setState(state => ({
@@ -10502,9 +10735,17 @@ function UserPreferencesModalDefault({
     setState(state => ({
       ...state,
       languageValue: defaultLanguage.value,
-      hotkeyDefinitions: resolvedHotkeyDefaults
+      hotkeyDefinitions: resolvedHotkeyDefaults,
+      crosshairModifier: getModifierFromBindings(defaultCrosshairBindings, 1)
     }));
     hotkeysManager.restoreDefaultBindings();
+    if (toolGroupService && defaultCrosshairBindings?.length) {
+      toolGroupService.setToolBindings('mpr', 'Crosshairs', defaultCrosshairBindings);
+      toolGroupService.applyToolBindings('mpr', 'Crosshairs', {
+        replaceExisting: true
+      });
+    }
+    toolGroupService?.removePersistedToolBindings('mpr', 'Crosshairs');
   };
   const displayNames = react.useMemo(() => {
     if (typeof Intl === 'undefined' || typeof Intl.DisplayNames !== 'function') {
@@ -10561,7 +10802,32 @@ function UserPreferencesModalDefault({
     onChange: newKeys => onHotkeyChangeHandler(id, newKeys),
     placeholder: definition.keys,
     hotkeys: src/* hotkeys */.ot
-  })))), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Left, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Auxiliary, {
+  }))), state.crosshairModifier != null && /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(ui_next_src/* UserPreferencesModal */.xMy.SubHeading, null, t('ModifierKeys', {
+    defaultValue: 'Modifier Keys'
+  })), /*#__PURE__*/react.createElement(ui_next_src/* UserPreferencesModal */.xMy.HotkeysGrid, null, /*#__PURE__*/react.createElement("div", {
+    className: "flex items-center justify-between gap-2"
+  }, /*#__PURE__*/react.createElement("span", {
+    className: "text-foreground text-base"
+  }, t('CrosshairsModifier', {
+    defaultValue: 'Crosshairs'
+  })), /*#__PURE__*/react.createElement("div", {
+    className: "flex items-center gap-1.5"
+  }, /*#__PURE__*/react.createElement("span", {
+    className: "text-muted-foreground text-sm"
+  }, t('PlusLeftClick', {
+    defaultValue: 'Left Click +'
+  })), /*#__PURE__*/react.createElement(ui_next_src/* Select */.l6P, {
+    value: state.crosshairModifier,
+    onValueChange: val => setState(s => ({
+      ...s,
+      crosshairModifier: val
+    }))
+  }, /*#__PURE__*/react.createElement(ui_next_src/* SelectTrigger */.bqE, {
+    className: "w-16"
+  }, /*#__PURE__*/react.createElement(ui_next_src/* SelectValue */.yvm, null)), /*#__PURE__*/react.createElement(ui_next_src/* SelectContent */.gCo, null, MODIFIER_OPTIONS.map(opt => /*#__PURE__*/react.createElement(ui_next_src/* SelectItem */.ebT, {
+    key: opt.value,
+    value: opt.value
+  }, opt.label))))))))), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Left, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Auxiliary, {
     onClick: onResetHandler
   }, t('Reset to defaults'))), /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Right, null, /*#__PURE__*/react.createElement(ui_next_src/* FooterAction */.esu.Secondary, {
     onClick: () => {
@@ -10578,6 +10844,17 @@ function UserPreferencesModalDefault({
         return; // Exit early since we're reloading
       }
       hotkeysManager.setHotkeys(state.hotkeyDefinitions);
+      if (toolGroupService && state.crosshairModifier != null) {
+        const bindings = [{
+          mouseButton: 1,
+          modifierKey: Number(state.crosshairModifier)
+        }];
+        toolGroupService.setToolBindings('mpr', 'Crosshairs', bindings);
+        toolGroupService.applyToolBindings('mpr', 'Crosshairs', {
+          replaceExisting: true
+        });
+        toolGroupService.persistToolBindings('mpr', 'Crosshairs', bindings);
+      }
       src/* hotkeys */.ot.stopRecord();
       src/* hotkeys */.ot.unpause();
       hide();
@@ -10585,13 +10862,15 @@ function UserPreferencesModalDefault({
   }, t('Save')))));
 }
 /* harmony default export */ const userPreferencesCustomization = ({
-  'ohif.userPreferencesModal': UserPreferencesModalDefault
+  'ohif.userPreferencesModal': UserPreferencesModalDefault,
+  'ohif.userPreferences.toolBindingsStorageKey': DEFAULT_TOOL_BINDINGS_STORAGE_KEY
 });
 ;// ../../../extensions/default/src/customizations/reportDialogCustomization.tsx
 
 
 
 
+
 function ReportDialog({
   dataSources,
   modality = 'SR',
@@ -10599,11 +10878,16 @@ function ReportDialog({
   minSeriesNumber = 3000,
   hide,
   onSave,
-  onCancel
+  onCancel,
+  enableDownload = false
 }) {
+  const {
+    t
+  } = (0,es/* useTranslation */.Bd)('Buttons');
   const {
     servicesManager
   } = (0,src/* useSystem */.Jg)();
+  const actionTakenRef = (0,react.useRef)(false);
   const [selectedDataSource, setSelectedDataSource] = (0,react.useState)(dataSources?.[0]?.value ?? null);
   const {
     displaySetService
@@ -10632,6 +10916,7 @@ function ReportDialog({
     setReportName(newReportName);
   }, [selectedSeries, seriesOptions]);
   const handleSave = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
     onSave({
       reportName,
       dataSource: selectedDataSource,
@@ -10641,10 +10926,31 @@ function ReportDialog({
     hide();
   }, [selectedDataSource, selectedSeries, reportName, hide, onSave]);
   const handleCancel = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
     onCancel();
     hide();
   }, [onCancel, hide]);
+  const handleDownload = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
+    onSave({
+      reportName,
+      dataSource: 'download',
+      priorSeriesNumber: Math.max(...seriesOptions.map(it => it.seriesNumber)),
+      series: selectedSeries
+    });
+    hide();
+  }, [selectedDataSource, selectedSeries, reportName, hide, onSave]);
+
+  // Handles the close dialog button/external close as a cancel
+  (0,react.useEffect)(() => {
+    return () => {
+      if (!actionTakenRef.current) {
+        onCancel();
+      }
+    };
+  }, [onCancel]);
   const showDataSourceSelect = dataSources?.length > 1;
+  const showDownloadButton = enableDownload;
   return /*#__PURE__*/react.createElement("div", {
     className: "text-foreground flex min-w-[400px] max-w-md flex-col"
   }, /*#__PURE__*/react.createElement("div", {
@@ -10701,9 +11007,9 @@ function ReportDialog({
     disabled: !!selectedSeries
   })))), /*#__PURE__*/react.createElement("div", {
     className: "flex justify-end gap-2"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.Actions, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsSecondary, {
-    onClick: handleCancel
-  }, "Cancel"), /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsPrimary, {
+  }, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.Actions, null, showDownloadButton && /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsSecondary, {
+    onClick: handleDownload
+  }, t('Download')), /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsPrimary, {
     onClick: handleSave
   }, "Save"))))));
 }
@@ -11611,11 +11917,12 @@ function promptLabelAnnotation({
 // EXTERNAL MODULE: ../../../extensions/default/src/Panels/StudyBrowser/PanelStudyBrowserHeader.tsx
 var PanelStudyBrowserHeader = __webpack_require__(3329);
 ;// ../../../extensions/default/src/utils/addIcon.ts
+/* unused harmony import specifier */ var Icons;
 
 
 /** Adds the icon to both ui and ui-next */
 function addIcon(name, icon) {
-  ui_next_src/* Icons */.FI1.addIcon(name, icon);
+  Icons.addIcon(name, icon);
 }
 ;// ../../../extensions/default/src/utils/Toolbox.tsx
 function Toolbox_extends() { return Toolbox_extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, Toolbox_extends.apply(null, arguments); }
@@ -11723,7 +12030,7 @@ function Toolbox({
       })));
     }));
   }), activeToolOptions && /*#__PURE__*/react.createElement("div", {
-    className: "bg-primary-dark mt-1 h-auto px-2"
+    className: "bg-muted mt-1 h-auto px-2"
   }, /*#__PURE__*/react.createElement(ui_next_src/* ToolSettings */.k_3, {
     options: activeToolOptions
   }))));
@@ -11807,10 +12114,10 @@ const defaultExtension = {
 /* harmony default export */ const default_src = (defaultExtension);
 
 
-/***/ }),
+/***/ },
 
-/***/ 96357:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+/***/ 96357
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
@@ -11825,6 +12132,6 @@ const RESPONSE = {
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (RESPONSE);
 
-/***/ })
+/***/ }
 
 }]);