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

fix(editor): missing block in select-all set (#12627)

Browse Source 
This PR fixed that the block is missing in the selecte-all set after undo a dragging from canvas to note. Related to #12473

### Before

https://github.com/user-attachments/assets/828b4f48-689a-4975-bba6-f380f324de3c

### After

https://github.com/user-attachments/assets/9996c1ca-c3ea-415c-ab2b-359d826a1ffa

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

- **Bug Fixes**
  - Improved handling of changes to child elements, ensuring more accurate updates when items are added or removed. This results in more reliable display and interaction with nested components.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
L-Sun
2025-05-29 11:04:01 +00:00
parent f616bd29d3
commit 625e8392a6
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
blocksuite/framework/std/src/gfx/layer.ts
View File

@@ -825,7 +825,7 @@ export class LayerManager extends GfxExtension {
const block = store.getModelById(payload.id); const block = store.getModelById(payload.id);
if (block instanceof GfxBlockElementModel) { if (block instanceof GfxBlockElementModel) {
this.delete(block as GfxBlockElementModel); this.delete(block);
} }
} }
}) })
@@ -834,20 +834,29 @@ export class LayerManager extends GfxExtension {
const watchSurface = (surface: SurfaceBlockModel) => { const watchSurface = (surface: SurfaceBlockModel) => {
let lastChildMap = new Map(surface.childMap.peek()); let lastChildMap = new Map(surface.childMap.peek());
this._disposable.add( this._disposable.add(
surface.childMap.subscribe(val => { surface.childMap.subscribe(currentChildMap => {
val.forEach((_, id) => { currentChildMap.forEach((_, id) => {
if (lastChildMap.has(id)) { if (lastChildMap.has(id)) {
lastChildMap.delete(id); lastChildMap.delete(id);
return; return;
} }
}); });
lastChildMap.forEach((_, id) => { lastChildMap.forEach((_, id) => {
const block = this._doc.getBlock(id); const model = this._doc.getModelById(id);
if (block?.model) { if (model instanceof GfxBlockElementModel) {
this.delete(block.model as GfxBlockElementModel); this.delete(model);
} }
}); });
lastChildMap = new Map(val); currentChildMap.forEach((_, id) => {
const model = store.getModelById(id);
if (
model instanceof GfxBlockElementModel &&
!this.blocks.includes(model)
) {
this.add(model);
}
});
lastChildMap = new Map(currentChildMap);
}) })
); );