Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-29 08:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): suface component can be null (#12270)

Browse Source 
Closes: BS-3149

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

## Summary by CodeRabbit

- **Refactor**
  - Improved internal handling of surface components across various tools, resulting in safer and more consistent access patterns.
  - Enhanced code maintainability and reliability without altering any visible features or user workflows.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Saul-Mirone
2025-05-14 08:37:10 +00:00
parent 7e722957a9
commit f2164e4d70
6 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocksuite/affine/gfx/shape/src/shape-tool.ts
+11 -9
View File
@@ -41,6 +41,10 @@ export class ShapeTool extends BaseTool<ShapeToolOption> {
// shape overlay
private _shapeOverlay: ShapeOverlay | null = null;
private get _surfaceComponent() {
return this.gfx.surfaceComponent as SurfaceBlockComponent | null;
}
private _spacePressedCtx: {
draggingArea: IBound & {
endX: number;
@@ -91,7 +95,7 @@ export class ShapeTool extends BaseTool<ShapeToolOption> {
private _hideOverlay() {
if (!this._shapeOverlay) return;
this._shapeOverlay.globalAlpha = 0;
(this.gfx.surfaceComponent as SurfaceBlockComponent)?.refresh();
this._surfaceComponent?.refresh();
}
private _resize(shiftPressed = false, spacePressed = false) {
@@ -152,7 +156,7 @@ export class ShapeTool extends BaseTool<ShapeToolOption> {
if (!this._shapeOverlay) return;
this._shapeOverlay.x = x;
this._shapeOverlay.y = y;
(this.gfx.surfaceComponent as SurfaceBlockComponent)?.refresh();
this._surfaceComponent?.refresh();
}
override activate() {
@@ -163,11 +167,11 @@ export class ShapeTool extends BaseTool<ShapeToolOption> {
if (!this._shapeOverlay) return;
this._shapeOverlay.dispose();
(
this.gfx.surfaceComponent as SurfaceBlockComponent
)?.renderer.removeOverlay(this._shapeOverlay);
this._surfaceComponent?.renderer.removeOverlay(this._shapeOverlay);
this._shapeOverlay = null;
(this.gfx.surfaceComponent as SurfaceBlockComponent)?.renderer.refresh();
this._surfaceComponent?.renderer.refresh();
}
override click(e: PointerEventState): void {
@@ -223,9 +227,7 @@ export class ShapeTool extends BaseTool<ShapeToolOption> {
fillColor: attributes.fillColor,
strokeColor: attributes.strokeColor,
});
(this.gfx.surfaceComponent as SurfaceBlockComponent)?.renderer.addOverlay(
this._shapeOverlay
);
this._surfaceComponent?.renderer.addOverlay(this._shapeOverlay);
}
override deactivate() {