@cornerstonejs/tools 2.0.0-beta.10 → 2.0.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -35,7 +35,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^2.0.0-beta.10",
+    "@cornerstonejs/core": "^2.0.0-beta.11",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -65,5 +65,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "134ced7eda99db84aaeb01fe15327b9607110b25"
+  "gitHead": "03dda9f60abcef9bd7e6fdb4a77df7cf7fc25595"
 }

package/src/eventDispatchers/annotationModifiedEventDispatcher.ts

@@ -18,7 +18,7 @@ import { AnnotationModifiedEventType } from '../types/EventTypes';
 const onAnnotationModified = function (evt: AnnotationModifiedEventType) {
   const { viewportId, renderingEngineId } = evt.detail;
   const renderingEngine = getRenderingEngine(renderingEngineId);
-  triggerAnnotationRenderForViewportIds(renderingEngine, [viewportId]);
+  triggerAnnotationRenderForViewportIds([viewportId]);
 };
 
 const enable = function () {

package/src/eventListeners/annotations/annotationModifiedListener.ts

@@ -1,4 +1,3 @@
-import { getRenderingEngine } from '@cornerstonejs/core';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 
 /**
@@ -14,9 +13,8 @@ import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnota
  * no svg update happens since the attributes for handles are the same)
  */
 function annotationModifiedListener(evt): void {
-  const { viewportId, renderingEngineId } = evt.detail;
-  const renderingEngine = getRenderingEngine(renderingEngineId);
-  triggerAnnotationRenderForViewportIds(renderingEngine, [viewportId]);
+  const { viewportId } = evt.detail;
+  triggerAnnotationRenderForViewportIds([viewportId]);
 }
 
 export default annotationModifiedListener;

package/src/eventListeners/annotations/annotationSelectionListener.ts

@@ -22,7 +22,7 @@ function annotationSelectionListener(evt): void {
   renderingEngines.forEach((renderingEngine) => {
     const viewports = renderingEngine.getViewports();
     const viewportIds = viewports.map((vp) => vp.id);
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIds);
+    triggerAnnotationRenderForViewportIds(viewportIds);
   });
 }
 

package/src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts

@@ -237,8 +237,6 @@ export function createPolylineHole(
   );
 
   const { element } = viewport;
-  const enabledElement = getEnabledElement(element);
-  const { renderingEngine } = enabledElement;
 
   // Updating a Spline contours, for example, should also update freehand contours
   const updatedToolNames = new Set([
@@ -252,7 +250,7 @@ export function createPolylineHole(
       element,
       toolName
     );
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   }
 }
 
