There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(editor): mindmap gfx extension (#11936)
Saul-Mironef0a233368d30
diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.jsonindex 2ebdc639e3..3cce2aa851 100644--- a/blocksuite/affine/all/package.json+++ b/blocksuite/affine/all/package.json@@ -180,8 +180,11 @@"./gfx/shape": "./src/gfx/shape/index.ts","./gfx/shape/store": "./src/gfx/shape/store.ts","./gfx/shape/view": "./src/gfx/shape/view.ts",- "./gfx/note": "./src/gfx/note.ts",- "./gfx/mindmap": "./src/gfx/mindmap.ts",+ "./gfx/note": "./src/gfx/note/index.ts",+ "./gfx/note/view": "./src/gfx/note/view.ts",+ "./gfx/mindmap": "./src/gfx/mindmap/index.ts",+ "./gfx/mindmap/store": "./src/gfx/mindmap/store.ts",+ "./gfx/mindmap/view": "./src/gfx/mindmap/view.ts","./gfx/connector": "./src/gfx/connector.ts","./gfx/group": "./src/gfx/group.ts","./gfx/template": "./src/gfx/template.ts",diff --git a/blocksuite/affine/all/src/extensions/store.ts b/blocksuite/affine/all/src/extensions/store.tsindex 0454f08129..48b65dfccb 100644--- a/blocksuite/affine/all/src/extensions/store.ts+++ b/blocksuite/affine/all/src/extensions/store.ts@@ -16,6 +16,7 @@ import { ParagraphStoreExtension } from '@blocksuite/affine-block-paragraph/storimport { SurfaceRefStoreExtension } from '@blocksuite/affine-block-surface-ref/store';import { TableStoreExtension } from '@blocksuite/affine-block-table/store';import { BrushStoreExtension } from '@blocksuite/affine-gfx-brush/store';+import { MindmapStoreExtension } from '@blocksuite/affine-gfx-mindmap/store';import { ShapeStoreExtension } from '@blocksuite/affine-gfx-shape/store';import { FootnoteStoreExtension } from '@blocksuite/affine-inline-footnote/store';import { LatexStoreExtension as InlineLatexStoreExtension } from '@blocksuite/affine-inline-latex/store';@@ -53,6 +54,7 @@ export function getInternalStoreExtensions() {BrushStoreExtension,ShapeStoreExtension,+ MindmapStoreExtension,MigratingStoreExtension,];diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.tsindex 3fa7222aac..d822cb90d0 100644--- a/blocksuite/affine/all/src/extensions/view.ts+++ b/blocksuite/affine/all/src/extensions/view.ts@@ -16,6 +16,7 @@ import { ParagraphViewExtension } from '@blocksuite/affine-block-paragraph/view'import { SurfaceRefViewExtension } from '@blocksuite/affine-block-surface-ref/view';import { TableViewExtension } from '@blocksuite/affine-block-table/view';import { BrushViewExtension } from '@blocksuite/affine-gfx-brush/view';+import { MindmapViewExtension } from '@blocksuite/affine-gfx-mindmap/view';import { NoteViewExtension as GfxNoteViewExtension } from '@blocksuite/affine-gfx-note/view';import { ShapeViewExtension } from '@blocksuite/affine-gfx-shape/view';import { FootnoteViewExtension } from '@blocksuite/affine-inline-footnote/view';@@ -32,7 +33,7 @@ export function getInternalViewExtensions() {GfxNoteViewExtension,BrushViewExtension,ShapeViewExtension,- // mind+ MindmapViewExtension,// template// Blockdiff --git a/blocksuite/affine/all/src/gfx/mindmap.ts b/blocksuite/affine/all/src/gfx/mindmap/index.tssimilarity index 100%rename from blocksuite/affine/all/src/gfx/mindmap.tsrename to blocksuite/affine/all/src/gfx/mindmap/index.tsdiff --git a/blocksuite/affine/all/src/gfx/mindmap/store.ts b/blocksuite/affine/all/src/gfx/mindmap/store.tsnew file mode 100644index 0000000000..d3f658cbbe--- /dev/null+++ b/blocksuite/affine/all/src/gfx/mindmap/store.ts@@ -0,0 +1 @@+export * from '@blocksuite/affine-gfx-mindmap/store';diff --git a/blocksuite/affine/all/src/gfx/mindmap/view.ts b/blocksuite/affine/all/src/gfx/mindmap/view.tsnew file mode 100644index 0000000000..db8df0daaa--- /dev/null+++ b/blocksuite/affine/all/src/gfx/mindmap/view.ts@@ -0,0 +1 @@+export * from '@blocksuite/affine-gfx-mindmap/view';diff --git a/blocksuite/affine/blocks/edgeless-text/src/view.ts b/blocksuite/affine/blocks/edgeless-text/src/view.tsindex afc7ae0344..d6a2c38821 100644--- a/blocksuite/affine/blocks/edgeless-text/src/view.ts+++ b/blocksuite/affine/blocks/edgeless-text/src/view.ts@@ -5,6 +5,7 @@ import {import { BlockViewExtension } from '@blocksuite/std';import { literal } from 'lit/static-html.js';+import { edgelessTextToolbarExtension } from './edgeless-toolbar';import { effects } from './effects';export class EdgelessTextViewExtension extends ViewExtensionProvider {@@ -26,6 +27,7 @@ export class EdgelessTextViewExtension extends ViewExtensionProvider {literal`affine-edgeless-text`),]);+ context.register(edgelessTextToolbarExtension);}}}diff --git a/blocksuite/affine/blocks/frame/src/edgeless-toolbar/quick-tool.ts b/blocksuite/affine/blocks/frame/src/edgeless-toolbar/quick-tool.tsindex 4769de3bb1..f62076c0ea 100644--- a/blocksuite/affine/blocks/frame/src/edgeless-toolbar/quick-tool.ts+++ b/blocksuite/affine/blocks/frame/src/edgeless-toolbar/quick-tool.ts@@ -11,5 +11,6 @@ export const frameQuickTool = QuickToolExtension('frame', ({ block, gfx }) => {></edgeless-frame-tool-button>`,menu: buildFrameDenseMenu(block, gfx),enable: !block.doc.readonly,+ priority: 90,};});diff --git a/blocksuite/affine/blocks/frame/src/view.ts b/blocksuite/affine/blocks/frame/src/view.tsindex 94e6820865..ee8b466d4a 100644--- a/blocksuite/affine/blocks/frame/src/view.ts+++ b/blocksuite/affine/blocks/frame/src/view.ts@@ -3,10 +3,12 @@ import {ViewExtensionProvider,} from '@blocksuite/affine-ext-loader';+import { frameQuickTool } from './edgeless-toolbar';import { effects } from './effects';import { FrameHighlightManager } from './frame-highlight-manager';import { FrameBlockSpec } from './frame-spec';import { FrameTool } from './frame-tool';+import { frameToolbarExtension } from './frame-toolbar';import { PresentTool } from './preset-tool';export class FrameViewExtension extends ViewExtensionProvider {@@ -24,6 +26,8 @@ export class FrameViewExtension extends ViewExtensionProvider {context.register(FrameHighlightManager);context.register(FrameTool);context.register(PresentTool);+ context.register(frameQuickTool);+ context.register(frameToolbarExtension);}}}diff --git a/blocksuite/affine/blocks/root/src/common-specs/index.ts b/blocksuite/affine/blocks/root/src/common-specs/index.tsindex 282e0e925e..32a12a7dcd 100644--- a/blocksuite/affine/blocks/root/src/common-specs/index.ts+++ b/blocksuite/affine/blocks/root/src/common-specs/index.ts@@ -7,10 +7,6 @@ import {GroupElementRendererExtension,GroupElementView,} from '@blocksuite/affine-gfx-group';-import {- MindmapElementRendererExtension,- MindMapView,-} from '@blocksuite/affine-gfx-mindmap';import {TextElementRendererExtension,TextElementView,@@ -48,7 +44,6 @@ import { viewportOverlayWidget } from './widgets';*/const EdgelessElementViews = [ConnectorElementView,- MindMapView,GroupElementView,TextElementView,];@@ -57,7 +52,6 @@ export const EdgelessElementRendererExtension: ExtensionType[] = [TextElementRendererExtension,ConnectorElementRendererExtension,GroupElementRendererExtension,- MindmapElementRendererExtension,];export const CommonSpecs: ExtensionType[] = [diff --git a/blocksuite/affine/blocks/root/src/edgeless/components/toolbar/tools.ts b/blocksuite/affine/blocks/root/src/edgeless/components/toolbar/tools.tsindex 3b1bbc0e80..57847ed88f 100644--- a/blocksuite/affine/blocks/root/src/edgeless/components/toolbar/tools.ts+++ b/blocksuite/affine/blocks/root/src/edgeless/components/toolbar/tools.ts@@ -1,6 +1,4 @@-import { frameQuickTool } from '@blocksuite/affine-block-frame';import { connectorQuickTool } from '@blocksuite/affine-gfx-connector';-import { mindMapSeniorTool } from '@blocksuite/affine-gfx-mindmap';import { templateSeniorTool } from '@blocksuite/affine-gfx-template';import { QuickToolExtension } from '@blocksuite/affine-widget-edgeless-toolbar';import { html } from 'lit';@@ -9,6 +7,7 @@ import { buildLinkDenseMenu } from './link/link-dense-menu.js';const defaultQuickTool = QuickToolExtension('default', ({ block }) => {return {+ priority: 100,type: 'default',content: html`<edgeless-default-tool-button.edgeless=${block}@@ -25,11 +24,6 @@ const linkQuickTool = QuickToolExtension('link', ({ block, gfx }) => {};});-export const quickTools = [- defaultQuickTool,- frameQuickTool,- connectorQuickTool,- linkQuickTool,-];+export const quickTools = [defaultQuickTool, connectorQuickTool, linkQuickTool];-export const seniorTools = [mindMapSeniorTool, templateSeniorTool];+export const seniorTools = [templateSeniorTool];diff --git a/blocksuite/affine/blocks/root/src/edgeless/configs/toolbar/index.ts b/blocksuite/affine/blocks/root/src/edgeless/configs/toolbar/index.tsindex 0cefe12c50..bcc5841b51 100644--- a/blocksuite/affine/blocks/root/src/edgeless/configs/toolbar/index.ts+++ b/blocksuite/affine/blocks/root/src/edgeless/configs/toolbar/index.ts@@ -1,12 +1,5 @@-import { edgelessTextToolbarExtension } from '@blocksuite/affine-block-edgeless-text';-import { frameToolbarExtension } from '@blocksuite/affine-block-frame';import { connectorToolbarExtension } from '@blocksuite/affine-gfx-connector';import { groupToolbarExtension } from '@blocksuite/affine-gfx-group';-import {- mindmapToolbarExtension,- shapeMindmapToolbarExtension,-} from '@blocksuite/affine-gfx-mindmap';-import { shapeToolbarExtension } from '@blocksuite/affine-gfx-shape';import { textToolbarExtension } from '@blocksuite/affine-gfx-text';import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services';import { BlockFlavourIdentifier } from '@blocksuite/std';@@ -15,22 +8,12 @@ import type { ExtensionType } from '@blocksuite/store';import { builtinLockedToolbarConfig, builtinMiscToolbarConfig } from './misc';export const EdgelessElementToolbarExtension: ExtensionType[] = [- frameToolbarExtension,-groupToolbarExtension,connectorToolbarExtension,- shapeToolbarExtension,-- shapeMindmapToolbarExtension,-- mindmapToolbarExtension,-textToolbarExtension,- edgelessTextToolbarExtension,-ToolbarModuleExtension({id: BlockFlavourIdentifier('affine:surface:*'),config: builtinMiscToolbarConfig,diff --git a/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts b/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.tsindex 9b03d06023..d86035a445 100644--- a/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts+++ b/blocksuite/affine/blocks/root/src/edgeless/edgeless-builtin-spec.ts@@ -4,10 +4,6 @@ import {ConnectorFilter,ConnectorTool,} from '@blocksuite/affine-gfx-connector';-import {- MindMapDragExtension,- MindMapIndicatorOverlay,-} from '@blocksuite/affine-gfx-mindmap';import type * as NoteEffect from '@blocksuite/affine-gfx-note';import type * as ShapeEffect from '@blocksuite/affine-gfx-shape';import { TemplateTool } from '@blocksuite/affine-gfx-template';@@ -44,13 +40,11 @@ export const EdgelessEditExtensions: ExtensionType[] = [InteractivityManager,ConnectorFilter,SnapExtension,- MindMapDragExtension,DblClickAddEdgelessText,];export const EdgelessBuiltInManager: ExtensionType[] = [ConnectionOverlay,- MindMapIndicatorOverlay,SnapOverlay,AltCloneExtension,EditPropsMiddlewareBuilder,diff --git a/blocksuite/affine/blocks/root/src/effects.ts b/blocksuite/affine/blocks/root/src/effects.tsindex 9d17913288..f05218532e 100644--- a/blocksuite/affine/blocks/root/src/effects.ts+++ b/blocksuite/affine/blocks/root/src/effects.ts@@ -1,6 +1,5 @@import { effects as gfxConnectorEffects } from '@blocksuite/affine-gfx-connector/effects';import { effects as gfxGroupEffects } from '@blocksuite/affine-gfx-group/effects';-import { effects as gfxMindmapEffects } from '@blocksuite/affine-gfx-mindmap/effects';import { effects as gfxTemplateEffects } from '@blocksuite/affine-gfx-template/effects';import { effects as gfxCanvasTextEffects } from '@blocksuite/affine-gfx-text/effects';import { effects as widgetEdgelessToolbarEffects } from '@blocksuite/affine-widget-edgeless-toolbar/effects';@@ -77,7 +76,6 @@ function registerRootComponents() {function registerGfxEffects() {gfxCanvasTextEffects();gfxConnectorEffects();- gfxMindmapEffects();gfxGroupEffects();gfxTemplateEffects();}diff --git a/blocksuite/affine/gfx/mindmap/package.json b/blocksuite/affine/gfx/mindmap/package.jsonindex 664a6bc12f..b959a232eb 100644--- a/blocksuite/affine/gfx/mindmap/package.json+++ b/blocksuite/affine/gfx/mindmap/package.json@@ -15,6 +15,7 @@"@blocksuite/affine-block-image": "workspace:*","@blocksuite/affine-block-surface": "workspace:*","@blocksuite/affine-components": "workspace:*",+ "@blocksuite/affine-ext-loader": "workspace:*","@blocksuite/affine-gfx-connector": "workspace:*","@blocksuite/affine-gfx-shape": "workspace:*","@blocksuite/affine-gfx-text": "workspace:*",@@ -40,7 +41,9 @@},"exports": {".": "./src/index.ts",- "./effects": "./src/effects.ts"+ "./effects": "./src/effects.ts",+ "./view": "./src/view.ts",+ "./store": "./src/store.ts"},"files": ["src",diff --git a/blocksuite/affine/gfx/mindmap/src/index.ts b/blocksuite/affine/gfx/mindmap/src/index.tsindex 07ec0aa275..ea1d52ffa9 100644--- a/blocksuite/affine/gfx/mindmap/src/index.ts+++ b/blocksuite/affine/gfx/mindmap/src/index.ts@@ -5,4 +5,4 @@ export * from './interactivity';export * from './toolbar/config';export * from './toolbar/senior-tool';export * from './utils';-export * from './view';+export * from './view/index';diff --git a/blocksuite/affine/gfx/mindmap/src/store.ts b/blocksuite/affine/gfx/mindmap/src/store.tsnew file mode 100644index 0000000000..c8e23b007a--- /dev/null+++ b/blocksuite/affine/gfx/mindmap/src/store.ts@@ -0,0 +1,19 @@+import {+ type StoreExtensionContext,+ StoreExtensionProvider,+} from '@blocksuite/affine-ext-loader';++import {+ mindmapToMarkdownAdapterMatcher,+ mindmapToPlainTextAdapterMatcher,+} from './adapter';++export class MindmapStoreExtension extends StoreExtensionProvider {+ override name = 'affine-mindmap-gfx';++ override setup(context: StoreExtensionContext) {+ super.setup(context);+ context.register(mindmapToPlainTextAdapterMatcher);+ context.register(mindmapToMarkdownAdapterMatcher);+ }+}diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/config.tsindex 70c66a07d9..66bd211fcd 100644--- a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts+++ b/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts@@ -23,7 +23,7 @@ import {MindmapStyleOne,MindmapStyleThree,MindmapStyleTwo,-} from '../view';+} from '../view/index';const MINDMAP_STYLE_LIST = [{diff --git a/blocksuite/affine/gfx/mindmap/src/view.ts b/blocksuite/affine/gfx/mindmap/src/view.tsnew file mode 100644index 0000000000..8e4d1d923e--- /dev/null+++ b/blocksuite/affine/gfx/mindmap/src/view.ts@@ -0,0 +1,35 @@+import {+ type ViewExtensionContext,+ ViewExtensionProvider,+} from '@blocksuite/affine-ext-loader';++import { effects } from './effects';+import { MindmapElementRendererExtension } from './element-renderer';+import { MindMapIndicatorOverlay } from './indicator-overlay';+import { MindMapDragExtension } from './interactivity';+import {+ mindmapToolbarExtension,+ shapeMindmapToolbarExtension,+} from './toolbar/config';+import { mindMapSeniorTool } from './toolbar/senior-tool';+import { MindMapView } from './view/view';++export class MindmapViewExtension extends ViewExtensionProvider {+ override name = 'affine-mindmap-gfx';++ override effect(): void {+ super.effect();+ effects();+ }++ override setup(context: ViewExtensionContext) {+ super.setup(context);+ context.register(MindmapElementRendererExtension);+ context.register(mindMapSeniorTool);+ context.register(mindmapToolbarExtension);+ context.register(shapeMindmapToolbarExtension);+ context.register(MindMapView);+ context.register(MindMapDragExtension);+ context.register(MindMapIndicatorOverlay);+ }+}diff --git a/blocksuite/affine/gfx/mindmap/tsconfig.json b/blocksuite/affine/gfx/mindmap/tsconfig.jsonindex 60d59adcc6..31d472e83b 100644--- a/blocksuite/affine/gfx/mindmap/tsconfig.json+++ b/blocksuite/affine/gfx/mindmap/tsconfig.json@@ -12,6 +12,7 @@{ "path": "../../blocks/image" },{ "path": "../../blocks/surface" },{ "path": "../../components" },+ { "path": "../../ext-loader" },{ "path": "../connector" },{ "path": "../shape" },{ "path": "../text" },diff --git a/blocksuite/affine/gfx/shape/src/view.ts b/blocksuite/affine/gfx/shape/src/view.tsindex 1c563c1f14..2f21971a6b 100644--- a/blocksuite/affine/gfx/shape/src/view.ts+++ b/blocksuite/affine/gfx/shape/src/view.ts@@ -10,7 +10,7 @@ import {} from './element-renderer';import { ShapeElementView } from './element-view';import { ShapeTool } from './shape-tool';-import { shapeSeniorTool } from './toolbar';+import { shapeSeniorTool, shapeToolbarExtension } from './toolbar';export class ShapeViewExtension extends ViewExtensionProvider {override name = 'affine-shape-gfx';@@ -22,10 +22,13 @@ export class ShapeViewExtension extends ViewExtensionProvider {override setup(context: ViewExtensionContext) {super.setup(context);- context.register(HighlighterElementRendererExtension);- context.register(ShapeElementRendererExtension);- context.register(ShapeElementView);- context.register(ShapeTool);- context.register(shapeSeniorTool);+ if (this.isEdgeless(context.scope)) {+ context.register(HighlighterElementRendererExtension);+ context.register(ShapeElementRendererExtension);+ context.register(ShapeElementView);+ context.register(ShapeTool);+ context.register(shapeSeniorTool);+ context.register(shapeToolbarExtension);+ }}}diff --git a/blocksuite/affine/widgets/edgeless-toolbar/src/edgeless-toolbar.ts b/blocksuite/affine/widgets/edgeless-toolbar/src/edgeless-toolbar.tsindex e9998e5d5e..42d1ec339b 100644--- a/blocksuite/affine/widgets/edgeless-toolbar/src/edgeless-toolbar.ts+++ b/blocksuite/affine/widgets/edgeless-toolbar/src/edgeless-toolbar.ts@@ -345,6 +345,7 @@ export class EdgelessToolbarWidget extends WidgetComponent<RootBlockModel> {.map(tool =>tool({ block, gfx, toolbarContainer: this.toolbarContainer }))+ .sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0)).filter(({ enable = true }) => enable);}diff --git a/blocksuite/affine/widgets/edgeless-toolbar/src/extension/index.ts b/blocksuite/affine/widgets/edgeless-toolbar/src/extension/index.tsindex df8a34cd87..6851517e76 100644--- a/blocksuite/affine/widgets/edgeless-toolbar/src/extension/index.ts+++ b/blocksuite/affine/widgets/edgeless-toolbar/src/extension/index.ts@@ -13,6 +13,7 @@ export interface QuickTool {* if not configured, the tool will not be shown in dense mode*/menu?: MenuConfig;+ priority?: number;}export interface SeniorTool {diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.tsindex fde6f576b2..07ff56a143 100644--- a/tools/utils/src/workspace.gen.ts+++ b/tools/utils/src/workspace.gen.ts@@ -548,6 +548,7 @@ export const PackageList = ['blocksuite/affine/blocks/image','blocksuite/affine/blocks/surface','blocksuite/affine/components',+ 'blocksuite/affine/ext-loader','blocksuite/affine/gfx/connector','blocksuite/affine/gfx/shape','blocksuite/affine/gfx/text',diff --git a/yarn.lock b/yarn.lockindex be37369d6e..75c751b40c 100644--- a/yarn.lock+++ b/yarn.lock@@ -3189,6 +3189,7 @@ __metadata:"@blocksuite/affine-block-image": "workspace:*""@blocksuite/affine-block-surface": "workspace:*""@blocksuite/affine-components": "workspace:*"+ "@blocksuite/affine-ext-loader": "workspace:*""@blocksuite/affine-gfx-connector": "workspace:*""@blocksuite/affine-gfx-shape": "workspace:*""@blocksuite/affine-gfx-text": "workspace:*"