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
refactor(editor): move mini mindmap to ai module (#9497)
Saul-Mirone30a181da384f
diff --git a/blocksuite/blocks/src/effects.ts b/blocksuite/blocks/src/effects.tsindex 839e72be81..d3524020ad 100644--- a/blocksuite/blocks/src/effects.ts+++ b/blocksuite/blocks/src/effects.ts@@ -181,11 +181,6 @@ import {AFFINE_VIEWPORT_OVERLAY_WIDGET,AffineViewportOverlayWidget,} from './root-block/widgets/viewport-overlay/viewport-overlay.js';-import {- MindmapRootBlock,- MindmapSurfaceBlock,- MiniMindmapPreview,-} from './surface-block/mini-mindmap/index.js';export function effects() {registerSpecs();@@ -232,8 +227,6 @@ export function effects() {customElements.define('affine-page-root', PageRootBlockComponent);customElements.define('affine-preview-root', PreviewRootBlockComponent);- customElements.define('mini-mindmap-preview', MiniMindmapPreview);- customElements.define('mini-mindmap-surface-block', MindmapSurfaceBlock);customElements.define('affine-edgeless-root', EdgelessRootBlockComponent);customElements.define('edgeless-copilot-panel', EdgelessCopilotPanel);customElements.define(@@ -371,7 +364,6 @@ export function effects() {);customElements.define('edgeless-text-editor', EdgelessTextEditor);customElements.define('affine-image-toolbar', AffineImageToolbar);- customElements.define('mini-mindmap-root-block', MindmapRootBlock);customElements.define('affine-block-selection', BlockSelection);customElements.define('edgeless-slide-menu', EdgelessSlideMenu);customElements.define(diff --git a/blocksuite/blocks/src/index.ts b/blocksuite/blocks/src/index.tsindex 0784cd3d52..51359e8eef 100644--- a/blocksuite/blocks/src/index.ts+++ b/blocksuite/blocks/src/index.ts@@ -33,11 +33,6 @@ export { EditPropsMiddlewareBuilder } from './root-block/edgeless/middlewares/baexport { EdgelessSnapManager } from './root-block/edgeless/utils/snap-manager.js';export * from './root-block/index.js';export * from './schemas.js';-export {- markdownToMindmap,- MindmapSurfaceBlock,- MiniMindmapPreview,-} from './surface-block/mini-mindmap/index.js';export * from '@blocksuite/affine-block-attachment';export * from '@blocksuite/affine-block-bookmark';export * from '@blocksuite/affine-block-code';diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/index.ts b/blocksuite/blocks/src/surface-block/mini-mindmap/index.tsdeleted file mode 100644index 10fd32a47e..0000000000--- a/blocksuite/blocks/src/surface-block/mini-mindmap/index.ts+++ /dev/null@@ -1,4 +0,0 @@-export { markdownToMindmap, MiniMindmapPreview } from './mindmap-preview.js';-export { MindmapRootBlock } from './mindmap-root-block.js';-export { MindmapService } from './mindmap-service.js';-export { MindmapSurfaceBlock } from './surface-block.js';diff --git a/blocksuite/presets/src/__tests__/edgeless/mini-mindmap.spec.ts b/blocksuite/presets/src/__tests__/edgeless/mini-mindmap.spec.tsdeleted file mode 100644index 6f41084262..0000000000--- a/blocksuite/presets/src/__tests__/edgeless/mini-mindmap.spec.ts+++ /dev/null@@ -1,117 +0,0 @@-import type { EditorHost } from '@blocksuite/block-std';-import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';-import {- type EdgelessRootBlockComponent,- type MindmapElementModel,- type MindmapSurfaceBlock,- MiniMindmapPreview,-} from '@blocksuite/blocks';-import { beforeEach, describe, expect, test } from 'vitest';--import { wait } from '../utils/common.js';-import { getDocRootBlock } from '../utils/edgeless.js';-import { setupEditor } from '../utils/setup.js';--describe('mini mindmap preview', () => {- let edgeless!: EdgelessRootBlockComponent;-- const createPreview = (host: EditorHost, answer: string) => {- const mindmapPreview = new MiniMindmapPreview();-- mindmapPreview.answer = answer;- mindmapPreview.host = host;- mindmapPreview.ctx = {- get() {- return {};- },- set() {},- };-- document.body.append(mindmapPreview);-- return mindmapPreview;- };-- beforeEach(async () => {- const cleanup = await setupEditor('edgeless');-- edgeless = getDocRootBlock(doc, editor, 'edgeless');-- edgeless.gfx.tool.setTool('default');-- return cleanup;- });-- test('mini mindmap basic', async () => {- const mindmapAnswer = `- - Mindmap- - Node 1- - Node 1.1- - Node 1.2- - Node 2- - Node 2.1- - Node 2.2- `;-- const miniMindMapPreview = createPreview(- window.editor.host!,- mindmapAnswer- );- await wait(50);- const miniMindMapSurface = miniMindMapPreview.renderRoot.querySelector(- 'mini-mindmap-surface-block'- ) as MindmapSurfaceBlock;-- // model-related properties- expect(miniMindMapPreview.mindmapId).toBeDefined();- expect(miniMindMapPreview.portalHost).toBeDefined();- expect(miniMindMapPreview.doc).toBeDefined();- expect(miniMindMapPreview.surface).toBeDefined();- expect(miniMindMapPreview.surface!.elementModels.length).toBe(8);-- // renderer- expect(miniMindMapSurface.renderer).toBeDefined();- expect(miniMindMapSurface.renderer?.canvas.isConnected).toBe(true);- expect(miniMindMapSurface.renderer?.canvas.width).toBeGreaterThan(0);- expect(miniMindMapSurface.renderer?.canvas.height).toBeGreaterThan(0);-- return () => {- miniMindMapPreview.remove();- };- });-- test('mini mindmap should layout automatically', async () => {- const mindmapAnswer = `- - Main node- - Child node- - Second child node- - Third child node- `;-- const miniMindMapPreview = createPreview(- window.editor.host!,- mindmapAnswer- );-- await wait(50);- const gfx = miniMindMapPreview.portalHost.std.get(GfxControllerIdentifier);- const mindmap = gfx.surface!.elementModels.filter(- model => model.type === 'mindmap'- )[0] as MindmapElementModel;- const [child1, child2, child3] = mindmap.tree.children;- const root = mindmap.tree;-- expect(mindmap).not.toBeUndefined();-- expect(root.children.length).toBe(3);- expect(root.element.x).toBeLessThan(child1.element.x);-- // children should be aligned horizontally- expect(child1.element.x).toBe(child2.element.x);- expect(child2.element.x).toBe(child3.element.x);-- // children- expect(child1.element.y + child1.element.h).toBeLessThan(child2.element.y);- expect(child2.element.y + child2.element.h).toBeLessThan(child3.element.y);- });-});diff --git a/blocksuite/presets/src/__tests__/env.d.ts b/blocksuite/presets/src/__tests__/env.d.tsdeleted file mode 100644index e24f18b5bd..0000000000--- a/blocksuite/presets/src/__tests__/env.d.ts+++ /dev/null@@ -1,16 +0,0 @@-import type { Doc, DocCollection, Job } from '@blocksuite/store';--import type { AffineEditorContainer } from '../index.js';--declare global {- const editor: AffineEditorContainer;- const doc: Doc;- const collection: DocCollection;- const job: Job;- interface Window {- editor: AffineEditorContainer;- doc: Doc;- job: Job;- collection: DocCollection;- }-}diff --git a/blocksuite/presets/src/__tests__/utils/setup.ts b/blocksuite/presets/src/__tests__/utils/setup.tsindex 0c8e25fc8a..b6f4a5d916 100644--- a/blocksuite/presets/src/__tests__/utils/setup.ts+++ b/blocksuite/presets/src/__tests__/utils/setup.ts@@ -1,5 +1,5 @@import { effects as blocksEffects } from '@blocksuite/blocks/effects';-import type { BlockCollection } from '@blocksuite/store';+import type { BlockCollection, Doc, Job } from '@blocksuite/store';import { effects } from '../../effects.js';@@ -109,3 +109,16 @@ export function cleanup() {delete (window as any).doc;}++declare global {+ const editor: AffineEditorContainer;+ const doc: Doc;+ const collection: DocCollection;+ const job: Job;+ interface Window {+ editor: AffineEditorContainer;+ doc: Doc;+ job: Job;+ collection: DocCollection;+ }+}diff --git a/blocksuite/presets/src/index.ts b/blocksuite/presets/src/index.tsindex 89258ff825..e784339a22 100644--- a/blocksuite/presets/src/index.ts+++ b/blocksuite/presets/src/index.ts@@ -1,8 +1,8 @@import '@blocksuite/affine-block-surface/effects';-export * from './editors/index.js';-export * from './fragments/index.js';-export * from './helpers/index.js';+export * from './editors';+export * from './fragments';+export * from './helpers';const env =typeof globalThis !== 'undefined'diff --git a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.tsindex 15e69b3530..d4c5751927 100644--- a/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/chat-panel/actions/mindmap.ts@@ -2,16 +2,13 @@ import './action-wrapper';import type { EditorHost } from '@blocksuite/affine/block-std';import { ShadowlessElement } from '@blocksuite/affine/block-std';-import { MiniMindmapPreview } from '@blocksuite/affine/blocks';-import { noop, WithDisposable } from '@blocksuite/affine/global/utils';+import { WithDisposable } from '@blocksuite/affine/global/utils';import { html } from 'lit';import { property } from 'lit/decorators.js';import { styleMap } from 'lit/directives/style-map.js';import type { ChatAction } from '../chat-context';-noop(MiniMindmapPreview);-export class ActionMindmap extends WithDisposable(ShadowlessElement) {@property({ attribute: false })accessor item!: ChatAction;diff --git a/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts b/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.tsindex e6693fc714..3337df3c9c 100644--- a/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/messages/mindmap.ts@@ -3,18 +3,12 @@ import type {AffineAIPanelWidgetConfig,MindmapStyle,} from '@blocksuite/affine/blocks';-import {- markdownToMindmap,- MiniMindmapPreview,-} from '@blocksuite/affine/blocks';-import { noop } from '@blocksuite/affine/global/utils';import { html, nothing } from 'lit';+import { markdownToMindmap } from '../mini-mindmap';import { getAIPanelWidget } from '../utils/ai-widgets';import type { AIContext } from '../utils/context';-noop(MiniMindmapPreview);-export const createMindmapRenderer: (host: EditorHost,/**diff --git a/blocksuite/blocks/src/__tests__/surface/mindmap-preview.unit.spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.tssimilarity index 80%rename from blocksuite/blocks/src/__tests__/surface/mindmap-preview.unit.spec.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.tsindex 27af835a21..54af06e2e0 100644--- a/blocksuite/blocks/src/__tests__/surface/mindmap-preview.unit.spec.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts@@ -1,11 +1,13 @@-import { Container } from '@blocksuite/global/di';-import { DocCollection, Schema } from '@blocksuite/store';+import {+ defaultBlockMarkdownAdapterMatchers,+ inlineDeltaToMarkdownAdapterMatchers,+ markdownInlineToDeltaMatchers,+} from '@blocksuite/affine/blocks';+import { Container } from '@blocksuite/affine/global/di';+import { DocCollection, Schema } from '@blocksuite/affine/store';import { describe, expect, test } from 'vitest';-import { defaultBlockMarkdownAdapterMatchers } from '../../_common/adapters/index.js';-import { inlineDeltaToMarkdownAdapterMatchers } from '../../_common/adapters/markdown/delta-converter/inline-delta.js';-import { markdownInlineToDeltaMatchers } from '../../_common/adapters/markdown/delta-converter/markdown-inline.js';-import { markdownToMindmap } from '../../surface-block/mini-mindmap/mindmap-preview.js';+import { markdownToMindmap } from '../mindmap-preview.js';const container = new Container();[diff --git a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/index.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/index.tsnew file mode 100644index 0000000000..6754b4f71a--- /dev/null+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/index.ts@@ -0,0 +1,14 @@+import { MiniMindmapPreview } from './mindmap-preview.js';+import { MindmapRootBlock } from './mindmap-root-block.js';+import { MindmapSurfaceBlock } from './surface-block.js';++export { markdownToMindmap, MiniMindmapPreview } from './mindmap-preview.js';+export { MindmapRootBlock } from './mindmap-root-block.js';+export { MindmapService } from './mindmap-service.js';+export { MindmapSurfaceBlock } from './surface-block.js';++export function registerMiniMindmapBlocks() {+ customElements.define('mini-mindmap-root-block', MindmapRootBlock);+ customElements.define('mini-mindmap-preview', MiniMindmapPreview);+ customElements.define('mini-mindmap-surface-block', MindmapSurfaceBlock);+}diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-preview.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-preview.tssimilarity index 93%rename from blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-preview.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-preview.tsindex 067a4af63f..fe9249616f 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-preview.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-preview.ts@@ -1,18 +1,16 @@-import type { SurfaceBlockModel } from '@blocksuite/affine-block-surface';+import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std';import {+ MarkdownAdapter,+ type MindmapElementModel,+ MindmapStyle,MindmapStyleFour,MindmapStyleOne,MindmapStyleThree,MindmapStyleTwo,-} from '@blocksuite/affine-components/icons';-import {- type MindmapElementModel,- MindmapStyle,-} from '@blocksuite/affine-model';-import { MarkdownAdapter } from '@blocksuite/affine-shared/adapters';-import { BlockStdScope, type EditorHost } from '@blocksuite/block-std';-import type { ServiceProvider } from '@blocksuite/global/di';-import { WithDisposable } from '@blocksuite/global/utils';+ type SurfaceBlockModel,+} from '@blocksuite/affine/blocks';+import type { ServiceProvider } from '@blocksuite/affine/global/di';+import { WithDisposable } from '@blocksuite/affine/global/utils';import {type Doc,DocCollection,@@ -20,7 +18,7 @@ import {IdGeneratorType,Job,Schema,-} from '@blocksuite/store';+} from '@blocksuite/affine/store';import { css, html, LitElement, nothing } from 'lit';import { property, query } from 'lit/decorators.js';import { repeat } from 'lit/directives/repeat.js';@@ -133,7 +131,9 @@ export class MiniMindmapPreview extends WithDisposable(LitElement) {}this.doc.transact(() => {- this._mindmap!.style = style;+ if (this._mindmap) {+ this._mindmap.style = style;+ }});this.ctx.set({ style });diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-root-block.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-root-block.tssimilarity index 84%rename from blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-root-block.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-root-block.tsindex affbeb1635..02321b2433 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-root-block.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-root-block.ts@@ -1,5 +1,5 @@-import type { RootBlockModel } from '@blocksuite/affine-model';-import { BlockComponent } from '@blocksuite/block-std';+import { BlockComponent } from '@blocksuite/affine/block-std';+import type { RootBlockModel } from '@blocksuite/affine/blocks';import { html } from 'lit';export class MindmapRootBlock extends BlockComponent<RootBlockModel> {diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-service.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-service.tssimilarity index 56%rename from blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-service.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-service.tsindex fdef7758c6..c2304d3519 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/mindmap-service.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/mindmap-service.ts@@ -1,6 +1,6 @@-import { RootBlockSchema } from '@blocksuite/affine-model';-import { BlockService } from '@blocksuite/block-std';-import { Slot } from '@blocksuite/global/utils';+import { BlockService } from '@blocksuite/affine/block-std';+import { RootBlockSchema } from '@blocksuite/affine/blocks';+import { Slot } from '@blocksuite/affine/global/utils';export class MindmapService extends BlockService {static override readonly flavour = RootBlockSchema.model.flavour;diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.tssimilarity index 77%rename from blocksuite/blocks/src/surface-block/mini-mindmap/spec.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.tsindex af97342147..2e16c1f78c 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/spec.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/spec.ts@@ -1,18 +1,16 @@-import {- MindMapView,- SurfaceBlockSchema,-} from '@blocksuite/affine-block-surface';-import { RootBlockSchema } from '@blocksuite/affine-model';-import {- DocModeService,- ThemeService,-} from '@blocksuite/affine-shared/services';import {BlockViewExtension,type ExtensionType,FlavourExtension,-} from '@blocksuite/block-std';-import type { BlockSchema } from '@blocksuite/store';+} from '@blocksuite/affine/block-std';+import {+ DocModeService,+ MindMapView,+ RootBlockSchema,+ SurfaceBlockSchema,+ ThemeService,+} from '@blocksuite/affine/blocks';+import type { BlockSchema } from '@blocksuite/affine/store';import { literal } from 'lit/static-html.js';import type { z } from 'zod';diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/surface-block.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-block.tssimilarity index 89%rename from blocksuite/blocks/src/surface-block/mini-mindmap/surface-block.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-block.tsindex e71b51090d..0372f0c930 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/surface-block.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-block.ts@@ -1,15 +1,18 @@/* oxlint-disable @typescript-eslint/no-non-null-assertion */-import type { SurfaceBlockModel } from '@blocksuite/affine-block-surface';+import { BlockComponent } from '@blocksuite/affine/block-std';+import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx';+import type {+ Color,+ ShapeElementModel,+ SurfaceBlockModel,+} from '@blocksuite/affine/blocks';import {CanvasRenderer,elementRenderers,fitContent,-} from '@blocksuite/affine-block-surface';-import type { Color, ShapeElementModel } from '@blocksuite/affine-model';-import { ThemeProvider } from '@blocksuite/affine-shared/services';-import { BlockComponent } from '@blocksuite/block-std';-import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';-import type { Bound } from '@blocksuite/global/utils';+ ThemeProvider,+} from '@blocksuite/affine/blocks';+import type { Bound } from '@blocksuite/affine/global/utils';import { html } from 'lit';import { query } from 'lit/decorators.js';diff --git a/blocksuite/blocks/src/surface-block/mini-mindmap/surface-service.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-service.tssimilarity index 52%rename from blocksuite/blocks/src/surface-block/mini-mindmap/surface-service.tsrename to packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-service.tsindex 2e84d4d14d..2825698f26 100644--- a/blocksuite/blocks/src/surface-block/mini-mindmap/surface-service.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/surface-service.ts@@ -1,5 +1,5 @@-import { SurfaceBlockSchema } from '@blocksuite/affine-block-surface';-import { BlockService } from '@blocksuite/block-std';+import { BlockService } from '@blocksuite/affine/block-std';+import { SurfaceBlockSchema } from '@blocksuite/affine/blocks';export class MindmapSurfaceBlockService extends BlockService {static override readonly flavour = SurfaceBlockSchema.model.flavour;diff --git a/packages/frontend/core/src/blocksuite/presets/effects.ts b/packages/frontend/core/src/blocksuite/presets/effects.tsindex b997d314df..31aefc0978 100644--- a/packages/frontend/core/src/blocksuite/presets/effects.ts+++ b/packages/frontend/core/src/blocksuite/presets/effects.ts@@ -21,6 +21,7 @@ import { ChatPanelMessages } from './ai/chat-panel/chat-panel-messages';import { AIErrorWrapper } from './ai/messages/error';import { AISlidesRenderer } from './ai/messages/slides-renderer';import { AIAnswerWrapper } from './ai/messages/wrapper';+import { registerMiniMindmapBlocks } from './ai/mini-mindmap';import { ChatBlockInput } from './ai/peek-view/chat-block-input';import { AIChatBlockPeekView } from './ai/peek-view/chat-block-peek-view';import { DateTime } from './ai/peek-view/date-time';@@ -38,6 +39,7 @@ import { ImagePlaceholder } from './blocks/ai-chat-block/components/image-placehimport { UserInfo } from './blocks/ai-chat-block/components/user-info';export function registerBlocksuitePresetsCustomComponents() {+ registerMiniMindmapBlocks();customElements.define('ask-ai-icon', AskAIIcon);customElements.define('ask-ai-button', AskAIButton);customElements.define('ask-ai-toolbar-button', AskAIToolbarButton);diff --git a/vitest.workspace.ts b/vitest.workspace.tsindex 87ef83e769..a00a232ea6 100644--- a/vitest.workspace.ts+++ b/vitest.workspace.ts@@ -1,5 +1,7 @@-export default [+import { defineWorkspace } from 'vitest/config';++export default defineWorkspace(['.','./packages/frontend/apps/electron','./blocksuite/**/*/vitest.config.ts',-];+]);