Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

refactor(editor): merge inline to std (#11025)

Saul-Mirone92d76ba571ba
diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json
index 043275ffcb..1865994155 100644
--- a/blocksuite/affine/all/package.json
+++ b/blocksuite/affine/all/package.json
@@ -48,7 +48,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/data-view": "workspace:*",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@blocksuite/sync": "workspace:*",
"rxjs": "^7.8.1"
@@ -58,6 +57,8 @@
"./effects": "./src/effects.ts",
"./block-std": "./src/block-std/index.ts",
"./block-std/gfx": "./src/block-std/gfx.ts",
+ "./block-std/inline": "./src/block-std/inline.ts",
+ "./block-std/effects": "./src/block-std/effects.ts",
"./global": "./src/global/index.ts",
"./global/utils": "./src/global/utils.ts",
"./global/env": "./src/global/env.ts",
@@ -69,10 +70,6 @@
"./global/lit": "./src/global/lit.ts",
"./store": "./src/store/index.ts",
"./store/test": "./src/store/test.ts",
- "./inline": "./src/inline/index.ts",
- "./inline/consts": "./src/inline/consts.ts",
- "./inline/effects": "./src/inline/effects.ts",
- "./inline/types": "./src/inline/types.ts",
"./blocks/attachment": "./src/blocks/attachment.ts",
"./blocks/bookmark": "./src/blocks/bookmark.ts",
"./blocks/callout": "./src/blocks/callout.ts",
diff --git a/blocksuite/affine/all/src/block-std/effects.ts b/blocksuite/affine/all/src/block-std/effects.ts
new file mode 100644
index 0000000000..c7b225a01e
--- /dev/null
+++ b/blocksuite/affine/all/src/block-std/effects.ts
@@ -0,0 +1 @@
+export * from '@blocksuite/block-std/effects';
diff --git a/blocksuite/affine/all/src/block-std/inline.ts b/blocksuite/affine/all/src/block-std/inline.ts
new file mode 100644
index 0000000000..a2dfc7f0a8
--- /dev/null
+++ b/blocksuite/affine/all/src/block-std/inline.ts
@@ -0,0 +1 @@
+export * from '@blocksuite/block-std/inline';
diff --git a/blocksuite/affine/all/src/effects.ts b/blocksuite/affine/all/src/effects.ts
index 756f203703..17428e397d 100644
--- a/blocksuite/affine/all/src/effects.ts
+++ b/blocksuite/affine/all/src/effects.ts
@@ -55,13 +55,11 @@ import { effects as widgetSlashMenuEffects } from '@blocksuite/affine-widget-sla
import { effects as widgetToolbarEffects } from '@blocksuite/affine-widget-toolbar/effects';
import { effects as stdEffects } from '@blocksuite/block-std/effects';
import { effects as dataViewEffects } from '@blocksuite/data-view/effects';
-import { effects as inlineEffects } from '@blocksuite/inline/effects';
import { registerSpecs } from './extensions/register.js';
export declare const _GLOBAL_:
| typeof stdEffects
- | typeof inlineEffects
| typeof dataViewEffects
| typeof richTextEffects
| typeof blockNoteEffects
@@ -111,7 +109,6 @@ export function effects() {
registerSpecs();
stdEffects();
- inlineEffects();
dataViewEffects();
richTextEffects();
diff --git a/blocksuite/affine/all/src/inline/consts.ts b/blocksuite/affine/all/src/inline/consts.ts
deleted file mode 100644
index d5ff75733a..0000000000
--- a/blocksuite/affine/all/src/inline/consts.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@blocksuite/inline/consts';
diff --git a/blocksuite/affine/all/src/inline/effects.ts b/blocksuite/affine/all/src/inline/effects.ts
deleted file mode 100644
index 216bdcc26c..0000000000
--- a/blocksuite/affine/all/src/inline/effects.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@blocksuite/inline/effects';
diff --git a/blocksuite/affine/all/src/inline/index.ts b/blocksuite/affine/all/src/inline/index.ts
deleted file mode 100644
index 7f498783ba..0000000000
--- a/blocksuite/affine/all/src/inline/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@blocksuite/inline';
diff --git a/blocksuite/affine/all/src/inline/types.ts b/blocksuite/affine/all/src/inline/types.ts
deleted file mode 100644
index da7ad699c8..0000000000
--- a/blocksuite/affine/all/src/inline/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@blocksuite/inline/types';
diff --git a/blocksuite/affine/all/tsconfig.json b/blocksuite/affine/all/tsconfig.json
index b78fdb84e3..da7b34ada4 100644
--- a/blocksuite/affine/all/tsconfig.json
+++ b/blocksuite/affine/all/tsconfig.json
@@ -45,7 +45,6 @@
{ "path": "../../framework/block-std" },
{ "path": "../data-view" },
{ "path": "../../framework/global" },
- { "path": "../../framework/inline" },
{ "path": "../../framework/store" },
{ "path": "../../framework/sync" }
]
diff --git a/blocksuite/affine/blocks/block-attachment/package.json b/blocksuite/affine/blocks/block-attachment/package.json
index e152378243..3c20d45a38 100644
--- a/blocksuite/affine/blocks/block-attachment/package.json
+++ b/blocksuite/affine/blocks/block-attachment/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-attachment/tsconfig.json b/blocksuite/affine/blocks/block-attachment/tsconfig.json
index e2b13ea526..786c8affaf 100644
--- a/blocksuite/affine/blocks/block-attachment/tsconfig.json
+++ b/blocksuite/affine/blocks/block-attachment/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-bookmark/package.json b/blocksuite/affine/blocks/block-bookmark/package.json
index a478e62fda..e3748fe842 100644
--- a/blocksuite/affine/blocks/block-bookmark/package.json
+++ b/blocksuite/affine/blocks/block-bookmark/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@lit/context": "^1.1.2",
"@preact/signals-core": "^1.8.0",
diff --git a/blocksuite/affine/blocks/block-bookmark/tsconfig.json b/blocksuite/affine/blocks/block-bookmark/tsconfig.json
index e2b13ea526..786c8affaf 100644
--- a/blocksuite/affine/blocks/block-bookmark/tsconfig.json
+++ b/blocksuite/affine/blocks/block-bookmark/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-callout/package.json b/blocksuite/affine/blocks/block-callout/package.json
index 884c3b572b..aea159b7ba 100644
--- a/blocksuite/affine/blocks/block-callout/package.json
+++ b/blocksuite/affine/blocks/block-callout/package.json
@@ -18,7 +18,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@emoji-mart/data": "^1.2.1",
"@floating-ui/dom": "^1.6.10",
diff --git a/blocksuite/affine/blocks/block-callout/tsconfig.json b/blocksuite/affine/blocks/block-callout/tsconfig.json
index 683d57906b..090131b11a 100644
--- a/blocksuite/affine/blocks/block-callout/tsconfig.json
+++ b/blocksuite/affine/blocks/block-callout/tsconfig.json
@@ -14,7 +14,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-code/package.json b/blocksuite/affine/blocks/block-code/package.json
index 17cef41ba8..231b0d6b20 100644
--- a/blocksuite/affine/blocks/block-code/package.json
+++ b/blocksuite/affine/blocks/block-code/package.json
@@ -18,7 +18,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-code/src/code-block.ts b/blocksuite/affine/blocks/block-code/src/code-block.ts
index 15c530e71d..ad4370b32a 100644
--- a/blocksuite/affine/blocks/block-code/src/code-block.ts
+++ b/blocksuite/affine/blocks/block-code/src/code-block.ts
@@ -8,19 +8,16 @@ import {
} from '@blocksuite/affine-shared/services';
import { getViewportElement } from '@blocksuite/affine-shared/utils';
import type { BlockComponent } from '@blocksuite/block-std';
+import { BlockSelection, TextSelection } from '@blocksuite/block-std';
import {
- BlockSelection,
getInlineRangeProvider,
- TextSelection,
-} from '@blocksuite/block-std';
-import { IS_MAC, IS_MOBILE } from '@blocksuite/global/env';
-import { noop } from '@blocksuite/global/utils';
-import {
INLINE_ROOT_ATTR,
type InlineRangeProvider,
type InlineRootElement,
type VLine,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { IS_MAC, IS_MOBILE } from '@blocksuite/global/env';
+import { noop } from '@blocksuite/global/utils';
import { Slice } from '@blocksuite/store';
import { computed, effect, type Signal, signal } from '@preact/signals-core';
import { html, nothing, type TemplateResult } from 'lit';
diff --git a/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts b/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts
index ec170c4b8a..40c8223413 100644
--- a/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts
+++ b/blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts
@@ -1,7 +1,7 @@
import { affineTextStyles } from '@blocksuite/affine-rich-text';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline';
import type { DeltaInsert } from '@blocksuite/store';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/blocks/block-code/tsconfig.json b/blocksuite/affine/blocks/block-code/tsconfig.json
index 683d57906b..090131b11a 100644
--- a/blocksuite/affine/blocks/block-code/tsconfig.json
+++ b/blocksuite/affine/blocks/block-code/tsconfig.json
@@ -14,7 +14,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-data-view/package.json b/blocksuite/affine/blocks/block-data-view/package.json
index fb7128da6e..45d9769028 100644
--- a/blocksuite/affine/blocks/block-data-view/package.json
+++ b/blocksuite/affine/blocks/block-data-view/package.json
@@ -19,7 +19,6 @@
"@blocksuite/data-view": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts b/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts
index f4d238e69b..ff8ea187c9 100644
--- a/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts
+++ b/blocksuite/affine/blocks/block-data-view/src/data-view-block.ts
@@ -19,10 +19,8 @@ import {
type TelemetryEventMap,
TelemetryProvider,
} from '@blocksuite/affine-shared/services';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
-} from '@blocksuite/block-std';
+import { type BlockComponent } from '@blocksuite/block-std';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import {
createRecordDetail,
createUniComponentFromWebComponent,
diff --git a/blocksuite/affine/blocks/block-data-view/tsconfig.json b/blocksuite/affine/blocks/block-data-view/tsconfig.json
index 7f70b7f2b8..1273f28aab 100644
--- a/blocksuite/affine/blocks/block-data-view/tsconfig.json
+++ b/blocksuite/affine/blocks/block-data-view/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../../framework/block-std" },
{ "path": "../../data-view" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-database/package.json b/blocksuite/affine/blocks/block-database/package.json
index a6ba73fd1c..c0beb587e9 100644
--- a/blocksuite/affine/blocks/block-database/package.json
+++ b/blocksuite/affine/blocks/block-database/package.json
@@ -20,7 +20,6 @@
"@blocksuite/data-view": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-database/src/database-block.ts b/blocksuite/affine/blocks/block-database/src/database-block.ts
index 686bf50a56..553ecd7d16 100644
--- a/blocksuite/affine/blocks/block-database/src/database-block.ts
+++ b/blocksuite/affine/blocks/block-database/src/database-block.ts
@@ -16,10 +16,8 @@ import {
TelemetryProvider,
} from '@blocksuite/affine-shared/services';
import { getDropResult } from '@blocksuite/affine-widget-drag-handle';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
-} from '@blocksuite/block-std';
+import { type BlockComponent } from '@blocksuite/block-std';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import {
createRecordDetail,
createUniComponentFromWebComponent,
diff --git a/blocksuite/affine/blocks/block-database/tsconfig.json b/blocksuite/affine/blocks/block-database/tsconfig.json
index 723fdd6103..cac1929af0 100644
--- a/blocksuite/affine/blocks/block-database/tsconfig.json
+++ b/blocksuite/affine/blocks/block-database/tsconfig.json
@@ -17,7 +17,6 @@
{ "path": "../../../framework/block-std" },
{ "path": "../../data-view" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-divider/package.json b/blocksuite/affine/blocks/block-divider/package.json
index 9b46fd57ad..b15f8f690e 100644
--- a/blocksuite/affine/blocks/block-divider/package.json
+++ b/blocksuite/affine/blocks/block-divider/package.json
@@ -15,7 +15,6 @@
"@blocksuite/affine-shared": "workspace:*",
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-divider/tsconfig.json b/blocksuite/affine/blocks/block-divider/tsconfig.json
index e66b3b80b1..1e2cb0da10 100644
--- a/blocksuite/affine/blocks/block-divider/tsconfig.json
+++ b/blocksuite/affine/blocks/block-divider/tsconfig.json
@@ -12,7 +12,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-edgeless-text/package.json b/blocksuite/affine/blocks/block-edgeless-text/package.json
index 6bd3c4e191..9d0c4e588a 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/package.json
+++ b/blocksuite/affine/blocks/block-edgeless-text/package.json
@@ -18,7 +18,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
index e039dcec62..952a90d3ce 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
+++ b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
@@ -14,7 +14,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-embed/package.json b/blocksuite/affine/blocks/block-embed/package.json
index a0f686391c..949a309bb8 100644
--- a/blocksuite/affine/blocks/block-embed/package.json
+++ b/blocksuite/affine/blocks/block-embed/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-embed/tsconfig.json b/blocksuite/affine/blocks/block-embed/tsconfig.json
index cde449dc36..360fd51ed1 100644
--- a/blocksuite/affine/blocks/block-embed/tsconfig.json
+++ b/blocksuite/affine/blocks/block-embed/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-frame/package.json b/blocksuite/affine/blocks/block-frame/package.json
index 98db6cb9e5..83b68369e5 100644
--- a/blocksuite/affine/blocks/block-frame/package.json
+++ b/blocksuite/affine/blocks/block-frame/package.json
@@ -18,7 +18,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-frame/tsconfig.json b/blocksuite/affine/blocks/block-frame/tsconfig.json
index 11dda846b8..3df4c6c17c 100644
--- a/blocksuite/affine/blocks/block-frame/tsconfig.json
+++ b/blocksuite/affine/blocks/block-frame/tsconfig.json
@@ -14,7 +14,6 @@
{ "path": "../../widgets/widget-frame-title" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-image/package.json b/blocksuite/affine/blocks/block-image/package.json
index 3cc81a59d7..687b2e8a25 100644
--- a/blocksuite/affine/blocks/block-image/package.json
+++ b/blocksuite/affine/blocks/block-image/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-image/tsconfig.json b/blocksuite/affine/blocks/block-image/tsconfig.json
index 43388554c6..7dff15976a 100644
--- a/blocksuite/affine/blocks/block-image/tsconfig.json
+++ b/blocksuite/affine/blocks/block-image/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-latex/package.json b/blocksuite/affine/blocks/block-latex/package.json
index 5568285007..0bae3cef4b 100644
--- a/blocksuite/affine/blocks/block-latex/package.json
+++ b/blocksuite/affine/blocks/block-latex/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-latex/tsconfig.json b/blocksuite/affine/blocks/block-latex/tsconfig.json
index dcc195b6c0..7dfc290bbd 100644
--- a/blocksuite/affine/blocks/block-latex/tsconfig.json
+++ b/blocksuite/affine/blocks/block-latex/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-list/package.json b/blocksuite/affine/blocks/block-list/package.json
index 7bf597bfe5..7887c03c26 100644
--- a/blocksuite/affine/blocks/block-list/package.json
+++ b/blocksuite/affine/blocks/block-list/package.json
@@ -17,7 +17,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-list/src/list-block.ts b/blocksuite/affine/blocks/block-list/src/list-block.ts
index 44c4d03e04..5c36023fa6 100644
--- a/blocksuite/affine/blocks/block-list/src/list-block.ts
+++ b/blocksuite/affine/blocks/block-list/src/list-block.ts
@@ -15,12 +15,11 @@ import {
import { DocModeProvider } from '@blocksuite/affine-shared/services';
import { getViewportElement } from '@blocksuite/affine-shared/utils';
import type { BlockComponent } from '@blocksuite/block-std';
+import { BlockSelection, TextSelection } from '@blocksuite/block-std';
import {
- BlockSelection,
getInlineRangeProvider,
- TextSelection,
-} from '@blocksuite/block-std';
-import type { InlineRangeProvider } from '@blocksuite/inline';
+ type InlineRangeProvider,
+} from '@blocksuite/block-std/inline';
import type { BaseSelection } from '@blocksuite/store';
import { effect } from '@preact/signals-core';
import { html, nothing, type TemplateResult } from 'lit';
diff --git a/blocksuite/affine/blocks/block-list/tsconfig.json b/blocksuite/affine/blocks/block-list/tsconfig.json
index 346d7e4e4e..b7256b24bc 100644
--- a/blocksuite/affine/blocks/block-list/tsconfig.json
+++ b/blocksuite/affine/blocks/block-list/tsconfig.json
@@ -13,7 +13,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-note/package.json b/blocksuite/affine/blocks/block-note/package.json
index 4df4f00323..1bc0d744bc 100644
--- a/blocksuite/affine/blocks/block-note/package.json
+++ b/blocksuite/affine/blocks/block-note/package.json
@@ -21,7 +21,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@lit/context": "^1.1.2",
"@preact/signals-core": "^1.8.0",
diff --git a/blocksuite/affine/blocks/block-note/tsconfig.json b/blocksuite/affine/blocks/block-note/tsconfig.json
index 5454d41f75..34e19eaf88 100644
--- a/blocksuite/affine/blocks/block-note/tsconfig.json
+++ b/blocksuite/affine/blocks/block-note/tsconfig.json
@@ -17,7 +17,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-paragraph/package.json b/blocksuite/affine/blocks/block-paragraph/package.json
index 01e397d951..0c9c7e0c25 100644
--- a/blocksuite/affine/blocks/block-paragraph/package.json
+++ b/blocksuite/affine/blocks/block-paragraph/package.json
@@ -17,7 +17,6 @@
"@blocksuite/affine-shared": "workspace:*",
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts
index 7d6547ad61..9d8ea326ce 100644
--- a/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts
+++ b/blocksuite/affine/blocks/block-paragraph/src/paragraph-block.ts
@@ -16,8 +16,11 @@ import {
getViewportElement,
} from '@blocksuite/affine-shared/utils';
import type { BlockComponent } from '@blocksuite/block-std';
-import { getInlineRangeProvider, TextSelection } from '@blocksuite/block-std';
-import type { InlineRangeProvider } from '@blocksuite/inline';
+import { TextSelection } from '@blocksuite/block-std';
+import {
+ getInlineRangeProvider,
+ type InlineRangeProvider,
+} from '@blocksuite/block-std/inline';
import { computed, effect, signal } from '@preact/signals-core';
import { html, nothing, type TemplateResult } from 'lit';
import { query, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/blocks/block-paragraph/tsconfig.json b/blocksuite/affine/blocks/block-paragraph/tsconfig.json
index aa93e149b2..a0f9c669b5 100644
--- a/blocksuite/affine/blocks/block-paragraph/tsconfig.json
+++ b/blocksuite/affine/blocks/block-paragraph/tsconfig.json
@@ -14,7 +14,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-root/package.json b/blocksuite/affine/blocks/block-root/package.json
index 77a2c401b5..e371e92e98 100644
--- a/blocksuite/affine/blocks/block-root/package.json
+++ b/blocksuite/affine/blocks/block-root/package.json
@@ -42,7 +42,6 @@
"@blocksuite/data-view": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
index 714ed5a403..00e1a55c13 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts
@@ -7,12 +7,9 @@ import type { ConnectorElementModel } from '@blocksuite/affine-model';
import type { RichText } from '@blocksuite/affine-rich-text';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { almostEqual } from '@blocksuite/affine-shared/utils';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
- ShadowlessElement,
-} from '@blocksuite/block-std';
+import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound, Vec } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { css, html, nothing } from 'lit';
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
index 53bf85df48..a20d3d0a92 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts
@@ -5,12 +5,9 @@ import {
} from '@blocksuite/affine-block-surface';
import type { GroupElementModel } from '@blocksuite/affine-model';
import type { RichText } from '@blocksuite/affine-rich-text';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
- ShadowlessElement,
-} from '@blocksuite/block-std';
+import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { html, nothing } from 'lit';
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
index 566fb14c3e..a6b935adf9 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts
@@ -7,12 +7,9 @@ import { MindmapElementModel, TextResizing } from '@blocksuite/affine-model';
import type { RichText } from '@blocksuite/affine-rich-text';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { getSelectedRect } from '@blocksuite/affine-shared/utils';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
- ShadowlessElement,
-} from '@blocksuite/block-std';
+import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound, toRadian, Vec } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { html, nothing } from 'lit';
diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts
index 50f70f9ed6..71e40c7ca7 100644
--- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts
+++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts
@@ -19,7 +19,7 @@ import {
type Signal,
} from '@blocksuite/affine-shared/utils';
import type { BlockStdScope, EditorHost } from '@blocksuite/block-std';
-import type { InlineRange } from '@blocksuite/inline';
+import type { InlineRange } from '@blocksuite/block-std/inline';
import type { TemplateResult } from 'lit';
import { showImportModal } from './import-doc/index.js';
diff --git a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts
index 9a1ffa40ff..71ab8c97a9 100644
--- a/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts
+++ b/blocksuite/affine/blocks/block-root/src/widgets/linked-doc/index.ts
@@ -8,12 +8,12 @@ import { getViewportElement } from '@blocksuite/affine-shared/utils';
import type { BlockComponent } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, WidgetComponent } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { IS_MOBILE } from '@blocksuite/global/env';
import {
INLINE_ROOT_ATTR,
type InlineEditor,
type InlineRootElement,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { IS_MOBILE } from '@blocksuite/global/env';
import { signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
import { choose } from 'lit/directives/choose.js';
diff --git a/blocksuite/affine/blocks/block-root/tsconfig.json b/blocksuite/affine/blocks/block-root/tsconfig.json
index 4d9d9001a0..33b5f75e25 100644
--- a/blocksuite/affine/blocks/block-root/tsconfig.json
+++ b/blocksuite/affine/blocks/block-root/tsconfig.json
@@ -38,7 +38,6 @@
{ "path": "../../../framework/block-std" },
{ "path": "../../data-view" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-surface-ref/package.json b/blocksuite/affine/blocks/block-surface-ref/package.json
index bd9bffbf9c..58cc918331 100644
--- a/blocksuite/affine/blocks/block-surface-ref/package.json
+++ b/blocksuite/affine/blocks/block-surface-ref/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts b/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts
index bd7b3bd097..76bd0f5798 100644
--- a/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts
+++ b/blocksuite/affine/blocks/block-surface-ref/src/portal/note.ts
@@ -14,9 +14,9 @@ import { SpecProvider } from '@blocksuite/affine-shared/utils';
import {
BlockStdScope,
type EditorHost,
- RANGE_QUERY_EXCLUDE_ATTR,
ShadowlessElement,
} from '@blocksuite/block-std';
+import { RANGE_QUERY_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { deserializeXYWH } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { type BlockModel, type Query } from '@blocksuite/store';
diff --git a/blocksuite/affine/blocks/block-surface-ref/tsconfig.json b/blocksuite/affine/blocks/block-surface-ref/tsconfig.json
index 6c86295069..1f079a4057 100644
--- a/blocksuite/affine/blocks/block-surface-ref/tsconfig.json
+++ b/blocksuite/affine/blocks/block-surface-ref/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../widgets/widget-slash-menu" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-surface/package.json b/blocksuite/affine/blocks/block-surface/package.json
index be565d638c..6123a5d4e4 100644
--- a/blocksuite/affine/blocks/block-surface/package.json
+++ b/blocksuite/affine/blocks/block-surface/package.json
@@ -16,7 +16,6 @@
"@blocksuite/affine-shared": "workspace:*",
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@lit/context": "^1.1.2",
"@preact/signals-core": "^1.8.0",
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts
index 7341b2a574..6220f9b70b 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts
@@ -5,11 +5,11 @@ import {
type LocalConnectorElementModel,
type PointStyle,
} from '@blocksuite/affine-model';
+import { deltaInsertsToChunks } from '@blocksuite/block-std/inline';
import {
getBezierParameters,
type PointLocation,
} from '@blocksuite/global/gfx';
-import { deltaInsertsToChunks } from '@blocksuite/inline';
import { isConnectorWithLabel } from '../../../managers/connector-manager.js';
import type { RoughCanvas } from '../../../utils/rough/canvas.js';
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts
index 3e809ed28a..09cb376092 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts
@@ -4,9 +4,9 @@ import type {
ShapeType,
} from '@blocksuite/affine-model';
import { DefaultTheme, TextAlign } from '@blocksuite/affine-model';
+import { deltaInsertsToChunks } from '@blocksuite/block-std/inline';
import type { IBound } from '@blocksuite/global/gfx';
import { Bound } from '@blocksuite/global/gfx';
-import { deltaInsertsToChunks } from '@blocksuite/inline';
import type { RoughCanvas } from '../../../utils/rough/canvas.js';
import type { CanvasRenderer } from '../../canvas-renderer.js';
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts
index 57e80ec92b..9b0ca527da 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts
@@ -5,8 +5,8 @@ import type {
TextVerticalAlign,
} from '@blocksuite/affine-model';
import { FeatureFlagService } from '@blocksuite/affine-shared/services';
+import { deltaInsertsToChunks } from '@blocksuite/block-std/inline';
import type { Bound, SerializedXYWH } from '@blocksuite/global/gfx';
-import { deltaInsertsToChunks } from '@blocksuite/inline';
import type { CanvasRenderer } from '../../canvas-renderer.js';
import {
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts
index af605b233e..5aec4c2738 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts
@@ -1,5 +1,5 @@
import { DefaultTheme, type TextElementModel } from '@blocksuite/affine-model';
-import { deltaInsertsToChunks } from '@blocksuite/inline';
+import { deltaInsertsToChunks } from '@blocksuite/block-std/inline';
import type { CanvasRenderer } from '../../canvas-renderer.js';
import {
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts
index e01a244a75..87014cb2a4 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts
@@ -4,12 +4,12 @@ import type {
FontWeight,
TextElementModel,
} from '@blocksuite/affine-model';
+import { deltaInsertsToChunks } from '@blocksuite/block-std/inline';
import type { Bound } from '@blocksuite/global/gfx';
import {
getPointsFromBoundWithRotation,
rotatePoints,
} from '@blocksuite/global/gfx';
-import { deltaInsertsToChunks } from '@blocksuite/inline';
import type * as Y from 'yjs';
import {
diff --git a/blocksuite/affine/blocks/block-surface/src/surface-block.ts b/blocksuite/affine/blocks/block-surface/src/surface-block.ts
index a6655a8b94..50a39f157a 100644
--- a/blocksuite/affine/blocks/block-surface/src/surface-block.ts
+++ b/blocksuite/affine/blocks/block-surface/src/surface-block.ts
@@ -1,11 +1,12 @@
import type { Color } from '@blocksuite/affine-model';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
import type { EditorHost, SurfaceSelection } from '@blocksuite/block-std';
-import { BlockComponent, RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std';
+import { BlockComponent } from '@blocksuite/block-std';
import {
GfxControllerIdentifier,
type Viewport,
} from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound } from '@blocksuite/global/gfx';
import { css, html } from 'lit';
import { query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/blocks/block-surface/tsconfig.json b/blocksuite/affine/blocks/block-surface/tsconfig.json
index 346d7e4e4e..b7256b24bc 100644
--- a/blocksuite/affine/blocks/block-surface/tsconfig.json
+++ b/blocksuite/affine/blocks/block-surface/tsconfig.json
@@ -13,7 +13,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/blocks/block-table/src/table-block.ts b/blocksuite/affine/blocks/block-table/src/table-block.ts
index 807e8d3582..7f87851a5b 100644
--- a/blocksuite/affine/blocks/block-table/src/table-block.ts
+++ b/blocksuite/affine/blocks/block-table/src/table-block.ts
@@ -3,10 +3,8 @@ import type { TableBlockModel } from '@blocksuite/affine-model';
import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
import { DocModeProvider } from '@blocksuite/affine-shared/services';
import { VirtualPaddingController } from '@blocksuite/affine-shared/utils';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
-} from '@blocksuite/block-std';
+import type { BlockComponent } from '@blocksuite/block-std';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { IS_MOBILE } from '@blocksuite/global/env';
import { signal } from '@preact/signals-core';
import { html, nothing } from 'lit';
diff --git a/blocksuite/affine/components/package.json b/blocksuite/affine/components/package.json
index 8693d46960..9ffcd23975 100644
--- a/blocksuite/affine/components/package.json
+++ b/blocksuite/affine/components/package.json
@@ -15,7 +15,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/components/tsconfig.json b/blocksuite/affine/components/tsconfig.json
index 803c56929e..a60ef14ba8 100644
--- a/blocksuite/affine/components/tsconfig.json
+++ b/blocksuite/affine/components/tsconfig.json
@@ -11,7 +11,6 @@
{ "path": "../shared" },
{ "path": "../../framework/block-std" },
{ "path": "../../framework/global" },
- { "path": "../../framework/inline" },
{ "path": "../../framework/store" }
]
}
diff --git a/blocksuite/affine/fragments/fragment-doc-title/package.json b/blocksuite/affine/fragments/fragment-doc-title/package.json
index 124d337f49..291d849969 100644
--- a/blocksuite/affine/fragments/fragment-doc-title/package.json
+++ b/blocksuite/affine/fragments/fragment-doc-title/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json b/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json
index 0c210a4081..bdc986e61f 100644
--- a/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json
+++ b/blocksuite/affine/fragments/fragment-doc-title/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/fragments/fragment-frame-panel/package.json b/blocksuite/affine/fragments/fragment-frame-panel/package.json
index 50612c9961..775711204e 100644
--- a/blocksuite/affine/fragments/fragment-frame-panel/package.json
+++ b/blocksuite/affine/fragments/fragment-frame-panel/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json b/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json
index 0c210a4081..bdc986e61f 100644
--- a/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json
+++ b/blocksuite/affine/fragments/fragment-frame-panel/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/fragments/fragment-outline/package.json b/blocksuite/affine/fragments/fragment-outline/package.json
index 7a984ea2b1..41b03c1ccc 100644
--- a/blocksuite/affine/fragments/fragment-outline/package.json
+++ b/blocksuite/affine/fragments/fragment-outline/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/fragments/fragment-outline/tsconfig.json b/blocksuite/affine/fragments/fragment-outline/tsconfig.json
index 6d71de5f48..7e04d02031 100644
--- a/blocksuite/affine/fragments/fragment-outline/tsconfig.json
+++ b/blocksuite/affine/fragments/fragment-outline/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/gfx/text/package.json b/blocksuite/affine/gfx/text/package.json
index 40275e2c11..0c47549f6e 100644
--- a/blocksuite/affine/gfx/text/package.json
+++ b/blocksuite/affine/gfx/text/package.json
@@ -19,7 +19,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@lit/context": "^1.1.2",
"@preact/signals-core": "^1.8.0",
diff --git a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
index 94bd6f4c63..9e99d09b67 100644
--- a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
+++ b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
@@ -9,11 +9,11 @@ import { ThemeProvider } from '@blocksuite/affine-shared/services';
import { getSelectedRect } from '@blocksuite/affine-shared/utils';
import {
type BlockStdScope,
- RANGE_SYNC_EXCLUDE_ATTR,
ShadowlessElement,
stdContext,
} from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound, toRadian, Vec } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { consume } from '@lit/context';
diff --git a/blocksuite/affine/gfx/text/tsconfig.json b/blocksuite/affine/gfx/text/tsconfig.json
index 5c9469e4ab..f3faa55427 100644
--- a/blocksuite/affine/gfx/text/tsconfig.json
+++ b/blocksuite/affine/gfx/text/tsconfig.json
@@ -15,7 +15,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/model/package.json b/blocksuite/affine/model/package.json
index 3bc222ab2e..7a7806d83f 100644
--- a/blocksuite/affine/model/package.json
+++ b/blocksuite/affine/model/package.json
@@ -12,7 +12,6 @@
"dependencies": {
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@toeverything/theme": "^1.1.12",
"@types/lodash-es": "^4.17.12",
diff --git a/blocksuite/affine/model/tsconfig.json b/blocksuite/affine/model/tsconfig.json
index 1d990701ae..51a0df23f4 100644
--- a/blocksuite/affine/model/tsconfig.json
+++ b/blocksuite/affine/model/tsconfig.json
@@ -9,7 +9,6 @@
"references": [
{ "path": "../../framework/block-std" },
{ "path": "../../framework/global" },
- { "path": "../../framework/inline" },
{ "path": "../../framework/store" }
]
}
diff --git a/blocksuite/affine/rich-text/package.json b/blocksuite/affine/rich-text/package.json
index e8f92f76fc..8580f9c1b4 100644
--- a/blocksuite/affine/rich-text/package.json
+++ b/blocksuite/affine/rich-text/package.json
@@ -16,7 +16,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/rich-text/src/dom.ts b/blocksuite/affine/rich-text/src/dom.ts
index ded4f29f1d..6bfd347e98 100644
--- a/blocksuite/affine/rich-text/src/dom.ts
+++ b/blocksuite/affine/rich-text/src/dom.ts
@@ -9,7 +9,7 @@ import {
type EditorHost,
TextSelection,
} from '@blocksuite/block-std';
-import type { InlineEditor, InlineRange } from '@blocksuite/inline';
+import type { InlineEditor, InlineRange } from '@blocksuite/block-std/inline';
import { BlockModel } from '@blocksuite/store';
import type { AffineInlineEditor } from './inline/index.js';
diff --git a/blocksuite/affine/rich-text/src/extension/inline-manager.ts b/blocksuite/affine/rich-text/src/extension/inline-manager.ts
index 701da09a5a..77bfc49487 100644
--- a/blocksuite/affine/rich-text/src/extension/inline-manager.ts
+++ b/blocksuite/affine/rich-text/src/extension/inline-manager.ts
@@ -1,13 +1,13 @@
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { type BlockStdScope, StdIdentifier } from '@blocksuite/block-std';
+import {
+ type AttributeRenderer,
+ getDefaultAttributeRenderer,
+} from '@blocksuite/block-std/inline';
import {
createIdentifier,
type ServiceIdentifier,
} from '@blocksuite/global/di';
-import {
- type AttributeRenderer,
- getDefaultAttributeRenderer,
-} from '@blocksuite/inline';
import {
baseTextAttributes,
type DeltaInsert,
diff --git a/blocksuite/affine/rich-text/src/extension/type.ts b/blocksuite/affine/rich-text/src/extension/type.ts
index a585d9b720..fb044a0075 100644
--- a/blocksuite/affine/rich-text/src/extension/type.ts
+++ b/blocksuite/affine/rich-text/src/extension/type.ts
@@ -2,7 +2,7 @@ import type {
AttributeRenderer,
InlineEditor,
InlineRange,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
import type * as Y from 'yjs';
import type { ZodTypeAny } from 'zod';
diff --git a/blocksuite/affine/rich-text/src/format/format-block.ts b/blocksuite/affine/rich-text/src/format/format-block.ts
index 3e1dcf9284..5c0903ec0b 100644
--- a/blocksuite/affine/rich-text/src/format/format-block.ts
+++ b/blocksuite/affine/rich-text/src/format/format-block.ts
@@ -1,7 +1,10 @@
import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import type { BlockSelection, Command } from '@blocksuite/block-std';
-import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';
+import {
+ INLINE_ROOT_ATTR,
+ type InlineRootElement,
+} from '@blocksuite/block-std/inline';
import { FORMAT_BLOCK_SUPPORT_FLAVOURS } from './consts.js';
diff --git a/blocksuite/affine/rich-text/src/format/format-native.ts b/blocksuite/affine/rich-text/src/format/format-native.ts
index 808ccebe87..de509a36aa 100644
--- a/blocksuite/affine/rich-text/src/format/format-native.ts
+++ b/blocksuite/affine/rich-text/src/format/format-native.ts
@@ -4,7 +4,10 @@ import {
type BlockComponent,
type Command,
} from '@blocksuite/block-std';
-import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';
+import {
+ INLINE_ROOT_ATTR,
+ type InlineRootElement,
+} from '@blocksuite/block-std/inline';
import { FORMAT_NATIVE_SUPPORT_FLAVOURS } from './consts.js';
diff --git a/blocksuite/affine/rich-text/src/format/format-text.ts b/blocksuite/affine/rich-text/src/format/format-text.ts
index ef280cb549..efc24d4c07 100644
--- a/blocksuite/affine/rich-text/src/format/format-text.ts
+++ b/blocksuite/affine/rich-text/src/format/format-text.ts
@@ -1,7 +1,10 @@
import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import type { Command, TextSelection } from '@blocksuite/block-std';
-import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';
+import {
+ INLINE_ROOT_ATTR,
+ type InlineRootElement,
+} from '@blocksuite/block-std/inline';
import { FORMAT_TEXT_SUPPORT_FLAVOURS } from './consts.js';
import { clearMarksOnDiscontinuousInput } from './utils.js';
diff --git a/blocksuite/affine/rich-text/src/format/text-style.ts b/blocksuite/affine/rich-text/src/format/text-style.ts
index 29abb1f54a..d340390706 100644
--- a/blocksuite/affine/rich-text/src/format/text-style.ts
+++ b/blocksuite/affine/rich-text/src/format/text-style.ts
@@ -4,7 +4,10 @@ import {
} from '@blocksuite/affine-shared/commands';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import type { Command } from '@blocksuite/block-std';
-import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';
+import {
+ INLINE_ROOT_ATTR,
+ type InlineRootElement,
+} from '@blocksuite/block-std/inline';
import { toggleLinkPopup } from '../inline/index.js';
import { formatBlockCommand } from './format-block.js';
diff --git a/blocksuite/affine/rich-text/src/format/utils.ts b/blocksuite/affine/rich-text/src/format/utils.ts
index 51660c3566..d2b84d92e4 100644
--- a/blocksuite/affine/rich-text/src/format/utils.ts
+++ b/blocksuite/affine/rich-text/src/format/utils.ts
@@ -16,7 +16,7 @@ import {
type InlineEditor,
type InlineRange,
type InlineRootElement,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
import type { BlockModel } from '@blocksuite/store';
import { effect } from '@preact/signals-core';
diff --git a/blocksuite/affine/rich-text/src/hooks.ts b/blocksuite/affine/rich-text/src/hooks.ts
index cda63ac4df..adaeaf3a55 100644
--- a/blocksuite/affine/rich-text/src/hooks.ts
+++ b/blocksuite/affine/rich-text/src/hooks.ts
@@ -4,7 +4,7 @@ import type {
BeforeinputHookCtx,
CompositionEndHookCtx,
HookContext,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
const EDGE_IGNORED_ATTRIBUTES = ['code', 'link'] as const;
const GLOBAL_IGNORED_ATTRIBUTES = [] as const;
diff --git a/blocksuite/affine/rich-text/src/inline/presets/affine-inline-specs.ts b/blocksuite/affine/rich-text/src/inline/presets/affine-inline-specs.ts
index 61f19abb7b..c6baf1e59f 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/affine-inline-specs.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/affine-inline-specs.ts
@@ -2,7 +2,10 @@ import { FootNoteSchema, ReferenceInfoSchema } from '@blocksuite/affine-model';
import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { BlockFlavourIdentifier, StdIdentifier } from '@blocksuite/block-std';
-import type { InlineEditor, InlineRootElement } from '@blocksuite/inline';
+import type {
+ InlineEditor,
+ InlineRootElement,
+} from '@blocksuite/block-std/inline';
import { html } from 'lit';
import { z } from 'zod';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/affine-text.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/affine-text.ts
index 08986803fa..1c2a16a68f 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/affine-text.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/affine-text.ts
@@ -1,6 +1,6 @@
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline';
import type { DeltaInsert } from '@blocksuite/store';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/footnote-node/footnote-node.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/footnote-node/footnote-node.ts
index 12b91d741e..b52bea15a1 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/footnote-node/footnote-node.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/footnote-node/footnote-node.ts
@@ -8,13 +8,13 @@ import {
ShadowlessElement,
TextSelection,
} from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/lit';
import {
INLINE_ROOT_ATTR,
type InlineRootElement,
ZERO_WIDTH_NON_JOINER,
ZERO_WIDTH_SPACE,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { DeltaInsert } from '@blocksuite/store';
import { shift } from '@floating-ui/dom';
import { baseTheme } from '@toeverything/theme';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-editor-unit.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-editor-unit.ts
index fc27f66dec..efedea8f83 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-editor-unit.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-editor-unit.ts
@@ -1,6 +1,6 @@
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/block-std/inline';
import type { DeltaInsert } from '@blocksuite/store';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-node.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-node.ts
index a8f65a9d4f..c08e46110c 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-node.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-node.ts
@@ -6,12 +6,12 @@ import {
type BlockStdScope,
ShadowlessElement,
} from '@blocksuite/block-std';
-import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import {
type InlineEditor,
ZERO_WIDTH_NON_JOINER,
ZERO_WIDTH_SPACE,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import type { DeltaInsert } from '@blocksuite/store';
import { signal } from '@preact/signals-core';
import katex from 'katex';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/affine-link.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/affine-link.ts
index 715834284b..e9b98c47d3 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/affine-link.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/affine-link.ts
@@ -7,12 +7,12 @@ import {
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/lit';
import {
INLINE_ROOT_ATTR,
type InlineRootElement,
ZERO_WIDTH_SPACE,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { DeltaInsert } from '@blocksuite/store';
import { css, html } from 'lit';
import { property } from 'lit/decorators.js';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/link-popup.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/link-popup.ts
index 6f78c6c38c..9d81a1f6cb 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/link-popup.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/link-popup.ts
@@ -5,9 +5,9 @@ import {
stopPropagation,
} from '@blocksuite/affine-shared/utils';
import { type BlockStdScope, TextSelection } from '@blocksuite/block-std';
+import type { InlineRange } from '@blocksuite/block-std/inline';
import { WithDisposable } from '@blocksuite/global/lit';
import { DoneIcon } from '@blocksuite/icons/lit';
-import type { InlineRange } from '@blocksuite/inline/types';
import { computePosition, inline, offset, shift } from '@floating-ui/dom';
import { html, LitElement } from 'lit';
import { property, query } from 'lit/decorators.js';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/toggle-link-popup.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/toggle-link-popup.ts
index 3d7e3a00da..9711482715 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/toggle-link-popup.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/link-popup/toggle-link-popup.ts
@@ -1,5 +1,5 @@
import type { BlockStdScope } from '@blocksuite/block-std';
-import type { InlineRange } from '@blocksuite/inline';
+import type { InlineRange } from '@blocksuite/block-std/inline';
import type { AffineInlineEditor } from '../../../affine-inline-specs';
import { LinkPopup } from './link-popup';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-node.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-node.ts
index 37a17b2da5..4b5f592269 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-node.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-node.ts
@@ -16,14 +16,14 @@ import {
} from '@blocksuite/affine-shared/utils';
import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/lit';
-import { LinkedPageIcon } from '@blocksuite/icons/lit';
import {
INLINE_ROOT_ATTR,
type InlineRootElement,
ZERO_WIDTH_NON_JOINER,
ZERO_WIDTH_SPACE,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { WithDisposable } from '@blocksuite/global/lit';
+import { LinkedPageIcon } from '@blocksuite/icons/lit';
import type { DeltaInsert, DocMeta, Store } from '@blocksuite/store';
import { css, html, nothing } from 'lit';
import { property, state } from 'lit/decorators.js';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
index 70b7258917..4d5561dd3a 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/reference-popup.ts
@@ -10,9 +10,9 @@ import { FONT_XS, PANEL_BASE } from '@blocksuite/affine-shared/styles';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { stopPropagation } from '@blocksuite/affine-shared/utils';
import { type BlockStdScope, ShadowlessElement } from '@blocksuite/block-std';
+import type { InlineRange } from '@blocksuite/block-std/inline';
import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
import { DoneIcon, ResetIcon } from '@blocksuite/icons/lit';
-import type { InlineRange } from '@blocksuite/inline';
import { computePosition, inline, offset, shift } from '@floating-ui/dom';
import { signal } from '@preact/signals-core';
import { css, html } from 'lit';
diff --git a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/toggle-reference-popup.ts b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/toggle-reference-popup.ts
index e9bb8b514c..8805d8d98d 100644
--- a/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/toggle-reference-popup.ts
+++ b/blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-popup/toggle-reference-popup.ts
@@ -1,6 +1,6 @@
import type { ReferenceInfo } from '@blocksuite/affine-model';
import type { BlockStdScope } from '@blocksuite/block-std';
-import type { InlineRange } from '@blocksuite/inline';
+import type { InlineRange } from '@blocksuite/block-std/inline';
import type { AffineInlineEditor } from '../../../affine-inline-specs';
import { ReferencePopup } from './reference-popup';
diff --git a/blocksuite/affine/rich-text/src/keymap/bracket.ts b/blocksuite/affine/rich-text/src/keymap/bracket.ts
index 0b49356894..e39e0d535e 100644
--- a/blocksuite/affine/rich-text/src/keymap/bracket.ts
+++ b/blocksuite/affine/rich-text/src/keymap/bracket.ts
@@ -6,7 +6,7 @@ import {
TextSelection,
type UIEventHandler,
} from '@blocksuite/block-std';
-import type { InlineEditor } from '@blocksuite/inline';
+import type { InlineEditor } from '@blocksuite/block-std/inline';
import { getInlineEditorByModel } from '../dom.js';
import { insertLinkedNode } from '../linked-node.js';
diff --git a/blocksuite/affine/rich-text/src/markdown/utils.ts b/blocksuite/affine/rich-text/src/markdown/utils.ts
index 63b870352c..b21fb0a713 100644
--- a/blocksuite/affine/rich-text/src/markdown/utils.ts
+++ b/blocksuite/affine/rich-text/src/markdown/utils.ts
@@ -1,5 +1,5 @@
import type { BlockStdScope } from '@blocksuite/block-std';
-import type { InlineEditor } from '@blocksuite/inline';
+import type { InlineEditor } from '@blocksuite/block-std/inline';
import type { BlockModel } from '@blocksuite/store';
import { focusTextModel } from '../dom.js';
diff --git a/blocksuite/affine/rich-text/src/rich-text.ts b/blocksuite/affine/rich-text/src/rich-text.ts
index 62ed1e845d..ac45221b72 100644
--- a/blocksuite/affine/rich-text/src/rich-text.ts
+++ b/blocksuite/affine/rich-text/src/rich-text.ts
@@ -1,13 +1,13 @@
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { ShadowlessElement } from '@blocksuite/block-std';
-import { WithDisposable } from '@blocksuite/global/lit';
import {
type AttributeRenderer,
InlineEditor,
type InlineRange,
type InlineRangeProvider,
type VLine,
-} from '@blocksuite/inline';
+} from '@blocksuite/block-std/inline';
+import { WithDisposable } from '@blocksuite/global/lit';
import type { DeltaInsert } from '@blocksuite/store';
import { Text } from '@blocksuite/store';
import { effect, signal } from '@preact/signals-core';
diff --git a/blocksuite/affine/rich-text/tsconfig.json b/blocksuite/affine/rich-text/tsconfig.json
index 230fca2705..54fcdbee83 100644
--- a/blocksuite/affine/rich-text/tsconfig.json
+++ b/blocksuite/affine/rich-text/tsconfig.json
@@ -12,7 +12,6 @@
{ "path": "../shared" },
{ "path": "../../framework/block-std" },
{ "path": "../../framework/global" },
- { "path": "../../framework/inline" },
{ "path": "../../framework/store" }
]
}
diff --git a/blocksuite/affine/shared/package.json b/blocksuite/affine/shared/package.json
index cb2610e53d..e18f1f16d0 100644
--- a/blocksuite/affine/shared/package.json
+++ b/blocksuite/affine/shared/package.json
@@ -14,7 +14,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/shared/src/utils/title.ts b/blocksuite/affine/shared/src/utils/title.ts
index babcd075c8..db678da88d 100644
--- a/blocksuite/affine/shared/src/utils/title.ts
+++ b/blocksuite/affine/shared/src/utils/title.ts
@@ -1,5 +1,5 @@
import type { EditorHost } from '@blocksuite/block-std';
-import type { InlineEditor } from '@blocksuite/inline';
+import type { InlineEditor } from '@blocksuite/block-std/inline';
function getDocTitleByEditorHost(editorHost: EditorHost): HTMLElement | null {
const docViewport = editorHost.closest('.affine-page-viewport');
diff --git a/blocksuite/affine/shared/tsconfig.json b/blocksuite/affine/shared/tsconfig.json
index ea3d3e5d94..745caa73de 100644
--- a/blocksuite/affine/shared/tsconfig.json
+++ b/blocksuite/affine/shared/tsconfig.json
@@ -10,7 +10,6 @@
{ "path": "../model" },
{ "path": "../../framework/block-std" },
{ "path": "../../framework/global" },
- { "path": "../../framework/inline" },
{ "path": "../../framework/store" }
]
}
diff --git a/blocksuite/affine/widgets/widget-drag-handle/package.json b/blocksuite/affine/widgets/widget-drag-handle/package.json
index 0d278a602c..999a7f5435 100644
--- a/blocksuite/affine/widgets/widget-drag-handle/package.json
+++ b/blocksuite/affine/widgets/widget-drag-handle/package.json
@@ -21,7 +21,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@lit/context": "^1.1.2",
diff --git a/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json b/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json
index 06c732eab7..f31059d0b8 100644
--- a/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json
+++ b/blocksuite/affine/widgets/widget-drag-handle/tsconfig.json
@@ -17,7 +17,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts b/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts
index a28886cfca..b5ed654ef6 100644
--- a/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts
+++ b/blocksuite/affine/widgets/widget-frame-title/src/edgeless-frame-title-editor.ts
@@ -1,11 +1,8 @@
import { FrameBlockModel } from '@blocksuite/affine-model';
import type { RichText } from '@blocksuite/affine-rich-text';
-import {
- type BlockComponent,
- RANGE_SYNC_EXCLUDE_ATTR,
- ShadowlessElement,
-} from '@blocksuite/block-std';
+import { type BlockComponent, ShadowlessElement } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
+import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std/inline';
import { Bound } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import { cssVarV2 } from '@toeverything/theme/v2';
diff --git a/blocksuite/affine/widgets/widget-slash-menu/package.json b/blocksuite/affine/widgets/widget-slash-menu/package.json
index 7a8f6832cf..6933909bab 100644
--- a/blocksuite/affine/widgets/widget-slash-menu/package.json
+++ b/blocksuite/affine/widgets/widget-slash-menu/package.json
@@ -16,7 +16,6 @@
"@blocksuite/block-std": "workspace:*",
"@blocksuite/global": "workspace:*",
"@blocksuite/icons": "^2.2.6",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@floating-ui/dom": "^1.6.13",
"@preact/signals-core": "^1.8.0",
diff --git a/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts b/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts
index 22dd4a11b9..7ff1a8658a 100644
--- a/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts
+++ b/blocksuite/affine/widgets/widget-slash-menu/src/widget.ts
@@ -4,8 +4,8 @@ import {
} from '@blocksuite/affine-rich-text';
import type { UIEventStateContext } from '@blocksuite/block-std';
import { TextSelection, WidgetComponent } from '@blocksuite/block-std';
+import { InlineEditor } from '@blocksuite/block-std/inline';
import { DisposableGroup } from '@blocksuite/global/disposable';
-import { InlineEditor } from '@blocksuite/inline';
import debounce from 'lodash-es/debounce';
import { AFFINE_SLASH_MENU_TRIGGER_KEY } from './consts';
diff --git a/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json b/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json
index 46cd9fa8d7..91c1dd04ad 100644
--- a/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json
+++ b/blocksuite/affine/widgets/widget-slash-menu/tsconfig.json
@@ -12,7 +12,6 @@
{ "path": "../../shared" },
{ "path": "../../../framework/block-std" },
{ "path": "../../../framework/global" },
- { "path": "../../../framework/inline" },
{ "path": "../../../framework/store" }
]
}
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/README.md b/blocksuite/docs/api/@blocksuite/block-std/index/README.md
index 6fa0af4fbe..e5ebc8187d 100644
--- a/blocksuite/docs/api/@blocksuite/block-std/index/README.md
+++ b/blocksuite/docs/api/@blocksuite/block-std/index/README.md
@@ -11,13 +11,6 @@
- [~~BlockService~~](classes/BlockService.md)
- [CommandManager](classes/CommandManager.md)
- [LifeCycleWatcher](classes/LifeCycleWatcher.md)
-- [RangeBinding](classes/RangeBinding.md)
-- [RangeManager](classes/RangeManager.md)
-
-## Variables
-
-- [RANGE\_QUERY\_EXCLUDE\_ATTR](variables/RANGE_QUERY_EXCLUDE_ATTR.md)
-- [RANGE\_SYNC\_EXCLUDE\_ATTR](variables/RANGE_SYNC_EXCLUDE_ATTR.md)
## Functions
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md b/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md
index 94e9609670..df7548b2e1 100644
--- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md
+++ b/blocksuite/docs/api/@blocksuite/block-std/index/classes/LifeCycleWatcher.md
@@ -29,7 +29,6 @@ In the life cycle watcher, the methods will be called in the following order:
## Extended by
- [`CommandManager`](CommandManager.md)
-- [`RangeManager`](RangeManager.md)
## Methods
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeBinding.md b/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeBinding.md
deleted file mode 100644
index 2f542da4b3..0000000000
--- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeBinding.md
+++ /dev/null
@@ -1,9 +0,0 @@
-[**@blocksuite/block-std**](../../../../@blocksuite/block-std/README.md)
-
-***
-
-[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / RangeBinding
-
-# Class: RangeBinding
-
-Two-way binding between native range and text selection
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeManager.md b/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeManager.md
deleted file mode 100644
index b8deca704e..0000000000
--- a/blocksuite/docs/api/@blocksuite/block-std/index/classes/RangeManager.md
+++ /dev/null
@@ -1,121 +0,0 @@
-[**@blocksuite/block-std**](../../../../@blocksuite/block-std/README.md)
-
-***
-
-[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / RangeManager
-
-# Class: RangeManager
-
-CRUD for Range and TextSelection
-
-## Extends
-
-- [`LifeCycleWatcher`](LifeCycleWatcher.md)
-
-## Methods
-
-### created()
-
-> **created**(): `void`
-
-Called when std is created.
-
-#### Returns
-
-`void`
-
-#### Inherited from
-
-[`LifeCycleWatcher`](LifeCycleWatcher.md).[`created`](LifeCycleWatcher.md#created)
-
-***
-
-### getSelectedBlockComponentsByRange()
-
-> **getSelectedBlockComponentsByRange**(`range`, `options`): `BlockComponent`\<`BlockModel`\<`object`\>, [`BlockService`](BlockService.md), `string`\>[]
-
-#### Parameters
-
-##### range
-
-`Range`
-
-##### options
-
-###### match?
-
-(`el`) => `boolean`
-
-###### mode?
-
-`"flat"` \| `"all"` \| `"highest"`
-
-#### Returns
-
-`BlockComponent`\<`BlockModel`\<`object`\>, [`BlockService`](BlockService.md), `string`\>[]
-
-#### Example
-
-```ts
-aaa
- b[bb
- ccc
-ddd
- ee]e
-
-all mode: [aaa, bbb, ccc, ddd, eee]
-flat mode: [bbb, ccc, ddd, eee]
-highest mode: [bbb, ddd]
-
-match function will be evaluated before filtering using mode
-```
-
-***
-
-### mounted()
-
-> **mounted**(): `void`
-
-Called when editor host is mounted.
-Which means the editor host emit the `connectedCallback` lifecycle event.
-
-#### Returns
-
-`void`
-
-#### Overrides
-
-[`LifeCycleWatcher`](LifeCycleWatcher.md).[`mounted`](LifeCycleWatcher.md#mounted)
-
-***
-
-### rendered()
-
-> **rendered**(): `void`
-
-Called when `std.render` is called.
-
-#### Returns
-
-`void`
-
-#### Inherited from
-
-[`LifeCycleWatcher`](LifeCycleWatcher.md).[`rendered`](LifeCycleWatcher.md#rendered)
-
-***
-
-### unmounted()
-
-> **unmounted**(): `void`
-
-Called when editor host is unmounted.
-Which means the editor host emit the `disconnectedCallback` lifecycle event.
-
-#### Returns
-
-`void`
-
-#### Inherited from
-
-[`LifeCycleWatcher`](LifeCycleWatcher.md).[`unmounted`](LifeCycleWatcher.md#unmounted)
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_QUERY_EXCLUDE_ATTR.md b/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_QUERY_EXCLUDE_ATTR.md
deleted file mode 100644
index 9e8576ea1b..0000000000
--- a/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_QUERY_EXCLUDE_ATTR.md
+++ /dev/null
@@ -1,11 +0,0 @@
-[**@blocksuite/block-std**](../../../../@blocksuite/block-std/README.md)
-
-***
-
-[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / RANGE\_QUERY\_EXCLUDE\_ATTR
-
-# Variable: RANGE\_QUERY\_EXCLUDE\_ATTR
-
-> `const` **RANGE\_QUERY\_EXCLUDE\_ATTR**: `"data-range-query-exclude"` = `'data-range-query-exclude'`
-
-Used to exclude certain elements when using `getSelectedBlockComponentsByRange`.
diff --git a/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_SYNC_EXCLUDE_ATTR.md b/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_SYNC_EXCLUDE_ATTR.md
deleted file mode 100644
index d6babf5a22..0000000000
--- a/blocksuite/docs/api/@blocksuite/block-std/index/variables/RANGE_SYNC_EXCLUDE_ATTR.md
+++ /dev/null
@@ -1,11 +0,0 @@
-[**@blocksuite/block-std**](../../../../@blocksuite/block-std/README.md)
-
-***
-
-[BlockSuite API Documentation](../../../../README.md) / [@blocksuite/block-std](../../README.md) / [index](../README.md) / RANGE\_SYNC\_EXCLUDE\_ATTR
-
-# Variable: RANGE\_SYNC\_EXCLUDE\_ATTR
-
-> `const` **RANGE\_SYNC\_EXCLUDE\_ATTR**: `"data-range-sync-exclude"` = `'data-range-sync-exclude'`
-
-Used to mark certain elements so that they are excluded when synchronizing the native range and text selection (such as database block).
diff --git a/blocksuite/framework/block-std/package.json b/blocksuite/framework/block-std/package.json
index ee958066f9..90fda8a69b 100644
--- a/blocksuite/framework/block-std/package.json
+++ b/blocksuite/framework/block-std/package.json
@@ -14,7 +14,6 @@
"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
"@blocksuite/global": "workspace:*",
- "@blocksuite/inline": "workspace:*",
"@blocksuite/store": "workspace:*",
"@lit/context": "^1.1.2",
"@preact/signals-core": "^1.8.0",
@@ -39,7 +38,8 @@
"exports": {
".": "./src/index.ts",
"./gfx": "./src/gfx/index.ts",
- "./effects": "./src/effects.ts"
+ "./effects": "./src/effects.ts",
+ "./inline": "./src/inline/index.ts"
},
"files": [
"src",
diff --git a/blocksuite/framework/inline/src/__tests__/convert.unit.spec.ts b/blocksuite/framework/block-std/src/__tests__/inline/convert.unit.spec.ts
similarity index 97%
rename from blocksuite/framework/inline/src/__tests__/convert.unit.spec.ts
rename to blocksuite/framework/block-std/src/__tests__/inline/convert.unit.spec.ts
index 828bd86764..84d897fddd 100644
--- a/blocksuite/framework/inline/src/__tests__/convert.unit.spec.ts
+++ b/blocksuite/framework/block-std/src/__tests__/inline/convert.unit.spec.ts
@@ -3,7 +3,7 @@ import { expect, test } from 'vitest';
import {
deltaInsertsToChunks,
transformDelta,
-} from '../utils/delta-convert.js';
+} from '../../inline/utils/delta-convert.js';
test('transformDelta', () => {
expect(
diff --git a/blocksuite/framework/inline/src/__tests__/editor.unit.spec.ts b/blocksuite/framework/block-std/src/__tests__/inline/editor.unit.spec.ts
similarity index 99%
rename from blocksuite/framework/inline/src/__tests__/editor.unit.spec.ts
rename to blocksuite/framework/block-std/src/__tests__/inline/editor.unit.spec.ts
index e968454f0e..9090bf1e4a 100644
--- a/blocksuite/framework/inline/src/__tests__/editor.unit.spec.ts
+++ b/blocksuite/framework/block-std/src/__tests__/inline/editor.unit.spec.ts
@@ -1,7 +1,7 @@
import { expect, test } from 'vitest';
import * as Y from 'yjs';
-import { InlineEditor } from '../inline-editor.js';
+import { InlineEditor } from '../../inline/index.js';
test('getDeltaByRangeIndex', () => {
const yDoc = new Y.Doc();
diff --git a/blocksuite/framework/inline/src/__tests__/inline-range.unit.spec.ts b/blocksuite/framework/block-std/src/__tests__/inline/inline-range.unit.spec.ts
similarity index 99%
rename from blocksuite/framework/inline/src/__tests__/inline-range.unit.spec.ts
rename to blocksuite/framework/block-std/src/__tests__/inline/inline-range.unit.spec.ts
index 734f6e5a7c..f8c8ea4cda 100644
--- a/blocksuite/framework/inline/src/__tests__/inline-range.unit.spec.ts
+++ b/blocksuite/framework/block-std/src/__tests__/inline/inline-range.unit.spec.ts
@@ -12,7 +12,7 @@ import {
isInlineRangeIntersect,
isPoint,
mergeInlineRange,
-} from '../utils/inline-range.js';
+} from '../../inline/utils/inline-range.js';
test('isInlineRangeContain', () => {
expect(
diff --git a/blocksuite/framework/inline/src/__tests__/utils.ts b/blocksuite/framework/block-std/src/__tests__/inline/utils.ts
similarity index 98%
rename from blocksuite/framework/inline/src/__tests__/utils.ts
rename to blocksuite/framework/block-std/src/__tests__/inline/utils.ts
index 6bc8be9312..13b74879d0 100644
--- a/blocksuite/framework/inline/src/__tests__/utils.ts
+++ b/blocksuite/framework/block-std/src/__tests__/inline/utils.ts
@@ -1,7 +1,7 @@
import type { DeltaInsert } from '@blocksuite/store';
import { expect, type Page } from '@playwright/test';
-import type { InlineEditor, InlineRange } from '../index.js';
+import type { InlineEditor, InlineRange } from '../../inline/index.js';
const defaultPlaygroundURL = new URL(
`http://localhost:${process.env.CI ? 4173 : 5173}/`
diff --git a/blocksuite/framework/block-std/src/effects.ts b/blocksuite/framework/block-std/src/effects.ts
index 6406571173..3af214c9e1 100644
--- a/blocksuite/framework/block-std/src/effects.ts
+++ b/blocksuite/framework/block-std/src/effects.ts
@@ -1,7 +1,14 @@
import { GfxViewportElement } from './gfx/viewport-element.js';
+import { VElement, VLine, VText } from './inline/index.js';
import { EditorHost } from './view/index.js';
export function effects() {
+ // editor host
customElements.define('editor-host', EditorHost);
+ // gfx
customElements.define('gfx-viewport', GfxViewportElement);
+ // inline
+ customElements.define('v-element', VElement);
+ customElements.define('v-line', VLine);
+ customElements.define('v-text', VText);
}
diff --git a/blocksuite/framework/block-std/src/index.ts b/blocksuite/framework/block-std/src/index.ts
index fbd2f453f7..7795c2bc17 100644
--- a/blocksuite/framework/block-std/src/index.ts
+++ b/blocksuite/framework/block-std/src/index.ts
@@ -3,7 +3,6 @@ export * from './command/index.js';
export * from './event/index.js';
export * from './extension/index.js';
export * from './identifier.js';
-export * from './inline/index.js';
export * from './scope/index.js';
export * from './selection/index.js';
export * from './spec/index.js';
diff --git a/blocksuite/framework/inline/src/components/embed-gap.ts b/blocksuite/framework/block-std/src/inline/components/embed-gap.ts
similarity index 100%
rename from blocksuite/framework/inline/src/components/embed-gap.ts
rename to blocksuite/framework/block-std/src/inline/components/embed-gap.ts
diff --git a/blocksuite/framework/inline/src/components/index.ts b/blocksuite/framework/block-std/src/inline/components/index.ts
similarity index 100%
rename from blocksuite/framework/inline/src/components/index.ts
rename to blocksuite/framework/block-std/src/inline/components/index.ts
diff --git a/blocksuite/framework/inline/src/components/v-element.ts b/blocksuite/framework/block-std/src/inline/components/v-element.ts
similarity index 100%
rename from blocksuite/framework/inline/src/components/v-element.ts
rename to blocksuite/framework/block-std/src/inline/components/v-element.ts
diff --git a/blocksuite/framework/inline/src/components/v-line.ts b/blocksuite/framework/block-std/src/inline/components/v-line.ts
similarity index 100%
rename from blocksuite/framework/inline/src/components/v-line.ts
rename to blocksuite/framework/block-std/src/inline/components/v-line.ts
diff --git a/blocksuite/framework/inline/src/components/v-text.ts b/blocksuite/framework/block-std/src/inline/components/v-text.ts
similarity index 100%
rename from blocksuite/framework/inline/src/components/v-text.ts
rename to blocksuite/framework/block-std/src/inline/components/v-text.ts
diff --git a/blocksuite/framework/inline/src/consts.ts b/blocksuite/framework/block-std/src/inline/consts.ts
similarity index 100%
rename from blocksuite/framework/inline/src/consts.ts
rename to blocksuite/framework/block-std/src/inline/consts.ts
diff --git a/blocksuite/framework/block-std/src/inline/index.ts b/blocksuite/framework/block-std/src/inline/index.ts
index f298acd3c9..f2a0f8cb5e 100644
--- a/blocksuite/framework/block-std/src/inline/index.ts
+++ b/blocksuite/framework/block-std/src/inline/index.ts
@@ -1 +1,7 @@
+export * from './components';
+export * from './consts';
+export * from './inline-editor';
export * from './range';
+export * from './services';
+export * from './types';
+export * from './utils';
diff --git a/blocksuite/framework/inline/src/inline-editor.ts b/blocksuite/framework/block-std/src/inline/inline-editor.ts
similarity index 100%
rename from blocksuite/framework/inline/src/inline-editor.ts
rename to blocksuite/framework/block-std/src/inline/inline-editor.ts
diff --git a/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts b/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts
index 7a56b7c23a..cbb2b899fd 100644
--- a/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts
+++ b/blocksuite/framework/block-std/src/inline/range/inline-range-provider.ts
@@ -1,4 +1,7 @@
-import type { InlineRange, InlineRangeProvider } from '@blocksuite/inline';
+import type {
+ InlineRange,
+ InlineRangeProvider,
+} from '@blocksuite/block-std/inline';
import { signal } from '@preact/signals-core';
import { TextSelection } from '../../selection/index.js';
diff --git a/blocksuite/framework/block-std/src/inline/range/range-manager.ts b/blocksuite/framework/block-std/src/inline/range/range-manager.ts
index 98ed85ae8f..92b96da785 100644
--- a/blocksuite/framework/block-std/src/inline/range/range-manager.ts
+++ b/blocksuite/framework/block-std/src/inline/range/range-manager.ts
@@ -1,9 +1,9 @@
-import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';
-
import { LifeCycleWatcher } from '../../extension/index.js';
import { TextSelection } from '../../selection/index.js';
import type { BlockComponent } from '../../view/element/block-component.js';
import { BLOCK_ID_ATTR } from '../../view/index.js';
+import { INLINE_ROOT_ATTR } from '../consts.js';
+import type { InlineRootElement } from '../inline-editor.js';
import { RANGE_QUERY_EXCLUDE_ATTR, RANGE_SYNC_EXCLUDE_ATTR } from './consts.js';
import { RangeBinding } from './range-binding.js';
diff --git a/blocksuite/framework/inline/src/services/attribute.ts b/blocksuite/framework/block-std/src/inline/services/attribute.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/attribute.ts
rename to blocksuite/framework/block-std/src/inline/services/attribute.ts
diff --git a/blocksuite/framework/inline/src/services/delta.ts b/blocksuite/framework/block-std/src/inline/services/delta.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/delta.ts
rename to blocksuite/framework/block-std/src/inline/services/delta.ts
diff --git a/blocksuite/framework/inline/src/services/event.ts b/blocksuite/framework/block-std/src/inline/services/event.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/event.ts
rename to blocksuite/framework/block-std/src/inline/services/event.ts
diff --git a/blocksuite/framework/inline/src/services/hook.ts b/blocksuite/framework/block-std/src/inline/services/hook.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/hook.ts
rename to blocksuite/framework/block-std/src/inline/services/hook.ts
diff --git a/blocksuite/framework/inline/src/services/index.ts b/blocksuite/framework/block-std/src/inline/services/index.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/index.ts
rename to blocksuite/framework/block-std/src/inline/services/index.ts
diff --git a/blocksuite/framework/inline/src/services/range.ts b/blocksuite/framework/block-std/src/inline/services/range.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/range.ts
rename to blocksuite/framework/block-std/src/inline/services/range.ts
diff --git a/blocksuite/framework/inline/src/services/render.ts b/blocksuite/framework/block-std/src/inline/services/render.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/render.ts
rename to blocksuite/framework/block-std/src/inline/services/render.ts
diff --git a/blocksuite/framework/inline/src/services/text.ts b/blocksuite/framework/block-std/src/inline/services/text.ts
similarity index 100%
rename from blocksuite/framework/inline/src/services/text.ts
rename to blocksuite/framework/block-std/src/inline/services/text.ts
diff --git a/blocksuite/framework/inline/src/types.ts b/blocksuite/framework/block-std/src/inline/types.ts
similarity index 100%
rename from blocksuite/framework/inline/src/types.ts
rename to blocksuite/framework/block-std/src/inline/types.ts
diff --git a/blocksuite/framework/inline/src/utils/attribute-renderer.ts b/blocksuite/framework/block-std/src/inline/utils/attribute-renderer.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/attribute-renderer.ts
rename to blocksuite/framework/block-std/src/inline/utils/attribute-renderer.ts
diff --git a/blocksuite/framework/inline/src/utils/delta-convert.ts b/blocksuite/framework/block-std/src/inline/utils/delta-convert.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/delta-convert.ts
rename to blocksuite/framework/block-std/src/inline/utils/delta-convert.ts
diff --git a/blocksuite/framework/inline/src/utils/embed.ts b/blocksuite/framework/block-std/src/inline/utils/embed.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/embed.ts
rename to blocksuite/framework/block-std/src/inline/utils/embed.ts
diff --git a/blocksuite/framework/inline/src/utils/guard.ts b/blocksuite/framework/block-std/src/inline/utils/guard.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/guard.ts
rename to blocksuite/framework/block-std/src/inline/utils/guard.ts
diff --git a/blocksuite/framework/inline/src/utils/index.ts b/blocksuite/framework/block-std/src/inline/utils/index.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/index.ts
rename to blocksuite/framework/block-std/src/inline/utils/index.ts
diff --git a/blocksuite/framework/inline/src/utils/inline-range.ts b/blocksuite/framework/block-std/src/inline/utils/inline-range.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/inline-range.ts
rename to blocksuite/framework/block-std/src/inline/utils/inline-range.ts
diff --git a/blocksuite/framework/inline/src/utils/point-conversion.ts b/blocksuite/framework/block-std/src/inline/utils/point-conversion.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/point-conversion.ts
rename to blocksuite/framework/block-std/src/inline/utils/point-conversion.ts
diff --git a/blocksuite/framework/inline/src/utils/query.ts b/blocksuite/framework/block-std/src/inline/utils/query.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/query.ts
rename to blocksuite/framework/block-std/src/inline/utils/query.ts
diff --git a/blocksuite/framework/inline/src/utils/range-conversion.ts b/blocksuite/framework/block-std/src/inline/utils/range-conversion.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/range-conversion.ts
rename to blocksuite/framework/block-std/src/inline/utils/range-conversion.ts
diff --git a/blocksuite/framework/inline/src/utils/renderer.ts b/blocksuite/framework/block-std/src/inline/utils/renderer.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/renderer.ts
rename to blocksuite/framework/block-std/src/inline/utils/renderer.ts
diff --git a/blocksuite/framework/inline/src/utils/text.ts b/blocksuite/framework/block-std/src/inline/utils/text.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/text.ts
rename to blocksuite/framework/block-std/src/inline/utils/text.ts
diff --git a/blocksuite/framework/inline/src/utils/transform-input.ts b/blocksuite/framework/block-std/src/inline/utils/transform-input.ts
similarity index 100%
rename from blocksuite/framework/inline/src/utils/transform-input.ts
rename to blocksuite/framework/block-std/src/inline/utils/transform-input.ts
diff --git a/blocksuite/framework/block-std/tsconfig.json b/blocksuite/framework/block-std/tsconfig.json
index a607fe5a21..a4ef79f252 100644
--- a/blocksuite/framework/block-std/tsconfig.json
+++ b/blocksuite/framework/block-std/tsconfig.json
@@ -6,9 +6,5 @@
"tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
},
"include": ["./src"],
- "references": [
- { "path": "../global" },
- { "path": "../inline" },
- { "path": "../store" }
- ]
+ "references": [{ "path": "../global" }, { "path": "../store" }]
}
diff --git a/blocksuite/framework/inline/README.md b/blocksuite/framework/inline/README.md
deleted file mode 100644
index 04ab3b19b6..0000000000
--- a/blocksuite/framework/inline/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# `@blocksuite/inline`
-
-Inline rich text editing component for BlockSuite. Checkout the docs at [blocksuite.io/inline](https://blocksuite.io/guide/inline.html).
diff --git a/blocksuite/framework/inline/package.json b/blocksuite/framework/inline/package.json
deleted file mode 100644
index 9c5a705811..0000000000
--- a/blocksuite/framework/inline/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "@blocksuite/inline",
- "description": "A micro editor.",
- "type": "module",
- "scripts": {
- "build": "tsc"
- },
- "sideEffects": false,
- "keywords": [],
- "files": [
- "src",
- "dist",
- "!src/__tests__",
- "!dist/__tests__"
- ],
- "author": "toeverything",
- "license": "MIT",
- "exports": {
- ".": "./src/index.ts",
- "./consts": "./src/consts.ts",
- "./effects": "./src/effects.ts",
- "./types": "./src/types.ts"
- },
- "dependencies": {
- "@blocksuite/global": "workspace:*",
- "@blocksuite/store": "workspace:*",
- "@preact/signals-core": "^1.8.0",
- "lit": "^3.2.0",
- "rxjs": "^7.8.1",
- "yjs": "^13.6.21",
- "zod": "^3.23.8"
- },
- "devDependencies": {
- "vitest": "3.0.8"
- },
- "version": "0.20.0"
-}
diff --git a/blocksuite/framework/inline/src/effects.ts b/blocksuite/framework/inline/src/effects.ts
deleted file mode 100644
index 73c66f6f1b..0000000000
--- a/blocksuite/framework/inline/src/effects.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { VElement, VLine, VText } from './components/index.js';
-
-export function effects() {
- customElements.define('v-element', VElement);
- customElements.define('v-line', VLine);
- customElements.define('v-text', VText);
-}
diff --git a/blocksuite/framework/inline/src/index.ts b/blocksuite/framework/inline/src/index.ts
deleted file mode 100644
index 643d0328de..0000000000
--- a/blocksuite/framework/inline/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './components/index.js';
-export * from './consts.js';
-export * from './inline-editor.js';
-export * from './services/index.js';
-export * from './types.js';
-export * from './utils/index.js';
diff --git a/blocksuite/framework/inline/tsconfig.json b/blocksuite/framework/inline/tsconfig.json
deleted file mode 100644
index a4ef79f252..0000000000
--- a/blocksuite/framework/inline/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "extends": "../../tsconfig.json",
- "compilerOptions": {
- "rootDir": "./src",
- "outDir": "./dist",
- "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
- },
- "include": ["./src"],
- "references": [{ "path": "../global" }, { "path": "../store" }]
-}
diff --git a/blocksuite/framework/inline/vitest.config.ts b/blocksuite/framework/inline/vitest.config.ts
deleted file mode 100644
index e9d0ef036a..0000000000
--- a/blocksuite/framework/inline/vitest.config.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
- esbuild: {
- target: 'es2018',
- },
- test: {
- include: ['src/__tests__/**/*.unit.spec.ts'],
- testTimeout: 500,
- coverage: {
- provider: 'istanbul', // or 'c8'
- reporter: ['lcov'],
- reportsDirectory: '../../../.coverage/inline',
- },
- /**
- * Custom handler for console.log in tests.
- *
- * Return `false` to ignore the log.
- */
- onConsoleLog(log, type) {
- if (log.includes('https://lit.dev/msg/dev-mode')) {
- return false;
- }
- console.warn(`Unexpected ${type} log`, log);
- throw new Error(log);
- },
- },
-});
diff --git a/blocksuite/playground/examples/inline/test-page.ts b/blocksuite/playground/examples/inline/test-page.ts
index 66f140e2e3..c63fc9e249 100644
--- a/blocksuite/playground/examples/inline/test-page.ts
+++ b/blocksuite/playground/examples/inline/test-page.ts
@@ -1,12 +1,12 @@
import '@shoelace-style/shoelace';
import { ShadowlessElement } from '@blocksuite/affine/block-std';
+import { effects } from '@blocksuite/affine/block-std/effects';
import {
type AttributeRenderer,
InlineEditor,
ZERO_WIDTH_NON_JOINER,
-} from '@blocksuite/affine/inline';
-import { effects } from '@blocksuite/affine/inline/effects';
+} from '@blocksuite/affine/block-std/inline';
import {
type BaseTextAttributes,
baseTextAttributes,
diff --git a/packages/frontend/core/src/modules/editor/entities/editor.ts b/packages/frontend/core/src/modules/editor/entities/editor.ts
index 0e26a89111..8ccd788db1 100644
--- a/packages/frontend/core/src/modules/editor/entities/editor.ts
+++ b/packages/frontend/core/src/modules/editor/entities/editor.ts
@@ -5,7 +5,7 @@ import type { DocTitle } from '@blocksuite/affine/fragments/doc-title';
import type { DocMode, ReferenceParams } from '@blocksuite/affine/model';
import { HighlightSelection } from '@blocksuite/affine/shared/selection';
import { FeatureFlagService as BSFeatureFlagService } from '@blocksuite/affine/shared/services';
-import type { InlineEditor } from '@blocksuite/inline';
+import type { InlineEditor } from '@blocksuite/block-std/inline';
import { effect } from '@preact/signals-core';
import { Entity, LiveData } from '@toeverything/infra';
import { defaults, isEqual, omit } from 'lodash-es';
diff --git a/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts b/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts
index b93fd9a4b5..8c86ca006a 100644
--- a/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts
+++ b/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts
@@ -234,7 +234,7 @@ test.describe('edgeless note element toolbar', () => {
await createEdgelessNoteBlock(page, [100, 100]);
await page.waitForSelector('.affine-paragraph-placeholder.visible');
await page.keyboard.type('Note 2');
- await clickView(page, [0, 0]);
+ await clickView(page, [0, 300]);
await clickView(page, [100, 100]);
const toolbar = locateToolbar(page);
diff --git a/tests/blocksuite/e2e/database/actions.ts b/tests/blocksuite/e2e/database/actions.ts
index 1e26ac65d3..4b831becc5 100644
--- a/tests/blocksuite/e2e/database/actions.ts
+++ b/tests/blocksuite/e2e/database/actions.ts
@@ -1,5 +1,4 @@
import type { RichTextCell } from '@blocksuite/affine/blocks/database';
-import { ZERO_WIDTH_SPACE } from '@blocksuite/affine/inline';
import { expect, type Locator, type Page } from '@playwright/test';
import {
@@ -13,6 +12,7 @@ import {
getEditorLocator,
waitNextFrame,
} from '../utils/actions/misc.js';
+import { ZERO_WIDTH_SPACE } from '../utils/inline-editor.js';
export async function press(page: Page, content: string) {
await page.keyboard.press(content, { delay: 50 });
diff --git a/tests/blocksuite/e2e/inline/inline-editor.spec.ts b/tests/blocksuite/e2e/inline/inline-editor.spec.ts
index b9576de625..3707876a73 100644
--- a/tests/blocksuite/e2e/inline/inline-editor.spec.ts
+++ b/tests/blocksuite/e2e/inline/inline-editor.spec.ts
@@ -1,8 +1,11 @@
+import type {
+ InlineEditor,
+ InlineRange,
+} from '@blocksuite/affine/block-std/inline';
import type { DeltaInsert } from '@blocksuite/affine/store';
-import type { InlineEditor, InlineRange } from '@blocksuite/inline';
-import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
import { expect, type Page, test } from '@playwright/test';
+import { ZERO_WIDTH_SPACE } from '../utils/inline-editor.js';
// FIXME(mirone): copy paste from framework/inline/__tests__/utils.ts
const defaultPlaygroundURL = new URL(
`http://localhost:${process.env.CI ? 4173 : 5173}/`
diff --git a/tests/blocksuite/e2e/latex/inline.spec.ts b/tests/blocksuite/e2e/latex/inline.spec.ts
index f41b799604..46eca3a38a 100644
--- a/tests/blocksuite/e2e/latex/inline.spec.ts
+++ b/tests/blocksuite/e2e/latex/inline.spec.ts
@@ -1,4 +1,3 @@
-import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
import { expect } from '@playwright/test';
import {
@@ -25,6 +24,7 @@ import {
assertRichTextInlineDeltas,
assertRichTextInlineRange,
} from '../utils/asserts.js';
+import { ZERO_WIDTH_SPACE } from '../utils/inline-editor.js';
import { test } from '../utils/playwright.js';
test('add inline latex at the start of line', async ({ page }) => {
diff --git a/tests/blocksuite/e2e/utils/actions/misc.ts b/tests/blocksuite/e2e/utils/actions/misc.ts
index 21cad179e3..4ed50950d2 100644
--- a/tests/blocksuite/e2e/utils/actions/misc.ts
+++ b/tests/blocksuite/e2e/utils/actions/misc.ts
@@ -1,6 +1,9 @@
import '../declare-test-window.js';
-import type { InlineRange, InlineRootElement } from '@blocksuite/affine/inline';
+import type {
+ InlineRange,
+ InlineRootElement,
+} from '@blocksuite/affine/block-std/inline';
import type { DatabaseBlockModel, ListType } from '@blocksuite/affine/model';
import type { RichText } from '@blocksuite/affine/rich-text';
import type { BlockModel } from '@blocksuite/affine/store';
diff --git a/tests/blocksuite/e2e/utils/asserts.ts b/tests/blocksuite/e2e/utils/asserts.ts
index ce008f7124..83c2ef9c0d 100644
--- a/tests/blocksuite/e2e/utils/asserts.ts
+++ b/tests/blocksuite/e2e/utils/asserts.ts
@@ -5,8 +5,8 @@ import type {
EditorHost,
TextSelection,
} from '@blocksuite/affine/block-std';
+import type { InlineRootElement } from '@blocksuite/affine/block-std/inline';
import type { EdgelessNoteBackground } from '@blocksuite/affine/blocks/note';
-import type { InlineRootElement } from '@blocksuite/affine/inline';
import type { NoteBlockModel, RootBlockModel } from '@blocksuite/affine/model';
import type {
AffineInlineEditor,
diff --git a/tests/blocksuite/e2e/utils/inline-editor.ts b/tests/blocksuite/e2e/utils/inline-editor.ts
index 364eb2bd08..b82a8edee4 100644
--- a/tests/blocksuite/e2e/utils/inline-editor.ts
+++ b/tests/blocksuite/e2e/utils/inline-editor.ts
@@ -20,3 +20,10 @@ export async function getStringFromRichText(
[index]
);
}
+
+// Why? we can't import from `@blocksuite/affine/block-std/inline` because playwright will throw an error
+export const ZERO_WIDTH_SPACE = /Apple Computer/.test(
+ globalThis.navigator?.vendor
+)
+ ? '\u200C'
+ : '\u200B';
diff --git a/tests/blocksuite/package.json b/tests/blocksuite/package.json
index a233d3a969..db3ebb6e61 100644
--- a/tests/blocksuite/package.json
+++ b/tests/blocksuite/package.json
@@ -2,7 +2,6 @@
"name": "@affine-test/blocksuite",
"private": true,
"type": "module",
- "main": "index.js",
"scripts": {
"test": "yarn playwright test"
},
@@ -14,16 +13,5 @@
"json-stable-stringify": "^1.2.1",
"rxjs": "^7.8.1"
},
- "bsImport": {
- "@atlaskit/pragmatic-drag-and-drop/element/adapter": "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/element/adapter.js",
- "@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview": "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/element/disable-native-drag-preview.js",
- "@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview": "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/element/set-custom-native-drag-preview.js",
- "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element": "@atlaskit/pragmatic-drag-and-drop-auto-scroll/dist/cjs/entry-point/element.js",
- "@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge": "@atlaskit/pragmatic-drag-and-drop-hitbox/dist/cjs/closest-edge.js"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/toeverything/blocksuite.git"
- },
"version": "0.20.0"
}
diff --git a/tests/blocksuite/tsconfig.json b/tests/blocksuite/tsconfig.json
index 8193a103a5..9aefa8d347 100644
--- a/tests/blocksuite/tsconfig.json
+++ b/tests/blocksuite/tsconfig.json
@@ -5,7 +5,7 @@
"outDir": "./dist",
"tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
},
- "include": ["./e2e"],
+ "include": ["e2e"],
"references": [
{ "path": "../../blocksuite/affine/all" },
{ "path": "../../blocksuite/integration-test" }
diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts
index 0de17f422a..9073c1c553 100644
--- a/tools/utils/src/workspace.gen.ts
+++ b/tools/utils/src/workspace.gen.ts
@@ -43,7 +43,6 @@ export const PackageList = [
'blocksuite/framework/block-std',
'blocksuite/affine/data-view',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
'blocksuite/framework/sync',
],
@@ -60,7 +59,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -76,7 +74,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -91,7 +88,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -106,7 +102,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -122,7 +117,6 @@ export const PackageList = [
'blocksuite/framework/block-std',
'blocksuite/affine/data-view',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -139,7 +133,6 @@ export const PackageList = [
'blocksuite/framework/block-std',
'blocksuite/affine/data-view',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -152,7 +145,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -167,7 +159,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -183,7 +174,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -198,7 +188,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-frame-title',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -214,7 +203,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -230,7 +218,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -244,7 +231,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -262,7 +248,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -277,7 +262,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -316,7 +300,6 @@ export const PackageList = [
'blocksuite/framework/block-std',
'blocksuite/affine/data-view',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -330,7 +313,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -346,7 +328,6 @@ export const PackageList = [
'blocksuite/affine/widgets/widget-slash-menu',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -373,7 +354,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -400,7 +380,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -416,7 +395,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -432,7 +410,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -448,7 +425,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -467,7 +443,6 @@ export const PackageList = [
workspaceDependencies: [
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -480,7 +455,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -491,7 +465,6 @@ export const PackageList = [
'blocksuite/affine/model',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -509,7 +482,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -569,7 +541,6 @@ export const PackageList = [
'blocksuite/affine/shared',
'blocksuite/framework/block-std',
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -597,7 +568,6 @@ export const PackageList = [
name: '@blocksuite/block-std',
workspaceDependencies: [
'blocksuite/framework/global',
- 'blocksuite/framework/inline',
'blocksuite/framework/store',
],
},
@@ -606,14 +576,6 @@ export const PackageList = [
name: '@blocksuite/global',
workspaceDependencies: [],
},
- {
- location: 'blocksuite/framework/inline',
- name: '@blocksuite/inline',
- workspaceDependencies: [
- 'blocksuite/framework/global',
- 'blocksuite/framework/store',
- ],
- },
{
location: 'blocksuite/framework/store',
name: '@blocksuite/store',
@@ -981,7 +943,6 @@ export type PackageName =
| '@blocksuite/bs-docs'
| '@blocksuite/block-std'
| '@blocksuite/global'
- | '@blocksuite/inline'
| '@blocksuite/store'
| '@blocksuite/sync'
| '@blocksuite/integration-test'
diff --git a/tsconfig.json b/tsconfig.json
index 5425687db7..e33ee124c0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -90,7 +90,6 @@
{ "path": "./blocksuite/docs" },
{ "path": "./blocksuite/framework/block-std" },
{ "path": "./blocksuite/framework/global" },
- { "path": "./blocksuite/framework/inline" },
{ "path": "./blocksuite/framework/store" },
{ "path": "./blocksuite/framework/sync" },
{ "path": "./blocksuite/integration-test" },
diff --git a/yarn.lock b/yarn.lock
index 185e317209..99d0d7bc20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2319,7 +2319,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2346,7 +2345,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@lit/context": "npm:^1.1.2"
"@preact/signals-core": "npm:^1.8.0"
@@ -2371,7 +2369,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@emoji-mart/data": "npm:^1.2.1"
"@floating-ui/dom": "npm:^1.6.10"
@@ -2399,7 +2396,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2427,7 +2423,6 @@ __metadata:
"@blocksuite/data-view": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2455,7 +2450,6 @@ __metadata:
"@blocksuite/data-view": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2481,7 +2475,6 @@ __metadata:
"@blocksuite/affine-shared": "workspace:*"
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2507,7 +2500,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2533,7 +2525,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2562,7 +2553,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2590,7 +2580,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2617,7 +2606,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2645,7 +2633,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2675,7 +2662,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@lit/context": "npm:^1.1.2"
"@preact/signals-core": "npm:^1.8.0"
@@ -2702,7 +2688,6 @@ __metadata:
"@blocksuite/affine-shared": "workspace:*"
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2752,7 +2737,6 @@ __metadata:
"@blocksuite/data-view": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2787,7 +2771,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2813,7 +2796,6 @@ __metadata:
"@blocksuite/affine-shared": "workspace:*"
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@lit/context": "npm:^1.1.2"
"@preact/signals-core": "npm:^1.8.0"
@@ -2866,7 +2848,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2904,7 +2885,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2930,7 +2910,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2958,7 +2937,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -2985,7 +2963,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@lit/context": "npm:^1.1.2"
"@preact/signals-core": "npm:^1.8.0"
@@ -3019,7 +2996,6 @@ __metadata:
dependencies:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@toeverything/theme": "npm:^1.1.12"
"@types/lodash-es": "npm:^4.17.12"
@@ -3041,7 +3017,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -3074,7 +3049,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -3127,7 +3101,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@lit/context": "npm:^1.1.2"
@@ -3224,7 +3197,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/global": "workspace:*"
"@blocksuite/icons": "npm:^2.2.6"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@floating-ui/dom": "npm:^1.6.13"
"@preact/signals-core": "npm:^1.8.0"
@@ -3306,7 +3278,6 @@ __metadata:
"@blocksuite/block-std": "workspace:*"
"@blocksuite/data-view": "workspace:*"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@blocksuite/sync": "workspace:*"
"@vanilla-extract/vite-plugin": "npm:^5.0.0"
@@ -3323,7 +3294,6 @@ __metadata:
"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "npm:^2.1.0"
"@atlaskit/pragmatic-drag-and-drop-hitbox": "npm:^1.0.3"
"@blocksuite/global": "workspace:*"
- "@blocksuite/inline": "workspace:*"
"@blocksuite/store": "workspace:*"
"@lit/context": "npm:^1.1.2"
"@preact/signals-core": "npm:^1.8.0"
@@ -3411,21 +3381,6 @@ __metadata:
languageName: node
linkType: hard
-"@blocksuite/inline@workspace:*, @blocksuite/inline@workspace:blocksuite/framework/inline":
- version: 0.0.0-use.local
- resolution: "@blocksuite/inline@workspace:blocksuite/framework/inline"
- dependencies:
- "@blocksuite/global": "workspace:*"
- "@blocksuite/store": "workspace:*"
- "@preact/signals-core": "npm:^1.8.0"
- lit: "npm:^3.2.0"
- rxjs: "npm:^7.8.1"
- vitest: "npm:3.0.8"
- yjs: "npm:^13.6.21"
- zod: "npm:^3.23.8"
- languageName: unknown
- linkType: soft
-
"@blocksuite/integration-test@workspace:*, @blocksuite/integration-test@workspace:blocksuite/integration-test":
version: 0.0.0-use.local
resolution: "@blocksuite/integration-test@workspace:blocksuite/integration-test"