Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions packages/react-reconciler/src/ReactFiberExpirationTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ export function inferPriorityFromExpirationTime(
return IdlePriority;
}
const msUntil =
msToExpirationTime(expirationTime) - msToExpirationTime(currentTime);
expirationTimeToMs(expirationTime) - expirationTimeToMs(currentTime);
if (msUntil <= 0) {
return ImmediatePriority;
}
if (msUntil <= HIGH_PRIORITY_EXPIRATION) {
if (msUntil <= HIGH_PRIORITY_EXPIRATION + HIGH_PRIORITY_BATCH_SIZE) {
return UserBlockingPriority;
}
if (msUntil <= LOW_PRIORITY_EXPIRATION) {
if (msUntil <= LOW_PRIORITY_EXPIRATION + LOW_PRIORITY_BATCH_SIZE) {
return NormalPriority;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,22 @@ describe('ReactSchedulerIntegration', () => {
]);
});

it('after completing a level of work, infers priority of the next batch based on its expiration time', () => {
function App({label}) {
Scheduler.yieldValue(`${label} [${getCurrentPriorityAsString()}]`);
return label;
}

// Schedule two separate updates at different priorities
runWithPriority(UserBlockingPriority, () => {
ReactNoop.render(<App label="A" />);
});
ReactNoop.render(<App label="B" />);

// The second update should run at normal priority
expect(Scheduler).toFlushAndYield(['A [UserBlocking]', 'B [Normal]']);
});

// TODO
it.skip('passive effects have render priority even if they are flushed early', () => {});
});