@cornerstonejs/core 4.18.1 → 4.18.2

package/dist/esm/RenderingEngine/ContextPoolRenderingEngine.js

@@ -9,7 +9,7 @@ import VolumeViewport from './VolumeViewport';
 import StackViewport from './StackViewport';
 import VolumeViewport3D from './VolumeViewport3D';
 import viewportTypeUsesCustomRenderingPipeline from './helpers/viewportTypeUsesCustomRenderingPipeline';
-import getOrCreateCanvas from './helpers/getOrCreateCanvas';
+import getOrCreateCanvas, { updateCanvasSizeAndAspectRatio, } from './helpers/getOrCreateCanvas';
 class ContextPoolRenderingEngine extends BaseRenderingEngine {
     constructor(id) {
         super(id);
@@ -47,6 +47,7 @@ class ContextPoolRenderingEngine extends BaseRenderingEngine {
         const viewportsDrivenByVtkJs = viewports.filter((vp) => viewportTypeUsesCustomRenderingPipeline(vp.type) === false);
         const canvasesDrivenByVtkJs = viewportsDrivenByVtkJs.map((vp) => vp.canvas);
         const canvas = getOrCreateCanvas(viewportInputEntry.element);
+        updateCanvasSizeAndAspectRatio(canvas);
         canvasesDrivenByVtkJs.push(canvas);
         const internalViewportEntry = { ...viewportInputEntry, canvas };
         this.addVtkjsDrivenViewport(internalViewportEntry);
@@ -113,12 +114,7 @@ class ContextPoolRenderingEngine extends BaseRenderingEngine {
     setVtkjsDrivenViewports(viewportInputEntries) {
         if (viewportInputEntries.length) {
             const vtkDrivenCanvases = viewportInputEntries.map((vp) => getOrCreateCanvas(vp.element));
-            vtkDrivenCanvases.forEach((canvas) => {
-                const devicePixelRatio = window.devicePixelRatio || 1;
-                const rect = canvas.getBoundingClientRect();
-                canvas.width = rect.width * devicePixelRatio;
-                canvas.height = rect.height * devicePixelRatio;
-            });
+            vtkDrivenCanvases.forEach((canvas) => updateCanvasSizeAndAspectRatio(canvas));
             for (let i = 0; i < viewportInputEntries.length; i++) {
                 const vtkDrivenViewportInputEntry = viewportInputEntries[i];
                 const canvas = vtkDrivenCanvases[i];
@@ -290,12 +286,7 @@ class ContextPoolRenderingEngine extends BaseRenderingEngine {
         const { element, canvas, id: viewportId, renderingEngineId, suppressEvents, } = viewport;
         const dWidth = viewport.sWidth;
         const dHeight = viewport.sHeight;
-        if (canvas.width !== dWidth ||
-            (canvas.height !== dHeight && dWidth >= 1 && dHeight >= 1)) {
-            canvas.width = dWidth;
-            canvas.height = dHeight;
-            canvas.style.aspectRatio = `${dWidth} / ${dHeight}`;
-        }
+        updateCanvasSizeAndAspectRatio(canvas, { width: dWidth, height: dHeight });
         const onScreenContext = canvas.getContext('2d');
         const contextIndex = this.contextPool.getContextIndexForViewport(viewportId);
         const maxSize = this.contextPool.getMaxSizeForContext(contextIndex);

package/dist/esm/RenderingEngine/helpers/getOrCreateCanvas.d.ts

@@ -2,5 +2,10 @@ export declare const EPSILON = 0.0001;
 export declare function createCanvas(element: Element | HTMLDivElement, width?: number, height?: number): HTMLCanvasElement;
 export declare function createViewportElement(element: HTMLDivElement): HTMLDivElement;
 export declare function setCanvasCreator(canvasCreatorArg: any): void;
+export type ViewportCanvasExtent = HTMLCanvasElement | {
+    width: number;
+    height: number;
+};
+export declare function updateCanvasSizeAndAspectRatio(canvas: HTMLCanvasElement, extentOrOffscreen?: ViewportCanvasExtent): boolean | undefined;
 export declare function getOrCreateCanvas(element: HTMLDivElement): HTMLCanvasElement;
 export default getOrCreateCanvas;

package/dist/esm/RenderingEngine/helpers/getOrCreateCanvas.js

@@ -30,6 +30,32 @@ export function createViewportElement(element) {
 export function setCanvasCreator(canvasCreatorArg) {
     canvasCreator = canvasCreatorArg;
 }
+export function updateCanvasSizeAndAspectRatio(canvas, extentOrOffscreen) {
+    if (extentOrOffscreen === undefined) {
+        const devicePixelRatio = window.devicePixelRatio || 1;
+        const rect = canvas.getBoundingClientRect();
+        const w = Math.round(rect.width * devicePixelRatio);
+        const h = Math.round(rect.height * devicePixelRatio);
+        if (w > 0 && h > 0) {
+            canvas.width = w;
+            canvas.height = h;
+            canvas.style.aspectRatio = `${w} / ${h}`;
+        }
+        return undefined;
+    }
+    const { width: targetW, height: targetH } = extentOrOffscreen;
+    if (targetW < 1 || targetH < 1) {
+        return false;
+    }
+    const needsUpdate = canvas.width !== targetW || canvas.height !== targetH;
+    if (needsUpdate) {
+        canvas.width = targetW;
+        canvas.height = targetH;
+        canvas.style.aspectRatio = `${targetW} / ${targetH}`;
+        return true;
+    }
+    return false;
+}
 export function getOrCreateCanvas(element) {
     const canvasSelector = `canvas.${CANVAS_CSS_CLASS}`;
     const viewportElement = `div.${VIEWPORT_ELEMENT}`;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.18.1";
+export declare const version = "4.18.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.18.1';
+export const version = '4.18.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.18.1",
+  "version": "4.18.2",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "1fc5684032269b1b1e3e3733cd891d48c27303f7"
+  "gitHead": "a978600e12def8b794ce0c1045e61bd4fc646851"
 }