diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index 2a410ffb0..cd7a29542 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -164,8 +164,10 @@ "./inlines/mention/view": "./src/inlines/mention/view.ts", "./widgets/drag-handle": "./src/widgets/drag-handle/index.ts", "./widgets/drag-handle/view": "./src/widgets/drag-handle/view.ts", - "./widgets/edgeless-auto-connect": "./src/widgets/edgeless-auto-connect.ts", - "./widgets/edgeless-toolbar": "./src/widgets/edgeless-toolbar.ts", + "./widgets/edgeless-auto-connect": "./src/widgets/edgeless-auto-connect/index.ts", + "./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/linked-doc": "./src/widgets/linked-doc.ts", "./widgets/remote-selection": "./src/widgets/remote-selection.ts", diff --git a/blocksuite/affine/all/src/extensions/effects.ts b/blocksuite/affine/all/src/extensions/effects.ts index ed6ef682b..2b77036e5 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 widgetEdgelessAutoConnectEffects } from '@blocksuite/affine-widget-edgeless-auto-connect/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'; @@ -70,7 +69,6 @@ export function effects() { widgetScrollAnchoringEffects(); widgetFrameTitleEffects(); widgetRemoteSelectionEffects(); - widgetEdgelessAutoConnectEffects(); widgetSlashMenuEffects(); widgetToolbarEffects(); diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.ts index 7b4fd1a48..07d42acb8 100644 --- a/blocksuite/affine/all/src/extensions/view.ts +++ b/blocksuite/affine/all/src/extensions/view.ts @@ -31,6 +31,8 @@ import { MentionViewExtension } from '@blocksuite/affine-inline-mention/view'; import { InlinePresetViewExtension } from '@blocksuite/affine-inline-preset/view'; 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 { MigratingViewExtension } from './migrating-view'; @@ -76,7 +78,8 @@ export function getInternalViewExtensions() { // Widget DragHandleViewExtension, - + EdgelessAutoConnectViewExtension, + EdgelessToolbarViewExtension, MigratingViewExtension, ]; } diff --git a/blocksuite/affine/all/src/widgets/edgeless-auto-connect.ts b/blocksuite/affine/all/src/widgets/edgeless-auto-connect/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/edgeless-auto-connect.ts rename to blocksuite/affine/all/src/widgets/edgeless-auto-connect/index.ts diff --git a/blocksuite/affine/all/src/widgets/edgeless-auto-connect/view.ts b/blocksuite/affine/all/src/widgets/edgeless-auto-connect/view.ts new file mode 100644 index 000000000..278bfbaa5 --- /dev/null +++ b/blocksuite/affine/all/src/widgets/edgeless-auto-connect/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-edgeless-auto-connect/view'; diff --git a/blocksuite/affine/all/src/widgets/edgeless-toolbar.ts b/blocksuite/affine/all/src/widgets/edgeless-toolbar/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/edgeless-toolbar.ts rename to blocksuite/affine/all/src/widgets/edgeless-toolbar/index.ts diff --git a/blocksuite/affine/all/src/widgets/edgeless-toolbar/view.ts b/blocksuite/affine/all/src/widgets/edgeless-toolbar/view.ts new file mode 100644 index 000000000..d8ec56d6d --- /dev/null +++ b/blocksuite/affine/all/src/widgets/edgeless-toolbar/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-edgeless-toolbar/view'; 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 a08cde7a7..15c7545e5 100644 --- a/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts +++ b/blocksuite/affine/blocks/root/src/edgeless/edgeless-root-spec.ts @@ -15,8 +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 { autoConnectWidget } from '@blocksuite/affine-widget-edgeless-auto-connect'; -import { edgelessToolbarWidget } from '@blocksuite/affine-widget-edgeless-toolbar'; import { frameTitleWidget } from '@blocksuite/affine-widget-frame-title'; import { edgelessRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selection'; import { @@ -100,12 +98,10 @@ export const EdgelessRootBlockSpec: ExtensionType[] = [ edgelessRemoteSelectionWidget, edgelessZoomToolbarWidget, frameTitleWidget, - autoConnectWidget, edgelessDraggingAreaWidget, noteSlicerWidget, edgelessNavigatorBgWidget, edgelessSelectedRectWidget, - edgelessToolbarWidget, EdgelessClipboardController, ]; diff --git a/blocksuite/affine/blocks/root/src/effects.ts b/blocksuite/affine/blocks/root/src/effects.ts index 172a7584d..6ac0e9c71 100644 --- a/blocksuite/affine/blocks/root/src/effects.ts +++ b/blocksuite/affine/blocks/root/src/effects.ts @@ -1,4 +1,3 @@ -import { effects as widgetEdgelessToolbarEffects } from '@blocksuite/affine-widget-edgeless-toolbar/effects'; import { effects as widgetMobileToolbarEffects } from '@blocksuite/affine-widget-keyboard-toolbar/effects'; import { effects as widgetLinkedDocEffects } from '@blocksuite/affine-widget-linked-doc/effects'; @@ -49,7 +48,6 @@ export function effects() { // Run other effects widgetMobileToolbarEffects(); widgetLinkedDocEffects(); - widgetEdgelessToolbarEffects(); // Register components by category registerRootComponents(); diff --git a/blocksuite/affine/blocks/root/src/widgets/edgeless-navigator-bg/index.ts b/blocksuite/affine/blocks/root/src/widgets/edgeless-navigator-bg/index.ts index 6fb0eb957..ef5262377 100644 --- a/blocksuite/affine/blocks/root/src/widgets/edgeless-navigator-bg/index.ts +++ b/blocksuite/affine/blocks/root/src/widgets/edgeless-navigator-bg/index.ts @@ -19,6 +19,7 @@ export class EdgelessNavigatorBlackBackgroundWidget extends WidgetComponent