fix: Only fire STACK_NEW_IMAGE event after we are certain this image …

…will be displayed (#72)
cornerstonejs · Apr 12, 2022 · bfb8b91 · bfb8b91
1 parent e3c7469
commit bfb8b91
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/packages/core/src/RenderingEngine/StackViewport.ts b/packages/core/src/RenderingEngine/StackViewport.ts
@@ -1224,6 +1224,13 @@ class StackViewport extends Viewport implements IStackViewport {
         imageIdIndex: number,
         imageId: string
       ) {
+        // Perform this check after the image has finished loading
+        // in case the user has already scrolled away to another image.
+        // In that case, do not render this image.
+        if (this.currentImageIdIndex !== imageIdIndex) {
+          return;
+        }
+
         const eventDetail: EventTypes.StackNewImageEventDetail = {
           image,
           imageId,
@@ -1274,13 +1281,6 @@ class StackViewport extends Viewport implements IStackViewport {
         // Todo: trigger an event to allow applications to hook into END of loading state
         // Currently we use loadHandlerManagers for this
 
-        // Perform this check after the image has finished loading
-        // in case the user has already scrolled away to another image.
-        // In that case, do not render this image.
-        if (this.currentImageIdIndex !== imageIdIndex) {
-          return;
-        }
-
         // Trigger the image to be drawn on the next animation frame
         this.render();
 
@@ -1364,6 +1364,16 @@ class StackViewport extends Viewport implements IStackViewport {
     return new Promise((resolve, reject) => {
       // 1. Load the image using the Image Loader
       function successCallback(image, imageIdIndex, imageId) {
+        // Todo: trigger an event to allow applications to hook into END of loading state
+        // Currently we use loadHandlerManagers for this
+
+        // Perform this check after the image has finished loading
+        // in case the user has already scrolled away to another image.
+        // In that case, do not render this image.
+        if (this.currentImageIdIndex !== imageIdIndex) {
+          return;
+        }
+
         const eventDetail: EventTypes.StackNewImageEventDetail = {
           image,
           imageId,
@@ -1375,16 +1385,6 @@ class StackViewport extends Viewport implements IStackViewport {
 
         this._updateActorToDisplayImageId(image);
 
-        // Todo: trigger an event to allow applications to hook into END of loading state
-        // Currently we use loadHandlerManagers for this
-
-        // Perform this check after the image has finished loading
-        // in case the user has already scrolled away to another image.
-        // In that case, do not render this image.
-        if (this.currentImageIdIndex !== imageIdIndex) {
-          return;
-        }
-
         // Trigger the image to be drawn on the next animation frame
         this.render();