Skip to content

HostRoot no longer pops context provider during complete phase #8568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2016
Merged

HostRoot no longer pops context provider during complete phase #8568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
HostRoot no longer pops context provider in complete phase 
Also added an invariant warning to guard against context being popped too many times.
  • Loading branch information
Brian Vaughn committed Dec 14, 2016
commit b4745ca72b63f1e5c9291bd030e6d0a28c23bcb7
1 change: 0 additions & 1 deletion src/renderers/shared/fiber/ReactFiberCompleteWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/renderers/shared/fiber/ReactFiberContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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--;
Expand Down