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

[WIP] Unify default lane with sync lane #25438

Closed
wants to merge 9 commits into from
Closed

[WIP] Unify default lane with sync lane #25438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
055364f
Add frame-end scheduling (V3)
rickhanlonii Jun 9, 2022
6c28764
Re-use rAF, don't re-schedule it
rickhanlonii Jun 15, 2022
9ec9df0
Address TODOs
tyao1 Sep 21, 2022
964ff73
lint&flow&build
tyao1 Sep 27, 2022
dfbc34e
Use frameAligned for DefaultUpdate
tyao1 Oct 5, 2022
3f9e2cc
Update isUnknownEvent to updateType enum
tyao1 Sep 28, 2022
aecf70f
Unify Default and Sync lane
tyao1 Oct 5, 2022
cef2437
flow
tyao1 Oct 6, 2022
0f13a3b
Fix some tests
tyao1 Oct 10, 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
9 changes: 9 additions & 0 deletions packages/jest-react/src/internalAct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ export function act<T>(scope: () => Thenable<T> | T): Thenable<T> {
let didFlushWork;
do {
didFlushWork = Scheduler.unstable_flushAllWithoutAsserting();

// Flush scheduled rAF.
if (global.flushRequestAnimationFrameQueue) {
global.flushRequestAnimationFrameQueue();
}
} while (didFlushWork);
return {
then(resolve, reject) {
Expand Down Expand Up @@ -143,6 +148,10 @@ function flushActWork(resolve, reject) {
// $FlowFixMe: Flow doesn't know about global Jest object
jest.runOnlyPendingTimers();
if (Scheduler.unstable_hasPendingWork()) {
// Flush scheduled rAF.
if (global.flushRequestAnimationFrameQueue) {
global.flushRequestAnimationFrameQueue();
}
// Committing a fallback scheduled additional work. Continue flushing.
flushActWork(resolve, reject);
return;
Expand Down
Loading