Skip to content

[Fiber] Fix missing render times when we cancel a pending commit #31065

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 3 commits into from
Sep 25, 2024
Merged

[Fiber] Fix missing render times when we cancel a pending commit #31065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1904ad6
Ensure `waitForCommitToBeReady` communicates that it will not pass ar…
eps1lon Sep 25, 2024
3e77914
[Fiber] Fix missing render times when we cancel a pending commit
eps1lon Sep 25, 2024
fd8287f
Strict types
eps1lon Sep 25, 2024
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
2 changes: 1 addition & 1 deletion packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3401,7 +3401,7 @@ export function suspendResource(
}
}

export function waitForCommitToBeReady(): null | (Function => Function) {
export function waitForCommitToBeReady(): null | ((() => void) => () => void) {
if (suspendedState === null) {
throw new Error(
'Internal React Error: suspendedState null when it was expected to exists. Please report this as a React bug.',
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberWorkLoop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,8 @@ function commitRootWhenReady(
updatedLanes,
suspendedRetryLanes,
SUSPENDED_COMMIT,
completedRenderStartTime,
completedRenderEndTime,
),
);
markRootSuspended(root, lanes, spawnedLane, didSkipSuspendedSiblings);
Expand Down Expand Up @@ -3087,8 +3089,6 @@ function commitRoot(
ReactSharedInternals.T = prevTransition;
setCurrentUpdatePriority(previousUpdateLanePriority);
}

return null;
Copy link
Collaborator Author

@eps1lon eps1lon Sep 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unused and mostly removed to have strict types so that commitRoot is assignable to

react/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js

Line 3292 in 0f1856c

unsuspend: null | (() => void),

}

function commitRootImpl(
Expand Down
Loading