From c3f6bea4467c847c725a4dec79bf4d6a1a5b2ac4 Mon Sep 17 00:00:00 2001 From: Saul-Mirone Date: Sat, 26 Apr 2025 02:45:18 +0000 Subject: [PATCH] feat(editor): linked doc widget extension (#12001) Closes: BS-3225 --- blocksuite/affine/all/package.json | 3 ++- blocksuite/affine/all/src/extensions/view.ts | 2 ++ .../{linked-doc.ts => linked-doc/index.ts} | 0 .../affine/all/src/widgets/linked-doc/view.ts | 1 + blocksuite/affine/blocks/root/package.json | 1 - .../blocks/root/src/common-specs/index.ts | 2 -- blocksuite/affine/blocks/root/src/effects.ts | 5 ----- blocksuite/affine/blocks/root/tsconfig.json | 1 - .../affine/widgets/linked-doc/package.json | 3 ++- .../affine/widgets/linked-doc/src/view.ts | 21 +++++++++++++++++++ tools/utils/src/workspace.gen.ts | 1 - yarn.lock | 1 - 12 files changed, 28 insertions(+), 13 deletions(-) rename blocksuite/affine/all/src/widgets/{linked-doc.ts => linked-doc/index.ts} (100%) create mode 100644 blocksuite/affine/all/src/widgets/linked-doc/view.ts create mode 100644 blocksuite/affine/widgets/linked-doc/src/view.ts diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index 31564ee355..1e60a4fda6 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -170,7 +170,8 @@ "./widgets/edgeless-toolbar/view": "./src/widgets/edgeless-toolbar/view.ts", "./widgets/frame-title": "./src/widgets/frame-title/index.ts", "./widgets/frame-title/view": "./src/widgets/frame-title/view.ts", - "./widgets/linked-doc": "./src/widgets/linked-doc.ts", + "./widgets/linked-doc": "./src/widgets/linked-doc/index.ts", + "./widgets/linked-doc/view": "./src/widgets/linked-doc/view.ts", "./widgets/remote-selection": "./src/widgets/remote-selection.ts", "./widgets/scroll-anchoring": "./src/widgets/scroll-anchoring.ts", "./widgets/slash-menu": "./src/widgets/slash-menu.ts", diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.ts index 6f0ca99a58..f319ca8cd0 100644 --- a/blocksuite/affine/all/src/extensions/view.ts +++ b/blocksuite/affine/all/src/extensions/view.ts @@ -35,6 +35,7 @@ import { EdgelessAutoConnectViewExtension } from '@blocksuite/affine-widget-edge import { EdgelessToolbarViewExtension } from '@blocksuite/affine-widget-edgeless-toolbar/view'; import { FrameTitleViewExtension } from '@blocksuite/affine-widget-frame-title/view'; import { KeyboardToolbarViewExtension } from '@blocksuite/affine-widget-keyboard-toolbar/view'; +import { LinkedDocViewExtension } from '@blocksuite/affine-widget-linked-doc/view'; import { MigratingViewExtension } from './migrating-view'; @@ -85,5 +86,6 @@ export function getInternalViewExtensions() { MigratingViewExtension, FrameTitleViewExtension, KeyboardToolbarViewExtension, + LinkedDocViewExtension, ]; } diff --git a/blocksuite/affine/all/src/widgets/linked-doc.ts b/blocksuite/affine/all/src/widgets/linked-doc/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/linked-doc.ts rename to blocksuite/affine/all/src/widgets/linked-doc/index.ts diff --git a/blocksuite/affine/all/src/widgets/linked-doc/view.ts b/blocksuite/affine/all/src/widgets/linked-doc/view.ts new file mode 100644 index 0000000000..39064f09ff --- /dev/null +++ b/blocksuite/affine/all/src/widgets/linked-doc/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-linked-doc/view'; diff --git a/blocksuite/affine/blocks/root/package.json b/blocksuite/affine/blocks/root/package.json index fcbf34fa09..98373b9de9 100644 --- a/blocksuite/affine/blocks/root/package.json +++ b/blocksuite/affine/blocks/root/package.json @@ -34,7 +34,6 @@ "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/affine-widget-linked-doc": "workspace:*", "@blocksuite/affine-widget-remote-selection": "workspace:*", "@blocksuite/affine-widget-scroll-anchoring": "workspace:*", "@blocksuite/affine-widget-slash-menu": "workspace:*", diff --git a/blocksuite/affine/blocks/root/src/common-specs/index.ts b/blocksuite/affine/blocks/root/src/common-specs/index.ts index 77732e171b..84657de6e6 100644 --- a/blocksuite/affine/blocks/root/src/common-specs/index.ts +++ b/blocksuite/affine/blocks/root/src/common-specs/index.ts @@ -10,7 +10,6 @@ import { ToolbarModuleExtension, ToolbarRegistryExtension, } from '@blocksuite/affine-shared/services'; -import { linkedDocWidget } from '@blocksuite/affine-widget-linked-doc'; import { docRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selection'; import { scrollAnchoringWidget } from '@blocksuite/affine-widget-scroll-anchoring'; import { SlashMenuExtension } from '@blocksuite/affine-widget-slash-menu'; @@ -37,7 +36,6 @@ export const CommonSpecs: ExtensionType[] = [ ...RootBlockAdapterExtensions, ...clipboardConfigs, SlashMenuExtension, - linkedDocWidget, docRemoteSelectionWidget, viewportOverlayWidget, scrollAnchoringWidget, diff --git a/blocksuite/affine/blocks/root/src/effects.ts b/blocksuite/affine/blocks/root/src/effects.ts index 576b0040c1..4abbea7a99 100644 --- a/blocksuite/affine/blocks/root/src/effects.ts +++ b/blocksuite/affine/blocks/root/src/effects.ts @@ -1,5 +1,3 @@ -import { effects as widgetLinkedDocEffects } from '@blocksuite/affine-widget-linked-doc/effects'; - import { EdgelessAutoCompletePanel } from './edgeless/components/auto-complete/auto-complete-panel.js'; import { EdgelessAutoComplete } from './edgeless/components/auto-complete/edgeless-auto-complete.js'; import { @@ -44,9 +42,6 @@ import { } from './widgets/viewport-overlay/viewport-overlay.js'; export function effects() { - // Run other effects - widgetLinkedDocEffects(); - // Register components by category registerRootComponents(); registerWidgets(); diff --git a/blocksuite/affine/blocks/root/tsconfig.json b/blocksuite/affine/blocks/root/tsconfig.json index 5a3e86ed87..8fd44d52c0 100644 --- a/blocksuite/affine/blocks/root/tsconfig.json +++ b/blocksuite/affine/blocks/root/tsconfig.json @@ -31,7 +31,6 @@ { "path": "../../rich-text" }, { "path": "../../shared" }, { "path": "../../widgets/edgeless-toolbar" }, - { "path": "../../widgets/linked-doc" }, { "path": "../../widgets/remote-selection" }, { "path": "../../widgets/scroll-anchoring" }, { "path": "../../widgets/slash-menu" }, diff --git a/blocksuite/affine/widgets/linked-doc/package.json b/blocksuite/affine/widgets/linked-doc/package.json index f11da6a660..5696394233 100644 --- a/blocksuite/affine/widgets/linked-doc/package.json +++ b/blocksuite/affine/widgets/linked-doc/package.json @@ -32,7 +32,8 @@ }, "exports": { ".": "./src/index.ts", - "./effects": "./src/effects.ts" + "./effects": "./src/effects.ts", + "./view": "./src/view.ts" }, "files": [ "src", diff --git a/blocksuite/affine/widgets/linked-doc/src/view.ts b/blocksuite/affine/widgets/linked-doc/src/view.ts new file mode 100644 index 0000000000..6ffa2a1973 --- /dev/null +++ b/blocksuite/affine/widgets/linked-doc/src/view.ts @@ -0,0 +1,21 @@ +import { + type ViewExtensionContext, + ViewExtensionProvider, +} from '@blocksuite/affine-ext-loader'; + +import { effects } from './effects'; +import { linkedDocWidget } from './widget'; + +export class LinkedDocViewExtension extends ViewExtensionProvider { + override name = 'affine-linked-doc-widget'; + + override effect() { + super.effect(); + effects(); + } + + override setup(context: ViewExtensionContext) { + super.setup(context); + context.register(linkedDocWidget); + } +} diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts index b84d7ae417..8a6713c3f7 100644 --- a/tools/utils/src/workspace.gen.ts +++ b/tools/utils/src/workspace.gen.ts @@ -344,7 +344,6 @@ export const PackageList = [ 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', 'blocksuite/affine/widgets/edgeless-toolbar', - 'blocksuite/affine/widgets/linked-doc', 'blocksuite/affine/widgets/remote-selection', 'blocksuite/affine/widgets/scroll-anchoring', 'blocksuite/affine/widgets/slash-menu', diff --git a/yarn.lock b/yarn.lock index a0adb143d1..64229c2ef6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2860,7 +2860,6 @@ __metadata: "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/affine-widget-linked-doc": "workspace:*" "@blocksuite/affine-widget-remote-selection": "workspace:*" "@blocksuite/affine-widget-scroll-anchoring": "workspace:*" "@blocksuite/affine-widget-slash-menu": "workspace:*"