Avoid infinite rerender loop when top-most error boundary attempts to…

… handle errors of its children, but fails
rpetrich · May 30, 2018 · 30cde7b · 30cde7b
1 parent b853143
commit 30cde7b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/vdom/component.js b/src/vdom/component.js
@@ -97,7 +97,7 @@ export function renderComponent(component, renderMode, mountAll, isChild) {
 		skip = false,
 		snapshot = previousContext,
 		rendered, inst, cbase,
-		exception, caught = component._caught;
+		exception, clearCaught = component._caught;
 
 	try {
 		if (component.constructor.getDerivedStateFromProps) {
@@ -178,6 +178,7 @@ export function renderComponent(component, renderMode, mountAll, isChild) {
 				}
 			} catch (e) {
 				exception = e;
+				clearCaught = false;
 				if (!base) {
 					base = initialBase || document.createTextNode("");
 				}
@@ -228,7 +229,7 @@ export function renderComponent(component, renderMode, mountAll, isChild) {
 
 		while (component._renderCallbacks.length) component._renderCallbacks.pop().call(component);
 
-		if (caught) {
+		if (clearCaught) {
 			component._caught = false;
 		}