Skip to content

Align StrictMode behaviour with production #25049

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 12 commits into from
Aug 23, 2022
+376 −557
Merged

Align StrictMode behaviour with production #25049

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
749f636
Skip double invoking effects in Offscreen
sammy-SC Aug 5, 2022
e23606d
Run yarn replace-fork
sammy-SC Aug 11, 2022
f1579c2
Use executionContext to disable profiler timer
sammy-SC Aug 11, 2022
267dea6
Restructure recursion into two functions
sammy-SC Aug 12, 2022
bedfe3d
Fix ReactStrictMode test
sammy-SC Aug 12, 2022
4a257a3
Use gate pragma in ReacetOffscreenStrictMode test
sammy-SC Aug 12, 2022
34a63f6
Set and reset current debug fiber in dev
sammy-SC Aug 15, 2022
5d28b15
Skip over paths that don't include any insertions
sammy-SC Aug 23, 2022
4073a3f
Extract common logic to check for profiling to a helper function
sammy-SC Aug 23, 2022
f4ff590
Remove hasPassiveEffects flag from StrictMode
sammy-SC Aug 23, 2022
c24c0a3
Fix flow issues
sammy-SC Aug 23, 2022
6b3de9f
Revert "Skip over paths that don't include any insertions"
sammy-SC Aug 23, 2022
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
Prev Previous commit
Next Next commit
Extract common logic to check for profiling to a helper function
  • Loading branch information
@sammy-SC
sammy-SC committed Aug 23, 2022
commit 4073a3f65d64f0e8d16b2a5c8365ae788ddf93bb
93 changes: 21 additions & 72 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 @@ -201,6 +201,15 @@ let nextEffect: Fiber | null = null;
let inProgressLanes: Lanes | null = null;
let inProgressRoot: FiberRoot | null = null;

function shouldProfile(current: Fiber): Boolean {
return (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
);
}

