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

Show file tree
Hide file tree
Changes from 8 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
14 changes: 12 additions & 2 deletions core/layer_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

import {getFocusManager} from './focus_manager.js';
import type {IFocusableNode} from './interfaces/i_focusable_node.js';
import {IRenderedElement} from './interfaces/i_rendered_element.js';
import * as layerNums from './layers.js';
import {Coordinate} from './utils/coordinate.js';
Expand Down Expand Up @@ -99,17 +101,25 @@ export class LayerManager {
*
* @internal
*/
moveToDragLayer(elem: IRenderedElement) {
moveToDragLayer(elem: IRenderedElement & IFocusableNode) {
this.dragLayer?.appendChild(elem.getSvgRoot());

// Since moving the element to the drag layer will cause it to lose focus,
// ensure it regains focus (to ensure proper highlights & sent events).
getFocusManager().focusNode(elem);
}

/**
* Moves the given element off of the drag layer.
*
* @internal
*/
moveOffDragLayer(elem: IRenderedElement, layerNum: number) {
moveOffDragLayer(elem: IRenderedElement & IFocusableNode, layerNum: number) {
this.append(elem, layerNum);

// Since moving the element off the drag layer will cause it to lose focus,
// ensure it regains focus (to ensure proper highlights & sent events).
getFocusManager().focusNode(elem);
}

/**
Expand Down
12 changes: 12 additions & 0 deletions core/renderers/zelos/path_object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import type {BlockSvg} from '../../block_svg.js';
import type {Connection} from '../../connection.js';
import {FocusManager} from '../../focus_manager.js';
import type {BlockStyle} from '../../theme.js';
import * as dom from '../../utils/dom.js';
import {Svg} from '../../utils/svg.js';
Expand Down Expand Up @@ -91,6 +92,17 @@ export class PathObject extends BasePathObject {
if (!this.svgPathSelected) {
this.svgPathSelected = this.svgPath.cloneNode(true) as SVGElement;
this.svgPathSelected.classList.add('blocklyPathSelected');
// Ensure focus-specific properties don't overlap with the block's path.
dom.removeClass(
this.svgPathSelected,
FocusManager.ACTIVE_FOCUS_NODE_CSS_CLASS_NAME,
);
dom.removeClass(
this.svgPathSelected,
FocusManager.PASSIVE_FOCUS_NODE_CSS_CLASS_NAME,
);
this.svgPathSelected.removeAttribute('tabindex');
this.svgPathSelected.removeAttribute('id');
this.svgRoot.appendChild(this.svgPathSelected);
}
} else {
Expand Down
11 changes: 10 additions & 1 deletion tests/mocha/layering_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ suite('Layering', function () {
const g = Blockly.utils.dom.createSvgElement('g', {});
return {
getSvgRoot: () => g,
getFocusableElement: () => {
throw new Error('Unsupported.');
},
getFocusableTree: () => {
throw new Error('Unsupported.');
},
onNodeFocus: () => {},
onNodeBlur: () => {},
canBeFocused: () => false,
};
}

Expand Down Expand Up @@ -80,7 +89,7 @@ suite('Layering', function () {
});

suite('dragging', function () {
test('moving an element to the drag layer adds it to the drag group', function () {
test.only('moving an element to the drag layer adds it to the drag group', function () {
Copy link
Collaborator

@rachel-fenichel rachel-fenichel May 13, 2025

Choose a reason for hiding this comment

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

Reset to test( so you're not skipping all the other tests.

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.

I forget this far too often until I do my self-review. :) Thanks & removed in latest.

const elem = createRenderedElement();

this.layerManager.moveToDragLayer(elem);
Expand Down