Skip to content

fix: cancelling all renders on triggering queued renders #7787

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

Merged
merged 1 commit into from
Jan 16, 2024
Merged

fix: cancelling all renders on triggering queued renders #7787

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
22 changes: 16 additions & 6 deletions core/render_management.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {WorkspaceSvg} from './workspace_svg.js';
const rootBlocks = new Set<BlockSvg>();

/** The set of all blocks in need of rendering. */
let dirtyBlocks = new WeakSet<BlockSvg>();
const dirtyBlocks = new WeakSet<BlockSvg>();

/**
* The promise which resolves after the current set of renders is completed. Or
Expand Down Expand Up @@ -81,9 +81,9 @@ export function finishQueuedRenders(): Promise<void> {
* @internal
*/
export function triggerQueuedRenders(workspace?: WorkspaceSvg) {
window.cancelAnimationFrame(animationRequestId);
if (!workspace) window.cancelAnimationFrame(animationRequestId);
doRenders(workspace);
if (afterRendersResolver) afterRendersResolver();
if (!workspace && afterRendersResolver) afterRendersResolver();
}

/**
Expand Down Expand Up @@ -134,9 +134,19 @@ function doRenders(workspace?: WorkspaceSvg) {
block.updateComponentLocations(blockOrigin);
}

rootBlocks.clear();
dirtyBlocks = new WeakSet();
afterRendersPromise = null;
for (const block of blocks) {
dequeueBlock(block);
}
if (!workspace) afterRendersPromise = null;
}

/** Removes the given block and children from the render queue. */
function dequeueBlock(block: BlockSvg) {
rootBlocks.delete(block);
dirtyBlocks.delete(block);
for (const child of block.getChildren(false)) {
dequeueBlock(child);
}
}

/**
Expand Down