Skip to content

Fix shadow block deselecting main block during multiselect #142

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

Open
LappiLappland wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix shadow block deselecting main block during multiselect #142

Show file tree
Hide file tree
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
26 changes: 24 additions & 2 deletions src/multiselect_controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,15 +491,37 @@ export class MultiselectControls {
}
return toRemove;
};
// Filter out shadow blocks from selection
const filterShadows = (list) => {
const toRemove = [];
for (const [element] of list.entries()) {
const elementParent = element.parentElement;
if (elementParent && elementParent.dataset && elementParent.dataset.id) {
const block = getByID(this.workspace_, elementParent.dataset.id);
if (block && block?.isShadow?.()) {
toRemove.push(element);
}
}
}
return toRemove;
};

this.dragSelect_.Selection.filterSelected = (
{selectorRect, select: _select, unselect: _unselect}) => {
const select = _select; const unselect = _unselect;
const toRemove = filterParent(select, selectorRect);
toRemove.forEach((el) => {

const shadowsToRemove = filterShadows(select);
shadowsToRemove.forEach((el) => {
select.delete(el);
});

const parentsToRemove = filterParent(select, selectorRect);
parentsToRemove.forEach((el) => {
const rect = select.get(el);
select.delete(el);
unselect.set(el, rect);
});

return {select, unselect};
};

Expand Down
80 changes: 80 additions & 0 deletions test-e2e/selection/multiselect/block.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,3 +420,83 @@ test("shift clicking child inside parent bounds selects child", async ({
expect(await getHighlightedBlockIds(page)).toEqual(["child"]);
expect(await getSelectedId(page)).toBe("child");
});

test("shift clicking block's shadow block input selects main block", async ({
page,
act,
}) => {
await act(
loadBlocks(page, [
{
type: "controls_repeat_ext",
id: "block",
inputs: {
TIMES: {
shadow: {
type: "math_number",
id: "shadow",
fields: {
NUM: 10,
},
},
},
},
},
]),
);

await act(page.keyboard.down("Shift"));

await act(
page.mouse.click(...(await getBlock(page, { id: "shadow" })).centerTop),
);

await act(page.keyboard.up("Shift"));

expect(await getHighlightedBlockIds(page)).toEqual(["block"]);
expect(await getSelectedId(page)).toBe("block");
});

test("shift clicking block's shadow block input adds main block into existing multiselection", async ({
page,
act,
}) => {
await act(
loadBlocks(page, [
{ type: "math_number", id: "block1" },
{ type: "math_number", id: "block2" },
{
type: "controls_repeat_ext",
id: "block3",
inputs: {
TIMES: {
shadow: {
type: "math_number",
id: "shadow",
fields: {
NUM: 10,
},
},
},
},
},
]),
);

await act(page.keyboard.down("Shift"));

await act(
page.mouse.click(...(await getBlock(page, { id: "block1" })).centerTop),
);
await act(
page.mouse.click(...(await getBlock(page, { id: "block2" })).centerTop),
);
await act(
page.mouse.click(...(await getBlock(page, { id: "shadow" })).centerTop),
);

await act(page.keyboard.up("Shift"));

expect(await getHighlightedBlockIds(page)).toEqual(["block1", "block2", "block3"]);
expect(await getSelectedId(page)).toBe(await getMultiselectDraggableId(page));
});