Skip to content

[pull] master from facebook:master #502

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
pull merged 2 commits into from
Jul 30, 2020
Merged

[pull] master from facebook:master #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1f96b8
Check PassiveStatic instead of Passive (#19489)
acdlite Jul 30, 2020
6ef997b
Check for passive effects on the root fiber (#19488)
acdlite Jul 30, 2020
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
5 changes: 0 additions & 5 deletions packages/react-reconciler/src/ReactFiberCommitWork.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ import {
Placement,
Snapshot,
Update,
Passive,
} from './ReactSideEffectTags';
import getComponentName from 'shared/getComponentName';
import invariant from 'shared/invariant';
Expand Down Expand Up @@ -880,10 +879,6 @@ function commitUnmount(
if ((tag & HookPassive) !== NoHookEffect) {
// TODO: Consider if we can move this block out of the synchronous commit phase
effect.tag |= HookHasEffect;

current.effectTag |= Passive;

schedulePassiveEffectCallback();
} else {
if (
enableProfilerTimer &&
Expand Down
18 changes: 10 additions & 8 deletions packages/react-reconciler/src/ReactFiberWorkLoop.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,10 @@ function commitRootImpl(root, renderPriorityLevel) {
}

// If there are pending passive effects, schedule a callback to process them.
if ((finishedWork.subtreeTag & PassiveSubtreeTag) !== NoSubtreeTag) {
if (
(finishedWork.subtreeTag & PassiveSubtreeTag) !== NoSubtreeTag ||
(finishedWork.effectTag & PassiveMask) !== NoEffect
) {
if (!rootDoesHavePassiveEffects) {
rootDoesHavePassiveEffects = true;
scheduleCallback(NormalSchedulerPriority, () => {
Expand Down Expand Up @@ -2836,13 +2839,12 @@ function flushPassiveUnmountEffectsInsideOfDeletedTree(
}
}

switch (fiber.tag) {
case FunctionComponent:
case ForwardRef:
case SimpleMemoComponent:
case Block: {
const primaryEffectTag = fiber.effectTag & Passive;
if (primaryEffectTag !== NoEffect) {
if ((fiber.effectTag & PassiveStatic) !== NoEffect) {
switch (fiber.tag) {
case FunctionComponent:
case ForwardRef:
case SimpleMemoComponent:
case Block: {
flushPassiveUnmountEffectsImpl(fiber);
}
}
Expand Down