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.

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

fix(asapScheduler): No longer stops after scheduling twice during flush #7198

Merged
merged 1 commit into from
Mar 1, 2023
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
24 changes: 24 additions & 0 deletions spec/schedulers/AsapScheduler-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,28 @@ describe('Scheduler.asap', () => {
done();
});
});

it('scheduling inside of an executing action more than once should work', (done) => {
const results: any[] = [];

let resolve: () => void;
let promise = new Promise<void>((r) => resolve = r);

asapScheduler.schedule(() => {
results.push(1)
asapScheduler.schedule(() => {
results.push(2);
});
asapScheduler.schedule(() => {
results.push(3);
resolve();
});
});

promise.then(() => {
// This should always fire after two recursively scheduled microtasks.
expect(results).to.deep.equal([1, 2, 3]);
done();
});
});
});
4 changes: 3 additions & 1 deletion src/internal/scheduler/AsapAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export class AsapAction<T> extends AsyncAction<T> {
const { actions } = scheduler;
if (id != null && actions[actions.length - 1]?.id !== id) {
immediateProvider.clearImmediate(id);
scheduler._scheduled = undefined;
if (scheduler._scheduled === id) {
scheduler._scheduled = undefined;
}
}
// Return undefined so the action knows to request a new async id if it's rescheduled.
return undefined;
Expand Down