Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-22 08:47:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): remove redundant getOptional for gfx (#10142)

Browse Source
This commit is contained in:
Yifeng Wang
2025-02-13 11:27:20 +08:00
committed by GitHub
parent ed0b25def0
commit 26de7a56fd
4 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
blocksuite/affine/widget-remote-selection/src/doc/doc-remote-selection.ts
View File

@@ -14,7 +14,7 @@ import {
TextSelection,
WidgetComponent,
} from '@blocksuite/block-std';
import { GfxController } from '@blocksuite/block-std/gfx';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { throttle } from '@blocksuite/global/utils';
import type { BaseSelection, UserInfo } from '@blocksuite/store';
import { computed, effect } from '@preact/signals-core';
@@ -308,8 +308,7 @@ export class AffineDocRemoteSelectionWidget extends WidgetComponent {
})
);
const gfx = this.std.getOptional(GfxController);
if (!gfx) return;
const gfx = this.std.get(GfxControllerIdentifier);
this.disposables.add(
gfx.viewport.viewportUpdated.on(() => {
const selections = this._remoteSelections.peek();

18
blocksuite/affine/widget-scroll-anchoring/src/scroll-anchoring.ts
View File

@@ -68,9 +68,7 @@ export class AffineScrollAnchoringWidget extends WidgetComponent {
);
#getBoundsInEdgeless() {
const controller = this.std.getOptional(GfxControllerIdentifier);
if (!controller) return;
const controller = this.std.get(GfxControllerIdentifier);
const bounds = this.anchorBounds$.peek();
if (!bounds) return;
@@ -96,9 +94,7 @@ export class AffineScrollAnchoringWidget extends WidgetComponent {
}
#moveToAnchorInEdgeless(id: string) {
const controller = this.std.getOptional(GfxControllerIdentifier);
if (!controller) return;
const controller = this.std.get(GfxControllerIdentifier);
const surface = controller.surface;
if (!surface) return;
@@ -194,12 +190,10 @@ export class AffineScrollAnchoringWidget extends WidgetComponent {
});
// In edgeless
const controler = this.std.getOptional(GfxControllerIdentifier);
if (controler) {
this.disposables.add(
controler.viewport.viewportUpdated.on(this.#requestUpdateFn)
);
}
const controler = this.std.get(GfxControllerIdentifier);
this.disposables.add(
controler.viewport.viewportUpdated.on(this.#requestUpdateFn)
);
this.disposables.add(
this.anchor$.subscribe(anchor => {

5
blocksuite/blocks/src/root-block/widgets/linked-doc/index.ts
View File

@@ -7,7 +7,7 @@ import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import { getViewportElement } from '@blocksuite/affine-shared/utils';
import type { BlockComponent } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, WidgetComponent } from '@blocksuite/block-std';
import { GfxController } from '@blocksuite/block-std/gfx';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { IS_MOBILE } from '@blocksuite/global/env';
import {
INLINE_ROOT_ATTR,
@@ -197,8 +197,7 @@ export class AffineLinkedDocWidget extends WidgetComponent<
}
private _watchViewportChange() {
const gfx = this.std.getOptional(GfxController);
if (!gfx) return;
const gfx = this.std.get(GfxControllerIdentifier);
this.disposables.add(
gfx.viewport.viewportUpdated.on(() => {
this._updateInputRects();

8
blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts
View File

@@ -12,7 +12,7 @@ import {
getViewportElement,
} from '@blocksuite/affine-shared/utils';
import { PropTypes, requiredProperties } from '@blocksuite/block-std';
import { GfxController } from '@blocksuite/block-std/gfx';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import {
SignalWatcher,
throttle,
@@ -341,10 +341,8 @@ export class LinkedDocPopover extends SignalWatcher(
);
}
const gfx = this.context.std.getOptional(GfxController);
if (gfx) {
this.disposables.add(gfx.viewport.viewportUpdated.on(updatePosition));
}
const gfx = this.context.std.get(GfxControllerIdentifier);
this.disposables.add(gfx.viewport.viewportUpdated.on(updatePosition));
updatePosition();
}