Skip to content

fix: Ensure cursor syncs with more than just focused blocks #9032

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
BenHenning merged 4 commits into from
May 14, 2025
Merged

fix: Ensure cursor syncs with more than just focused blocks #9032

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80c09e4
fix: Ensure LineCursor synchronizes with focus.
BenHenning May 12, 2025
0caa5b6
Merge branch 'rc/v12.0.0' into ensure-cursor-syncs-with-more-than-jus…
BenHenning May 13, 2025
ab53527
Merge branch 'rc/v12.0.0' into ensure-cursor-syncs-with-more-than-jus…
BenHenning May 13, 2025
e97985c
fix: Post-merge fixes.
BenHenning May 13, 2025
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: 9 additions & 15 deletions core/keyboard_nav/line_cursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,15 @@ export class LineCursor extends Marker {
* @returns The current field, connection, or block the cursor is on.
*/
override getCurNode(): IFocusableNode | null {
this.updateCurNodeFromFocus();
// Ensure the current node matches what's currently focused.
const focused = getFocusManager().getFocusedNode();
const block = this.getSourceBlockFromNode(focused);
if (!block || block.workspace === this.workspace) {
// If the current focused node corresponds to a block then ensure that it
// belongs to the correct workspace for this cursor.
this.setCurNode(focused);
}

return super.getCurNode();
}

Expand All @@ -401,20 +409,6 @@ export class LineCursor extends Marker {
}
}

/**
* Updates the current node to match what's currently focused.
*/
private updateCurNodeFromFocus() {
const focused = getFocusManager().getFocusedNode();

if (focused instanceof BlockSvg) {
const block: BlockSvg | null = focused;
if (block && block.workspace === this.workspace) {
this.setCurNode(block);
}
}
}

/**
* Get the first navigable node on the workspace, or null if none exist.
*
Expand Down