diff --git a/blocksuite/affine/shared/src/adapters/index.ts b/blocksuite/affine/shared/src/adapters/index.ts index dbaa184157..8f60f43122 100644 --- a/blocksuite/affine/shared/src/adapters/index.ts +++ b/blocksuite/affine/shared/src/adapters/index.ts @@ -35,6 +35,7 @@ export { MarkdownDeltaConverter, } from './markdown'; export * from './middlewares'; +export * from './mix-text'; export { BlockNotionHtmlAdapterExtension, type BlockNotionHtmlAdapterMatcher, diff --git a/blocksuite/blocks/src/_common/adapters/mix-text.ts b/blocksuite/affine/shared/src/adapters/mix-text.ts similarity index 98% rename from blocksuite/blocks/src/_common/adapters/mix-text.ts rename to blocksuite/affine/shared/src/adapters/mix-text.ts index 06f07f9dbf..bf9fda3302 100644 --- a/blocksuite/blocks/src/_common/adapters/mix-text.ts +++ b/blocksuite/affine/shared/src/adapters/mix-text.ts @@ -1,8 +1,4 @@ import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model'; -import { - AdapterFactoryIdentifier, - MarkdownAdapter, -} from '@blocksuite/affine-shared/adapters'; import type { ServiceProvider } from '@blocksuite/global/di'; import type { DeltaInsert } from '@blocksuite/inline'; import { @@ -26,6 +22,9 @@ import { type ToDocSnapshotPayload, } from '@blocksuite/store'; +import { MarkdownAdapter } from './markdown/markdown'; +import { AdapterFactoryIdentifier } from './types/adapter'; + export type MixText = string; type MixTextToSliceSnapshotPayload = { diff --git a/blocksuite/blocks/src/_common/adapters/extension.ts b/blocksuite/blocks/src/_common/adapters/extension.ts index 60e6354404..9d29930636 100644 --- a/blocksuite/blocks/src/_common/adapters/extension.ts +++ b/blocksuite/blocks/src/_common/adapters/extension.ts @@ -3,6 +3,7 @@ import { HtmlAdapterFactoryExtension, ImageAdapterFactoryExtension, MarkdownAdapterFactoryExtension, + MixTextAdapterFactoryExtension, NotionHtmlAdapterFactoryExtension, NotionTextAdapterFactoryExtension, PlainTextAdapterFactoryExtension, @@ -13,7 +14,6 @@ import { htmlInlineToDeltaMatchers } from './html/delta-converter/html-inline.js import { inlineDeltaToHtmlAdapterMatchers } from './html/delta-converter/inline-delta.js'; import { inlineDeltaToMarkdownAdapterMatchers } from './markdown/delta-converter/inline-delta.js'; import { markdownInlineToDeltaMatchers } from './markdown/delta-converter/markdown-inline.js'; -import { MixTextAdapterFactoryExtension } from './mix-text.js'; import { notionHtmlInlineToDeltaMatchers } from './notion-html/delta-converter/html-inline.js'; import { inlineDeltaToPlainTextAdapterMatchers } from './plain-text/delta-converter/inline-delta.js'; diff --git a/blocksuite/blocks/src/_common/adapters/index.ts b/blocksuite/blocks/src/_common/adapters/index.ts index 4891b724fd..832906d6c7 100644 --- a/blocksuite/blocks/src/_common/adapters/index.ts +++ b/blocksuite/blocks/src/_common/adapters/index.ts @@ -1,4 +1,3 @@ export * from './extension.js'; export * from './markdown/index.js'; -export * from './mix-text.js'; export * from './notion-html/index.js'; diff --git a/blocksuite/blocks/src/index.ts b/blocksuite/blocks/src/index.ts index 0345339a9c..cfeb95c33f 100644 --- a/blocksuite/blocks/src/index.ts +++ b/blocksuite/blocks/src/index.ts @@ -107,6 +107,9 @@ export { MarkdownAdapter, MarkdownAdapterFactoryExtension, MarkdownAdapterFactoryIdentifier, + MixTextAdapter, + MixTextAdapterFactoryExtension, + MixTextAdapterFactoryIdentifier, NotionTextAdapter, NotionTextAdapterFactoryExtension, NotionTextAdapterFactoryIdentifier, diff --git a/blocksuite/blocks/src/root-block/clipboard/index.ts b/blocksuite/blocks/src/root-block/clipboard/index.ts index 2bc58a07bd..6f0305eac9 100644 --- a/blocksuite/blocks/src/root-block/clipboard/index.ts +++ b/blocksuite/blocks/src/root-block/clipboard/index.ts @@ -3,6 +3,7 @@ import { copyMiddleware, HtmlAdapter, ImageAdapter, + MixTextAdapter, NotionTextAdapter, pasteMiddleware, } from '@blocksuite/affine-shared/adapters'; @@ -10,7 +11,6 @@ import type { BlockComponent, UIEventHandler } from '@blocksuite/block-std'; import { DisposableGroup } from '@blocksuite/global/utils'; import type { Blocks, BlockSnapshot } from '@blocksuite/store'; -import { MixTextAdapter } from '../../_common/adapters/index.js'; import { defaultImageProxyMiddleware, replaceIdMiddleware,