Skip to content

Commit 93e0bdf

Browse files
sophiebitssophiebits
committed
Remove unnecessary comparisons
Ran these, then prettier, then these again. ``` codemod --accept-all -d packages -m '\(\s*([a-zA-Z.]+) === NoWork\s*\|\|\s*\1 (>=?) ([a-zA-Z.]+)\s*\)' '(\1 \2 \3)' codemod --accept-all -d packages -m '\(\s*([a-zA-Z.]+) === NoWork\s*\|\|\s*([a-zA-Z.]+) (<=?) \1\s*\)' '(\2 \3 \1)' codemod --accept-all -d packages -m '(?<![.\w])([a-zA-Z.]+) !== NoWork\s*&&\s*\1 (<) ([a-zA-Z.]+)' '\1 \2 \3' codemod --accept-all -d packages -m '(?<![.\w])([a-zA-Z.]+) !== NoWork\s*&&\s*([a-zA-Z.]+) (>) \1' '\2 \3 \1' codemod --accept-all -d packages -m '(?<![.\w])([a-zA-Z.]+) === NoWork\s*\|\|\s*\1 (>=?) ([a-zA-Z.]+)\s*\?\s' '\1 \2 \3 ? ' codemod --accept-all -d packages -m '(?<![.\w])([a-zA-Z.]+) === NoWork\s*\|\|\s*([a-zA-Z.]+) (<=?) \1\s*\?\s' '\2 \3 \1 ? ' ```
1 parent a684f09 commit 93e0bdf

File tree

5 files changed

+29
-107
lines changed

5 files changed

+29
-107
lines changed

