diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index cd7a29542..31564ee35 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -168,13 +168,15 @@ "./widgets/edgeless-auto-connect/view": "./src/widgets/edgeless-auto-connect/view.ts", "./widgets/edgeless-toolbar": "./src/widgets/edgeless-toolbar/index.ts", "./widgets/edgeless-toolbar/view": "./src/widgets/edgeless-toolbar/view.ts", - "./widgets/frame-title": "./src/widgets/frame-title.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/remote-selection": "./src/widgets/remote-selection.ts", "./widgets/scroll-anchoring": "./src/widgets/scroll-anchoring.ts", "./widgets/slash-menu": "./src/widgets/slash-menu.ts", "./widgets/toolbar": "./src/widgets/toolbar.ts", - "./widgets/keyboard-toolbar": "./src/widgets/keyboard-toolbar.ts", + "./widgets/keyboard-toolbar": "./src/widgets/keyboard-toolbar/index.ts", + "./widgets/keyboard-toolbar/view": "./src/widgets/keyboard-toolbar/view.ts", "./fragments/doc-title": "./src/fragments/doc-title.ts", "./fragments/frame-panel": "./src/fragments/frame-panel.ts", "./fragments/outline": "./src/fragments/outline.ts", diff --git a/blocksuite/affine/all/src/extensions/effects.ts b/blocksuite/affine/all/src/extensions/effects.ts index 2b77036e5..3eddaad75 100644 --- a/blocksuite/affine/all/src/extensions/effects.ts +++ b/blocksuite/affine/all/src/extensions/effects.ts @@ -29,7 +29,6 @@ import { effects as fragmentDocTitleEffects } from '@blocksuite/affine-fragment- import { effects as fragmentFramePanelEffects } from '@blocksuite/affine-fragment-frame-panel/effects'; import { effects as fragmentOutlineEffects } from '@blocksuite/affine-fragment-outline/effects'; import { effects as richTextEffects } from '@blocksuite/affine-rich-text/effects'; -import { effects as widgetFrameTitleEffects } from '@blocksuite/affine-widget-frame-title/effects'; import { effects as widgetRemoteSelectionEffects } from '@blocksuite/affine-widget-remote-selection/effects'; import { effects as widgetScrollAnchoringEffects } from '@blocksuite/affine-widget-scroll-anchoring/effects'; import { effects as widgetSlashMenuEffects } from '@blocksuite/affine-widget-slash-menu/effects'; @@ -67,7 +66,6 @@ export function effects() { componentOpenDocDropdownMenuEffects(); widgetScrollAnchoringEffects(); - widgetFrameTitleEffects(); widgetRemoteSelectionEffects(); widgetSlashMenuEffects(); widgetToolbarEffects(); diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.ts index 07d42acb8..6f0ca99a5 100644 --- a/blocksuite/affine/all/src/extensions/view.ts +++ b/blocksuite/affine/all/src/extensions/view.ts @@ -33,6 +33,8 @@ import { ReferenceViewExtension } from '@blocksuite/affine-inline-reference/view import { DragHandleViewExtension } from '@blocksuite/affine-widget-drag-handle/view'; import { EdgelessAutoConnectViewExtension } from '@blocksuite/affine-widget-edgeless-auto-connect/view'; 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 { MigratingViewExtension } from './migrating-view'; @@ -81,5 +83,7 @@ export function getInternalViewExtensions() { EdgelessAutoConnectViewExtension, EdgelessToolbarViewExtension, MigratingViewExtension, + FrameTitleViewExtension, + KeyboardToolbarViewExtension, ]; } diff --git a/blocksuite/affine/all/src/widgets/frame-title.ts b/blocksuite/affine/all/src/widgets/frame-title/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/frame-title.ts rename to blocksuite/affine/all/src/widgets/frame-title/index.ts diff --git a/blocksuite/affine/all/src/widgets/frame-title/view.ts b/blocksuite/affine/all/src/widgets/frame-title/view.ts new file mode 100644 index 000000000..5b205a1cc --- /dev/null +++ b/blocksuite/affine/all/src/widgets/frame-title/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-frame-title/view'; diff --git a/blocksuite/affine/all/src/widgets/keyboard-toolbar.ts b/blocksuite/affine/all/src/widgets/keyboard-toolbar/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/keyboard-toolbar.ts rename to blocksuite/affine/all/src/widgets/keyboard-toolbar/index.ts diff --git a/blocksuite/affine/all/src/widgets/keyboard-toolbar/view.ts b/blocksuite/affine/all/src/widgets/keyboard-toolbar/view.ts new file mode 100644 index 000000000..95ec485c7 --- /dev/null +++ b/blocksuite/affine/all/src/widgets/keyboard-toolbar/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-keyboard-toolbar/view'; diff --git a/blocksuite/affine/blocks/root/package.json b/blocksuite/affine/blocks/root/package.json index 771051c3b..fcbf34fa0 100644 --- a/blocksuite/affine/blocks/root/package.json +++ b/blocksuite/affine/blocks/root/package.json @@ -33,10 +33,7 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/affine-widget-edgeless-auto-connect": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", - "@blocksuite/affine-widget-frame-title": "workspace:*", - "@blocksuite/affine-widget-keyboard-toolbar": "workspace:*", "@blocksuite/affine-widget-linked-doc": "workspace:*", "@blocksuite/affine-widget-remote-selection": "workspace:*", "@blocksuite/affine-widget-scroll-anchoring": "workspace:*", diff --git a/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts b/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts index 15c7545e5..a86c30f9e 100644 --- a/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts +++ b/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts @@ -15,7 +15,6 @@ import { EdgelessClipboardFrameConfig } from '@blocksuite/affine-block-frame'; import { EdgelessClipboardImageConfig } from '@blocksuite/affine-block-image'; import { EdgelessClipboardNoteConfig } from '@blocksuite/affine-block-note'; import { ViewportElementExtension } from '@blocksuite/affine-shared/services'; -import { frameTitleWidget } from '@blocksuite/affine-widget-frame-title'; import { edgelessRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selection'; import { BlockViewExtension, @@ -97,7 +96,6 @@ export const EdgelessRootBlockSpec: ExtensionType[] = [ BlockViewExtension('affine:page', literal`affine-edgeless-root`), edgelessRemoteSelectionWidget, edgelessZoomToolbarWidget, - frameTitleWidget, edgelessDraggingAreaWidget, noteSlicerWidget, edgelessNavigatorBgWidget, diff --git a/blocksuite/affine/blocks/root/src/effects.ts b/blocksuite/affine/blocks/root/src/effects.ts index 6ac0e9c71..576b0040c 100644 --- a/blocksuite/affine/blocks/root/src/effects.ts +++ b/blocksuite/affine/blocks/root/src/effects.ts @@ -1,4 +1,3 @@ -import { effects as widgetMobileToolbarEffects } from '@blocksuite/affine-widget-keyboard-toolbar/effects'; import { effects as widgetLinkedDocEffects } from '@blocksuite/affine-widget-linked-doc/effects'; import { EdgelessAutoCompletePanel } from './edgeless/components/auto-complete/auto-complete-panel.js'; @@ -46,7 +45,6 @@ import { export function effects() { // Run other effects - widgetMobileToolbarEffects(); widgetLinkedDocEffects(); // Register components by category diff --git a/blocksuite/affine/blocks/root/src/page/page-root-spec.ts b/blocksuite/affine/blocks/root/src/page/page-root-spec.ts index 91d23a796..68153a870 100644 --- a/blocksuite/affine/blocks/root/src/page/page-root-spec.ts +++ b/blocksuite/affine/blocks/root/src/page/page-root-spec.ts @@ -1,6 +1,4 @@ import { ViewportElementExtension } from '@blocksuite/affine-shared/services'; -import { keyboardToolbarWidget } from '@blocksuite/affine-widget-keyboard-toolbar'; -import { IS_MOBILE } from '@blocksuite/global/env'; import { BlockViewExtension, WidgetViewExtension } from '@blocksuite/std'; import type { ExtensionType } from '@blocksuite/store'; import { literal, unsafeStatic } from 'lit/static-html.js'; @@ -26,7 +24,6 @@ const PageCommonExtension: ExtensionType[] = [ export const PageRootBlockSpec: ExtensionType[] = [ ...PageCommonExtension, BlockViewExtension('affine:page', literal`affine-page-root`), - IS_MOBILE ? [keyboardToolbarWidget] : [], PageClipboard, ].flat(); diff --git a/blocksuite/affine/blocks/root/src/widgets/index.ts b/blocksuite/affine/blocks/root/src/widgets/index.ts index 1147a6e2d..8d74a22a7 100644 --- a/blocksuite/affine/blocks/root/src/widgets/index.ts +++ b/blocksuite/affine/blocks/root/src/widgets/index.ts @@ -1,4 +1,3 @@ export { AffineEdgelessZoomToolbarWidget } from './edgeless-zoom-toolbar/index.js'; export { AffinePageDraggingAreaWidget } from './page-dragging-area/page-dragging-area.js'; export * from './viewport-overlay/viewport-overlay.js'; -export { AffineFrameTitleWidget } from '@blocksuite/affine-widget-frame-title'; diff --git a/blocksuite/affine/blocks/root/tsconfig.json b/blocksuite/affine/blocks/root/tsconfig.json index a7df274e4..5a3e86ed8 100644 --- a/blocksuite/affine/blocks/root/tsconfig.json +++ b/blocksuite/affine/blocks/root/tsconfig.json @@ -30,10 +30,7 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../widgets/edgeless-auto-connect" }, { "path": "../../widgets/edgeless-toolbar" }, - { "path": "../../widgets/frame-title" }, - { "path": "../../widgets/keyboard-toolbar" }, { "path": "../../widgets/linked-doc" }, { "path": "../../widgets/remote-selection" }, { "path": "../../widgets/scroll-anchoring" }, diff --git a/blocksuite/affine/widgets/frame-title/package.json b/blocksuite/affine/widgets/frame-title/package.json index 28d34b649..3b5c3bb8f 100644 --- a/blocksuite/affine/widgets/frame-title/package.json +++ b/blocksuite/affine/widgets/frame-title/package.json @@ -11,6 +11,7 @@ "license": "MIT", "dependencies": { "@blocksuite/affine-components": "workspace:*", + "@blocksuite/affine-ext-loader": "workspace:*", "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", @@ -24,7 +25,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/frame-title/src/view.ts b/blocksuite/affine/widgets/frame-title/src/view.ts new file mode 100644 index 000000000..f9abf9bfb --- /dev/null +++ b/blocksuite/affine/widgets/frame-title/src/view.ts @@ -0,0 +1,23 @@ +import { + type ViewExtensionContext, + ViewExtensionProvider, +} from '@blocksuite/affine-ext-loader'; + +import { frameTitleWidget } from './affine-frame-title-widget'; +import { effects } from './effects'; + +export class FrameTitleViewExtension extends ViewExtensionProvider { + override name = 'affine-frame-title-widget'; + + override effect() { + super.effect(); + effects(); + } + + override setup(context: ViewExtensionContext) { + super.setup(context); + if (context.scope === 'edgeless') { + context.register(frameTitleWidget); + } + } +} diff --git a/blocksuite/affine/widgets/frame-title/tsconfig.json b/blocksuite/affine/widgets/frame-title/tsconfig.json index 61f3ba15e..6a1c46edb 100644 --- a/blocksuite/affine/widgets/frame-title/tsconfig.json +++ b/blocksuite/affine/widgets/frame-title/tsconfig.json @@ -8,6 +8,7 @@ "include": ["./src"], "references": [ { "path": "../../components" }, + { "path": "../../ext-loader" }, { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, diff --git a/blocksuite/affine/widgets/keyboard-toolbar/package.json b/blocksuite/affine/widgets/keyboard-toolbar/package.json index 950057c98..778ce9f40 100644 --- a/blocksuite/affine/widgets/keyboard-toolbar/package.json +++ b/blocksuite/affine/widgets/keyboard-toolbar/package.json @@ -21,6 +21,7 @@ "@blocksuite/affine-block-surface": "workspace:*", "@blocksuite/affine-block-surface-ref": "workspace:*", "@blocksuite/affine-components": "workspace:*", + "@blocksuite/affine-ext-loader": "workspace:*", "@blocksuite/affine-fragment-doc-title": "workspace:*", "@blocksuite/affine-inline-latex": "workspace:*", "@blocksuite/affine-inline-link": "workspace:*", @@ -45,7 +46,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/keyboard-toolbar/src/view.ts b/blocksuite/affine/widgets/keyboard-toolbar/src/view.ts new file mode 100644 index 000000000..78e75143e --- /dev/null +++ b/blocksuite/affine/widgets/keyboard-toolbar/src/view.ts @@ -0,0 +1,28 @@ +import { + type ViewExtensionContext, + ViewExtensionProvider, +} from '@blocksuite/affine-ext-loader'; +import { IS_MOBILE } from '@blocksuite/global/env'; + +import { effects } from './effects'; +import { keyboardToolbarWidget } from './widget'; + +export class KeyboardToolbarViewExtension extends ViewExtensionProvider { + override name = 'affine-keyboard-toolbar-widget'; + + override effect() { + super.effect(); + effects(); + } + + override setup(context: ViewExtensionContext) { + super.setup(context); + if ( + context.scope === 'mobile-page' || + // Legacy mobile page + (context.scope === 'page' && IS_MOBILE) + ) { + context.register(keyboardToolbarWidget); + } + } +} diff --git a/blocksuite/affine/widgets/keyboard-toolbar/tsconfig.json b/blocksuite/affine/widgets/keyboard-toolbar/tsconfig.json index b43471c41..29eaab9ed 100644 --- a/blocksuite/affine/widgets/keyboard-toolbar/tsconfig.json +++ b/blocksuite/affine/widgets/keyboard-toolbar/tsconfig.json @@ -18,6 +18,7 @@ { "path": "../../blocks/surface" }, { "path": "../../blocks/surface-ref" }, { "path": "../../components" }, + { "path": "../../ext-loader" }, { "path": "../../fragments/doc-title" }, { "path": "../../inlines/latex" }, { "path": "../../inlines/link" }, diff --git a/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts index 6bbf761bc..cb26feeb1 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts @@ -1,9 +1,7 @@ import type { FrameBlockComponent } from '@blocksuite/affine/blocks/frame'; -import type { - AffineFrameTitleWidget, - EdgelessRootBlockComponent, -} from '@blocksuite/affine/blocks/root'; +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; import type { FrameBlockModel } from '@blocksuite/affine/model'; +import type { AffineFrameTitleWidget } from '@blocksuite/affine/widgets/frame-title'; import { assertType } from '@blocksuite/global/utils'; import { Text } from '@blocksuite/store'; import { beforeEach, describe, expect, test } from 'vitest'; diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts index 18b7b6fe8..b84d7ae41 100644 --- a/tools/utils/src/workspace.gen.ts +++ b/tools/utils/src/workspace.gen.ts @@ -343,10 +343,7 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/affine/widgets/edgeless-auto-connect', 'blocksuite/affine/widgets/edgeless-toolbar', - 'blocksuite/affine/widgets/frame-title', - 'blocksuite/affine/widgets/keyboard-toolbar', 'blocksuite/affine/widgets/linked-doc', 'blocksuite/affine/widgets/remote-selection', 'blocksuite/affine/widgets/scroll-anchoring', @@ -803,6 +800,7 @@ export const PackageList = [ name: '@blocksuite/affine-widget-frame-title', workspaceDependencies: [ 'blocksuite/affine/components', + 'blocksuite/affine/ext-loader', 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', @@ -825,6 +823,7 @@ export const PackageList = [ 'blocksuite/affine/blocks/surface', 'blocksuite/affine/blocks/surface-ref', 'blocksuite/affine/components', + 'blocksuite/affine/ext-loader', 'blocksuite/affine/fragments/doc-title', 'blocksuite/affine/inlines/latex', 'blocksuite/affine/inlines/link', diff --git a/yarn.lock b/yarn.lock index 5f1e2965e..a0adb143d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2859,10 +2859,7 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/affine-widget-edgeless-auto-connect": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" - "@blocksuite/affine-widget-frame-title": "workspace:*" - "@blocksuite/affine-widget-keyboard-toolbar": "workspace:*" "@blocksuite/affine-widget-linked-doc": "workspace:*" "@blocksuite/affine-widget-remote-selection": "workspace:*" "@blocksuite/affine-widget-scroll-anchoring": "workspace:*" @@ -3710,6 +3707,7 @@ __metadata: resolution: "@blocksuite/affine-widget-frame-title@workspace:blocksuite/affine/widgets/frame-title" dependencies: "@blocksuite/affine-components": "workspace:*" + "@blocksuite/affine-ext-loader": "workspace:*" "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" @@ -3738,6 +3736,7 @@ __metadata: "@blocksuite/affine-block-surface": "workspace:*" "@blocksuite/affine-block-surface-ref": "workspace:*" "@blocksuite/affine-components": "workspace:*" + "@blocksuite/affine-ext-loader": "workspace:*" "@blocksuite/affine-fragment-doc-title": "workspace:*" "@blocksuite/affine-inline-latex": "workspace:*" "@blocksuite/affine-inline-link": "workspace:*"