export function reportUncaughtErrorInDEV(error: mixed) {
// Wrapping each small part of the commit phase into a guarded
// callback is a bit too slow (https://github.com/facebook/react/pull/21666).
Expand All @@ -218,12 +227,7 @@ export function reportUncaughtErrorInDEV(error: mixed) {
const callComponentWillUnmountWithTimer = function(current, instance) {
instance.props = current.memoizedProps;
instance.state = current.memoizedState;
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
instance.componentWillUnmount();
Expand Down Expand Up @@ -263,12 +267,7 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) {
if (typeof ref === 'function') {
let retVal;
try {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
retVal = ref(null);
Expand Down Expand Up @@ -701,12 +700,7 @@ function commitHookLayoutEffects(finishedWork: Fiber, hookFlags: HookFlags) {
// This is done to prevent sibling component effects from interfering with each other,
// e.g. a destroy function in one component should never override a ref set
// by a create function in another component during the same commit.
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListMount(hookFlags, finishedWork);
Expand Down Expand Up @@ -759,12 +753,7 @@ function commitClassLayoutLifecycles(
}
}
}
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
instance.componentDidMount();
Expand Down Expand Up @@ -815,12 +804,7 @@ function commitClassLayoutLifecycles(
}
}
}
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
instance.componentDidUpdate(
Expand Down Expand Up @@ -1351,12 +1335,7 @@ function commitAttachRef(finishedWork: Fiber) {
}
if (typeof ref === 'function') {
let retVal;
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
retVal = ref(instanceToUse);
Expand Down Expand Up @@ -1395,12 +1374,7 @@ function commitDetachRef(current: Fiber) {
const currentRef = current.ref;
if (currentRef !== null) {
if (typeof currentRef === 'function') {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
currentRef(null);
Expand Down Expand Up @@ -1926,12 +1900,7 @@ function commitDeletionEffectsOnFiber(
markComponentLayoutEffectUnmountStarted(deletedFiber);
}

if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
deletedFiber.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(deletedFiber)) {
startLayoutEffectTimer();
safelyCallDestroy(
deletedFiber,
Expand Down Expand Up @@ -2250,12 +2219,7 @@ function commitMutationEffectsOnFiber(
// This prevents sibling component effects from interfering with each other,
// e.g. a destroy function in one component should never override a ref set
// by a create function in another component during the same commit.
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListUnmount(
Expand Down Expand Up @@ -2648,12 +2612,7 @@ export function disappearLayoutEffects(finishedWork: Fiber) {
case MemoComponent:
case SimpleMemoComponent: {
// TODO (Offscreen) Check: flags & LayoutStatic
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListUnmount(
Expand Down Expand Up @@ -2891,12 +2850,7 @@ function commitHookPassiveMountEffects(
finishedWork: Fiber,
hookFlags: HookFlags,
) {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
startPassiveEffectTimer();
try {
commitHookEffectListMount(hookFlags, finishedWork);
Expand Down Expand Up @@ -3601,12 +3555,7 @@ function commitHookPassiveUnmountEffects(
nearestMountedAncestor,
hookFlags: HookFlags,
) {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
startPassiveEffectTimer();
commitHookEffectListUnmount(
hookFlags,
Expand Down
93 changes: 21 additions & 72 deletions packages/react-reconciler/src/ReactFiberCommitWork.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,15 @@ let nextEffect: Fiber | null = null;
let inProgressLanes: Lanes | null = null;
let inProgressRoot: FiberRoot | null = null;

function shouldProfile(current: Fiber): Boolean {
return (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
);
}

export function reportUncaughtErrorInDEV(error: mixed) {
// Wrapping each small part of the commit phase into a guarded
// callback is a bit too slow (https://github.com/facebook/react/pull/21666).
Expand All @@ -218,12 +227,7 @@ export function reportUncaughtErrorInDEV(error: mixed) {
const callComponentWillUnmountWithTimer = function(current, instance) {
instance.props = current.memoizedProps;
instance.state = current.memoizedState;
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
instance.componentWillUnmount();
Expand Down Expand Up @@ -263,12 +267,7 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) {
if (typeof ref === 'function') {
let retVal;
try {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
retVal = ref(null);
Expand Down Expand Up @@ -701,12 +700,7 @@ function commitHookLayoutEffects(finishedWork: Fiber, hookFlags: HookFlags) {
// This is done to prevent sibling component effects from interfering with each other,
// e.g. a destroy function in one component should never override a ref set
// by a create function in another component during the same commit.
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListMount(hookFlags, finishedWork);
Expand Down Expand Up @@ -759,12 +753,7 @@ function commitClassLayoutLifecycles(
}
}
}
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
instance.componentDidMount();
Expand Down Expand Up @@ -815,12 +804,7 @@ function commitClassLayoutLifecycles(
}
}
}
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
instance.componentDidUpdate(
Expand Down Expand Up @@ -1351,12 +1335,7 @@ function commitAttachRef(finishedWork: Fiber) {
}
if (typeof ref === 'function') {
let retVal;
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
retVal = ref(instanceToUse);
Expand Down Expand Up @@ -1395,12 +1374,7 @@ function commitDetachRef(current: Fiber) {
const currentRef = current.ref;
if (currentRef !== null) {
if (typeof currentRef === 'function') {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
current.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(current)) {
try {
startLayoutEffectTimer();
currentRef(null);
Expand Down Expand Up @@ -1926,12 +1900,7 @@ function commitDeletionEffectsOnFiber(
markComponentLayoutEffectUnmountStarted(deletedFiber);
}

if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
deletedFiber.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(deletedFiber)) {
startLayoutEffectTimer();
safelyCallDestroy(
deletedFiber,
Expand Down Expand Up @@ -2250,12 +2219,7 @@ function commitMutationEffectsOnFiber(
// This prevents sibling component effects from interfering with each other,
// e.g. a destroy function in one component should never override a ref set
// by a create function in another component during the same commit.
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListUnmount(
Expand Down Expand Up @@ -2648,12 +2612,7 @@ export function disappearLayoutEffects(finishedWork: Fiber) {
case MemoComponent:
case SimpleMemoComponent: {
// TODO (Offscreen) Check: flags & LayoutStatic
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
try {
startLayoutEffectTimer();
commitHookEffectListUnmount(
Expand Down Expand Up @@ -2891,12 +2850,7 @@ function commitHookPassiveMountEffects(
finishedWork: Fiber,
hookFlags: HookFlags,
) {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
startPassiveEffectTimer();
try {
commitHookEffectListMount(hookFlags, finishedWork);
Expand Down Expand Up @@ -3601,12 +3555,7 @@ function commitHookPassiveUnmountEffects(
nearestMountedAncestor,
hookFlags: HookFlags,
) {
if (
enableProfilerTimer &&
enableProfilerCommitHooks &&
finishedWork.mode & ProfileMode &&
getExecutionContext() & CommitContext
) {
if (shouldProfile(finishedWork)) {
startPassiveEffectTimer();
commitHookEffectListUnmount(
hookFlags,
Expand Down