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 comments: expiration time -> lanes #21551

Merged
merged 1 commit into from
Jun 5, 2021
Merged

fix comments: expiration time -> lanes #21551

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
8 changes: 4 additions & 4 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 @@ -389,7 +389,7 @@ export function requestUpdateLane(fiber: Fiber): Lane {
workInProgressRootRenderLanes !== NoLanes
) {
// This is a render phase update. These are not officially supported. The
// old behavior is to give this the same "thread" (expiration time) as
// old behavior is to give this the same "thread" (lanes) as
// whatever is currently rendering. So if you call `setState` on a component
// that happens later in the same render, it will flush. Ideally, we want to
// remove the special case and treat them as if they came from an
Expand Down Expand Up @@ -756,7 +756,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
}
}

// Determine the next expiration time to work on, using the fields stored
// Determine the next lanes to work on, using the fields stored
// on the root.
let lanes = getNextLanes(
root,
Expand Down Expand Up @@ -1629,7 +1629,7 @@ function completeUnitOfWork(unitOfWork: Fiber): void {
// capture values if possible.
const next = unwindWork(completedWork, subtreeRenderLanes);

// Because this fiber did not complete, don't reset its expiration time.
// Because this fiber did not complete, don't reset its lanes.

if (next !== null) {
// If completing this work spawned new work, do that next. We'll come
Expand Down Expand Up @@ -2308,7 +2308,7 @@ function retryTimedOutBoundary(boundaryFiber: Fiber, retryLane: Lane) {
// The boundary fiber (a Suspense component or SuspenseList component)
// previously was rendered in its fallback state. One of the promises that
// suspended it has resolved, which means at least part of the tree was
// likely unblocked. Try rendering again, at a new expiration time.
// likely unblocked. Try rendering again, at a new lanes.
if (retryLane === NoLane) {
// TODO: Assign this to `suspenseState.retryLane`? to avoid
// unnecessary entanglement?
Expand Down
8 changes: 4 additions & 4 deletions packages/react-reconciler/src/ReactFiberWorkLoop.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export function requestUpdateLane(fiber: Fiber): Lane {
workInProgressRootRenderLanes !== NoLanes
) {
// This is a render phase update. These are not officially supported. The
// old behavior is to give this the same "thread" (expiration time) as
// old behavior is to give this the same "thread" (lanes) as
// whatever is currently rendering. So if you call `setState` on a component
// that happens later in the same render, it will flush. Ideally, we want to
// remove the special case and treat them as if they came from an
Expand Down Expand Up @@ -756,7 +756,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
}
}

// Determine the next expiration time to work on, using the fields stored
// Determine the next lanes to work on, using the fields stored
// on the root.
let lanes = getNextLanes(
root,
Expand Down Expand Up @@ -1629,7 +1629,7 @@ function completeUnitOfWork(unitOfWork: Fiber): void {
// capture values if possible.
const next = unwindWork(completedWork, subtreeRenderLanes);

// Because this fiber did not complete, don't reset its expiration time.
// Because this fiber did not complete, don't reset its lanes.

if (next !== null) {
// If completing this work spawned new work, do that next. We'll come
Expand Down Expand Up @@ -2308,7 +2308,7 @@ function retryTimedOutBoundary(boundaryFiber: Fiber, retryLane: Lane) {
// The boundary fiber (a Suspense component or SuspenseList component)
// previously was rendered in its fallback state. One of the promises that
// suspended it has resolved, which means at least part of the tree was
// likely unblocked. Try rendering again, at a new expiration time.
// likely unblocked. Try rendering again, at a new lanes.
if (retryLane === NoLane) {
// TODO: Assign this to `suspenseState.retryLane`? to avoid
// unnecessary entanglement?
Expand Down