Merge pull request #28 from fiddleheadjs/bugfix_miss_flush_currently_…

…processing_info_on_error Bugfix miss flush currently processing info on error
fiddleheadjs · Feb 1, 2023 · 9f1b34e · 9f1b34e
2 parents 51408dd + e98d633
commit 9f1b34e
Show file tree

Hide file tree

Showing 24 changed files with 160 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.7 (Feb 01, 2023)
+
+- Bugfix: Miss flushing currently processing info on error, that leads to lost of tracking of the current hook
+
 ## 1.7.6 (Jan 31, 2023)
 
 - Bugfix: Effect dependencies undefined when re-run the callback without re-rendering

diff --git a/lib/core/cjs.development.js b/lib/core/cjs.development.js
@@ -1478,11 +1478,14 @@ let _reconcileOnlyChildOfDynamicNode = (current, alternate, isRenderRoot) => {
     prepareCurrentlyProcessing(current);
     try {
         newContent = current.type_(current.props_);
+        flushCurrentlyProcessing();
     } catch (error) {
-        catchError(error, current);
         newContent = null;
+        // Must flush currently processing info before catchError(),
+        // because catchError() may cause re-render at a higher level component
+        flushCurrentlyProcessing();
+        catchError(error, current);
     }
-    flushCurrentlyProcessing();
 
     let newChild = createVNodeFromContent(newContent);
 

diff --git a/lib/core/cjs.development.legacy.js b/lib/core/cjs.development.legacy.js
@@ -1456,12 +1456,15 @@ var _reconcileOnlyChildOfDynamicNode = function _reconcileOnlyChildOfDynamicNode
 
   try {
     newContent = current.type_(current.props_);
+    flushCurrentlyProcessing();
   } catch (error) {
+    newContent = null; // Must flush currently processing info before catchError(),
+    // because catchError() may cause re-render at a higher level component
+
+    flushCurrentlyProcessing();
     catchError(error, current);
-    newContent = null;
   }
 
-  flushCurrentlyProcessing();
   var newChild = createVNodeFromContent(newContent);
 
   if (newChild !== null) {

diff --git a/lib/core/cjs.development.legacy.min.js b/lib/core/cjs.development.legacy.min.js
diff --git a/lib/core/cjs.development.min.js b/lib/core/cjs.development.min.js
diff --git a/lib/core/cjs.production.js b/lib/core/cjs.production.js
@@ -1478,11 +1478,14 @@ let _reconcileOnlyChildOfDynamicNode = (current, alternate, isRenderRoot) => {
     prepareCurrentlyProcessing(current);
     try {
         newContent = current.type_(current.props_);
+        flushCurrentlyProcessing();
     } catch (error) {
-        catchError(error, current);
         newContent = null;
+        // Must flush currently processing info before catchError(),
+        // because catchError() may cause re-render at a higher level component
+        flushCurrentlyProcessing();
+        catchError(error, current);
     }
-    flushCurrentlyProcessing();
 
     let newChild = createVNodeFromContent(newContent);
 

diff --git a/lib/core/cjs.production.legacy.js b/lib/core/cjs.production.legacy.js
@@ -1456,12 +1456,15 @@ var _reconcileOnlyChildOfDynamicNode = function _reconcileOnlyChildOfDynamicNode
 
   try {
     newContent = current.type_(current.props_);
+    flushCurrentlyProcessing();
   } catch (error) {
+    newContent = null; // Must flush currently processing info before catchError(),
+    // because catchError() may cause re-render at a higher level component
+
+    flushCurrentlyProcessing();
     catchError(error, current);
-    newContent = null;
   }
 
-  flushCurrentlyProcessing();
   var newChild = createVNodeFromContent(newContent);
 
   if (newChild !== null) {

diff --git a/lib/core/cjs.production.legacy.min.js b/lib/core/cjs.production.legacy.min.js
diff --git a/lib/core/cjs.production.min.js b/lib/core/cjs.production.min.js
diff --git a/lib/core/esm.development.js b/lib/core/esm.development.js
@@ -1474,11 +1474,14 @@ let _reconcileOnlyChildOfDynamicNode = (current, alternate, isRenderRoot) => {
     prepareCurrentlyProcessing(current);
     try {
         newContent = current.type_(current.props_);
+        flushCurrentlyProcessing();
     } catch (error) {
-        catchError(error, current);
         newContent = null;
+        // Must flush currently processing info before catchError(),
+        // because catchError() may cause re-render at a higher level component
+        flushCurrentlyProcessing();
+        catchError(error, current);
     }
-    flushCurrentlyProcessing();
 
     let newChild = createVNodeFromContent(newContent);
 

diff --git a/lib/core/esm.development.legacy.js b/lib/core/esm.development.legacy.js
@@ -1451,12 +1451,15 @@ var _reconcileOnlyChildOfDynamicNode = function _reconcileOnlyChildOfDynamicNode
 
   try {
     newContent = current.type_(current.props_);
+    flushCurrentlyProcessing();
   } catch (error) {
+    newContent = null; // Must flush currently processing info before catchError(),
+    // because catchError() may cause re-render at a higher level component
+
+    flushCurrentlyProcessing();
     catchError(error, current);
-    newContent = null;
   }
 
-  flushCurrentlyProcessing();
   var newChild = createVNodeFromContent(newContent);
 
   if (newChild !== null) {