Skip to content

fix: Ensure selection stays when dragging blocks, comments, and bubbles #9034

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 9 commits into from
May 13, 2025
Merged

fix: Ensure selection stays when dragging blocks, comments, and bubbles #9034

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5193b48
fix: Ensure selection is retained when dragging.
BenHenning May 12, 2025
60c9510
chore: Empty commit to re-trigger CI.
BenHenning May 12, 2025
f519607
chore: Add comment explaining 'why' for focusNode.
BenHenning May 12, 2025
7e866f8
Merge branch 'rc/v12.0.0' into fix-selection-lost-on-drag
BenHenning May 13, 2025
134199a
fix: Fix selection & restore in other places, too.
BenHenning May 13, 2025
ca88088
chore: Move fix to drag layer for robustness.
BenHenning May 13, 2025
bc00986
fix: Remove redundancy in path object.
BenHenning May 13, 2025
6c8ab8f
fix: Fix broken test.
BenHenning May 13, 2025
a1c05cc
chore: Remove unintentional 'only' test filter.
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
5 changes: 5 additions & 0 deletions core/dragging/block_drag_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {ConnectionType} from '../connection_type.js';
import type {BlockMove} from '../events/events_block_move.js';
import {EventType} from '../events/type.js';
import * as eventUtils from '../events/utils.js';
import {getFocusManager} from '../focus_manager.js';
import {IConnectionPreviewer} from '../interfaces/i_connection_previewer.js';
import {IDragStrategy} from '../interfaces/i_draggable.js';
import * as layers from '../layers.js';
Expand Down Expand Up @@ -120,6 +121,10 @@ export class BlockDragStrategy implements IDragStrategy {
}
this.block.setDragging(true);
this.workspace.getLayerManager()?.moveToDragLayer(this.block);

// Since moving the block to the drag layer will cause it to lose focus,
// ensure it regains focus (to enable the block's selection highlight).
getFocusManager().focusNode(this.block);
Copy link
Collaborator

@rachel-fenichel rachel-fenichel May 12, 2025

Choose a reason for hiding this comment

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

Question: should this be done in moveToDragLayer (and moveOffDragLayer) instead of in the drag strategy?

Copy link
Collaborator Author

@BenHenning BenHenning May 13, 2025

Choose a reason for hiding this comment

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

Good idea. This actually made me realize that workspace comments had the same problem, so this shift actually fixes those, too.

}

/**
Expand Down