@@ -430,7 +428,6 @@ function combinePolylines(
 function updateViewports(enabledElement, targetAnnotation, sourceAnnotation) {
   const { viewport } = enabledElement;
   const { element } = viewport;
-  const { renderingEngine } = enabledElement;
 
   const updatedTtoolNames = new Set([
     DEFAULT_CONTOUR_SEG_TOOLNAME,
@@ -443,7 +440,7 @@ function updateViewports(enabledElement, targetAnnotation, sourceAnnotation) {
       element,
       toolName
     );
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   }
 
   return new Promise((resolve) => window.requestAnimationFrame(resolve));

package/src/eventListeners/keyboard/keyDownListener.ts

@@ -1,5 +1,4 @@
 import { getEnabledElement, triggerEvent } from '@cornerstonejs/core';
-import cloneDeep from 'lodash.clonedeep';
 import Events from '../../enums/Events';
 import { KeyDownEventDetail, KeyUpEventDetail } from '../../types/EventTypes';
 

package/src/stateManagement/segmentation/SegmentationStateManager.ts

@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash.clonedeep';
 import type { Types } from '@cornerstonejs/core';
 import { utilities as csUtils } from '@cornerstonejs/core';
 
@@ -450,7 +449,7 @@ export default class SegmentationStateManager {
       console.warn('Color LUT table already exists, overwriting');
     }
 
-    this.state.colorLUT[lutIndex] = cloneDeep(colorLUT);
+    this.state.colorLUT[lutIndex] = structuredClone(colorLUT);
   }
 
   /**

package/src/stateManagement/segmentation/addSegmentationRepresentation.ts

@@ -1,4 +1,4 @@
-import { getRenderingEngine, utilities } from '@cornerstonejs/core';
+import { utilities } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import {
   SegmentationRepresentationConfig,
@@ -79,9 +79,8 @@ async function addSegmentationRepresentation(
   if (representationInput.type === SegmentationRepresentations.Contour) {
     getToolGroup(toolGroupId)
       .getViewportsInfo()
-      .forEach(({ viewportId, renderingEngineId }) => {
-        const renderingEngine = getRenderingEngine(renderingEngineId);
-        triggerAnnotationRenderForViewportIds(renderingEngine, [viewportId]);
+      .forEach(({ viewportId }) => {
+        triggerAnnotationRenderForViewportIds([viewportId]);
       });
   }
 

package/src/store/ToolGroupManager/ToolGroup.ts

@@ -1,6 +1,5 @@
 import { MouseBindings, ToolModes } from '../../enums';
 import get from 'lodash.get';
-import cloneDeep from 'lodash.clonedeep';
 import {
   triggerEvent,
   eventTarget,

package/src/store/state.ts

@@ -1,7 +1,6 @@
 import { IToolGroup, IToolClassReference } from '../types';
 import Synchronizer from './SynchronizerManager/Synchronizer';
 import svgNodeCache, { resetSvgNodeCache } from './svgNodeCache';
-import cloneDeep from 'lodash.clonedeep';
 
 interface ICornerstoneTools3dState {
   isInteractingWithTool: boolean;

package/src/tools/AdvancedMagnifyTool.ts

@@ -186,7 +186,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
     );
 
     evt.preventDefault();
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return annotation;
   };
@@ -267,10 +267,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
 
     this._activateModify(element);
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   };
@@ -304,10 +301,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
 
     hideElementCursor(element);
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   };
@@ -325,13 +319,10 @@ class AdvancedMagnifyTool extends AnnotationTool {
 
     resetElementCursor(element);
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
     this.editData = null;
     this.isDrawing = false;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     if (newAnnotation) {
       triggerAnnotationCompleted(annotation);
@@ -341,10 +332,8 @@ class AdvancedMagnifyTool extends AnnotationTool {
   _dragDrawCallback = (evt: EventTypes.InteractionEventType): void => {
     this.isDrawing = true;
     const eventDetail = evt.detail;
-    const { element, deltaPoints } = eventDetail;
+    const { deltaPoints } = eventDetail;
     const canvasDelta = deltaPoints?.canvas ?? [0, 0, 0];
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
 
     const { annotation, viewportIdsToRender } = this.editData;
     const { points } = annotation.data.handles;
@@ -357,7 +346,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
     annotation.invalidated = true;
     this.editData.hasMoved = true;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   _dragModifyCallback = (evt: EventTypes.InteractionEventType): void => {
@@ -385,10 +374,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
       annotation.invalidated = true;
     }
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   _dragHandle = (evt: EventTypes.InteractionEventType): void => {
@@ -442,10 +428,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
     annotation.highlighted = false;
     data.handles.activeHandleIndex = null;
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     if (newAnnotation) {
       triggerAnnotationCompleted(annotation);

package/src/tools/AdvancedMagnifyViewport.ts

@@ -26,7 +26,7 @@ const MAGNIFY_CLASSNAME = 'advancedMagnifyTool';
 const MAGNIFY_VIEWPORT_INITIAL_RADIUS = 125;
 
 // TODO: find a better to identify segmentation actors
-const isSegmentation = (actor) => actor.uid !== actor.referenceId;
+const isSegmentation = (actor) => actor.uid !== actor.referencedId;
 
 export type AutoPanCallbackData = {
   points: {
@@ -291,7 +291,7 @@ class AdvancedMagnifyViewport {
     sourceActors.filter(isSegmentation).forEach((actor) => {
       segmentation.addSegmentationRepresentations(magnifyToolGroupId, [
         {
-          segmentationId: actor.referenceId,
+          segmentationId: actor.referencedId,
           type: SegmentationRepresentations.Labelmap,
         },
       ]);

package/src/tools/CrosshairsTool.ts

@@ -303,19 +303,19 @@ class CrosshairsTool extends AnnotationTool {
         viewportId,
         renderingEngineId
       );
-      const { viewport } = enabledElement;
+      const viewport = enabledElement.viewport as Types.IVolumeViewport;
       const resetPan = true;
       const resetZoom = true;
       const resetToCenter = true;
       const resetRotation = true;
-      const supressEvents = true;
-      viewport.resetCamera(
+      const suppressEvents = true;
+      viewport.resetCamera({
         resetPan,
         resetZoom,
         resetToCenter,
         resetRotation,
-        supressEvents
-      );
+        suppressEvents,
+      });
       (viewport as Types.IVolumeViewport).resetSlabThickness();
       const { element } = viewport;
       let annotations = this._getAnnotations(enabledElement);
@@ -387,13 +387,8 @@ class CrosshairsTool extends AnnotationTool {
     this.toolCenter = csUtils.planar.threePlaneIntersection(firstPlane, secondPlane, thirdPlane)
 
     // assuming all viewports are in the same rendering engine
-    const { renderingEngine } = getEnabledElementByIds(
-      viewportsInfo[0].viewportId,
-      viewportsInfo[0].renderingEngineId
-    );
 
     triggerAnnotationRenderForViewportIds(
-      renderingEngine,
       viewportsInfo.map(({ viewportId }) => viewportId)
     );
   };
@@ -680,7 +675,7 @@ class CrosshairsTool extends AnnotationTool {
       requireSameOrientation
     );
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   onResetCamera = (evt) => {
@@ -1995,9 +1990,6 @@ class CrosshairsTool extends AnnotationTool {
 
     this.editData = null;
 
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine } = enabledElement;
-
     const requireSameOrientation = false;
     const viewportIdsToRender = getViewportIdsWithToolToRender(
       element,
@@ -2005,7 +1997,7 @@ class CrosshairsTool extends AnnotationTool {
       requireSameOrientation
     );
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   _dragCallback = (evt: EventTypes.InteractionEventType) => {

package/src/tools/MagnifyTool.ts

@@ -96,7 +96,7 @@ class MagnifyTool extends BaseTool {
 
     evt.preventDefault();
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return true;
   };
@@ -197,7 +197,7 @@ class MagnifyTool extends BaseTool {
     });
 
     magnifyToolElement.style.display = 'block';
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   _dragCallback = (evt: EventTypes.InteractionEventType) => {

package/src/tools/OverlayGridTool.ts

@@ -123,7 +123,6 @@ class OverlayGridTool extends AnnotationDisplayTool {
     }
 
     triggerAnnotationRenderForViewportIds(
-      getRenderingEngine(viewportsInfo[0].renderingEngineId),
       viewportsInfo.map(({ viewportId }) => viewportId)
     );
   };

package/src/tools/PlanarRotateTool.ts

@@ -67,8 +67,10 @@ class PlanarRotateTool extends BaseTool {
       const rotatedViewUp = vec3.transformMat4(vec3.create(), viewUp, rotMat);
       viewport.setCamera({ viewUp: rotatedViewUp as Types.Point3 });
     } else {
-      const { rotation } = (viewport as Types.IStackViewport).getProperties();
-      viewport.setProperties({ rotation: rotation + angle });
+      const { rotation } = (
+        viewport as Types.IStackViewport
+      ).getViewPresentation();
+      viewport.setViewPresentation({ rotation: rotation + angle });
     }
 
     viewport.render();

package/src/tools/ReferenceCursors.ts

@@ -212,7 +212,7 @@ class ReferenceCursors extends AnnotationDisplayTool {
       false
     );
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   getActiveAnnotation(element: HTMLDivElement): null | Annotation {
@@ -250,8 +250,7 @@ class ReferenceCursors extends AnnotationDisplayTool {
     if (!enabledElement) {
       return;
     }
-    const { renderingEngine } = enabledElement;
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   }
 
   //checks if we need to update the annotation position due to camera changes

package/src/tools/ReferenceLinesTool.ts

@@ -115,7 +115,6 @@ class ReferenceLines extends AnnotationDisplayTool {
     };
 
     triggerAnnotationRenderForViewportIds(
-      renderingEngine,
       viewports
         .filter((viewport) => viewport.id !== sourceViewport.id)
         .map((viewport) => viewport.id)

package/src/tools/SculptorTool.ts

@@ -209,10 +209,7 @@ class SculptorTool extends BaseTool {
       cursorShape.updateToolSize(canvasCoords, viewport, activeAnnotation);
     }
 
-    triggerAnnotationRenderForViewportIds(
-      renderingEngine,
-      this.commonData.viewportIdsToRender
-    );
+    triggerAnnotationRenderForViewportIds(this.commonData.viewportIdsToRender);
   }
 
   /**

package/src/tools/SegmentationIntersectionTool.ts

@@ -80,7 +80,6 @@ class SegmentationIntersectionTool extends AnnotationDisplayTool {
     }
 
     triggerAnnotationRenderForViewportIds(
-      getRenderingEngine(viewportsInfo[0].renderingEngineId),
       viewportsInfo.map(({ viewportId }) => viewportId)
     );
   };

package/src/tools/WindowLevelRegionTool.ts

@@ -131,7 +131,7 @@ class WindowLevelRegionTool extends AnnotationTool {
 
     evt.preventDefault();
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return annotation;
   };
@@ -153,7 +153,7 @@ class WindowLevelRegionTool extends AnnotationTool {
 
     removeAnnotation(annotation.annotationUID);
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     triggerAnnotationCompleted(annotation);
 
@@ -199,7 +199,7 @@ class WindowLevelRegionTool extends AnnotationTool {
 
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   /**

package/src/tools/annotation/AngleTool.ts

@@ -169,7 +169,7 @@ class AngleTool extends AnnotationTool {
 
     evt.preventDefault();
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return annotation;
   };
@@ -275,7 +275,7 @@ class AngleTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   };
@@ -319,7 +319,7 @@ class AngleTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   }
@@ -363,7 +363,7 @@ class AngleTool extends AnnotationTool {
       removeAnnotation(annotation.annotationUID);
     }
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     if (newAnnotation) {
       triggerAnnotationCompleted(annotation);
@@ -422,7 +422,7 @@ class AngleTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   cancel = (element: HTMLDivElement) => {
@@ -439,13 +439,7 @@ class AngleTool extends AnnotationTool {
       annotation.highlighted = false;
       data.handles.activeHandleIndex = null;
 
-      const enabledElement = getEnabledElement(element);
-      const { renderingEngine } = enabledElement;
-
-      triggerAnnotationRenderForViewportIds(
-        renderingEngine,
-        viewportIdsToRender
-      );
+      triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
       if (newAnnotation) {
         triggerAnnotationCompleted(annotation);

package/src/tools/annotation/ArrowAnnotateTool.ts

@@ -159,7 +159,7 @@ class ArrowAnnotateTool extends AnnotationTool {
 
     evt.preventDefault();
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return annotation;
   };
@@ -239,7 +239,7 @@ class ArrowAnnotateTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   };
@@ -283,7 +283,7 @@ class ArrowAnnotateTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   }
@@ -308,8 +308,6 @@ class ArrowAnnotateTool extends AnnotationTool {
     this._deactivateDraw(element);
     resetElementCursor(element);
 
-    const { renderingEngine } = getEnabledElement(element);
-
     if (
       this.isHandleOutsideImage &&
       this.configuration.preventHandleOutsideImage
@@ -321,10 +319,7 @@ class ArrowAnnotateTool extends AnnotationTool {
       this.configuration.getTextCallback((text) => {
         if (!text) {
           removeAnnotation(annotation.annotationUID);
-          triggerAnnotationRenderForViewportIds(
-            renderingEngine,
-            viewportIdsToRender
-          );
+          triggerAnnotationRenderForViewportIds(viewportIdsToRender);
           this.editData = null;
           this.isDrawing = false;
           return;
@@ -333,10 +328,7 @@ class ArrowAnnotateTool extends AnnotationTool {
 
         triggerAnnotationCompleted(annotation);
 
-        triggerAnnotationRenderForViewportIds(
-          renderingEngine,
-          viewportIdsToRender
-        );
+        triggerAnnotationRenderForViewportIds(viewportIdsToRender);
       });
     } else {
       triggerAnnotationModified(annotation, element);
@@ -395,7 +387,7 @@ class ArrowAnnotateTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   touchTapCallback = (evt: EventTypes.TouchTapEventType) => {
@@ -460,7 +452,7 @@ class ArrowAnnotateTool extends AnnotationTool {
       element,
       this.getToolName()
     );
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     // Dispatching annotation modified
     triggerAnnotationModified(annotation, element);
@@ -480,12 +472,7 @@ class ArrowAnnotateTool extends AnnotationTool {
       annotation.highlighted = false;
       data.handles.activeHandleIndex = null;
 
-      const { renderingEngine } = getEnabledElement(element);
-
-      triggerAnnotationRenderForViewportIds(
-        renderingEngine,
-        viewportIdsToRender
-      );
+      triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
       if (newAnnotation) {
         triggerAnnotationCompleted(annotation);

package/src/tools/annotation/BidirectionalTool.ts

@@ -208,7 +208,7 @@ class BidirectionalTool extends AnnotationTool {
 
     evt.preventDefault();
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     return annotation;
   }
@@ -319,7 +319,7 @@ class BidirectionalTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     hideElementCursor(element);
 
@@ -374,7 +374,7 @@ class BidirectionalTool extends AnnotationTool {
     const enabledElement = getEnabledElement(element);
     const { renderingEngine } = enabledElement;
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     evt.preventDefault();
   };
@@ -475,7 +475,7 @@ class BidirectionalTool extends AnnotationTool {
       removeAnnotation(annotation.annotationUID);
     }
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     if (newAnnotation) {
       triggerAnnotationCompleted(annotation);
@@ -563,7 +563,7 @@ class BidirectionalTool extends AnnotationTool {
     data.handles.points[3] = viewport.canvasToWorld([endX, endY]);
 
     annotation.invalidated = true;
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
     this.editData.hasMoved = true;
   };
@@ -611,7 +611,7 @@ class BidirectionalTool extends AnnotationTool {
       annotation.invalidated = true;
     }
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(viewportIdsToRender);
   };
 
   /**
@@ -890,12 +890,7 @@ class BidirectionalTool extends AnnotationTool {
       annotation.highlighted = false;
       data.handles.activeHandleIndex = null;
 
-      const { renderingEngine } = getEnabledElement(element);
-
-      triggerAnnotationRenderForViewportIds(
-        renderingEngine,
-        viewportIdsToRender
-      );
+      triggerAnnotationRenderForViewportIds(viewportIdsToRender);
 
       if (newAnnotation) {
         triggerAnnotationCompleted(annotation);