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

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';

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,

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';

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';
 

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';
 

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';

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';

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';
 

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;

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';
 

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';