From ae6773e9349101513996a15f17dda127df0f7598 Mon Sep 17 00:00:00 2001 From: donteatfriedrice Date: Thu, 19 Dec 2024 06:44:10 +0000 Subject: [PATCH] chore: use surface block flavour in adapter (#9022) --- .../block-surface/src/adapters/markdown/markdown.ts | 9 ++++----- .../block-surface/src/adapters/plain-text/plain-text.ts | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/affine/block-surface/src/adapters/markdown/markdown.ts b/packages/affine/block-surface/src/adapters/markdown/markdown.ts index 7a2ddb95e14d..d0d3675341a2 100644 --- a/packages/affine/block-surface/src/adapters/markdown/markdown.ts +++ b/packages/affine/block-surface/src/adapters/markdown/markdown.ts @@ -3,14 +3,13 @@ import { type BlockMarkdownAdapterMatcher, } from '@blocksuite/affine-shared/adapters'; -import { SurfaceBlockSchema } from '../../surface-model.js'; import { getMindMapNodeMap } from '../utils/mindmap.js'; import { MarkdownElementModelAdapter } from './element-adapter/index.js'; export const surfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = { - flavour: SurfaceBlockSchema.model.flavour, + flavour: 'affine:surface', toMatch: () => false, - fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour, + fromMatch: o => o.node.flavour === 'affine:surface', toBlockSnapshot: {}, fromBlockSnapshot: { enter: (_, context) => { @@ -24,9 +23,9 @@ export const SurfaceBlockMarkdownAdapterExtension = export const edgelessSurfaceBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = { - flavour: SurfaceBlockSchema.model.flavour, + flavour: 'affine:surface', toMatch: () => false, - fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour, + fromMatch: o => o.node.flavour === 'affine:surface', toBlockSnapshot: {}, fromBlockSnapshot: { enter: (o, context) => { diff --git a/packages/affine/block-surface/src/adapters/plain-text/plain-text.ts b/packages/affine/block-surface/src/adapters/plain-text/plain-text.ts index 82fffaaaf7bd..16f32ca80d04 100644 --- a/packages/affine/block-surface/src/adapters/plain-text/plain-text.ts +++ b/packages/affine/block-surface/src/adapters/plain-text/plain-text.ts @@ -3,15 +3,14 @@ import { type BlockPlainTextAdapterMatcher, } from '@blocksuite/affine-shared/adapters'; -import { SurfaceBlockSchema } from '../../surface-model.js'; import { getMindMapNodeMap } from '../utils/mindmap.js'; import { PlainTextElementModelAdapter } from './element-adapter/index.js'; export const surfaceBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher = { - flavour: SurfaceBlockSchema.model.flavour, + flavour: 'affine:surface', toMatch: () => false, - fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour, + fromMatch: o => o.node.flavour === 'affine:surface', toBlockSnapshot: {}, fromBlockSnapshot: { enter: (_, context) => { @@ -25,9 +24,9 @@ export const SurfaceBlockPlainTextAdapterExtension = export const edgelessSurfaceBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher = { - flavour: SurfaceBlockSchema.model.flavour, + flavour: 'affine:surface', toMatch: () => false, - fromMatch: o => o.node.flavour === SurfaceBlockSchema.model.flavour, + fromMatch: o => o.node.flavour === 'affine:surface', toBlockSnapshot: {}, fromBlockSnapshot: { enter: (o, context) => {