‎packages/react-reconciler/src/ReactFiberBeginWork.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,7 @@ function updatePureComponent(
243243
) {
244244
const render = Component.render;
245245

246-
if (
247-
current !== null &&
248-
(updateExpirationTime === NoWork ||
249-
updateExpirationTime > renderExpirationTime)
250-
) {
246+
if (current !== null && updateExpirationTime > renderExpirationTime) {
251247
const prevProps = current.memoizedProps;
252248
// Default to shallow comparison
253249
let compare = Component.compare;
@@ -1351,10 +1347,7 @@ function bailoutOnAlreadyFinishedWork(
13511347

13521348
// Check if the children have any pending work.
13531349
const childExpirationTime = workInProgress.childExpirationTime;
1354-
if (
1355-
childExpirationTime === NoWork ||
1356-
childExpirationTime > renderExpirationTime
1357-
) {
1350+
if (childExpirationTime > renderExpirationTime) {
13581351
// The children don't have any work either. We can skip them.
13591352
// TODO: Once we add back resuming, we should check if the children are
13601353
// a work-in-progress set. If so, we need to transfer their effects.
@@ -1380,8 +1373,7 @@ function beginWork(
13801373
if (
13811374
oldProps === newProps &&
13821375
!hasLegacyContextChanged() &&
1383-
(updateExpirationTime === NoWork ||
1384-
updateExpirationTime > renderExpirationTime)
1376+
updateExpirationTime > renderExpirationTime
13851377
) {
13861378
// This fiber does not have any pending work. Bailout without entering
13871379
// the begin phase. There's still some bookkeeping we that needs to be done

‎packages/react-reconciler/src/ReactFiberNewContext.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,13 @@ export function propagateContextChange(
177177
enqueueUpdate(fiber, update);
178178
}
179179

180-
if (
181-
fiber.expirationTime === NoWork ||
182-
fiber.expirationTime > renderExpirationTime
183-
) {
180+
if (fiber.expirationTime > renderExpirationTime) {
184181
fiber.expirationTime = renderExpirationTime;
185182
}
186183
let alternate = fiber.alternate;
187184
if (
188185
alternate !== null &&
189-
(alternate.expirationTime === NoWork ||
190-
alternate.expirationTime > renderExpirationTime)
186+
alternate.expirationTime > renderExpirationTime
191187
) {
192188
alternate.expirationTime = renderExpirationTime;
193189
}
@@ -196,22 +192,17 @@ export function propagateContextChange(
196192
let node = fiber.return;
197193
while (node !== null) {
198194
alternate = node.alternate;
199-
if (
200-
node.childExpirationTime === NoWork ||
201-
node.childExpirationTime > renderExpirationTime
202-
) {
195+
if (node.childExpirationTime > renderExpirationTime) {
203196
node.childExpirationTime = renderExpirationTime;
204197
if (
205198
alternate !== null &&
206-
(alternate.childExpirationTime === NoWork ||
207-
alternate.childExpirationTime > renderExpirationTime)
199+
alternate.childExpirationTime > renderExpirationTime
208200
) {
209201
alternate.childExpirationTime = renderExpirationTime;
210202
}
211203
} else if (
212204
alternate !== null &&
213-
(alternate.childExpirationTime === NoWork ||
214-
alternate.childExpirationTime > renderExpirationTime)
205+
alternate.childExpirationTime > renderExpirationTime
215206
) {
216207
alternate.childExpirationTime = renderExpirationTime;
217208
} else {

‎packages/react-reconciler/src/ReactFiberPendingPriority.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,10 @@ export function findEarliestOutstandingPriorityLevel(
225225

226226
const earliestPendingTime = root.earliestPendingTime;
227227
const earliestSuspendedTime = root.earliestSuspendedTime;
228-
if (
229-
earliestExpirationTime === NoWork ||
230-
(earliestPendingTime !== NoWork &&
231-
earliestPendingTime < earliestExpirationTime)
232-
) {
228+
if (earliestPendingTime < earliestExpirationTime) {
233229
earliestExpirationTime = earliestPendingTime;
234230
}
235-
if (
236-
earliestExpirationTime === NoWork ||
237-
(earliestSuspendedTime !== NoWork &&
238-
earliestSuspendedTime < earliestExpirationTime)
239-
) {
231+
if (earliestSuspendedTime < earliestExpirationTime) {
240232
earliestExpirationTime = earliestSuspendedTime;
241233
}
242234
return earliestExpirationTime;
@@ -278,11 +270,7 @@ function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {
278270
}
279271

280272
let expirationTime = nextExpirationTimeToWorkOn;
281-
if (
282-
expirationTime !== NoWork &&
283-
earliestSuspendedTime !== NoWork &&
284-
earliestSuspendedTime < expirationTime
285-
) {
273+
if (expirationTime !== NoWork && earliestSuspendedTime < expirationTime) {
286274
// Expire using the earliest known expiration time.
287275
expirationTime = earliestSuspendedTime;
288276
}

‎packages/react-reconciler/src/ReactFiberScheduler.js

Lines changed: 16 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
556556
const updateExpirationTimeBeforeCommit = finishedWork.expirationTime;
557557
const childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;
558558
const earliestRemainingTimeBeforeCommit =
559-
updateExpirationTimeBeforeCommit === NoWork ||
560-
(childExpirationTimeBeforeCommit !== NoWork &&
561-
childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)
559+
childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit
562560
? childExpirationTimeBeforeCommit
563561
: updateExpirationTimeBeforeCommit;
564562
markCommittedPriorityLevels(root, earliestRemainingTimeBeforeCommit);
@@ -733,9 +731,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
733731
const updateExpirationTimeAfterCommit = finishedWork.expirationTime;
734732
const childExpirationTimeAfterCommit = finishedWork.childExpirationTime;
735733
const earliestRemainingTimeAfterCommit =
736-
updateExpirationTimeAfterCommit === NoWork ||
737-
(childExpirationTimeAfterCommit !== NoWork &&
738-
childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit)
734+
childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit
739735
? childExpirationTimeAfterCommit
740736
: updateExpirationTimeAfterCommit;
741737
if (earliestRemainingTimeAfterCommit === NoWork) {
@@ -776,10 +772,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {
776772
// Only decrement the pending interaction count if we're done.
777773
// If there's still work at the current priority,
778774
// That indicates that we are waiting for suspense data.
779-
if (
780-
earliestRemainingTimeAfterCommit === NoWork ||
781-
scheduledExpirationTime < earliestRemainingTimeAfterCommit
782-
) {
775+
if (scheduledExpirationTime < earliestRemainingTimeAfterCommit) {
783776
pendingInteractionMap.delete(scheduledExpirationTime);
784777

785778
scheduledInteractions.forEach(interaction => {
@@ -839,18 +832,10 @@ function resetChildExpirationTime(
839832
while (child !== null) {
840833
const childUpdateExpirationTime = child.expirationTime;
841834
const childChildExpirationTime = child.childExpirationTime;
842-
if (
843-
newChildExpirationTime === NoWork ||
844-
(childUpdateExpirationTime !== NoWork &&
845-
childUpdateExpirationTime < newChildExpirationTime)
846-
) {
835+
if (childUpdateExpirationTime < newChildExpirationTime) {
847836
newChildExpirationTime = childUpdateExpirationTime;
848837
}
849-
if (
850-
newChildExpirationTime === NoWork ||
851-
(childChildExpirationTime !== NoWork &&
852-
childChildExpirationTime < newChildExpirationTime)
853-
) {
838+
if (childChildExpirationTime < newChildExpirationTime) {
854839
newChildExpirationTime = childChildExpirationTime;
855840
}
856841
if (shouldBubbleActualDurations) {
@@ -866,18 +851,10 @@ function resetChildExpirationTime(
866851
while (child !== null) {
867852
const childUpdateExpirationTime = child.expirationTime;
868853
const childChildExpirationTime = child.childExpirationTime;
869-
if (
870-
newChildExpirationTime === NoWork ||
871-
(childUpdateExpirationTime !== NoWork &&
872-
childUpdateExpirationTime < newChildExpirationTime)
873-
) {
854+
if (childUpdateExpirationTime < newChildExpirationTime) {
874855
newChildExpirationTime = childUpdateExpirationTime;
875856
}
876-
if (
877-
newChildExpirationTime === NoWork ||
878-
(childChildExpirationTime !== NoWork &&
879-
childChildExpirationTime < newChildExpirationTime)
880-
) {
857+
if (childChildExpirationTime < newChildExpirationTime) {
881858
newChildExpirationTime = childChildExpirationTime;
882859
}
883860
child = child.sibling;
@@ -1645,18 +1622,11 @@ function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {
16451622
}
16461623

16471624
// Update the source fiber's expiration time
1648-
if (
1649-
fiber.expirationTime === NoWork ||
1650-
fiber.expirationTime > expirationTime
1651-
) {
1625+
if (fiber.expirationTime > expirationTime) {
16521626
fiber.expirationTime = expirationTime;
16531627
}
16541628
let alternate = fiber.alternate;
1655-
if (
1656-
alternate !== null &&
1657-
(alternate.expirationTime === NoWork ||
1658-
alternate.expirationTime > expirationTime)
1659-
) {
1629+
if (alternate !== null && alternate.expirationTime > expirationTime) {
16601630
alternate.expirationTime = expirationTime;
16611631
}
16621632
// Walk the parent path to the root and update the child expiration time.
@@ -1667,22 +1637,17 @@ function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {
16671637
} else {
16681638
while (node !== null) {
16691639
alternate = node.alternate;
1670-
if (
1671-
node.childExpirationTime === NoWork ||
1672-
node.childExpirationTime > expirationTime
1673-
) {
1640+
if (node.childExpirationTime > expirationTime) {
16741641
node.childExpirationTime = expirationTime;
16751642
if (
16761643
alternate !== null &&
1677-
(alternate.childExpirationTime === NoWork ||
1678-
alternate.childExpirationTime > expirationTime)
1644+
alternate.childExpirationTime > expirationTime
16791645
) {
16801646
alternate.childExpirationTime = expirationTime;
16811647
}
16821648
} else if (
16831649
alternate !== null &&
1684-
(alternate.childExpirationTime === NoWork ||
1685-
alternate.childExpirationTime > expirationTime)
1650+
alternate.childExpirationTime > expirationTime
16861651
) {
16871652
alternate.childExpirationTime = expirationTime;
16881653
}
@@ -2031,10 +1996,7 @@ function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {
20311996
} else {
20321997
// This root is already scheduled, but its priority may have increased.
20331998
const remainingExpirationTime = root.expirationTime;
2034-
if (
2035-
remainingExpirationTime === NoWork ||
2036-
expirationTime < remainingExpirationTime
2037-
) {
1999+
if (expirationTime < remainingExpirationTime) {
20382000
// Update the priority.
20392001
root.expirationTime = expirationTime;
20402002
}
@@ -2083,10 +2045,7 @@ function findHighestPriorityRoot() {
20832045
}
20842046
root = previousScheduledRoot.nextScheduledRoot;
20852047
} else {
2086-
if (
2087-
highestPriorityWork === NoWork ||
2088-
remainingExpirationTime < highestPriorityWork
2089-
) {
2048+
if (remainingExpirationTime < highestPriorityWork) {
20902049
// Update the priority, if it's higher
20912050
highestPriorityWork = remainingExpirationTime;
20922051
highestPriorityRoot = root;
@@ -2153,8 +2112,7 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
21532112
while (
21542113
nextFlushedRoot !== null &&
21552114
nextFlushedExpirationTime !== NoWork &&
2156-
(minExpirationTime === NoWork ||
2157-
minExpirationTime >= nextFlushedExpirationTime) &&
2115+
minExpirationTime >= nextFlushedExpirationTime &&
21582116
(!deadlineDidExpire || currentRendererTime >= nextFlushedExpirationTime)
21592117
) {
21602118
performWorkOnRoot(
@@ -2170,8 +2128,7 @@ function performWork(minExpirationTime: ExpirationTime, dl: Deadline | null) {
21702128
while (
21712129
nextFlushedRoot !== null &&
21722130
nextFlushedExpirationTime !== NoWork &&
2173-
(minExpirationTime === NoWork ||
2174-
minExpirationTime >= nextFlushedExpirationTime)
2131+
minExpirationTime >= nextFlushedExpirationTime
21752132
) {
21762133
performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, true);
21772134
findHighestPriorityRoot();

‎packages/react-reconciler/src/ReactUpdateQueue.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,7 @@ export function processUpdateQueue<State>(
437437
}
438438
// Since this update will remain in the list, update the remaining
439439
// expiration time.
440-
if (
441-
newExpirationTime === NoWork ||
442-
newExpirationTime > updateExpirationTime
443-
) {
440+
if (newExpirationTime > updateExpirationTime) {
444441
newExpirationTime = updateExpirationTime;
445442
}
446443
} else {
@@ -490,10 +487,7 @@ export function processUpdateQueue<State>(
490487
}
491488
// Since this update will remain in the list, update the remaining
492489
// expiration time.
493-
if (
494-
newExpirationTime === NoWork ||
495-
newExpirationTime > updateExpirationTime
496-
) {
490+
if (newExpirationTime > updateExpirationTime) {
497491
newExpirationTime = updateExpirationTime;
498492
}
499493
} else {

0 commit comments

Comments
 (0)