diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index 942b36c2e..2a410ffb0 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -162,7 +162,8 @@ "./inlines/latex/view": "./src/inlines/latex/view.ts", "./inlines/mention": "./src/inlines/mention/index.ts", "./inlines/mention/view": "./src/inlines/mention/view.ts", - "./widgets/drag-handle": "./src/widgets/drag-handle.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/frame-title": "./src/widgets/frame-title.ts", diff --git a/blocksuite/affine/all/src/extensions/effects.ts b/blocksuite/affine/all/src/extensions/effects.ts index 00da3a587..ed6ef682b 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 widgetDragHandleEffects } from '@blocksuite/affine-widget-drag-handle/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'; @@ -71,7 +70,6 @@ export function effects() { widgetScrollAnchoringEffects(); widgetFrameTitleEffects(); widgetRemoteSelectionEffects(); - widgetDragHandleEffects(); widgetEdgelessAutoConnectEffects(); widgetSlashMenuEffects(); widgetToolbarEffects(); diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.ts index 586e34832..7b4fd1a48 100644 --- a/blocksuite/affine/all/src/extensions/view.ts +++ b/blocksuite/affine/all/src/extensions/view.ts @@ -30,6 +30,7 @@ import { LinkViewExtension } from '@blocksuite/affine-inline-link/view'; 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 { MigratingViewExtension } from './migrating-view'; @@ -73,6 +74,9 @@ export function getInternalViewExtensions() { MentionViewExtension, InlinePresetViewExtension, + // Widget + DragHandleViewExtension, + MigratingViewExtension, ]; } diff --git a/blocksuite/affine/all/src/widgets/drag-handle.ts b/blocksuite/affine/all/src/widgets/drag-handle/index.ts similarity index 100% rename from blocksuite/affine/all/src/widgets/drag-handle.ts rename to blocksuite/affine/all/src/widgets/drag-handle/index.ts diff --git a/blocksuite/affine/all/src/widgets/drag-handle/view.ts b/blocksuite/affine/all/src/widgets/drag-handle/view.ts new file mode 100644 index 000000000..2c80afd2f --- /dev/null +++ b/blocksuite/affine/all/src/widgets/drag-handle/view.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-widget-drag-handle/view'; diff --git a/blocksuite/affine/blocks/root/package.json b/blocksuite/affine/blocks/root/package.json index 93dc8595a..771051c3b 100644 --- a/blocksuite/affine/blocks/root/package.json +++ b/blocksuite/affine/blocks/root/package.json @@ -33,7 +33,6 @@ "@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-rich-text": "workspace:*", "@blocksuite/affine-shared": "workspace:*", - "@blocksuite/affine-widget-drag-handle": "workspace:*", "@blocksuite/affine-widget-edgeless-auto-connect": "workspace:*", "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*", "@blocksuite/affine-widget-frame-title": "workspace:*", diff --git a/blocksuite/affine/blocks/root/src/common-specs/index.ts b/blocksuite/affine/blocks/root/src/common-specs/index.ts index 5fd177db2..77732e171 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 { dragHandleWidget } from '@blocksuite/affine-widget-drag-handle'; import { linkedDocWidget } from '@blocksuite/affine-widget-linked-doc'; import { docRemoteSelectionWidget } from '@blocksuite/affine-widget-remote-selection'; import { scrollAnchoringWidget } from '@blocksuite/affine-widget-scroll-anchoring'; @@ -39,7 +38,6 @@ export const CommonSpecs: ExtensionType[] = [ ...clipboardConfigs, SlashMenuExtension, linkedDocWidget, - dragHandleWidget, docRemoteSelectionWidget, viewportOverlayWidget, scrollAnchoringWidget, diff --git a/blocksuite/affine/blocks/root/tsconfig.json b/blocksuite/affine/blocks/root/tsconfig.json index b02a7b6e6..a7df274e4 100644 --- a/blocksuite/affine/blocks/root/tsconfig.json +++ b/blocksuite/affine/blocks/root/tsconfig.json @@ -30,7 +30,6 @@ { "path": "../../model" }, { "path": "../../rich-text" }, { "path": "../../shared" }, - { "path": "../../widgets/drag-handle" }, { "path": "../../widgets/edgeless-auto-connect" }, { "path": "../../widgets/edgeless-toolbar" }, { "path": "../../widgets/frame-title" }, diff --git a/blocksuite/affine/widgets/drag-handle/package.json b/blocksuite/affine/widgets/drag-handle/package.json index 82e205cb0..7b917eeb9 100644 --- a/blocksuite/affine/widgets/drag-handle/package.json +++ b/blocksuite/affine/widgets/drag-handle/package.json @@ -37,7 +37,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/drag-handle/src/view.ts b/blocksuite/affine/widgets/drag-handle/src/view.ts new file mode 100644 index 000000000..afa7febdb --- /dev/null +++ b/blocksuite/affine/widgets/drag-handle/src/view.ts @@ -0,0 +1,21 @@ +import { + type ViewExtensionContext, + ViewExtensionProvider, +} from '@blocksuite/affine-ext-loader'; + +import { dragHandleWidget } from '.'; +import { effects } from './effects'; + +export class DragHandleViewExtension extends ViewExtensionProvider { + override name = 'affine-drag-handle-widget'; + + override effect() { + super.effect(); + effects(); + } + + override setup(context: ViewExtensionContext) { + super.setup(context); + context.register(dragHandleWidget); + } +} diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts index f227058e7..96ec62f35 100644 --- a/tools/utils/src/workspace.gen.ts +++ b/tools/utils/src/workspace.gen.ts @@ -343,7 +343,6 @@ export const PackageList = [ 'blocksuite/affine/model', 'blocksuite/affine/rich-text', 'blocksuite/affine/shared', - 'blocksuite/affine/widgets/drag-handle', 'blocksuite/affine/widgets/edgeless-auto-connect', 'blocksuite/affine/widgets/edgeless-toolbar', 'blocksuite/affine/widgets/frame-title', diff --git a/yarn.lock b/yarn.lock index 7378a74ef..c930f805b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2844,7 +2844,6 @@ __metadata: "@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-rich-text": "workspace:*" "@blocksuite/affine-shared": "workspace:*" - "@blocksuite/affine-widget-drag-handle": "workspace:*" "@blocksuite/affine-widget-edgeless-auto-connect": "workspace:*" "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*" "@blocksuite/affine-widget-frame-title": "workspace:*"