@niivue/nv-ohif 1.0.0-rc.2 → 1.0.0-rc.4

package/dist/index.js

@@ -1421,7 +1421,6 @@ function ohifToolToAnnotationTool(tool) {
       return null;
   }
 }
-var UNSUPPORTED_MEASUREMENT_TOOLS = new Set;
 function ohifToolToDragMode(tool) {
   switch (tool) {
     case "WindowLevel":
@@ -1433,10 +1432,6 @@ function ohifToolToDragMode(tool) {
     case "Angle":
     case "CobbAngle":
       return DRAG_MODE.angle;
-    case "RectangleROI":
-    case "EllipticalROI":
-    case "CircleROI":
-      return DRAG_MODE.roiSelection;
     default:
       return DRAG_MODE.crosshair;
   }
@@ -1973,6 +1968,16 @@ function NiivueViewport(props) {
     if (!container)
       return;
     let disposed = false;
+    let noteTimeout;
+    const flashNote = (message, ms = 2000) => {
+      window.clearTimeout(noteTimeout);
+      const note = { kind: "note", message };
+      setStatus(note);
+      noteTimeout = window.setTimeout(() => {
+        noteTimeout = undefined;
+        setStatus((current) => current === note ? { kind: "idle" } : current);
+      }, ms);
+    };
     let annotationOverlay = null;
     let unregisterAnnotation = null;
     const canvas = document.createElement("canvas");
@@ -2008,8 +2013,7 @@ function NiivueViewport(props) {
       if (!wl)
         return;
       const message = `W: ${Math.round(wl.window)}  L: ${Math.round(wl.level)}`;
-      setStatus({ kind: "note", message });
-      window.setTimeout(() => setStatus((s) => s.kind === "note" && s.message === message ? { kind: "idle" } : s), 2000);
+      flashNote(message);
     };
     canvas.addEventListener("pointerup", onPointerUp);
     const onAnnotationAdded = (e) => {
@@ -2024,8 +2028,7 @@ function NiivueViewport(props) {
       if (!added || !stats)
         return;
       const message = stats.length !== undefined ? `Length: ${stats.length.toFixed(1)} mm` : `Area: ${stats.area.toFixed(1)} mm²`;
-      setStatus({ kind: "note", message });
-      window.setTimeout(() => setStatus((s) => s.kind === "note" && s.message === message ? { kind: "idle" } : s), 2000);
+      flashNote(message);
     };
     const onAnnotationRemoved = (e) => {
       const id = e.detail?.id;
@@ -2044,6 +2047,7 @@ function NiivueViewport(props) {
     const unsubscribeLabelSync = subscribeOhifLabelSync(servicesManagerRef.current);
     return () => {
       disposed = true;
+      window.clearTimeout(noteTimeout);
       setReady(false);
       clearNiivueAnnotations(viewportId, servicesManagerRef.current);
       unregisterNiivue(viewportId);
@@ -2247,11 +2251,6 @@ function NiivueViewport(props) {
       } else {
         nv.annotationIsEnabled = false;
         nv.primaryDragMode = ohifToolToDragMode(tool);
-        if (tool && UNSUPPORTED_MEASUREMENT_TOOLS.has(tool)) {
-          const message = `${tool} is not supported in NiiVue`;
-          setStatus({ kind: "note", message });
-          window.setTimeout(() => setStatus((s) => s.kind === "note" && s.message === message ? { kind: "idle" } : s), 2500);
-        }
       }
       slideViewRef.current?.setTool(tool);
     };
@@ -2481,6 +2480,31 @@ function getNiivueSopClassHandlerModule() {
         const seriesUID = String(first2.SeriesInstanceUID ?? "");
         const imageIds = instances2.map((inst) => inst.imageId).filter((id) => typeof id === "string");
         const description = String(first2.SeriesDescription ?? "Whole-slide image");
+        let thumbnailPromise;
+        const getThumbnailSrc = (options) => {
+          const signal = options?.signal;
+          if (signal?.aborted)
+            return Promise.resolve(null);
+          thumbnailPromise ??= fetchWsiThumbnailObjectUrl(instances2, authHeaders(undefined)).then((src) => {
+            if (src === null)
+              thumbnailPromise = undefined;
+            return src;
+          }, () => {
+            thumbnailPromise = undefined;
+            return null;
+          });
+          if (!signal)
+            return thumbnailPromise;
+          const pending = thumbnailPromise;
+          return new Promise((resolve) => {
+            const onAbort = () => resolve(null);
+            signal.addEventListener("abort", onAbort, { once: true });
+            pending.then((src) => {
+              signal.removeEventListener("abort", onAbort);
+              resolve(signal.aborted ? null : src);
+            });
+          });
+        };
         const displaySet = {
           displaySetInstanceUID: `${seriesUID}-niivue-wsi`,
           SOPClassHandlerId: NIIVUE_SOP_CLASS_HANDLER_ID,
@@ -2494,7 +2518,7 @@ function getNiivueSopClassHandlerModule() {
           numInstances: instances2.length,
           instances: instances2,
           imageIds,
-          getThumbnailSrc: (options) => fetchWsiThumbnailObjectUrl(instances2, authHeaders(undefined), options?.signal),
+          getThumbnailSrc,
           label: description
         };
         return [displaySet];

package/dist/types/toolBridge.d.ts

@@ -7,10 +7,5 @@ import { type AnnotationTool } from '@niivue/niivue';
  * compute ROI stats (area/mean) and fire `annotationAdded` with them.
  */
 export declare function ohifToolToAnnotationTool(tool: string | undefined): AnnotationTool | null;
-/**
- * OHIF measurement tools NiiVue cannot back yet (no core primitive). Activating
- * one shows a brief 'not supported' status and keeps safe crosshair navigation.
- */
-export declare const UNSUPPORTED_MEASUREMENT_TOOLS: ReadonlySet<string>;
 /** Map an OHIF primary tool name to NiiVue's matching left-drag mode. */
 export declare function ohifToolToDragMode(tool: string | undefined): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@niivue/nv-ohif",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "private": false,
   "type": "module",
   "description": "NiiVue viewport extension for the OHIF Viewer (render series with NiiVue: 3D volume rendering, meshes, overlays, multiplanar, drawing).",
@@ -28,18 +28,18 @@
   },
   "comment:peers": "The host OHIF app (>= 3.12, React 18) provides @ohif/core, @ohif/extension-default and react-dom. They are intentionally NOT peerDependencies here: bun would install the whole OHIF tree (pinned to react-dom 18) into this monorepo, colliding with @niivue/nvreact (React 19). This package builds against local OHIF typings (src/ohif-types.ts) and externalizes react. The react peer allows 18 or 19 so bun reuses the monorepo's React 19 for dev; the component's simple hook usage is compatible with both, and the OHIF host supplies React 18 at runtime.",
   "peerDependencies": {
-    "@niivue/niivue": "1.0.0-rc.15",
+    "@niivue/niivue": "1.0.0-rc.17",
     "react": "^18.3.1 || ^19"
   },
   "comment:dcm2niix-pin": "The dcm2niix Web-Worker exit fix (wrap callMain in try/catch, read err.status) is PUBLISHED: @niivue/dcm2niix 1.3.20260724 (calendar-versioned, now npm 'latest') contains it (verified in the published dist/worker.js + worker.jpeg.js). The pin requires that fixed release or newer, so DICOM conversion now works for npm-install consumers. The dev-rig local-patched dcm2niix override can be dropped in favor of the published package. See README '## DICOM support'.",
   "comment:uikit-dep": "@niivue/uikit is externalized in build:lib and is a runtime dependency (its ruler/line/text overlays, loadDefaultFont, and the inlined MSDF font are imported at runtime, not bundled). It is published from this monorepo in the same Nx release group, so `npm install @niivue/nv-ohif` resolves it. The workspace range is rewritten to the published version on pack/release. Its only @niivue/niivue import is type-only, so no niivue runtime is duplicated.",
   "dependencies": {
     "@niivue/dcm2niix": "^1.3.20260724",
-    "@niivue/uikit": "1.0.0-rc.2",
+    "@niivue/uikit": "1.0.0-rc.4",
     "dcmjs": "^0.49.0"
   },
   "devDependencies": {
-    "@niivue/niivue": "1.0.0-rc.15",
+    "@niivue/niivue": "1.0.0-rc.17",
     "@types/bun": "^1.3.12",
     "@types/react": "^19",
     "@types/react-dom": "^19",