@cornerstonejs/core 5.6.13 → 5.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/RenderingEngine/BaseRenderingEngine.js +3 -0
- package/dist/esm/RenderingEngine/ContextPoolRenderingEngine.js +2 -0
- package/dist/esm/RenderingEngine/TiledRenderingEngine.js +2 -0
- package/dist/esm/RenderingEngine/helpers/elementTouchAction.d.ts +2 -0
- package/dist/esm/RenderingEngine/helpers/elementTouchAction.js +32 -0
- package/dist/esm/utilities/getCurrentVolumeViewportSlice.js +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +6 -6
|
@@ -6,6 +6,7 @@ import triggerEvent from '../utilities/triggerEvent.js';
|
|
|
6
6
|
import ViewportType from '../enums/ViewportType.js';
|
|
7
7
|
import viewportTypeUsesCustomRenderingPipeline, { viewportUsesCustomRenderingPipeline, } from './helpers/viewportTypeUsesCustomRenderingPipeline.js';
|
|
8
8
|
import getOrCreateCanvas from './helpers/getOrCreateCanvas.js';
|
|
9
|
+
import { setElementTouchActionNone, restoreElementTouchAction, } from './helpers/elementTouchAction.js';
|
|
9
10
|
import { getShouldUseCPURendering, getUseGenericViewport, isCornerstoneInitialized, getConfiguration, } from '../init.js';
|
|
10
11
|
import { getViewportClassForInput } from './helpers/viewportTypeToViewportClass.js';
|
|
11
12
|
import ViewportStatus from '../enums/ViewportStatus.js';
|
|
@@ -234,6 +235,7 @@ class BaseRenderingEngine {
|
|
|
234
235
|
addCustomViewport(viewportInputEntry) {
|
|
235
236
|
const { element, viewportId, type, defaultOptions } = viewportInputEntry;
|
|
236
237
|
element.tabIndex = -1;
|
|
238
|
+
setElementTouchActionNone(element);
|
|
237
239
|
const canvas = getOrCreateCanvas(element);
|
|
238
240
|
const { clientWidth, clientHeight } = canvas;
|
|
239
241
|
if (canvas.width !== clientWidth || canvas.height !== clientHeight) {
|
|
@@ -309,6 +311,7 @@ class BaseRenderingEngine {
|
|
|
309
311
|
viewport.destroy?.();
|
|
310
312
|
element.removeAttribute('data-viewport-uid');
|
|
311
313
|
element.removeAttribute('data-rendering-engine-uid');
|
|
314
|
+
restoreElementTouchAction(element);
|
|
312
315
|
const context = canvas.getContext('2d');
|
|
313
316
|
context.clearRect(0, 0, canvas.width, canvas.height);
|
|
314
317
|
}
|
|
@@ -7,6 +7,7 @@ import triggerEvent from '../utilities/triggerEvent.js';
|
|
|
7
7
|
import ViewportType from '../enums/ViewportType.js';
|
|
8
8
|
import viewportTypeUsesCustomRenderingPipeline, { viewportUsesCustomRenderingPipeline, } from './helpers/viewportTypeUsesCustomRenderingPipeline.js';
|
|
9
9
|
import getOrCreateCanvas, { updateCanvasSizeAndAspectRatio, } from './helpers/getOrCreateCanvas.js';
|
|
10
|
+
import { setElementTouchActionNone } from './helpers/elementTouchAction.js';
|
|
10
11
|
import { getViewportClassForInput } from './helpers/viewportTypeToViewportClass.js';
|
|
11
12
|
import { isGenericViewport } from '../utilities/viewportCapabilities.js';
|
|
12
13
|
class ContextPoolRenderingEngine extends BaseRenderingEngine {
|
|
@@ -61,6 +62,7 @@ class ContextPoolRenderingEngine extends BaseRenderingEngine {
|
|
|
61
62
|
const contextPool = this.ensureContextPool();
|
|
62
63
|
const { element, canvas, viewportId, type, defaultOptions } = viewportInputEntry;
|
|
63
64
|
element.tabIndex = -1;
|
|
65
|
+
setElementTouchActionNone(element);
|
|
64
66
|
let contextIndex = 0;
|
|
65
67
|
if (type === ViewportType.STACK) {
|
|
66
68
|
const contexts = contextPool.getAllContexts();
|
|
@@ -6,6 +6,7 @@ import viewportTypeUsesCustomRenderingPipeline from './helpers/viewportTypeUsesC
|
|
|
6
6
|
import getOrCreateCanvas from './helpers/getOrCreateCanvas.js';
|
|
7
7
|
import { vtkOffscreenMultiRenderWindow } from './vtkClasses/index.js';
|
|
8
8
|
import { attachWebGLContextEvents } from './helpers/attachWebGLContextEvents.js';
|
|
9
|
+
import { setElementTouchActionNone } from './helpers/elementTouchAction.js';
|
|
9
10
|
import { getViewportClassForInput } from './helpers/viewportTypeToViewportClass.js';
|
|
10
11
|
class TiledRenderingEngine extends BaseRenderingEngine {
|
|
11
12
|
constructor(id) {
|
|
@@ -71,6 +72,7 @@ class TiledRenderingEngine extends BaseRenderingEngine {
|
|
|
71
72
|
this.ensureOffscreenResources();
|
|
72
73
|
const { element, canvas, viewportId, type, defaultOptions } = viewportInputEntry;
|
|
73
74
|
element.tabIndex = -1;
|
|
75
|
+
setElementTouchActionNone(element);
|
|
74
76
|
const { offScreenCanvasWidth, offScreenCanvasHeight, xOffset } = offscreenCanvasProperties;
|
|
75
77
|
const { sxStartDisplayCoords, syStartDisplayCoords, sxEndDisplayCoords, syEndDisplayCoords, sx, sy, sWidth, sHeight, } = this._getViewportCoordsOnOffScreenCanvas(viewportInputEntry, offScreenCanvasWidth, offScreenCanvasHeight, xOffset);
|
|
76
78
|
this.offscreenMultiRenderWindow.addRenderer({
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
const MANAGED_PROPERTIES = [
|
|
2
|
+
{ name: 'touch-action', attribute: 'data-prior-touch-action' },
|
|
3
|
+
{ name: 'user-select', attribute: 'data-prior-user-select' },
|
|
4
|
+
{ name: '-webkit-user-select', attribute: 'data-prior-webkit-user-select' },
|
|
5
|
+
{
|
|
6
|
+
name: '-webkit-touch-callout',
|
|
7
|
+
attribute: 'data-prior-webkit-touch-callout',
|
|
8
|
+
},
|
|
9
|
+
];
|
|
10
|
+
export function setElementTouchActionNone(element) {
|
|
11
|
+
MANAGED_PROPERTIES.forEach(({ name, attribute }) => {
|
|
12
|
+
if (!element.hasAttribute(attribute)) {
|
|
13
|
+
element.setAttribute(attribute, element.style.getPropertyValue(name));
|
|
14
|
+
}
|
|
15
|
+
element.style.setProperty(name, 'none');
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
export function restoreElementTouchAction(element) {
|
|
19
|
+
MANAGED_PROPERTIES.forEach(({ name, attribute }) => {
|
|
20
|
+
if (!element.hasAttribute(attribute)) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const priorValue = element.getAttribute(attribute);
|
|
24
|
+
if (priorValue) {
|
|
25
|
+
element.style.setProperty(name, priorValue);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
element.style.removeProperty(name);
|
|
29
|
+
}
|
|
30
|
+
element.removeAttribute(attribute);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
@@ -15,7 +15,7 @@ function getCurrentVolumeViewportSlice(viewport) {
|
|
|
15
15
|
const maxIJKRowVec = Math.max(Math.abs(ijkRowVec[0]), Math.abs(ijkRowVec[1]), Math.abs(ijkRowVec[2]));
|
|
16
16
|
const maxIJKColVec = Math.max(Math.abs(ijkColVec[0]), Math.abs(ijkColVec[1]), Math.abs(ijkColVec[2]));
|
|
17
17
|
if (!glMatrix.equals(1, maxIJKRowVec) || !glMatrix.equals(1, maxIJKColVec)) {
|
|
18
|
-
throw new Error('
|
|
18
|
+
throw new Error('getCurrentVolumeViewportSlice is not available for rotate/oblique viewports');
|
|
19
19
|
}
|
|
20
20
|
const { voxelManager } = viewport.getImageData();
|
|
21
21
|
const sliceViewInfo = viewport.getSliceViewInfo();
|
package/dist/esm/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "5.
|
|
1
|
+
export declare const version = "5.7.0";
|
package/dist/esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '5.
|
|
1
|
+
export const version = '5.7.0';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/core",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.7.0",
|
|
4
4
|
"description": "Cornerstone3D Core",
|
|
5
5
|
"module": "./dist/esm/index.js",
|
|
6
6
|
"types": "./dist/esm/index.d.ts",
|
|
@@ -85,18 +85,18 @@
|
|
|
85
85
|
"prepublishOnly": "pnpm run build"
|
|
86
86
|
},
|
|
87
87
|
"dependencies": {
|
|
88
|
-
"@cornerstonejs/utils": "5.
|
|
88
|
+
"@cornerstonejs/utils": "5.7.0",
|
|
89
89
|
"@kitware/vtk.js": "36.4.1",
|
|
90
90
|
"comlink": "4.4.2",
|
|
91
91
|
"gl-matrix": "3.4.3",
|
|
92
92
|
"loglevel": "1.9.2"
|
|
93
93
|
},
|
|
94
94
|
"devDependencies": {
|
|
95
|
-
"@cornerstonejs/metadata": "5.
|
|
95
|
+
"@cornerstonejs/metadata": "5.7.0"
|
|
96
96
|
},
|
|
97
97
|
"peerDependencies": {
|
|
98
|
-
"@cornerstonejs/metadata": "5.
|
|
99
|
-
"@cornerstonejs/utils": "5.
|
|
98
|
+
"@cornerstonejs/metadata": "5.7.0",
|
|
99
|
+
"@cornerstonejs/utils": "5.7.0"
|
|
100
100
|
},
|
|
101
101
|
"contributors": [
|
|
102
102
|
{
|
|
@@ -109,5 +109,5 @@
|
|
|
109
109
|
"type": "individual",
|
|
110
110
|
"url": "https://ohif.org/donate"
|
|
111
111
|
},
|
|
112
|
-
"gitHead": "
|
|
112
|
+
"gitHead": "49e9ce38a3d34844f5b5a58e0e796469b7ea50bd"
|
|
113
113
|
}
|