Skip to content
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

Jump to bottom

Fix host context issues around EventComponents and EventTargets #15284

Merged
merged 4 commits into from
Apr 1, 2019
Merged

Fix host context issues around EventComponents and EventTargets #15284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
791ee53
Add unwinding host context to EventComponents and EventTargets
trueadm Apr 1, 2019
0f8f6ba
Handle pushHostContextForEvent in Begin phase
trueadm Apr 1, 2019
471ed8e
Fix conflict
trueadm Apr 1, 2019
b8a1eea
Add test to confirm host context pushing with bail out works
trueadm Apr 1, 2019
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
9 changes: 8 additions & 1 deletion packages/react-reconciler/src/ReactFiberBeginWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2112,8 +2112,15 @@ function beginWork(
// been unsuspended it has committed as a regular Suspense component.
// If it needs to be retried, it should have work scheduled on it.
workInProgress.effectTag |= DidCapture;
break;
}
break;
}
case EventComponent:
case EventTarget: {
if (enableEventAPI) {
pushHostContextForEvent(workInProgress);
}
break;
}
}
return bailoutOnAlreadyFinishedWork(
Expand Down
9 changes: 9 additions & 0 deletions packages/react-reconciler/src/ReactFiberUnwindWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import {
SuspenseComponent,
DehydratedSuspenseComponent,
IncompleteClassComponent,
EventComponent,
EventTarget,
} from 'shared/ReactWorkTags';
import {
DidCapture,
Expand All @@ -38,6 +40,7 @@ import {
import {
enableSchedulerTracing,
enableSuspenseServerRenderer,
enableEventAPI,
} from 'shared/ReactFeatureFlags';
import {ConcurrentMode} from './ReactTypeOfMode';
import {shouldCaptureSuspense} from './ReactFiberSuspenseComponent';
Expand Down Expand Up @@ -510,6 +513,12 @@ function unwindWork(
case ContextProvider:
popProvider(workInProgress);
return null;
case EventComponent:
case EventTarget:
if (enableEventAPI) {
popHostContext(workInProgress);
}
return null;
default:
return null;
}
Expand Down
Loading