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

refactor(editor): remove global types in edgeless (#10092)

Browse Source 
Closes: [BS-2553](https://linear.app/affine-design/issue/BS-2553/remove-global-types-in-edgeless)
This commit is contained in:
Saul-Mirone
2025-02-11 12:09:44 +00:00
parent 3062bd0771
commit dbf0f9dc20
45 changed files with 126 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocksuite/affine/model/src/blocks/attachment/attachment-model.ts
-8
View File
@@ -88,11 +88,3 @@ export const AttachmentBlockSchema = defineBlockSchema({
export class AttachmentBlockModel
extends GfxCompatible<AttachmentBlockProps>(BlockModel)
implements GfxElementGeometry {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:attachment': AttachmentBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts
-8
View File
@@ -57,11 +57,3 @@ export const BookmarkBlockSchema = defineBlockSchema({
export class BookmarkBlockModel
extends GfxCompatible<BookmarkBlockProps>(BlockModel)
implements GfxElementGeometry {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:bookmark': BookmarkBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/edgeless-text/edgeless-text-model.ts
-12
View File
@@ -79,15 +79,3 @@ export const EdgelessTextBlockSchema = defineBlockSchema({
export class EdgelessTextBlockModel
extends GfxCompatible<EdgelessTextProps>(BlockModel)
implements GfxElementGeometry {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:edgeless-text': EdgelessTextBlockModel;
}
interface EdgelessTextModelMap {
'edgeless-text': EdgelessTextBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/figma/figma-model.ts
-8
View File
@@ -19,11 +19,3 @@ export type EmbedFigmaBlockProps = {
export class EmbedFigmaModel extends defineEmbedModel<EmbedFigmaBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-figma': EmbedFigmaModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/github/github-model.ts
-8
View File
@@ -33,11 +33,3 @@ export type EmbedGithubBlockProps = {
export class EmbedGithubModel extends defineEmbedModel<EmbedGithubBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-github': EmbedGithubModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/html/html-model.ts
-8
View File
@@ -15,11 +15,3 @@ export type EmbedHtmlBlockProps = {
export class EmbedHtmlModel extends defineEmbedModel<EmbedHtmlBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-html': EmbedHtmlModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/linked-doc/linked-doc-model.ts
-8
View File
@@ -20,11 +20,3 @@ export type EmbedLinkedDocBlockProps = {
export class EmbedLinkedDocModel extends defineEmbedModel<EmbedLinkedDocBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-linked-doc': EmbedLinkedDocModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/loom/loom-model.ts
-8
View File
@@ -21,11 +21,3 @@ export type EmbedLoomBlockProps = {
export class EmbedLoomModel extends defineEmbedModel<EmbedLoomBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-loom': EmbedLoomModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/synced-doc/synced-doc-model.ts
-8
View File
@@ -15,11 +15,3 @@ export type EmbedSyncedDocBlockProps = {
export class EmbedSyncedDocModel extends defineEmbedModel<EmbedSyncedDocBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-synced-doc': EmbedSyncedDocModel;
}
}
}
blocksuite/affine/model/src/blocks/embed/youtube/youtube-model.ts
-8
View File
@@ -24,11 +24,3 @@ export type EmbedYoutubeBlockProps = {
export class EmbedYoutubeModel extends defineEmbedModel<EmbedYoutubeBlockProps>(
BlockModel
) {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:embed-youtube': EmbedYoutubeModel;
}
}
}
blocksuite/affine/model/src/blocks/frame/frame-model.ts
-8
View File
@@ -144,11 +144,3 @@ export class FrameBlockModel
});
}
}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:frame': FrameBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/image/image-model.ts
-8
View File
@@ -42,11 +42,3 @@ export const ImageBlockSchema = defineBlockSchema({
export class ImageBlockModel
extends GfxCompatible<ImageBlockProps>(BlockModel)
implements GfxElementGeometry {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:image': ImageBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/latex/latex-model.ts
-8
View File
@@ -37,11 +37,3 @@ export const LatexBlockSchema = defineBlockSchema({
export class LatexBlockModel
extends GfxCompatible<LatexProps>(BlockModel)
implements GfxElementGeometry {}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:latex': LatexBlockModel;
}
}
}
blocksuite/affine/model/src/blocks/note/note-model.ts
-8
View File
@@ -155,11 +155,3 @@ export class NoteBlockModel
return false;
}
}
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {
'affine:note': NoteBlockModel;
}
}
}
blocksuite/affine/model/src/elements/brush/brush.ts
-8
View File
@@ -224,11 +224,3 @@ export class BrushElementModel extends GfxPrimitiveElementModel<BrushProps> {
}
type Instance = GfxPrimitiveElementModel<BrushProps> & BrushProps;
declare global {
namespace BlockSuite {
interface SurfaceElementModelMap {
brush: BrushElementModel;
}
}
}
blocksuite/affine/model/src/elements/connector/connector.ts
-11
View File
@@ -508,14 +508,3 @@ export class ConnectorElementModel extends GfxPrimitiveElementModel<ConnectorEle
@local()
accessor xywh: SerializedXYWH = '[0,0,0,0]';
}
declare global {
namespace BlockSuite {
interface SurfaceElementModelMap {
connector: ConnectorElementModel;
}
interface EdgelessTextModelMap {
connector: ConnectorElementModel;
}
}
}
blocksuite/affine/model/src/elements/connector/local-connector.ts
-8
View File
@@ -56,11 +56,3 @@ export class LocalConnectorElementModel extends GfxLocalElementModel {
return 'connector';
}
}
declare global {
namespace BlockSuite {
interface SurfaceLocalModelMap {
connector: LocalConnectorElementModel;
}
}
}
blocksuite/affine/model/src/elements/group/group.ts
-12
View File
@@ -119,15 +119,3 @@ export class GroupElementModel extends GfxGroupLikeElementModel<GroupElementProp
@field()
accessor title: Y.Text = new Y.Text();
}
declare global {
namespace BlockSuite {
interface SurfaceGroupLikeModelMap {
group: GroupElementModel;
}
interface SurfaceElementModelMap {
group: GroupElementModel;
}
}
}
blocksuite/affine/model/src/elements/index.ts
+26
View File
@@ -1,6 +1,32 @@
import type { EdgelessTextBlockModel } from '../blocks/edgeless-text/edgeless-text-model.js';
import type { BrushElementModel } from './brush/index.js';
import type { ConnectorElementModel } from './connector/index.js';
import type { GroupElementModel } from './group/index.js';
import type { MindmapElementModel } from './mindmap/index.js';
import type { ShapeElementModel } from './shape/index.js';
import type { TextElementModel } from './text/index.js';
export * from './brush/index.js';
export * from './connector/index.js';
export * from './group/index.js';
export * from './mindmap/index.js';
export * from './shape/index.js';
export * from './text/index.js';
export type SurfaceElementModelMap = {
brush: BrushElementModel;
connector: ConnectorElementModel;
group: GroupElementModel;
mindmap: MindmapElementModel;
shape: ShapeElementModel;
text: TextElementModel;
};
export type SurfaceTextModelMap = {
text: TextElementModel;
connector: ConnectorElementModel;
shape: ShapeElementModel;
'edgeless-text': EdgelessTextBlockModel;
};
export type SurfaceTextModel = SurfaceTextModelMap[keyof SurfaceTextModelMap];
blocksuite/affine/model/src/elements/mindmap/mindmap.ts
+3 -10
View File
@@ -1,6 +1,7 @@
import type {
BaseElementProps,
GfxModel,
GfxPrimitiveElementModel,
PointTestOptions,
SerializedElement,
} from '@blocksuite/block-std/gfx';
@@ -44,7 +45,7 @@ export type MindmapNode = {
id: string;
detail: NodeDetail;
element: BlockSuite.SurfaceElementModel;
element: GfxPrimitiveElementModel;
children: MindmapNode[];
parent: MindmapNode | null;
@@ -836,7 +837,7 @@ export class MindmapElementModel extends GfxGroupLikeElementModel<MindmapElement
return;
}
const stashed = new Set<BlockSuite.SurfaceElementModel>();
const stashed = new Set<GfxPrimitiveElementModel>();
const traverse = (node: MindmapNode) => {
node.element.stash('xywh');
stashed.add(node.element);
@@ -975,11 +976,3 @@ export class MindmapElementModel extends GfxGroupLikeElementModel<MindmapElement
@field()
accessor style: MindmapStyle = MindmapStyle.ONE;
}
declare global {
namespace BlockSuite {
interface SurfaceGroupLikeModelMap {
mindmap: MindmapElementModel;
}
}
}
blocksuite/affine/model/src/elements/shape/shape.ts
-12
View File
@@ -261,15 +261,3 @@ export class LocalShapeElementModel extends GfxLocalElementModel {
@prop()
accessor textVerticalAlign: TextVerticalAlign = TextVerticalAlign.Center;
}
declare global {
namespace BlockSuite {
interface SurfaceElementModelMap {
shape: ShapeElementModel;
}
interface EdgelessTextModelMap {
shape: ShapeElementModel;
}
}
}
blocksuite/affine/model/src/elements/text/text.ts
-12
View File
@@ -90,15 +90,3 @@ export class TextElementModel extends GfxPrimitiveElementModel<TextElementProps>
@field()
accessor xywh: SerializedXYWH = '[0,0,16,16]';
}
declare global {
namespace BlockSuite {
interface SurfaceElementModelMap {
text: TextElementModel;
}
interface EdgelessTextModelMap {
text: TextElementModel;
}
}
}
blocksuite/affine/model/src/utils/global.ts
-46
View File
@@ -1,46 +0,0 @@
import type {
GfxBlockElementModel,
GfxGroupLikeElementModel,
GfxLocalElementModel,
GfxPrimitiveElementModel,
} from '@blocksuite/block-std/gfx';
declare global {
namespace BlockSuite {
interface EdgelessBlockModelMap {}
type EdgelessBlockModelKeyType = keyof EdgelessBlockModelMap;
type EdgelessBlockModelType =
| EdgelessBlockModelMap[EdgelessBlockModelKeyType]
| GfxBlockElementModel;
interface EdgelessTextModelMap {}
type EdgelessTextModelKeyType = keyof EdgelessTextModelMap;
type EdgelessTextModelType = EdgelessTextModelMap[EdgelessTextModelKeyType];
interface SurfaceElementModelMap {}
type SurfaceElementModelKeys = keyof SurfaceElementModelMap;
type SurfaceElementModel =
| SurfaceElementModelMap[SurfaceElementModelKeys]
| GfxPrimitiveElementModel;
interface SurfaceGroupLikeModelMap {}
type SurfaceGroupLikeModelKeys = keyof SurfaceGroupLikeModelMap;
type SurfaceGroupLikeModel =
| SurfaceGroupLikeModelMap[SurfaceGroupLikeModelKeys]
| GfxGroupLikeElementModel;
interface SurfaceLocalModelMap {}
type SurfaceLocalModelKeys = keyof SurfaceLocalModelMap;
type SurfaceLocalModel =
| SurfaceLocalModelMap[SurfaceLocalModelKeys]
| GfxLocalElementModel;
// not include local model
type SurfaceModel = SurfaceElementModel | SurfaceGroupLikeModel;
type SurfaceModelKeyType =
| SurfaceElementModelKeys
| SurfaceGroupLikeModelKeys;
type EdgelessModelKeys = EdgelessBlockModelKeyType | SurfaceModelKeyType;
}
}
blocksuite/affine/model/src/utils/index.ts
-1
View File
@@ -1,4 +1,3 @@
export * from './enum.js';
export * from './global.js';
export * from './helper.js';
export * from './types.js';