Don't store suspended state on renderer [refactor]

lib/renderer.js

@@ -42,10 +42,7 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		};
 		this.tree = tree;
 		this.node = tree;
-
-		// Init suspense state
 		this.suspenseNode = null;
-		this.suspended = false;
 
 		// Init lazy node awaiting counter
 		this.numAwaiting = 0;
@@ -90,7 +87,10 @@ class PartialRenderer extends ReactDOMServerRenderer {
 			this.errored(err);
 		}
 
-		if (this.numAwaiting !== 0 || this.suspended) return;
+		if (this.numAwaiting !== 0) return;
+
+		const {suspenseNode} = this;
+		if (suspenseNode && suspenseNode.suspended) return;
 
 		// Finished processing
 		this.destroy();
@@ -272,7 +272,6 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		node.fallback = fallback;
 		node.suspended = false;
 		this.suspenseNode = node;
-		this.suspended = false;
 
 		this.node = node;
 
@@ -284,7 +283,8 @@ class PartialRenderer extends ReactDOMServerRenderer {
 
 	handlePromise(element, promise) {
 		// If no enclosing suspense boundary, abort promise and exit with error
-		if (!this.suspenseNode) {
+		const {suspenseNode} = this;
+		if (!suspenseNode) {
 			followAndAbort(promise);
 			this.halt(new Error(
 				'A React component suspended while rendering, but no fallback UI was specified.\n\n' +
@@ -302,7 +302,7 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		// TODO Check this works if promise resolves sync.
 		// I think it won't because on client side it will render immediately
 		// and that could include more lazy elements.
-		if (this.suspended) {
+		if (suspenseNode.suspended) {
 			followAndAbort(promise);
 			return;
 		}
@@ -376,7 +376,6 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		this.node = node;
 		const suspenseNode = node.parentSuspense;
 		this.suspenseNode = suspenseNode;
-		this.suspended = suspenseNode ? suspenseNode.suspended : false;
 		this.restoreStack(node.stackState, element);
 
 		// Render element
@@ -389,7 +388,7 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		this.resetProviders();
 
 		// If suspended, render fallback of suspense boundary
-		if (!this.suspended) return;
+		if (!suspenseNode || !suspenseNode.suspended) return;
 
 		// Convert node to fallback and discard children
 		const {fallback} = suspenseNode;
@@ -451,7 +450,6 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		this.abortDescendents(suspenseNode);
 
 		// Suspend
-		this.suspended = true;
 		suspenseNode.suspended = true;
 	}
 
@@ -527,15 +525,12 @@ class PartialRenderer extends ReactDOMServerRenderer {
 	}
 
 	popSuspense(node, frame) {
-		const {suspended} = this,
-			{fallback} = node;
+		const {fallback} = node;
 
 		// Step down suspense stack
-		const {parentSuspense} = node;
-		this.suspenseNode = parentSuspense;
-		this.suspended = parentSuspense ? parentSuspense.suspended : false;
+		this.suspenseNode = node.parentSuspense;
 
-		if (!suspended) return;
+		if (!node.suspended) return;
 
 		// Was suspended
 		// Convert node to fallback