luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(editor): add index checking to selected elements array (#9453)

Browse Source 
Close https://toeverything.sentry.io/issues/6187666983/?alert_rule_id=15031714&alert_type=issue&notification_uuid=fe3f4b9d-1e86-420e-a715-c3ca0fa932e4&project=4506307500179456&referrer=slack
This commit is contained in:
L-Sun
2024-12-31 08:05:13 +00:00
parent 597b631918
commit b51de2ac4c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blocksuite/blocks/src/root-block/widgets/element-toolbar/lock-button.ts
View File

@@ -33,8 +33,6 @@ export class EdgelessLockButton extends SignalWatcher(
private _lock() { private _lock() {
const { service, doc, std } = this.edgeless; const { service, doc, std } = this.edgeless;
doc.captureSync();
// get most top selected elements(*) from tree, like in a tree below // get most top selected elements(*) from tree, like in a tree below
// G0 // G0
// / \ // / \
@@ -46,12 +44,16 @@ export class EdgelessLockButton extends SignalWatcher(
// return [E1] // return [E1]
const selectedElements = this._selectedElements; const selectedElements = this._selectedElements;
if (selectedElements.length === 0) return;
const levels = selectedElements.map(element => element.groups.length); const levels = selectedElements.map(element => element.groups.length);
const topElement = selectedElements[levels.indexOf(Math.min(...levels))]; const topElement = selectedElements[levels.indexOf(Math.min(...levels))];
const otherElements = selectedElements.filter( const otherElements = selectedElements.filter(
element => element !== topElement element => element !== topElement
); );
doc.captureSync();
// release other elements from their groups and group with top element // release other elements from their groups and group with top element
otherElements.forEach(element => { otherElements.forEach(element => {
// oxlint-disable-next-line unicorn/prefer-dom-node-remove // oxlint-disable-next-line unicorn/prefer-dom-node-remove
@@ -97,9 +99,13 @@ export class EdgelessLockButton extends SignalWatcher(
private _unlock() { private _unlock() {
const { service, doc } = this.edgeless; const { service, doc } = this.edgeless;
const selectedElements = this._selectedElements;
if (selectedElements.length === 0) return;
doc.captureSync(); doc.captureSync();
this._selectedElements.forEach(element => { selectedElements.forEach(element => {
if (element instanceof GroupElementModel) { if (element instanceof GroupElementModel) {
service.ungroup(element); service.ungroup(element);
} else { } else {