Fix: Restore new Contexts fully in nested render

overlookmotel · Jan 25, 2019 · 2077600 · 2077600
1 parent 59b587c
commit 2077600
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/renderer.js b/lib/renderer.js
@@ -75,6 +75,14 @@ class PartialRenderer extends ReactDOMServerRenderer {
 		// Restore contexts from new Context API
 		const {threadID} = this;
 		this.contextStack = stackState.contexts.map(({context, value}) => {
+			// Fill any gaps in Context's slots
+			// (copied from ReactDOM's `validateContextBounds()` function
+			// https://github.com/facebook/react/blob/f11a9c1cb06514e40a50503e0f9bd26941251e06/packages/react-dom/src/server/ReactPartialRendererContext.js#L55)
+			for (let i = context._threadCount | 0; i <= threadID; i++) {
+				context[i] = context._currentValue2;
+				context._threadCount = i + 1;
+			}
+
 			context[threadID] = value;
 			return context;
 		});