From dc84a51c79c744f3cfcc50ae14fe05170cfa0732 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Mon, 17 Apr 2023 12:39:44 -0700
Subject: [PATCH] app: wait one tick before setNewOriginalImage

This works around a bug in react (more details in inline comments)

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 .../src/components/App/index.jsx              | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/packages/react-filerobot-image-editor/src/components/App/index.jsx b/packages/react-filerobot-image-editor/src/components/App/index.jsx
index 17520e55..8ca60290 100644
--- a/packages/react-filerobot-image-editor/src/components/App/index.jsx
+++ b/packages/react-filerobot-image-editor/src/components/App/index.jsx
@@ -120,30 +120,40 @@ const App = () => {
 
       imageBeingLoadedSrc.current = imgSrc;
 
-      if (typeof imgToLoad === 'string') {
-        loadImage(imgToLoad, defaultSavedImageName)
-          .then(setNewOriginalImage)
-          .catch(setError)
-          .finally(triggerResolve);
-      } else if (imgToLoad instanceof HTMLImageElement) {
-        if (!imgToLoad.name && defaultSavedImageName) {
-          // eslint-disable-next-line no-param-reassign
-          imgToLoad.name = defaultSavedImageName;
-        }
-        if (!imgToLoad.complete) {
-          imgToLoad.addEventListener('load', () => {
-            setNewOriginalImage(imgToLoad);
-            triggerResolve();
-          });
-          return;
-        }
+      // This timeout is a workaround when re-initializing
+      // the react app from vanilla JS. Due to a bug in react
+      // the dispatch method that is called in setNewOriginalImage
+      // still points to the old dispatch method after re-init,
+      // so we need to wait for one tick to make sure it's updated.
+      //
+      // This applies to both URLs and HTMLImageElement, since URLs
+      // may resolve immediately in some cases, e.g. memory cache.
+      setTimeout(() => {
+        if (typeof imgToLoad === 'string') {
+          loadImage(imgToLoad, defaultSavedImageName)
+            .then(setNewOriginalImage)
+            .catch(setError)
+            .finally(triggerResolve);
+        } else if (imgToLoad instanceof HTMLImageElement) {
+          if (!imgToLoad.name && defaultSavedImageName) {
+            // eslint-disable-next-line no-param-reassign
+            imgToLoad.name = defaultSavedImageName;
+          }
+          if (!imgToLoad.complete) {
+            imgToLoad.addEventListener('load', () => {
+              setNewOriginalImage(imgToLoad);
+              triggerResolve();
+            });
+            return;
+          }
 
-        setNewOriginalImage(imgToLoad);
-        triggerResolve();
-      } else {
-        setError(t('invalidImageError'));
-        triggerResolve();
-      }
+          setNewOriginalImage(imgToLoad);
+          triggerResolve();
+        } else {
+          setError(t('invalidImageError'));
+          triggerResolve();
+        }
+      }, 0);
     });
 
   const promptDialogIfHasChangeNotSaved = (e) => {