refactor(editor): remove components in blocks/_common (#9401)

blocksuite/blocks/src/root-block/widgets/element-toolbar/change-embed-card-button.ts

@@ -1,3 +1,11 @@
+import type {
+  BuiltInEmbedBlockComponent,
+  BuiltInEmbedModel,
+} from '@blocksuite/affine-block-bookmark';
+import {
+  isInternalEmbedModel,
+  toggleEmbedCardEditModal,
+} from '@blocksuite/affine-block-bookmark';
 import {
   getDocContentWithMaxLength,
   getEmbedCardIcons,
@@ -44,12 +52,6 @@ import { ifDefined } from 'lit/directives/if-defined.js';
 import { join } from 'lit/directives/join.js';
 import { repeat } from 'lit/directives/repeat.js';
 
-import { toggleEmbedCardEditModal } from '../../../_common/components/embed-card/modal/embed-card-edit-modal.js';
-import type {
-  EmbedBlockComponent,
-  EmbedModel,
-} from '../../../_common/components/embed-card/type.js';
-import { isInternalEmbedModel } from '../../../_common/components/embed-card/type.js';
 import type { EmbedCardStyle } from '../../../_common/types.js';
 import type { EdgelessRootBlockComponent } from '../../edgeless/edgeless-root-block.js';
 import {
@@ -373,7 +375,7 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
 
     const blockComponent = this.std.view.getBlock(
       blockSelection[0].blockId
-    ) as EmbedBlockComponent | null;
+    ) as BuiltInEmbedBlockComponent | null;
 
     if (!blockComponent) return;
 
@@ -837,7 +839,7 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
   accessor edgeless!: EdgelessRootBlockComponent;
 
   @property({ attribute: false })
-  accessor model!: EmbedModel;
+  accessor model!: BuiltInEmbedModel;
 
   @property({ attribute: false })
   accessor quickConnectButton!: TemplateResult<1> | typeof nothing;
@@ -861,7 +863,7 @@ export function renderEmbedButton(
 
 function track(
   std: BlockStdScope,
-  model: EmbedModel,
+  model: BuiltInEmbedModel,
   viewType: string,
   event: LinkEventType,
   props: Partial<TelemetryEvent>

blocksuite/blocks/src/root-block/widgets/element-toolbar/index.ts

@@ -1,3 +1,4 @@
+import type { BuiltInEmbedModel } from '@blocksuite/affine-block-bookmark';
 import { CommonUtils } from '@blocksuite/affine-block-surface';
 import { ConnectorCWithArrowIcon } from '@blocksuite/affine-components/icons';
 import {
@@ -38,7 +39,6 @@ import { css, html, nothing, type TemplateResult, unsafeCSS } from 'lit';
 import { property, state } from 'lit/decorators.js';
 import { join } from 'lit/directives/join.js';
 
-import type { EmbedModel } from '../../../_common/components/embed-card/type.js';
 import type { EdgelessRootBlockComponent } from '../../edgeless/edgeless-root-block.js';
 import {
   isAttachmentBlock,
@@ -79,7 +79,7 @@ type CategorizedElements = {
   image?: ImageBlockModel[];
   attachment?: AttachmentBlockModel[];
   mindmap?: MindmapElementModel[];
-  embedCard?: EmbedModel[];
+  embedCard?: BuiltInEmbedModel[];
   edgelessText?: EdgelessTextBlockModel[];
 };
 

blocksuite/blocks/src/root-block/widgets/embed-card-toolbar/context.ts

@@ -1,7 +1,6 @@
+import type { BuiltInEmbedBlockComponent } from '@blocksuite/affine-block-bookmark';
 import { MenuContext } from '@blocksuite/affine-components/toolbar';
 
-import type { EmbedBlockComponent } from '../../../_common/components/embed-card/type.js';
-
 export class EmbedCardToolbarContext extends MenuContext {
   override close = () => {
     this.abortController.abort();
@@ -25,7 +24,7 @@ export class EmbedCardToolbarContext extends MenuContext {
   }
 
   constructor(
-    public blockComponent: EmbedBlockComponent,
+    public blockComponent: BuiltInEmbedBlockComponent,
     public abortController: AbortController
   ) {
     super();

blocksuite/blocks/src/root-block/widgets/embed-card-toolbar/embed-card-toolbar.ts

@@ -1,3 +1,11 @@
+import {
+  type BuiltInEmbedBlockComponent,
+  type BuiltInEmbedModel,
+  isEmbedCardBlockComponent,
+  isInternalEmbedModel,
+  toggleEmbedCardCaptionEditModal,
+  toggleEmbedCardEditModal,
+} from '@blocksuite/affine-block-bookmark';
 import {
   getDocContentWithMaxLength,
   getEmbedCardIcons,
@@ -54,14 +62,6 @@ import { ifDefined } from 'lit/directives/if-defined.js';
 import { join } from 'lit/directives/join.js';
 import { repeat } from 'lit/directives/repeat.js';
 
-import { toggleEmbedCardCaptionEditModal } from '../../../_common/components/embed-card/modal/embed-card-caption-edit-modal.js';
-import { toggleEmbedCardEditModal } from '../../../_common/components/embed-card/modal/embed-card-edit-modal.js';
-import {
-  type EmbedBlockComponent,
-  type EmbedModel,
-  isEmbedCardBlockComponent,
-  isInternalEmbedModel,
-} from '../../../_common/components/embed-card/type.js';
 import {
   isBookmarkBlock,
   isEmbedGithubBlock,
@@ -303,7 +303,7 @@ export class EmbedCardToolbar extends WidgetComponent<
     return 'inline';
   }
 
-  get focusModel(): EmbedModel | undefined {
+  get focusModel(): BuiltInEmbedModel | undefined {
     return this.focusBlock?.model;
   }
 
@@ -726,7 +726,7 @@ export class EmbedCardToolbar extends WidgetComponent<
           return;
         }
 
-        this.focusBlock = block as EmbedBlockComponent;
+        this.focusBlock = block as BuiltInEmbedBlockComponent;
         this._show();
       })
     );
@@ -848,7 +848,7 @@ export class EmbedCardToolbar extends WidgetComponent<
   accessor embedCardToolbarElement!: HTMLElement;
 
   @state()
-  accessor focusBlock: EmbedBlockComponent | null = null;
+  accessor focusBlock: BuiltInEmbedBlockComponent | null = null;
 
   @state()
   accessor hide: boolean = true;
@@ -865,7 +865,7 @@ declare global {
 
 function track(
   std: BlockStdScope,
-  model: EmbedModel,
+  model: BuiltInEmbedModel,
   viewType: string,
   event: LinkEventType,
   props: Partial<TelemetryEvent>

blocksuite/blocks/src/root-block/widgets/keyboard-toolbar/config.ts

@@ -1,4 +1,5 @@
 import { addSiblingAttachmentBlocks } from '@blocksuite/affine-block-attachment';
+import { toggleEmbedCardCreateModal } from '@blocksuite/affine-block-bookmark';
 import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
 import {
   getInlineEditorByModel,
@@ -61,7 +62,6 @@ import { computed } from '@preact/signals-core';
 import { cssVarV2 } from '@toeverything/theme/v2';
 import type { TemplateResult } from 'lit';
 
-import { toggleEmbedCardCreateModal } from '../../../_common/components/embed-card/modal/embed-card-create-modal.js';
 import type { PageRootBlockComponent } from '../../page/page-root-block.js';
 import { formatDate, formatTime } from '../../utils/misc.js';
 import type { AffineLinkedDocWidget } from '../linked-doc/index.js';

blocksuite/blocks/src/root-block/widgets/linked-doc/linked-doc-popover.ts

@@ -2,6 +2,11 @@ import { LoadingIcon } from '@blocksuite/affine-block-image';
 import type { IconButton } from '@blocksuite/affine-components/icon-button';
 import { MoreHorizontalIcon } from '@blocksuite/affine-components/icons';
 import {
+  cleanSpecifiedTail,
+  getTextContentFromInlineRange,
+} from '@blocksuite/affine-components/rich-text';
+import {
+  createKeydownObserver,
   getCurrentNativeRange,
   getViewportElement,
 } from '@blocksuite/affine-shared/utils';
@@ -15,11 +20,6 @@ import { html, LitElement, nothing } from 'lit';
 import { property, query, queryAll, state } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
-import {
-  cleanSpecifiedTail,
-  createKeydownObserver,
-  getQuery,
-} from '../../../_common/components/utils.js';
 import { getPopperPosition } from '../../utils/position.js';
 import type { LinkedDocContext, LinkedMenuGroup } from './config.js';
 import { linkedDocPopoverStyles } from './styles.js';
@@ -86,7 +86,10 @@ export class LinkedDocPopover extends SignalWatcher(
   }
 
   private get _query() {
-    return getQuery(this.context.inlineEditor, this.context.startRange);
+    return getTextContentFromInlineRange(
+      this.context.inlineEditor,
+      this.context.startRange
+    );
   }
 
   private _getActionItems(group: LinkedMenuGroup) {

blocksuite/blocks/src/root-block/widgets/linked-doc/mobile-linked-doc-menu.ts

@@ -1,8 +1,15 @@
+import {
+  cleanSpecifiedTail,
+  getTextContentFromInlineRange,
+} from '@blocksuite/affine-components/rich-text';
 import {
   VirtualKeyboardController,
   type VirtualKeyboardControllerConfig,
 } from '@blocksuite/affine-components/virtual-keyboard';
-import { getViewportElement } from '@blocksuite/affine-shared/utils';
+import {
+  createKeydownObserver,
+  getViewportElement,
+} from '@blocksuite/affine-shared/utils';
 import { PropTypes, requiredProperties } from '@blocksuite/block-std';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/utils';
 import { MoreHorizontalIcon } from '@blocksuite/icons/lit';
@@ -12,11 +19,6 @@ import { property } from 'lit/decorators.js';
 import { join } from 'lit/directives/join.js';
 import { repeat } from 'lit/directives/repeat.js';
 
-import {
-  cleanSpecifiedTail,
-  createKeydownObserver,
-  getQuery,
-} from '../../../_common/components/utils.js';
 import { PageRootBlockComponent } from '../../index.js';
 import type {
   LinkedDocContext,
@@ -151,7 +153,10 @@ export class AffineMobileLinkedDocMenu extends SignalWatcher(
   private _updateLinkedDocGroupAbortController: AbortController | null = null;
 
   private get _query() {
-    return getQuery(this.context.inlineEditor, this.context.startRange);
+    return getTextContentFromInlineRange(
+      this.context.inlineEditor,
+      this.context.startRange
+    );
   }
 
   get virtualKeyboardControllerConfig(): VirtualKeyboardControllerConfig {

blocksuite/blocks/src/root-block/widgets/slash-menu/config.ts

@@ -1,4 +1,5 @@
 import { addSiblingAttachmentBlocks } from '@blocksuite/affine-block-attachment';
+import { toggleEmbedCardCreateModal } from '@blocksuite/affine-block-bookmark';
 import {
   FigmaIcon,
   GithubIcon,
@@ -50,7 +51,6 @@ import type { BlockModel } from '@blocksuite/store';
 import { Slice, Text } from '@blocksuite/store';
 import type { TemplateResult } from 'lit';
 
-import { toggleEmbedCardCreateModal } from '../../../_common/components/embed-card/modal/embed-card-create-modal.js';
 import type { DataViewBlockComponent } from '../../../data-view-block/index.js';
 import type { RootBlockComponent } from '../../types.js';
 import { formatDate, formatTime } from '../../utils/misc.js';

blocksuite/blocks/src/root-block/widgets/slash-menu/slash-menu-popover.ts

@@ -1,8 +1,13 @@
 import { ArrowDownIcon } from '@blocksuite/affine-components/icons';
 import { createLitPortal } from '@blocksuite/affine-components/portal';
 import type { AffineInlineEditor } from '@blocksuite/affine-components/rich-text';
-import { getInlineEditorByModel } from '@blocksuite/affine-components/rich-text';
 import {
+  cleanSpecifiedTail,
+  getInlineEditorByModel,
+  getTextContentFromInlineRange,
+} from '@blocksuite/affine-components/rich-text';
+import {
+  createKeydownObserver,
   isControlledKeyboardEvent,
   isFuzzyMatch,
   substringMatchScore,
@@ -14,11 +19,6 @@ import { property, query, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
-import {
-  cleanSpecifiedTail,
-  createKeydownObserver,
-  getQuery,
-} from '../../../_common/components/utils.js';
 import type {
   SlashMenuActionItem,
   SlashMenuContext,
@@ -144,7 +144,7 @@ export class SlashMenu extends WithDisposable(LitElement) {
   };
 
   private get _query() {
-    return getQuery(this.inlineEditor, this._startRange);
+    return getTextContentFromInlineRange(this.inlineEditor, this._startRange);
   }
 
   get host() {