trigger event in scroll utility

cornerstonejs · Sep 18, 2024 · ea4b2d8 · ea4b2d8
1 parent 38aac18
commit ea4b2d8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/packages/core/src/RenderingEngine/StackViewport.ts b/packages/core/src/RenderingEngine/StackViewport.ts
@@ -84,7 +84,6 @@ import {
   PixelDataTypedArray,
 } from '../types';
 import {
-  StackScrollOutOfBoundsEventDetail,
   StackViewportNewStackEventDetail,
   StackViewportScrollEventDetail,
   VoiModifiedEventDetail,
@@ -2602,19 +2601,6 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
       }, 40);
     }
 
-    const imageIdIndex = this.getCurrentImageIdIndex();
-
-    if (
-      imageIdIndex + delta > this.getImageIds().length - 1 ||
-      imageIdIndex + delta < 0
-    ) {
-      const eventData: StackScrollOutOfBoundsEventDetail = {
-        imageIdIndex,
-        direction: delta,
-      };
-      triggerEvent(this.element, Events.STACK_SCROLL_OUT_OF_BOUNDS, eventData);
-    }
-
     const eventData: StackViewportScrollEventDetail = {
       newImageIdIndex: newTargetImageIdIndex,
       imageId: targetImageId,

diff --git a/packages/tools/examples/stackManipulationTools/index.ts b/packages/tools/examples/stackManipulationTools/index.ts
@@ -1,4 +1,9 @@
-import { RenderingEngine, Types, Enums } from '@cornerstonejs/core';
+import {
+  eventTarget,
+  RenderingEngine,
+  Types,
+  Enums,
+} from '@cornerstonejs/core';
 import {
   initDemo,
   createImageIdsAndCacheMetaData,
@@ -112,7 +117,7 @@ let eventNumber = 1;
 
 const { STACK_SCROLL_OUT_OF_BOUNDS } = Enums.Events;
 
-element.addEventListener(STACK_SCROLL_OUT_OF_BOUNDS, ((
+eventTarget.addEventListener(STACK_SCROLL_OUT_OF_BOUNDS, ((
   evt: StackScrollOutOfBoundsEvent
 ) => {
   updateLastEvents(

diff --git a/packages/tools/src/utilities/scroll.ts b/packages/tools/src/utilities/scroll.ts
@@ -41,6 +41,24 @@ export default function scroll(
   if (viewport instanceof VolumeViewport) {
     scrollVolume(viewport, volumeId, delta, scrollSlabs);
   } else {
+    const imageIdIndex = viewport.getCurrentImageIdIndex();
+
+    if (
+      imageIdIndex + delta >
+        (viewport as Types.IStackViewport).getImageIds().length - 1 ||
+      imageIdIndex + delta < 0
+    ) {
+      const eventData: Types.EventTypes.StackScrollOutOfBoundsEventDetail = {
+        imageIdIndex,
+        direction: delta,
+      };
+      csUtils.triggerEvent(
+        eventTarget,
+        EVENTS.STACK_SCROLL_OUT_OF_BOUNDS,
+        eventData
+      );
+    }
+
     (viewport as Types.IStackViewport).scroll(
       delta,
       options.debounceLoading,