Merge pull request #8568 from bvaughn/top-level-context-push-pop

HostRoot no longer pops context provider during complete phase
facebook · Dec 14, 2016 · 3def431 · 3def431
2 parents 480e404 + b4745ca
commit 3def431
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -202,7 +202,6 @@ module.exports = function<T, P, I, TI, C, CX>(
         return null;
       case HostRoot: {
         workInProgress.memoizedProps = workInProgress.pendingProps;
-        popContextProvider();
         const fiberRoot = (workInProgress.stateNode : FiberRoot);
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;

diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -77,6 +77,7 @@ function isContextProvider(fiber : Fiber) : boolean {
 exports.isContextProvider = isContextProvider;
 
 function popContextProvider() : void {
+  invariant(index > -1, 'Unexpected context pop');
   contextStack[index] = emptyObject;
   didPerformWorkStack[index] = false;
   index--;