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

fix(editor): make selected and out-of-viewport block active (#12135)

Browse Source 
This PR make out-of-viewport but selected edgeless block keep active, since the selected block may still have some user interactions on the DOM. For example, when hover on a selected note and scroll viewport by wheel to view its hidden content, the note should not be hidden (a.k.a idel).

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

## Summary by CodeRabbit

- **Refactor**
  - Updated viewport logic to keep selected items visible instead of only those being edited. Visibility now depends on selection status rather than editing state.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
L-Sun
2025-05-06 07:05:54 +00:00
parent aa33b3ac07
commit 245db4e992
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
blocksuite/framework/std/src/gfx/viewport-element.ts
View File

@@ -66,13 +66,13 @@ export class GfxViewportElement extends WithDisposable(ShadowlessElement) {
} }
`; `;
private readonly _hideOutsideNoEditingBlock = () => { private readonly _hideOutsideAndNoSelectedBlock = () => {
if (!this.host) return; if (!this.host) return;
const gfx = this.host.std.get(GfxControllerIdentifier); const gfx = this.host.std.get(GfxControllerIdentifier);
const nextVisibleModels = new Set([ const nextVisibleModels = new Set([
...this.getModelsInViewport(), ...this.getModelsInViewport(),
...this._getEditingModels(), ...this._getSelectedModels(),
]); ]);
batch(() => { batch(() => {
@@ -106,7 +106,7 @@ export class GfxViewportElement extends WithDisposable(ShadowlessElement) {
}[] = []; }[] = [];
private readonly _refreshViewport = requestThrottledConnectedFrame(() => { private readonly _refreshViewport = requestThrottledConnectedFrame(() => {
this._hideOutsideNoEditingBlock(); this._hideOutsideAndNoSelectedBlock();
}, this); }, this);
private _updatingChildrenFlag = false; private _updatingChildrenFlag = false;
@@ -122,7 +122,7 @@ export class GfxViewportElement extends WithDisposable(ShadowlessElement) {
delete this.scheduleUpdateChildren; delete this.scheduleUpdateChildren;
} }
this._hideOutsideNoEditingBlock(); this._hideOutsideAndNoSelectedBlock();
this.disposables.add( this.disposables.add(
this.viewport.viewportUpdated.subscribe(() => viewportUpdateCallback()) this.viewport.viewportUpdated.subscribe(() => viewportUpdateCallback())
); );
@@ -169,12 +169,11 @@ export class GfxViewportElement extends WithDisposable(ShadowlessElement) {
return promise; return promise;
}; };
private _getEditingModels(): Set<GfxBlockElementModel> { private _getSelectedModels(): Set<GfxBlockElementModel> {
if (!this.host) return new Set(); if (!this.host) return new Set();
const gfx = this.host.std.get(GfxControllerIdentifier); const gfx = this.host.std.get(GfxControllerIdentifier);
return new Set( return new Set(
gfx.selection.surfaceSelections gfx.selection.surfaceSelections
.filter(s => s.editing)
.flatMap(({ elements }) => elements) .flatMap(({ elements }) => elements)
.map(id => gfx.getElementById(id)) .map(id => gfx.getElementById(id))
.filter(e => e instanceof GfxBlockElementModel) .filter(e => e instanceof GfxBlockElementModel)