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

fix: improve performance of connecting blocks #6876

Merged
merged 11 commits into from
Mar 16, 2023
Merged

fix: improve performance of connecting blocks #6876

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a2d1faa
fix: early return from updateDisabled if it is noop
BeksOmega Mar 2, 2023
76cf448
chore: trigger connect and disconnect before hiding
BeksOmega Mar 2, 2023
441a5ac
chore: remove disconnectInternal
BeksOmega Mar 2, 2023
8d60bb2
fix: skip setting parent when disconnecting before connecting
BeksOmega Mar 2, 2023
9f7eec7
chore: fixup docs
BeksOmega Mar 2, 2023
05e6029
chore: remove erroneous test
BeksOmega Mar 2, 2023
99b95a4
fix: add delay to context menu callback.
BeksOmega Mar 6, 2023
995fa1d
fix: rendering bug
BeksOmega Mar 8, 2023
7e2129b
fix: connecting bug
BeksOmega Mar 8, 2023
aa6751e
chore: remove setParent param from public API
BeksOmega Mar 15, 2023
e94cca1
chore: tsdoc
BeksOmega Mar 15, 2023
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: 2 additions & 7 deletions core/insertion_marker_manager.ts
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConnectionType is now unused, and you missed the lint warning (but now we can all enjoy it! 🤣)

Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,14 @@ export class InsertionMarkerManager {
*/
applyConnections() {
if (!this.activeCandidate) return;
// Don't fire events for insertion markers.
const {local, closest} = this.activeCandidate;
local.connect(closest);
BeksOmega marked this conversation as resolved.
Show resolved Hide resolved
eventUtils.disable();
this.hidePreview();
eventUtils.enable();
const {local, closest} = this.activeCandidate;
// Connect two blocks together.
local.connect(closest);
if (this.topBlock.rendered) {
// Trigger a connection animation.
// Determine which connection is inferior (lower in the source stack).
const inferiorConnection = local.isSuperior() ? closest : local;
blockAnimations.connectionUiEffect(inferiorConnection.getSourceBlock());
// Bring the just-edited stack to the front.
const rootBlock = this.topBlock.getRootBlock();
setTimeout(() => {
rootBlock.bringToFront();
Expand Down