refactor(editor): move embed-card-modal to components (#10037)

blocksuite/affine/block-bookmark/package.json

@@ -14,7 +14,6 @@
   "license": "MIT",
   "dependencies": {
     "@blocksuite/affine-block-embed": "workspace:*",
-    "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",

blocksuite/affine/block-bookmark/src/components/embed-card-modal/index.ts

@@ -1,4 +0,0 @@
-export * from './embed-card-caption-edit-modal';
-export * from './embed-card-create-modal';
-export * from './embed-card-edit-modal';
-export * from './type';

blocksuite/affine/block-bookmark/src/components/index.ts

@@ -1,2 +1 @@
 export * from './bookmark-card';
-export * from './embed-card-modal';

blocksuite/affine/block-bookmark/src/effects.ts

@@ -1,11 +1,6 @@
 import { BookmarkBlockComponent } from './bookmark-block';
 import { BookmarkEdgelessBlockComponent } from './bookmark-edgeless-block';
 import { BookmarkCard } from './components/bookmark-card';
-import {
-  EmbedCardCreateModal,
-  EmbedCardEditCaptionEditModal,
-  EmbedCardEditModal,
-} from './components/embed-card-modal';
 
 export function effects() {
   customElements.define(
@@ -14,11 +9,4 @@ export function effects() {
   );
   customElements.define('affine-bookmark', BookmarkBlockComponent);
   customElements.define('bookmark-card', BookmarkCard);
-
-  customElements.define('embed-card-create-modal', EmbedCardCreateModal);
-  customElements.define('embed-card-edit-modal', EmbedCardEditModal);
-  customElements.define(
-    'embed-card-caption-edit-modal',
-    EmbedCardEditCaptionEditModal
-  );
 }

blocksuite/affine/block-bookmark/tsconfig.json

@@ -8,7 +8,6 @@
   "include": ["./src"],
   "references": [
     { "path": "../block-embed" },
-    { "path": "../block-surface" },
     { "path": "../components" },
     { "path": "../model" },
     { "path": "../shared" },

blocksuite/affine/components/package.json

@@ -62,7 +62,8 @@
     "./notification": "./src/notification/index.ts",
     "./block-zero-width": "./src/block-zero-width/index.ts",
     "./block-selection": "./src/block-selection/index.ts",
-    "./doc-title": "./src/doc-title/index.ts"
+    "./doc-title": "./src/doc-title/index.ts",
+    "./embed-card-modal": "./src/embed-card-modal/index.ts"
   },
   "files": [
     "src",

blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts

@@ -1,21 +1,15 @@
-import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
-import { toast } from '@blocksuite/affine-components/toast';
-import type { EmbedCardStyle } from '@blocksuite/affine-model';
-import {
-  EMBED_CARD_HEIGHT,
-  EMBED_CARD_WIDTH,
-} from '@blocksuite/affine-shared/consts';
 import { EmbedOptionProvider } from '@blocksuite/affine-shared/services';
 import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils';
 import type { EditorHost } from '@blocksuite/block-std';
 import { ShadowlessElement } from '@blocksuite/block-std';
 import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
-import { Bound, Vec, WithDisposable } from '@blocksuite/global/utils';
+import { WithDisposable } from '@blocksuite/global/utils';
 import type { BlockModel } from '@blocksuite/store';
 import { html } from 'lit';
 import { property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 
+import { toast } from '../toast';
 import { embedCardModalStyles } from './styles.js';
 
 export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
@@ -55,37 +49,13 @@ export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
         index
       );
     } else if (mode === 'edgeless') {
-      let flavour = 'affine:bookmark',
-        targetStyle: EmbedCardStyle = 'vertical';
-
-      if (embedOptions) {
-        flavour = embedOptions.flavour;
-        targetStyle = embedOptions.styles[0];
-      }
-
       const gfx = this.host.std.get(GfxControllerIdentifier);
-      const crud = this.host.std.get(EdgelessCRUDIdentifier);
-
-      const viewport = gfx.viewport;
       const surfaceModel = gfx.surface;
       if (!surfaceModel) {
         return;
       }
 
-      const center = Vec.toVec(viewport.center);
+      this.createOptions.onSave(url);
-      crud.addBlock(
-        flavour,
-        {
-          url,
-          xywh: Bound.fromCenter(
-            center,
-            EMBED_CARD_WIDTH[targetStyle],
-            EMBED_CARD_HEIGHT[targetStyle]
-          ).serialize(),
-          style: targetStyle,
-        },
-        surfaceModel
-      );
 
       gfx.tool.setTool(
         // @ts-expect-error FIXME: resolve after gfx tool refactor
@@ -180,6 +150,7 @@ export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
       }
     | {
         mode: 'edgeless';
+        onSave: (url: string) => void;
       };
 
   @property({ attribute: false })
@@ -210,6 +181,7 @@ export async function toggleEmbedCardCreateModal(
       }
     | {
         mode: 'edgeless';
+        onSave: (url: string) => void;
       }
 ): Promise<void> {
   host.selection.clear();

blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts

@@ -1,16 +1,8 @@
-import {
+import type { AliasInfo, LinkableEmbedModel } from '@blocksuite/affine-model';
-  EmbedLinkedDocBlockComponent,
-  EmbedSyncedDocBlockComponent,
-} from '@blocksuite/affine-block-embed';
-import {
-  notifyLinkedDocClearedAliases,
-  notifyLinkedDocSwitchedToCard,
-} from '@blocksuite/affine-components/notification';
-import { toast } from '@blocksuite/affine-components/toast';
-import type { AliasInfo } from '@blocksuite/affine-model';
 import {
   EmbedLinkedDocModel,
   EmbedSyncedDocModel,
+  isInternalEmbedModel,
 } from '@blocksuite/affine-model';
 import {
   type LinkEventType,
@@ -37,8 +29,7 @@ import { choose } from 'lit/directives/choose.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { live } from 'lit/directives/live.js';
 
-import type { LinkableEmbedModel } from './type.js';
+import { toast } from '../toast';
-import { isInternalEmbedModel } from './type.js';
 
 export class EmbedCardEditModal extends SignalWatcher(
   WithDisposable(LitElement)
@@ -171,14 +162,8 @@ export class EmbedCardEditModal extends SignalWatcher(
 
     this.model.doc.updateBlock(this.model, { title: null, description: null });
 
-    if (
+    this.onReset?.(std, blockComponent);
-      this.isEmbedLinkedDocModel &&
-      blockComponent instanceof EmbedLinkedDocBlockComponent
-    ) {
-      blockComponent.refreshData();
 
-      notifyLinkedDocClearedAliases(std);
-    }
     blockComponent.requestUpdate();
 
     track(std, this.model, this.viewType, 'ResetedAlias', { control: 'reset' });
@@ -207,17 +192,7 @@ export class EmbedCardEditModal extends SignalWatcher(
     const props: AliasInfo = { title };
     if (description) props.description = description;
 
-    if (
+    this.onSave?.(std, blockComponent, props);
-      this.isEmbedSyncedDocModel &&
-      blockComponent instanceof EmbedSyncedDocBlockComponent
-    ) {
-      blockComponent.convertToCard(props);
-
-      notifyLinkedDocSwitchedToCard(std);
-    } else {
-      this.model.doc.updateBlock(this.model, props);
-      blockComponent.requestUpdate();
-    }
 
     track(std, this.model, this.viewType, 'SavedAlias', { control: 'save' });
 
@@ -393,6 +368,20 @@ export class EmbedCardEditModal extends SignalWatcher(
   @property({ attribute: false })
   accessor originalDocInfo: AliasInfo | undefined = undefined;
 
+  @property({ attribute: false })
+  accessor onReset:
+    | ((std: BlockStdScope, component: BlockComponent) => void)
+    | undefined = undefined;
+
+  @property({ attribute: false })
+  accessor onSave:
+    | ((
+        std: BlockStdScope,
+        component: BlockComponent,
+        props: AliasInfo
+      ) => void)
+    | undefined = undefined;
+
   accessor resetButtonDisabled$ = computed<boolean>(
     () =>
       !(
@@ -418,7 +407,13 @@ export function toggleEmbedCardEditModal(
   host: EditorHost,
   embedCardModel: LinkableEmbedModel,
   viewType: string,
-  originalDocInfo?: AliasInfo
+  originalDocInfo?: AliasInfo,
+  onReset?: (std: BlockStdScope, component: BlockComponent) => void,
+  onSave?: (
+    std: BlockStdScope,
+    component: BlockComponent,
+    props: AliasInfo
+  ) => void
 ) {
   document.body.querySelector('embed-card-edit-modal')?.remove();
 
@@ -427,6 +422,8 @@ export function toggleEmbedCardEditModal(
   embedCardEditModal.host = host;
   embedCardEditModal.viewType = viewType;
   embedCardEditModal.originalDocInfo = originalDocInfo;
+  embedCardEditModal.onReset = onReset;
+  embedCardEditModal.onSave = onSave;
   document.body.append(embedCardEditModal);
 }
 

blocksuite/affine/components/src/embed-card-modal/index.ts

@@ -0,0 +1,16 @@
+import { EmbedCardEditCaptionEditModal } from './embed-card-caption-edit-modal';
+import { EmbedCardCreateModal } from './embed-card-create-modal';
+import { EmbedCardEditModal } from './embed-card-edit-modal';
+
+export * from './embed-card-caption-edit-modal';
+export * from './embed-card-create-modal';
+export * from './embed-card-edit-modal';
+
+export function effects() {
+  customElements.define(
+    'embed-card-caption-edit-modal',
+    EmbedCardEditCaptionEditModal
+  );
+  customElements.define('embed-card-create-modal', EmbedCardCreateModal);
+  customElements.define('embed-card-edit-modal', EmbedCardEditModal);
+}

blocksuite/affine/model/src/blocks/embed/index.ts

@@ -1,7 +1,8 @@
-export * from './figma/index.js';
+export * from './figma/index';
-export * from './github/index.js';
+export * from './github/index';
-export * from './html/index.js';
+export * from './html/index';
-export * from './linked-doc/index.js';
+export * from './linked-doc/index';
-export * from './loom/index.js';
+export * from './loom/index';
-export * from './synced-doc/index.js';
+export * from './synced-doc/index';
-export * from './youtube/index.js';
+export * from './types';
+export * from './youtube/index';

blocksuite/affine/model/src/blocks/embed/types.ts

@@ -0,0 +1,38 @@
+import { EmbedFigmaModel } from './figma';
+import { EmbedGithubModel } from './github';
+import type { EmbedHtmlModel } from './html';
+import { EmbedLinkedDocModel } from './linked-doc';
+import { EmbedLoomModel } from './loom';
+import { EmbedSyncedDocModel } from './synced-doc';
+import { EmbedYoutubeModel } from './youtube';
+
+export type ExternalEmbedModel =
+  | EmbedFigmaModel
+  | EmbedGithubModel
+  | EmbedLoomModel
+  | EmbedYoutubeModel;
+
+export type InternalEmbedModel = EmbedLinkedDocModel | EmbedSyncedDocModel;
+
+export type LinkableEmbedModel = ExternalEmbedModel | InternalEmbedModel;
+
+export type BuiltInEmbedModel = LinkableEmbedModel | EmbedHtmlModel;
+
+export function isExternalEmbedModel(
+  model: BuiltInEmbedModel
+): model is ExternalEmbedModel {
+  return (
+    model instanceof EmbedFigmaModel ||
+    model instanceof EmbedGithubModel ||
+    model instanceof EmbedLoomModel ||
+    model instanceof EmbedYoutubeModel
+  );
+}
+
+export function isInternalEmbedModel(
+  model: BuiltInEmbedModel
+): model is InternalEmbedModel {
+  return (
+    model instanceof EmbedLinkedDocModel || model instanceof EmbedSyncedDocModel
+  );
+}

blocksuite/blocks/src/effects.ts

@@ -23,6 +23,7 @@ import { effects as componentColorPickerEffects } from '@blocksuite/affine-compo
 import { effects as componentContextMenuEffects } from '@blocksuite/affine-components/context-menu';
 import { effects as componentDatePickerEffects } from '@blocksuite/affine-components/date-picker';
 import { effects as componentDropIndicatorEffects } from '@blocksuite/affine-components/drop-indicator';
+import { effects as componentEmbedCardModalEffects } from '@blocksuite/affine-components/embed-card-modal';
 import { FilterableListComponent } from '@blocksuite/affine-components/filterable-list';
 import { IconButton } from '@blocksuite/affine-components/icon-button';
 import { effects as componentPortalEffects } from '@blocksuite/affine-components/portal';
@@ -212,6 +213,7 @@ export function effects() {
   componentToggleButtonEffects();
   componentAiItemEffects();
   componentColorPickerEffects();
+  componentEmbedCardModalEffects();
 
   widgetScrollAnchoringEffects();
   widgetMobileToolbarEffects();

blocksuite/blocks/src/root-block/utils/index.ts

@@ -1 +1,2 @@
-export * from './callback.js';
+export * from './callback';
+export * from './types';

blocksuite/blocks/src/root-block/utils/types.ts

@@ -1,3 +1,4 @@
+import { BookmarkBlockComponent } from '@blocksuite/affine-block-bookmark';
 import {
   EmbedFigmaBlockComponent,
   EmbedGithubBlockComponent,
@@ -7,22 +8,8 @@ import {
   EmbedSyncedDocBlockComponent,
   EmbedYoutubeBlockComponent,
 } from '@blocksuite/affine-block-embed';
-import type {
-  BookmarkBlockModel,
-  EmbedFigmaModel,
-  EmbedGithubModel,
-  EmbedHtmlModel,
-  EmbedLoomModel,
-  EmbedYoutubeModel,
-} from '@blocksuite/affine-model';
-import {
-  EmbedLinkedDocModel,
-  EmbedSyncedDocModel,
-} from '@blocksuite/affine-model';
 import type { BlockComponent } from '@blocksuite/block-std';
 
-import { BookmarkBlockComponent } from '../../bookmark-block';
-
 export type ExternalEmbedBlockComponent =
   | BookmarkBlockComponent
   | EmbedFigmaBlockComponent
@@ -42,19 +29,6 @@ export type BuiltInEmbedBlockComponent =
   | LinkableEmbedBlockComponent
   | EmbedHtmlBlockComponent;
 
-export type ExternalEmbedModel =
-  | BookmarkBlockModel
-  | EmbedFigmaModel
-  | EmbedGithubModel
-  | EmbedLoomModel
-  | EmbedYoutubeModel;
-
-export type InternalEmbedModel = EmbedLinkedDocModel | EmbedSyncedDocModel;
-
-export type LinkableEmbedModel = ExternalEmbedModel | InternalEmbedModel;
-
-export type BuiltInEmbedModel = LinkableEmbedModel | EmbedHtmlModel;
-
 export function isEmbedCardBlockComponent(
   block: BlockComponent
 ): block is BuiltInEmbedBlockComponent {
@@ -69,11 +43,3 @@ export function isEmbedCardBlockComponent(
     block instanceof EmbedSyncedDocBlockComponent
   );
 }
-
-export function isInternalEmbedModel(
-  model: BuiltInEmbedModel
-): model is InternalEmbedModel {
-  return (
-    model instanceof EmbedLinkedDocModel || model instanceof EmbedSyncedDocModel
-  );
-}

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

@@ -1,12 +1,7 @@
-import type {
+import {} from '@blocksuite/affine-block-bookmark';
-  BuiltInEmbedBlockComponent,
-  BuiltInEmbedModel,
-} from '@blocksuite/affine-block-bookmark';
-import {
-  isInternalEmbedModel,
-  toggleEmbedCardEditModal,
-} from '@blocksuite/affine-block-bookmark';
 import {
+  EmbedLinkedDocBlockComponent,
+  EmbedSyncedDocBlockComponent,
   getDocContentWithMaxLength,
   getEmbedCardIcons,
 } from '@blocksuite/affine-block-embed';
@@ -14,6 +9,7 @@ import {
   EdgelessCRUDIdentifier,
   reassociateConnectorsCommand,
 } from '@blocksuite/affine-block-surface';
+import { toggleEmbedCardEditModal } from '@blocksuite/affine-components/embed-card-modal';
 import {
   CaptionIcon,
   CopyIcon,
@@ -23,7 +19,11 @@ import {
   PaletteIcon,
   SmallArrowDownIcon,
 } from '@blocksuite/affine-components/icons';
-import { notifyLinkedDocSwitchedToEmbed } from '@blocksuite/affine-components/notification';
+import {
+  notifyLinkedDocClearedAliases,
+  notifyLinkedDocSwitchedToCard,
+  notifyLinkedDocSwitchedToEmbed,
+} from '@blocksuite/affine-components/notification';
 import { isPeekable, peek } from '@blocksuite/affine-components/peek';
 import { toast } from '@blocksuite/affine-components/toast';
 import {
@@ -33,7 +33,9 @@ import {
 import {
   type AliasInfo,
   BookmarkStyles,
+  type BuiltInEmbedModel,
   type EmbedCardStyle,
+  isInternalEmbedModel,
 } from '@blocksuite/affine-model';
 import {
   EMBED_CARD_HEIGHT,
@@ -69,6 +71,7 @@ import {
   isEmbedLinkedDocBlock,
   isEmbedSyncedDocBlock,
 } from '../../edgeless/utils/query.js';
+import type { BuiltInEmbedBlockComponent } from '../../utils/types';
 
 export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
   static override styles = css`
@@ -287,7 +290,30 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
       this.std.host,
       this.model,
       this._viewType,
-      originalDocInfo
+      originalDocInfo,
+      (std, component) => {
+        if (
+          isEmbedLinkedDocBlock(this.model) &&
+          component instanceof EmbedLinkedDocBlockComponent
+        ) {
+          component.refreshData();
+
+          notifyLinkedDocClearedAliases(std);
+        }
+      },
+      (std, component, props) => {
+        if (
+          isEmbedSyncedDocBlock(this.model) &&
+          component instanceof EmbedSyncedDocBlockComponent
+        ) {
+          component.convertToCard(props);
+
+          notifyLinkedDocSwitchedToCard(std);
+        } else {
+          this.model.doc.updateBlock(this.model, props);
+          component.requestUpdate();
+        }
+      }
     );
 
     track(this.std, this.model, this._viewType, 'OpenedAliasPopup', {

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

@@ -1,4 +1,3 @@
-import type { BuiltInEmbedModel } from '@blocksuite/affine-block-bookmark';
 import { isNoteBlock } from '@blocksuite/affine-block-surface';
 import { ConnectorCWithArrowIcon } from '@blocksuite/affine-components/icons';
 import {
@@ -12,6 +11,7 @@ import {
 import type {
   AttachmentBlockModel,
   BrushElementModel,
+  BuiltInEmbedModel,
   ConnectorElementModel,
   EdgelessTextBlockModel,
   FrameBlockModel,

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

@@ -1,6 +1,7 @@
-import type { BuiltInEmbedBlockComponent } from '@blocksuite/affine-block-bookmark';
 import { MenuContext } from '@blocksuite/affine-components/toolbar';
 
+import type { BuiltInEmbedBlockComponent } from '../../utils';
+
 export class EmbedCardToolbarContext extends MenuContext {
   override close = () => {
     this.abortController.abort();

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

@@ -1,15 +1,13 @@
 import {
-  type BuiltInEmbedBlockComponent,
+  EmbedLinkedDocBlockComponent,
-  type BuiltInEmbedModel,
+  EmbedSyncedDocBlockComponent,
-  isEmbedCardBlockComponent,
-  isInternalEmbedModel,
-  toggleEmbedCardCaptionEditModal,
-  toggleEmbedCardEditModal,
-} from '@blocksuite/affine-block-bookmark';
-import {
   getDocContentWithMaxLength,
   getEmbedCardIcons,
 } from '@blocksuite/affine-block-embed';
+import {
+  toggleEmbedCardCaptionEditModal,
+  toggleEmbedCardEditModal,
+} from '@blocksuite/affine-components/embed-card-modal';
 import {
   CaptionIcon,
   CopyIcon,
@@ -19,7 +17,11 @@ import {
   PaletteIcon,
   SmallArrowDownIcon,
 } from '@blocksuite/affine-components/icons';
-import { notifyLinkedDocSwitchedToEmbed } from '@blocksuite/affine-components/notification';
+import {
+  notifyLinkedDocClearedAliases,
+  notifyLinkedDocSwitchedToCard,
+  notifyLinkedDocSwitchedToEmbed,
+} from '@blocksuite/affine-components/notification';
 import { isPeekable, peek } from '@blocksuite/affine-components/peek';
 import { toast } from '@blocksuite/affine-components/toast';
 import {
@@ -34,9 +36,11 @@ import {
   type AliasInfo,
   type BookmarkBlockModel,
   BookmarkStyles,
+  type BuiltInEmbedModel,
   type EmbedCardStyle,
   type EmbedGithubModel,
   type EmbedLinkedDocModel,
+  isInternalEmbedModel,
   type RootBlockModel,
 } from '@blocksuite/affine-model';
 import {
@@ -76,6 +80,10 @@ import {
   isEmbedSyncedDocBlock,
 } from '../../edgeless/utils/query.js';
 import type { RootBlockComponent } from '../../types.js';
+import {
+  type BuiltInEmbedBlockComponent,
+  isEmbedCardBlockComponent,
+} from '../../utils/types';
 import { BUILT_IN_GROUPS } from './config.js';
 import { EmbedCardToolbarContext } from './context.js';
 import { embedCardToolbarStyle } from './styles.js';
@@ -127,7 +135,35 @@ export class EmbedCardToolbar extends WidgetComponent<
 
     this._hide();
 
-    toggleEmbedCardEditModal(this.host, model, this._viewType, originalDocInfo);
+    toggleEmbedCardEditModal(
+      this.host,
+      model,
+      this._viewType,
+      originalDocInfo,
+      (std, component) => {
+        if (
+          isEmbedLinkedDocBlock(model) &&
+          component instanceof EmbedLinkedDocBlockComponent
+        ) {
+          component.refreshData();
+
+          notifyLinkedDocClearedAliases(std);
+        }
+      },
+      (std, component, props) => {
+        if (
+          isEmbedSyncedDocBlock(model) &&
+          component instanceof EmbedSyncedDocBlockComponent
+        ) {
+          component.convertToCard(props);
+
+          notifyLinkedDocSwitchedToCard(std);
+        } else {
+          this.model.doc.updateBlock(model, props);
+          component.requestUpdate();
+        }
+      }
+    );
 
     track(this.std, model, this._viewType, 'OpenedAliasPopup', {
       control: 'edit',

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

@@ -1,5 +1,4 @@
 import { addSiblingAttachmentBlocks } from '@blocksuite/affine-block-attachment';
-import { toggleEmbedCardCreateModal } from '@blocksuite/affine-block-bookmark';
 import { insertDatabaseBlockCommand } from '@blocksuite/affine-block-database';
 import { insertImagesCommand } from '@blocksuite/affine-block-image';
 import { insertLatexBlockCommand } from '@blocksuite/affine-block-latex';
@@ -18,6 +17,7 @@ import {
 } from '@blocksuite/affine-block-paragraph';
 import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
 import { insertSurfaceRefBlockCommand } from '@blocksuite/affine-block-surface-ref';
+import { toggleEmbedCardCreateModal } from '@blocksuite/affine-components/embed-card-modal';
 import {
   formatBlockCommand,
   formatNativeCommand,

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

@@ -1,5 +1,4 @@
 import { addSiblingAttachmentBlocks } from '@blocksuite/affine-block-attachment';
-import { toggleEmbedCardCreateModal } from '@blocksuite/affine-block-bookmark';
 import type { DataViewBlockComponent } from '@blocksuite/affine-block-data-view';
 import { insertDatabaseBlockCommand } from '@blocksuite/affine-block-database';
 import {
@@ -13,6 +12,7 @@ import { insertLatexBlockCommand } from '@blocksuite/affine-block-latex';
 import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
 import { insertSurfaceRefBlockCommand } from '@blocksuite/affine-block-surface-ref';
 import { insertTableBlockCommand } from '@blocksuite/affine-block-table';
+import { toggleEmbedCardCreateModal } from '@blocksuite/affine-components/embed-card-modal';
 import {
   ArrowDownBigIcon,
   ArrowUpBigIcon,

tools/utils/src/workspace.gen.ts

@@ -34,7 +34,6 @@ export const PackageList = [
     name: '@blocksuite/affine-block-bookmark',
     workspaceDependencies: [
       'blocksuite/affine/block-embed',
-      'blocksuite/affine/block-surface',
       'blocksuite/affine/components',
       'blocksuite/affine/model',
       'blocksuite/affine/shared',

yarn.lock

@@ -3298,7 +3298,6 @@ __metadata:
   resolution: "@blocksuite/affine-block-bookmark@workspace:blocksuite/affine/block-bookmark"
   dependencies:
     "@blocksuite/affine-block-embed": "workspace:*"
-    "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-shared": "workspace:*"