diff --git a/blocksuite/affine/blocks/block-edgeless-text/package.json b/blocksuite/affine/blocks/block-edgeless-text/package.json
index a035eb56a..785d9447d 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/package.json
+++ b/blocksuite/affine/blocks/block-edgeless-text/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-inline-preset": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts
index 45296099f..d8e37a0f6 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts
+++ b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts
@@ -1,6 +1,8 @@
 import { TextUtils } from '@blocksuite/affine-block-surface';
 import { formatBlockCommand } from '@blocksuite/affine-inline-preset';
 import {
+  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
+  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
   type EdgelessTextBlockModel,
   ListBlockModel,
   ParagraphBlockModel,
@@ -23,9 +25,6 @@ import { css, html } from 'lit';
 import { query, state } from 'lit/decorators.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
 
-export const EDGELESS_TEXT_BLOCK_MIN_WIDTH = 50;
-export const EDGELESS_TEXT_BLOCK_MIN_HEIGHT = 50;
-
 export class EdgelessTextBlockComponent extends GfxBlockComponent<EdgelessTextBlockModel> {
   static override styles = css`
     .edgeless-text-block-container[data-max-width='false'] .inline-editor span {
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-toolbar/config.ts
similarity index 90%
rename from blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts
rename to blocksuite/affine/blocks/block-edgeless-text/src/edgeless-toolbar/config.ts
index fa78a0a4f..4e04c32e4 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts
+++ b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-toolbar/config.ts
@@ -1,9 +1,9 @@
+import { createTextActions } from '@blocksuite/affine-gfx-text';
 import { EdgelessTextBlockModel } from '@blocksuite/affine-model';
 import {
   type ToolbarModuleConfig,
   ToolbarModuleExtension,
 } from '@blocksuite/affine-shared/services';
-import { createTextActions } from '@blocksuite/affine-widget-edgeless-toolbar';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
 
 export const edgelessTextToolbarConfig = {
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/index.ts b/blocksuite/affine/blocks/block-edgeless-text/src/edgeless-toolbar/index.ts
similarity index 100%
rename from blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/index.ts
rename to blocksuite/affine/blocks/block-edgeless-text/src/edgeless-toolbar/index.ts
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/index.ts b/blocksuite/affine/blocks/block-edgeless-text/src/index.ts
index 355d04d98..51a0887a0 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/src/index.ts
+++ b/blocksuite/affine/blocks/block-edgeless-text/src/index.ts
@@ -1,4 +1,3 @@
-export * from './commands';
 export * from './edgeless-text-block.js';
 export * from './edgeless-text-spec.js';
-export * from './edgelss-toolbar';
+export * from './edgeless-toolbar';
diff --git a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
index 30bb600a7..0dd8e8a90 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
+++ b/blocksuite/affine/blocks/block-edgeless-text/tsconfig.json
@@ -9,6 +9,7 @@
   "references": [
     { "path": "../block-surface" },
     { "path": "../../components" },
+    { "path": "../../gfx/text" },
     { "path": "../../inlines/preset" },
     { "path": "../../model" },
     { "path": "../../rich-text" },
diff --git a/blocksuite/affine/blocks/block-root/src/common-specs/index.ts b/blocksuite/affine/blocks/block-root/src/common-specs/index.ts
index e88099088..6aaa3dca1 100644
--- a/blocksuite/affine/blocks/block-root/src/common-specs/index.ts
+++ b/blocksuite/affine/blocks/block-root/src/common-specs/index.ts
@@ -1,9 +1,26 @@
 import { FileDropExtension } from '@blocksuite/affine-components/drop-indicator';
-import { ConnectorElementView } from '@blocksuite/affine-gfx-connector';
-import { GroupElementView } from '@blocksuite/affine-gfx-group';
-import { MindMapView } from '@blocksuite/affine-gfx-mindmap';
-import { ShapeElementView } from '@blocksuite/affine-gfx-shape';
-import { TextElementView } from '@blocksuite/affine-gfx-text';
+import { BrushElementRendererExtension } from '@blocksuite/affine-gfx-brush';
+import {
+  ConnectorElementRendererExtension,
+  ConnectorElementView,
+} from '@blocksuite/affine-gfx-connector';
+import {
+  GroupElementRendererExtension,
+  GroupElementView,
+} from '@blocksuite/affine-gfx-group';
+import {
+  MindmapElementRendererExtension,
+  MindMapView,
+} from '@blocksuite/affine-gfx-mindmap';
+import {
+  HighlighterElementRendererExtension,
+  ShapeElementRendererExtension,
+  ShapeElementView,
+} from '@blocksuite/affine-gfx-shape';
+import {
+  TextElementRendererExtension,
+  TextElementView,
+} from '@blocksuite/affine-gfx-text';
 import { NoteBlockSchema } from '@blocksuite/affine-model';
 import {
   DNDAPIExtension,
@@ -45,6 +62,16 @@ const EdgelessElementViews = [
   ShapeElementView,
 ];
 
+export const EdgelessElementRendererExtension: ExtensionType[] = [
+  BrushElementRendererExtension,
+  HighlighterElementRendererExtension,
+  ShapeElementRendererExtension,
+  TextElementRendererExtension,
+  ConnectorElementRendererExtension,
+  GroupElementRendererExtension,
+  MindmapElementRendererExtension,
+];
+
 export const CommonSpecs: ExtensionType[] = [
   FlavourExtension('affine:page'),
   DocModeService,
@@ -57,7 +84,7 @@ export const CommonSpecs: ExtensionType[] = [
   ...RootBlockAdapterExtensions,
   ...clipboardConfigs,
   ...EdgelessElementViews,
-
+  ...EdgelessElementRendererExtension,
   modalWidget,
   innerModalWidget,
   SlashMenuExtension,
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts
index bc3386caf..1f21a0607 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/clipboard/clipboard.ts
@@ -5,8 +5,8 @@ import {
   EdgelessCRUDIdentifier,
   ExportManager,
   getSurfaceComponent,
-  TextUtils,
 } from '@blocksuite/affine-block-surface';
+import { splitIntoLines } from '@blocksuite/affine-gfx-text';
 import type { ShapeElementModel } from '@blocksuite/affine-model';
 import {
   BookmarkStyles,
@@ -609,7 +609,7 @@ export class EdgelessClipboardController extends PageClipboard {
     });
 
     if (typeof content === 'string') {
-      TextUtils.splitIntoLines(content).forEach((line, idx) => {
+      splitIntoLines(content).forEach((line, idx) => {
         this.crud.addBlock(
           'affine:paragraph',
           { text: new Y.Text(line) },
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
index f45088722..bcc86dc58 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts
@@ -1,4 +1,3 @@
-import { insertEdgelessTextCommand } from '@blocksuite/affine-block-edgeless-text';
 import { EdgelessFrameManagerIdentifier } from '@blocksuite/affine-block-frame';
 import {
   CanvasElementType,
@@ -13,7 +12,10 @@ import {
   SHAPE_OVERLAY_WIDTH,
   ShapeComponentConfig,
 } from '@blocksuite/affine-gfx-shape';
-import { mountTextElementEditor } from '@blocksuite/affine-gfx-text';
+import {
+  insertEdgelessTextCommand,
+  mountTextElementEditor,
+} from '@blocksuite/affine-gfx-text';
 import type {
   Connection,
   ConnectorElementModel,
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
index 60cbb9034..993218fbf 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts
@@ -1,5 +1,4 @@
 import type { EdgelessTextBlockComponent } from '@blocksuite/affine-block-edgeless-text';
-import { EDGELESS_TEXT_BLOCK_MIN_WIDTH } from '@blocksuite/affine-block-edgeless-text';
 import {
   EMBED_HTML_MIN_HEIGHT,
   EMBED_HTML_MIN_WIDTH,
@@ -14,14 +13,15 @@ import {
 import {
   CanvasElementType,
   isNoteBlock,
-  normalizeShapeBound,
   OverlayIdentifier,
-  TextUtils,
 } from '@blocksuite/affine-block-surface';
 import { isMindmapNode } from '@blocksuite/affine-gfx-mindmap';
+import { normalizeShapeBound } from '@blocksuite/affine-gfx-shape';
+import { normalizeTextBound } from '@blocksuite/affine-gfx-text';
 import {
   type BookmarkBlockModel,
   ConnectorElementModel,
+  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
   type EdgelessTextBlockModel,
   type EmbedHtmlModel,
   type EmbedSyncedDocModel,
@@ -1278,7 +1278,7 @@ export class EdgelessSelectedRectWidget extends WidgetComponent<
       } = element;
       // If the width of the text element has been changed by dragging,
       // We need to set hasMaxWidth to true for wrapping the text
-      bound = TextUtils.normalizeTextBound(
+      bound = normalizeTextBound(
         {
           yText,
           fontFamily,
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts
index e0f63df51..70490d5f0 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/configs/toolbar/index.ts
@@ -6,7 +6,10 @@ import {
 } from '@blocksuite/affine-gfx-brush';
 import { connectorToolbarExtension } from '@blocksuite/affine-gfx-connector';
 import { groupToolbarExtension } from '@blocksuite/affine-gfx-group';
-import { mindmapToolbarExtension } from '@blocksuite/affine-gfx-mindmap';
+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';
@@ -26,14 +29,16 @@ export const EdgelessElementToolbarExtension: ExtensionType[] = [
 
   connectorToolbarExtension,
 
+  shapeToolbarExtension,
+
+  shapeMindmapToolbarExtension,
+
   mindmapToolbarExtension,
 
   textToolbarExtension,
 
   edgelessTextToolbarExtension,
 
-  shapeToolbarExtension,
-
   ToolbarModuleExtension({
     id: BlockFlavourIdentifier('affine:surface:*'),
     config: builtinMiscToolbarConfig,
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts
index 2aed57a44..aa3613559 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-builtin-spec.ts
@@ -5,7 +5,6 @@ import {
 } from '@blocksuite/affine-block-frame';
 import { ConnectionOverlay } from '@blocksuite/affine-block-surface';
 import {
-  BrushElementRendererExtension,
   BrushTool,
   EraserTool,
   HighlighterTool,
@@ -53,10 +52,6 @@ export const EdgelessToolExtension: ExtensionType[] = [
   HighlighterTool,
 ];
 
-export const EdgelessElementRendererExtension: ExtensionType[] = [
-  BrushElementRendererExtension,
-];
-
 export const EdgelessEditExtensions: ExtensionType[] = [
   ElementTransformManager,
   ConnectorFilter,
@@ -79,5 +74,4 @@ export const EdgelessBuiltInSpecs: ExtensionType[] = [
   EdgelessToolExtension,
   EdgelessBuiltInManager,
   EdgelessEditExtensions,
-  EdgelessElementRendererExtension,
 ].flat();
diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts
index 81194f098..961c9c996 100644
--- a/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts
+++ b/blocksuite/affine/blocks/block-root/src/edgeless/element-transform/dblclick-add-edgeless-text.ts
@@ -1,5 +1,7 @@
-import { insertEdgelessTextCommand } from '@blocksuite/affine-block-edgeless-text';
-import { addText } from '@blocksuite/affine-gfx-text';
+import {
+  addText,
+  insertEdgelessTextCommand,
+} from '@blocksuite/affine-gfx-text';
 import {
   FeatureFlagService,
   TelemetryProvider,
diff --git a/blocksuite/affine/blocks/block-surface/src/index.ts b/blocksuite/affine/blocks/block-surface/src/index.ts
index e37b072b8..90c62a652 100644
--- a/blocksuite/affine/blocks/block-surface/src/index.ts
+++ b/blocksuite/affine/blocks/block-surface/src/index.ts
@@ -20,21 +20,10 @@ export {
   PathGenerator,
 } from './managers/connector-manager.js';
 export { CanvasRenderer } from './renderer/canvas-renderer.js';
-export * from './renderer/elements/group/consts.js';
 export type { ElementRenderer } from './renderer/elements/index.js';
-export { normalizeShapeBound } from './renderer/elements/index.js';
-export { fitContent } from './renderer/elements/shape/utils.js';
 export * from './renderer/elements/type.js';
 export { Overlay, OverlayIdentifier } from './renderer/overlay.js';
 export { ToolOverlay } from './renderer/tool-overlay.js';
-import {
-  getCursorByCoord,
-  getLineHeight,
-  isFontStyleSupported,
-  isFontWeightSupported,
-  normalizeTextBound,
-  splitIntoLines,
-} from './renderer/elements/text/utils.js';
 import {
   getFontFaces,
   getFontFacesByFontFamily,
@@ -80,12 +69,6 @@ export const ConnectorUtils = {
 };
 
 export const TextUtils = {
-  splitIntoLines,
-  normalizeTextBound,
-  getLineHeight,
-  getCursorByCoord,
-  isFontWeightSupported,
-  isFontStyleSupported,
   wrapFontFamily,
   getFontFaces,
   getFontFacesByFontFamily,
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts b/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts
index 5a0c9c845..26c0ca5af 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts
+++ b/blocksuite/affine/blocks/block-surface/src/renderer/elements/index.ts
@@ -4,16 +4,8 @@ import type {
   GfxPrimitiveElementModel,
 } from '@blocksuite/std/gfx';
 
-import { ElementRendererExtension } from '../../extensions/element-renderer.js';
 import type { RoughCanvas } from '../../index.js';
 import type { CanvasRenderer } from '../canvas-renderer.js';
-import { connector } from './connector/index.js';
-import { group } from './group/index.js';
-import { highlighter } from './highlighter/index.js';
-import { mindmap } from './mindmap.js';
-import { shape } from './shape/index.js';
-import { text } from './text/index.js';
-export { normalizeShapeBound } from './shape/utils.js';
 
 export type ElementRenderer<
   T extends
@@ -28,41 +20,4 @@ export type ElementRenderer<
   viewportBound: IBound
 ) => void;
 
-export const HighlighterElementRendererExtension = ElementRendererExtension(
-  'highlighter',
-  highlighter
-);
-
-export const ConnectorElementRendererExtension = ElementRendererExtension(
-  'connector',
-  connector
-);
-
-export const GroupElementRendererExtension = ElementRendererExtension(
-  'group',
-  group
-);
-
-export const ShapeElementRendererExtension = ElementRendererExtension(
-  'shape',
-  shape
-);
-
-export const TextElementRendererExtension = ElementRendererExtension(
-  'text',
-  text
-);
-
-export const MindmapElementRendererExtension = ElementRendererExtension(
-  'mindmap',
-  mindmap
-);
-
-export const elementRendererExtensions = [
-  HighlighterElementRendererExtension,
-  ConnectorElementRendererExtension,
-  GroupElementRendererExtension,
-  ShapeElementRendererExtension,
-  TextElementRendererExtension,
-  MindmapElementRendererExtension,
-];
+export const elementRendererExtensions = [];
diff --git a/blocksuite/affine/blocks/block-surface/src/surface-spec.ts b/blocksuite/affine/blocks/block-surface/src/surface-spec.ts
index 8f57a6414..8bdbf0449 100644
--- a/blocksuite/affine/blocks/block-surface/src/surface-spec.ts
+++ b/blocksuite/affine/blocks/block-surface/src/surface-spec.ts
@@ -11,14 +11,12 @@ import {
   EdgelessLegacySlotExtension,
 } from './extensions';
 import { ExportManagerExtension } from './extensions/export-manager/export-manager';
-import { elementRendererExtensions } from './renderer/elements';
 
 const CommonSurfaceBlockSpec: ExtensionType[] = [
   FlavourExtension('affine:surface'),
   EdgelessCRUDExtension,
   EdgelessLegacySlotExtension,
   ExportManagerExtension,
-  ...elementRendererExtensions,
 ];
 
 export const PageSurfaceBlockSpec: ExtensionType[] = [
diff --git a/blocksuite/affine/gfx/connector/package.json b/blocksuite/affine/gfx/connector/package.json
index ff313e847..47c69d74c 100644
--- a/blocksuite/affine/gfx/connector/package.json
+++ b/blocksuite/affine/gfx/connector/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts b/blocksuite/affine/gfx/connector/src/element-renderer/index.ts
similarity index 92%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts
rename to blocksuite/affine/gfx/connector/src/element-renderer/index.ts
index 242bb2382..ff1895590 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/index.ts
+++ b/blocksuite/affine/gfx/connector/src/element-renderer/index.ts
@@ -1,3 +1,18 @@
+import {
+  type CanvasRenderer,
+  ConnectorUtils,
+  type ElementRenderer,
+  ElementRendererExtension,
+  type RoughCanvas,
+} from '@blocksuite/affine-block-surface';
+import {
+  getFontString,
+  getLineHeight,
+  getTextWidth,
+  isRTL,
+  type TextDelta,
+  wrapTextDeltas,
+} from '@blocksuite/affine-gfx-text';
 import {
   type ConnectorElementModel,
   ConnectorMode,
@@ -11,17 +26,6 @@ import {
 } from '@blocksuite/global/gfx';
 import { deltaInsertsToChunks } from '@blocksuite/std/inline';
 
-import { isConnectorWithLabel } from '../../../managers/connector-manager.js';
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
-import {
-  getFontString,
-  getLineHeight,
-  getTextWidth,
-  isRTL,
-  type TextDelta,
-  wrapTextDeltas,
-} from '../text/utils.js';
 import {
   DEFAULT_ARROW_SIZE,
   getArrowOptions,
@@ -31,13 +35,9 @@ import {
   renderTriangle,
 } from './utils.js';
 
-export function connector(
-  model: ConnectorElementModel | LocalConnectorElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer,
-  rc: RoughCanvas
-) {
+export const connector: ElementRenderer<
+  ConnectorElementModel | LocalConnectorElementModel
+> = (model, ctx, matrix, renderer, rc) => {
   const {
     mode,
     path: points,
@@ -55,7 +55,7 @@ export function connector(
 
   ctx.setTransform(matrix);
 
-  const hasLabel = isConnectorWithLabel(model);
+  const hasLabel = ConnectorUtils.isConnectorWithLabel(model);
   let dx = 0;
   let dy = 0;
 
@@ -120,7 +120,12 @@ export function connector(
       renderer
     );
   }
-}
+};
+
+export const ConnectorElementRendererExtension = ElementRendererExtension(
+  'connector',
+  connector
+);
 
 function renderPoints(
   model: ConnectorElementModel | LocalConnectorElementModel,
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/utils.ts b/blocksuite/affine/gfx/connector/src/element-renderer/utils.ts
similarity index 99%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/utils.ts
rename to blocksuite/affine/gfx/connector/src/element-renderer/utils.ts
index 89d4eb79e..04d6beec5 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/connector/utils.ts
+++ b/blocksuite/affine/gfx/connector/src/element-renderer/utils.ts
@@ -1,3 +1,4 @@
+import type { RoughCanvas } from '@blocksuite/affine-block-surface';
 import {
   type ConnectorElementModel,
   ConnectorMode,
@@ -14,8 +15,6 @@ import {
   Vec,
 } from '@blocksuite/global/gfx';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-
 type ConnectorEnd = 'Front' | 'Rear';
 
 export const DEFAULT_ARROW_SIZE = 15;
diff --git a/blocksuite/affine/gfx/connector/src/index.ts b/blocksuite/affine/gfx/connector/src/index.ts
index a654539df..730ea8833 100644
--- a/blocksuite/affine/gfx/connector/src/index.ts
+++ b/blocksuite/affine/gfx/connector/src/index.ts
@@ -1,4 +1,5 @@
 export * from './connector-tool';
+export * from './element-renderer';
 export * from './element-transform';
 export * from './text';
 export * from './toolbar/config';
diff --git a/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts b/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts
index c5ddb2aec..34ceb3487 100644
--- a/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts
+++ b/blocksuite/affine/gfx/connector/src/text/edgeless-connector-label-editor.ts
@@ -1,7 +1,5 @@
-import {
-  EdgelessCRUDIdentifier,
-  TextUtils,
-} from '@blocksuite/affine-block-surface';
+import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
+import { getLineHeight } from '@blocksuite/affine-gfx-text';
 import type { ConnectorElementModel } from '@blocksuite/affine-model';
 import type { RichText } from '@blocksuite/affine-rich-text';
 import { ThemeProvider } from '@blocksuite/affine-shared/services';
@@ -319,11 +317,7 @@ export class EdgelessConnectorLabelEditor extends WithDisposable(
       labelConstraints: { hasMaxWidth, maxWidth },
     } = connector;
 
-    const lineHeight = TextUtils.getLineHeight(
-      fontFamily,
-      fontSize,
-      fontWeight
-    );
+    const lineHeight = getLineHeight(fontFamily, fontSize, fontWeight);
     const { translateX, translateY, zoom } = this.gfx.viewport;
     const [x, y] = Vec.mul(connector.getPointByOffsetDistance(distance), zoom);
     const transformOperation = [
diff --git a/blocksuite/affine/gfx/connector/src/toolbar/config.ts b/blocksuite/affine/gfx/connector/src/toolbar/config.ts
index c64ff62ec..13f8f6a33 100644
--- a/blocksuite/affine/gfx/connector/src/toolbar/config.ts
+++ b/blocksuite/affine/gfx/connector/src/toolbar/config.ts
@@ -1,13 +1,16 @@
 import {
   ConnectorUtils,
   EdgelessCRUDIdentifier,
-  TextUtils,
 } from '@blocksuite/affine-block-surface';
 import {
   packColor,
   type PickColorEvent,
 } from '@blocksuite/affine-components/color-picker';
 import type { LineDetailType } from '@blocksuite/affine-components/edgeless-line-styles-panel';
+import {
+  createTextActions,
+  normalizeTextBound,
+} from '@blocksuite/affine-gfx-text';
 import {
   ConnectorElementModel,
   type ConnectorElementProps,
@@ -33,7 +36,6 @@ import {
 } from '@blocksuite/affine-shared/utils';
 import type { MenuItem } from '@blocksuite/affine-widget-edgeless-toolbar';
 import {
-  createTextActions,
   getRootBlock,
   LINE_STYLE_LIST,
   renderMenu,
@@ -368,7 +370,7 @@ export const connectorToolbarConfig = {
         } = model;
         const prevBounds = Bound.fromXYWH(labelXYWH || [0, 0, 16, 16]);
         const center = prevBounds.center;
-        const bounds = TextUtils.normalizeTextBound(
+        const bounds = normalizeTextBound(
           {
             yText: text!,
             fontFamily,
diff --git a/blocksuite/affine/gfx/connector/tsconfig.json b/blocksuite/affine/gfx/connector/tsconfig.json
index df6d3f773..a0e6d2481 100644
--- a/blocksuite/affine/gfx/connector/tsconfig.json
+++ b/blocksuite/affine/gfx/connector/tsconfig.json
@@ -9,6 +9,7 @@
   "references": [
     { "path": "../../blocks/block-surface" },
     { "path": "../../components" },
+    { "path": "../text" },
     { "path": "../../model" },
     { "path": "../../rich-text" },
     { "path": "../../shared" },
diff --git a/blocksuite/affine/gfx/group/package.json b/blocksuite/affine/gfx/group/package.json
index 06c4775c3..2664b44d9 100644
--- a/blocksuite/affine/gfx/group/package.json
+++ b/blocksuite/affine/gfx/group/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/group/consts.ts b/blocksuite/affine/gfx/group/src/element-renderer/consts.ts
similarity index 100%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/group/consts.ts
rename to blocksuite/affine/gfx/group/src/element-renderer/consts.ts
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/group/index.ts b/blocksuite/affine/gfx/group/src/element-renderer/index.ts
similarity index 83%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/group/index.ts
rename to blocksuite/affine/gfx/group/src/element-renderer/index.ts
index 7bfc7f784..0d301c1bc 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/group/index.ts
+++ b/blocksuite/affine/gfx/group/src/element-renderer/index.ts
@@ -1,15 +1,19 @@
+import {
+  type CanvasRenderer,
+  type ElementRenderer,
+  ElementRendererExtension,
+} from '@blocksuite/affine-block-surface';
 import type { GroupElementModel } from '@blocksuite/affine-model';
 import { Bound } from '@blocksuite/global/gfx';
 
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import { titleRenderParams } from './utils.js';
 
-export function group(
-  model: GroupElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer
-) {
+export const group: ElementRenderer<GroupElementModel> = (
+  model,
+  ctx,
+  matrix,
+  renderer
+) => {
   const { xywh } = model;
   const bound = Bound.deserialize(xywh);
   const elements = renderer.provider.selectedElements?.() || [];
@@ -34,7 +38,12 @@ export function group(
 
     if (model.showTitle) renderTitle(model, ctx, renderer, renderParams);
   }
-}
+};
+
+export const GroupElementRendererExtension = ElementRendererExtension(
+  'group',
+  group
+);
 
 function renderTitle(
   model: GroupElementModel,
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/group/utils.ts b/blocksuite/affine/gfx/group/src/element-renderer/utils.ts
similarity index 98%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/group/utils.ts
rename to blocksuite/affine/gfx/group/src/element-renderer/utils.ts
index a0b8a4feb..7b4d8ae70 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/group/utils.ts
+++ b/blocksuite/affine/gfx/group/src/element-renderer/utils.ts
@@ -1,13 +1,13 @@
-import type { GroupElementModel } from '@blocksuite/affine-model';
-import { FontWeight } from '@blocksuite/affine-model';
-import { Bound } from '@blocksuite/global/gfx';
-
 import {
   getFontString,
   getLineHeight,
   getLineWidth,
   truncateTextByWidth,
-} from '../text/utils.js';
+} from '@blocksuite/affine-gfx-text';
+import type { GroupElementModel } from '@blocksuite/affine-model';
+import { FontWeight } from '@blocksuite/affine-model';
+import { Bound } from '@blocksuite/global/gfx';
+
 import {
   GROUP_TITLE_FONT,
   GROUP_TITLE_FONT_SIZE,
diff --git a/blocksuite/affine/gfx/group/src/index.ts b/blocksuite/affine/gfx/group/src/index.ts
index bc3b0a726..684c16bdd 100644
--- a/blocksuite/affine/gfx/group/src/index.ts
+++ b/blocksuite/affine/gfx/group/src/index.ts
@@ -1,4 +1,5 @@
 export * from './command';
+export * from './element-renderer';
 export * from './text/text';
 export * from './toolbar/config';
 export * from './view';
diff --git a/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts b/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts
index 89f1197f2..08d4eed79 100644
--- a/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts
+++ b/blocksuite/affine/gfx/group/src/text/edgeless-group-title-editor.ts
@@ -1,8 +1,3 @@
-import {
-  GROUP_TITLE_FONT_SIZE,
-  GROUP_TITLE_OFFSET,
-  GROUP_TITLE_PADDING,
-} from '@blocksuite/affine-block-surface';
 import type { GroupElementModel } from '@blocksuite/affine-model';
 import type { RichText } from '@blocksuite/affine-rich-text';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
@@ -21,6 +16,12 @@ import { html, nothing } from 'lit';
 import { property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
+import {
+  GROUP_TITLE_FONT_SIZE,
+  GROUP_TITLE_OFFSET,
+  GROUP_TITLE_PADDING,
+} from '../element-renderer/consts';
+
 export function mountGroupTitleEditor(
   group: GroupElementModel,
   edgeless: BlockComponent
diff --git a/blocksuite/affine/gfx/group/tsconfig.json b/blocksuite/affine/gfx/group/tsconfig.json
index df6d3f773..a0e6d2481 100644
--- a/blocksuite/affine/gfx/group/tsconfig.json
+++ b/blocksuite/affine/gfx/group/tsconfig.json
@@ -9,6 +9,7 @@
   "references": [
     { "path": "../../blocks/block-surface" },
     { "path": "../../components" },
+    { "path": "../text" },
     { "path": "../../model" },
     { "path": "../../rich-text" },
     { "path": "../../shared" },
diff --git a/blocksuite/affine/gfx/mindmap/package.json b/blocksuite/affine/gfx/mindmap/package.json
index 18f400203..d3c15afdf 100644
--- a/blocksuite/affine/gfx/mindmap/package.json
+++ b/blocksuite/affine/gfx/mindmap/package.json
@@ -15,6 +15,8 @@
     "@blocksuite/affine-block-image": "workspace:*",
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-gfx-connector": "workspace:*",
+    "@blocksuite/affine-gfx-shape": "workspace:*",
     "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts b/blocksuite/affine/gfx/mindmap/src/element-renderer.ts
similarity index 67%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts
rename to blocksuite/affine/gfx/mindmap/src/element-renderer.ts
index d99ee87d1..25cdb65d0 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/mindmap.ts
+++ b/blocksuite/affine/gfx/mindmap/src/element-renderer.ts
@@ -1,23 +1,23 @@
+import {
+  ConnectorPathGenerator,
+  type ElementRenderer,
+  ElementRendererExtension,
+} from '@blocksuite/affine-block-surface';
+import { connector as renderConnector } from '@blocksuite/affine-gfx-connector';
 import type {
   MindmapElementModel,
   MindmapNode,
 } from '@blocksuite/affine-model';
-import type { IBound } from '@blocksuite/global/gfx';
 import type { GfxModel } from '@blocksuite/std/gfx';
 
-import { ConnectorPathGenerator } from '../../managers/connector-manager.js';
-import type { RoughCanvas } from '../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../canvas-renderer.js';
-import { connector as renderConnector } from './connector/index.js';
-
-export function mindmap(
-  model: MindmapElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer,
-  rc: RoughCanvas,
-  bound: IBound
-) {
+export const mindmap: ElementRenderer<MindmapElementModel> = (
+  model,
+  ctx,
+  matrix,
+  renderer,
+  rc,
+  bound
+) => {
   const dx = model.x - bound.x;
   const dy = model.y - bound.y;
 
@@ -48,7 +48,15 @@ export function mindmap(
         ctx.globalAlpha = connector.opacity * mindmapOpacity;
       }
 
-      renderConnector(connector, ctx, matrix.translate(dx, dy), renderer, rc);
+      renderConnector(
+        connector,
+        ctx,
+        matrix.translate(dx, dy),
+        renderer,
+        rc,
+        // NOTE: should we add this?
+        bound
+      );
 
       if (shouldSetGlobalAlpha) {
         ctx.globalAlpha = origin;
@@ -63,4 +71,9 @@ export function mindmap(
   };
 
   model.tree && traverse(model.tree);
-}
+};
+
+export const MindmapElementRendererExtension = ElementRendererExtension(
+  'mindmap',
+  mindmap
+);
diff --git a/blocksuite/affine/gfx/mindmap/src/index.ts b/blocksuite/affine/gfx/mindmap/src/index.ts
index 0836b3bed..6d7a339c5 100644
--- a/blocksuite/affine/gfx/mindmap/src/index.ts
+++ b/blocksuite/affine/gfx/mindmap/src/index.ts
@@ -1,3 +1,4 @@
+export * from './element-renderer';
 export * from './element-transform';
 export * from './indicator-overlay';
 export * from './toolbar/config';
diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts
index 61eea9343..92197f2b6 100644
--- a/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts
+++ b/blocksuite/affine/gfx/mindmap/src/toolbar/basket-elements.ts
@@ -1,11 +1,13 @@
 import { addAttachments } from '@blocksuite/affine-block-attachment';
-import { insertEdgelessTextCommand } from '@blocksuite/affine-block-edgeless-text';
 import { addImages } from '@blocksuite/affine-block-image';
 import {
   CanvasElementType,
   EdgelessCRUDIdentifier,
 } from '@blocksuite/affine-block-surface';
-import { mountTextElementEditor } from '@blocksuite/affine-gfx-text';
+import {
+  insertEdgelessTextCommand,
+  mountTextElementEditor,
+} from '@blocksuite/affine-gfx-text';
 import {
   MAX_IMAGE_WIDTH,
   type MindmapStyle,
diff --git a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts b/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts
index edecc68cb..70c66a07d 100644
--- a/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts
+++ b/blocksuite/affine/gfx/mindmap/src/toolbar/config.ts
@@ -1,7 +1,9 @@
+import { hasGrouped } from '@blocksuite/affine-gfx-shape';
 import {
   LayoutType,
   MindmapElementModel,
   MindmapStyle,
+  ShapeElementModel,
 } from '@blocksuite/affine-model';
 import {
   type ToolbarContext,
@@ -130,7 +132,68 @@ export const mindmapToolbarConfig = {
   when: ctx => ctx.getSurfaceModelsByType(MindmapElementModel).length > 0,
 } as const satisfies ToolbarModuleConfig;
 
+export const shapeMindmapToolbarConfig = {
+  actions: [
+    {
+      id: 'a.mindmap-style',
+      when(ctx) {
+        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
+        return models.some(hasGrouped);
+      },
+      content(ctx) {
+        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
+        if (!models.length) return null;
+
+        let mindmaps = models
+          .map(model => model.group)
+          .filter(model => ctx.matchModel(model, MindmapElementModel));
+        if (!mindmaps.length) return null;
+
+        // Not displayed when there is both a normal shape and a mindmap shape.
+        if (models.length !== mindmaps.length) return null;
+
+        mindmaps = Array.from(new Set(mindmaps));
+
+        return createMindmapStyleActionMenu(ctx, mindmaps);
+      },
+    },
+    {
+      id: 'b.mindmap-layout',
+      when(ctx) {
+        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
+        return models.some(hasGrouped);
+      },
+      content(ctx) {
+        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
+        if (!models.length) return null;
+
+        let mindmaps = models
+          .map(model => model.group)
+          .filter(model => ctx.matchModel(model, MindmapElementModel));
+        if (!mindmaps.length) return null;
+
+        // Not displayed when there is both a normal shape and a mindmap shape.
+        if (models.length !== mindmaps.length) return null;
+
+        mindmaps = Array.from(new Set(mindmaps));
+
+        // It's a sub node.
+        if (models.length === 1 && mindmaps[0].tree.element !== models[0])
+          return null;
+
+        return createMindmapLayoutActionMenu(ctx, mindmaps);
+      },
+    },
+  ],
+  when: ctx => ctx.getSurfaceModelsByType(ShapeElementModel).length > 0,
+} as const satisfies ToolbarModuleConfig;
+
 export const mindmapToolbarExtension = ToolbarModuleExtension({
   id: BlockFlavourIdentifier('affine:surface:mindmap'),
   config: mindmapToolbarConfig,
 });
+
+export const shapeMindmapToolbarExtension = ToolbarModuleExtension({
+  id: BlockFlavourIdentifier('custom:affine:surface:shape'),
+  config: shapeMindmapToolbarConfig,
+});
diff --git a/blocksuite/affine/gfx/mindmap/src/view/utils.ts b/blocksuite/affine/gfx/mindmap/src/view/utils.ts
index 3b00b1d15..c56fea368 100644
--- a/blocksuite/affine/gfx/mindmap/src/view/utils.ts
+++ b/blocksuite/affine/gfx/mindmap/src/view/utils.ts
@@ -1,4 +1,4 @@
-import { fitContent } from '@blocksuite/affine-block-surface';
+import { fitContent } from '@blocksuite/affine-gfx-shape';
 import {
   applyNodeStyle,
   LayoutType,
diff --git a/blocksuite/affine/gfx/mindmap/tsconfig.json b/blocksuite/affine/gfx/mindmap/tsconfig.json
index 7a9ce1c4f..bb04c3ed2 100644
--- a/blocksuite/affine/gfx/mindmap/tsconfig.json
+++ b/blocksuite/affine/gfx/mindmap/tsconfig.json
@@ -12,6 +12,8 @@
     { "path": "../../blocks/block-image" },
     { "path": "../../blocks/block-surface" },
     { "path": "../../components" },
+    { "path": "../connector" },
+    { "path": "../shape" },
     { "path": "../text" },
     { "path": "../../model" },
     { "path": "../../rich-text" },
diff --git a/blocksuite/affine/gfx/shape/package.json b/blocksuite/affine/gfx/shape/package.json
index 398a31dbd..105487283 100644
--- a/blocksuite/affine/gfx/shape/package.json
+++ b/blocksuite/affine/gfx/shape/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
-    "@blocksuite/affine-gfx-mindmap": "workspace:*",
+    "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/highlighter/index.ts b/blocksuite/affine/gfx/shape/src/element-renderer/highlighter.ts
similarity index 59%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/highlighter/index.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/highlighter.ts
index 358e78314..899a3ce5d 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/highlighter/index.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/highlighter.ts
@@ -1,16 +1,18 @@
+import {
+  type ElementRenderer,
+  ElementRendererExtension,
+} from '@blocksuite/affine-block-surface';
 import {
   DefaultTheme,
   type HighlighterElementModel,
 } from '@blocksuite/affine-model';
 
-import type { CanvasRenderer } from '../../canvas-renderer.js';
-
-export function highlighter(
-  model: HighlighterElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer
-) {
+export const highlighter: ElementRenderer<HighlighterElementModel> = (
+  model,
+  ctx,
+  matrix,
+  renderer
+) => {
   const {
     rotate,
     deserializedXYWH: [, , w, h],
@@ -31,4 +33,9 @@ export function highlighter(
   ctx.fillStyle = color;
 
   ctx.fill(new Path2D(model.commands));
-}
+};
+
+export const HighlighterElementRendererExtension = ElementRendererExtension(
+  'highlighter',
+  highlighter
+);
diff --git a/blocksuite/affine/gfx/shape/src/element-renderer/index.ts b/blocksuite/affine/gfx/shape/src/element-renderer/index.ts
new file mode 100644
index 000000000..f2bd9c395
--- /dev/null
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/index.ts
@@ -0,0 +1,2 @@
+export * from './highlighter';
+export * from './shape';
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/diamond.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/diamond.ts
similarity index 92%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/diamond.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/diamond.ts
index a6b0540ac..a5eeba9f5 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/diamond.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/diamond.ts
@@ -1,10 +1,12 @@
+import type {
+  CanvasRenderer,
+  RoughCanvas,
+} from '@blocksuite/affine-block-surface';
 import type {
   LocalShapeElementModel,
   ShapeElementModel,
 } from '@blocksuite/affine-model';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import { type Colors, drawGeneralShape } from './utils.js';
 
 export function diamond(
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/ellipse.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/ellipse.ts
similarity index 91%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/ellipse.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/ellipse.ts
index 800a480ff..566046f6e 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/ellipse.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/ellipse.ts
@@ -1,10 +1,12 @@
+import type {
+  CanvasRenderer,
+  RoughCanvas,
+} from '@blocksuite/affine-block-surface';
 import type {
   LocalShapeElementModel,
   ShapeElementModel,
 } from '@blocksuite/affine-model';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import { type Colors, drawGeneralShape } from './utils.js';
 
 export function ellipse(
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/index.ts
similarity index 90%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/index.ts
index 2dcb22787..5bc892828 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/index.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/index.ts
@@ -1,3 +1,17 @@
+import {
+  type CanvasRenderer,
+  type ElementRenderer,
+  ElementRendererExtension,
+  type RoughCanvas,
+} from '@blocksuite/affine-block-surface';
+import {
+  getFontMetrics,
+  getFontString,
+  getLineWidth,
+  isRTL,
+  measureTextInDOM,
+  wrapTextDeltas,
+} from '@blocksuite/affine-gfx-text';
 import type {
   LocalShapeElementModel,
   ShapeElementModel,
@@ -8,16 +22,6 @@ import type { IBound } from '@blocksuite/global/gfx';
 import { Bound } from '@blocksuite/global/gfx';
 import { deltaInsertsToChunks } from '@blocksuite/std/inline';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
-import {
-  getFontMetrics,
-  getFontString,
-  getLineWidth,
-  isRTL,
-  measureTextInDOM,
-  wrapTextDeltas,
-} from '../text/utils.js';
 import { diamond } from './diamond.js';
 import { ellipse } from './ellipse.js';
 import { rect } from './rect.js';
@@ -41,13 +45,13 @@ const shapeRenderers: Record<
   ellipse,
 };
 
-export function shape(
-  model: ShapeElementModel | LocalShapeElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer,
-  rc: RoughCanvas
-) {
+export const shape: ElementRenderer<ShapeElementModel> = (
+  model,
+  ctx,
+  matrix,
+  renderer,
+  rc
+) => {
   const color = renderer.getColorValue(
     model.color,
     DefaultTheme.shapeTextColor,
@@ -70,7 +74,14 @@ export function shape(
   if (model.textDisplay) {
     renderText(model, ctx, colors);
   }
-}
+};
+
+export const ShapeElementRendererExtension = ElementRendererExtension(
+  'shape',
+  shape
+);
+
+export * from './utils';
 
 function renderText(
   model: ShapeElementModel | LocalShapeElementModel,
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/rect.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/rect.ts
similarity index 94%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/rect.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/rect.ts
index 7afb5ea30..306ac550d 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/rect.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/rect.ts
@@ -1,10 +1,12 @@
+import type {
+  CanvasRenderer,
+  RoughCanvas,
+} from '@blocksuite/affine-block-surface';
 import type {
   LocalShapeElementModel,
   ShapeElementModel,
 } from '@blocksuite/affine-model';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import { type Colors, drawGeneralShape } from './utils.js';
 
 /**
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/triangle.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/triangle.ts
similarity index 91%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/triangle.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/triangle.ts
index 2ab8ece12..a31eb0c8f 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/triangle.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/triangle.ts
@@ -1,10 +1,12 @@
+import type {
+  CanvasRenderer,
+  RoughCanvas,
+} from '@blocksuite/affine-block-surface';
 import type {
   LocalShapeElementModel,
   ShapeElementModel,
 } from '@blocksuite/affine-model';
 
-import type { RoughCanvas } from '../../../utils/rough/canvas.js';
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import { type Colors, drawGeneralShape } from './utils.js';
 
 export function triangle(
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts b/blocksuite/affine/gfx/shape/src/element-renderer/shape/utils.ts
similarity index 98%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts
rename to blocksuite/affine/gfx/shape/src/element-renderer/shape/utils.ts
index 30c5d14d1..52fbfd437 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/shape/utils.ts
+++ b/blocksuite/affine/gfx/shape/src/element-renderer/shape/utils.ts
@@ -1,14 +1,4 @@
-import type {
-  LocalShapeElementModel,
-  ShapeElementModel,
-  TextAlign,
-  TextVerticalAlign,
-} from '@blocksuite/affine-model';
-import { FeatureFlagService } from '@blocksuite/affine-shared/services';
-import type { Bound, SerializedXYWH } from '@blocksuite/global/gfx';
-import { deltaInsertsToChunks } from '@blocksuite/std/inline';
-
-import type { CanvasRenderer } from '../../canvas-renderer.js';
+import type { CanvasRenderer } from '@blocksuite/affine-block-surface';
 import {
   getFontString,
   getLineHeight,
@@ -18,7 +8,16 @@ import {
   type TextDelta,
   wrapText,
   wrapTextDeltas,
-} from '../text/utils.js';
+} from '@blocksuite/affine-gfx-text';
+import type {
+  LocalShapeElementModel,
+  ShapeElementModel,
+  TextAlign,
+  TextVerticalAlign,
+} from '@blocksuite/affine-model';
+import { FeatureFlagService } from '@blocksuite/affine-shared/services';
+import type { Bound, SerializedXYWH } from '@blocksuite/global/gfx';
+import { deltaInsertsToChunks } from '@blocksuite/std/inline';
 
 export type Colors = {
   color: string;
diff --git a/blocksuite/affine/gfx/shape/src/index.ts b/blocksuite/affine/gfx/shape/src/index.ts
index 31d8ae4aa..bff4574d8 100644
--- a/blocksuite/affine/gfx/shape/src/index.ts
+++ b/blocksuite/affine/gfx/shape/src/index.ts
@@ -1,5 +1,6 @@
 export * from './consts';
 export * from './draggable';
+export * from './element-renderer';
 export * from './overlay';
 export * from './shape-tool';
 export * from './text';
diff --git a/blocksuite/affine/gfx/shape/src/toolbar/config.ts b/blocksuite/affine/gfx/shape/src/toolbar/config.ts
index 2c769afb8..9e660ee01 100644
--- a/blocksuite/affine/gfx/shape/src/toolbar/config.ts
+++ b/blocksuite/affine/gfx/shape/src/toolbar/config.ts
@@ -1,16 +1,10 @@
-import {
-  EdgelessCRUDIdentifier,
-  normalizeShapeBound,
-} from '@blocksuite/affine-block-surface';
+import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
 import {
   packColor,
   type PickColorEvent,
 } from '@blocksuite/affine-components/color-picker';
 import type { LineDetailType } from '@blocksuite/affine-components/edgeless-line-styles-panel';
-import {
-  createMindmapLayoutActionMenu,
-  createMindmapStyleActionMenu,
-} from '@blocksuite/affine-gfx-mindmap';
+import { createTextActions } from '@blocksuite/affine-gfx-text';
 import {
   type Color,
   DefaultTheme,
@@ -35,7 +29,6 @@ import {
 } from '@blocksuite/affine-shared/services';
 import { getMostCommonValue } from '@blocksuite/affine-shared/utils';
 import {
-  createTextActions,
   getRootBlock,
   LINE_STYLE_LIST,
   renderMenu,
@@ -46,62 +39,13 @@ import { BlockFlavourIdentifier } from '@blocksuite/std';
 import { html } from 'lit';
 import isEqual from 'lodash-es/isEqual';
 
+import { normalizeShapeBound } from '../element-renderer';
 import type { ShapeToolOption } from '../shape-tool';
 import { mountShapeTextEditor } from '../text/edgeless-shape-text-editor';
 import { ShapeComponentConfig } from './shape-menu-config';
 
 export const shapeToolbarConfig = {
   actions: [
-    {
-      id: 'a.mindmap-style',
-      when(ctx) {
-        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
-        return models.some(hasGrouped);
-      },
-      content(ctx) {
-        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
-        if (!models.length) return null;
-
-        let mindmaps = models
-          .map(model => model.group)
-          .filter(model => ctx.matchModel(model, MindmapElementModel));
-        if (!mindmaps.length) return null;
-
-        // Not displayed when there is both a normal shape and a mindmap shape.
-        if (models.length !== mindmaps.length) return null;
-
-        mindmaps = Array.from(new Set(mindmaps));
-
-        return createMindmapStyleActionMenu(ctx, mindmaps);
-      },
-    },
-    {
-      id: 'b.mindmap-layout',
-      when(ctx) {
-        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
-        return models.some(hasGrouped);
-      },
-      content(ctx) {
-        const models = ctx.getSurfaceModelsByType(ShapeElementModel);
-        if (!models.length) return null;
-
-        let mindmaps = models
-          .map(model => model.group)
-          .filter(model => ctx.matchModel(model, MindmapElementModel));
-        if (!mindmaps.length) return null;
-
-        // Not displayed when there is both a normal shape and a mindmap shape.
-        if (models.length !== mindmaps.length) return null;
-
-        mindmaps = Array.from(new Set(mindmaps));
-
-        // It's a sub node.
-        if (models.length === 1 && mindmaps[0].tree.element !== models[0])
-          return null;
-
-        return createMindmapLayoutActionMenu(ctx, mindmaps);
-      },
-    },
     {
       id: 'c.switch-type',
       when(ctx) {
@@ -386,7 +330,7 @@ function getTextColor(fillColor: Color, isNotTransparent = false) {
   return DefaultTheme.shapeTextColor;
 }
 
-function hasGrouped(model: ShapeElementModel) {
+export function hasGrouped(model: ShapeElementModel) {
   return model.group instanceof MindmapElementModel;
 }
 
diff --git a/blocksuite/affine/gfx/shape/tsconfig.json b/blocksuite/affine/gfx/shape/tsconfig.json
index d76640204..a0e6d2481 100644
--- a/blocksuite/affine/gfx/shape/tsconfig.json
+++ b/blocksuite/affine/gfx/shape/tsconfig.json
@@ -9,7 +9,7 @@
   "references": [
     { "path": "../../blocks/block-surface" },
     { "path": "../../components" },
-    { "path": "../mindmap" },
+    { "path": "../text" },
     { "path": "../../model" },
     { "path": "../../rich-text" },
     { "path": "../../shared" },
diff --git a/blocksuite/affine/gfx/text/package.json b/blocksuite/affine/gfx/text/package.json
index 776b1b5dc..109c2a735 100644
--- a/blocksuite/affine/gfx/text/package.json
+++ b/blocksuite/affine/gfx/text/package.json
@@ -10,7 +10,6 @@
   "author": "toeverything",
   "license": "MIT",
   "dependencies": {
-    "@blocksuite/affine-block-edgeless-text": "workspace:*",
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/commands/index.ts b/blocksuite/affine/gfx/text/src/commands/index.ts
similarity index 100%
rename from blocksuite/affine/blocks/block-edgeless-text/src/commands/index.ts
rename to blocksuite/affine/gfx/text/src/commands/index.ts
diff --git a/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts b/blocksuite/affine/gfx/text/src/commands/insert-edgeless-text.ts
similarity index 91%
rename from blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts
rename to blocksuite/affine/gfx/text/src/commands/insert-edgeless-text.ts
index e74a4686b..c6e831109 100644
--- a/blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts
+++ b/blocksuite/affine/gfx/text/src/commands/insert-edgeless-text.ts
@@ -2,16 +2,16 @@ import {
   EdgelessCRUDIdentifier,
   getSurfaceBlock,
 } from '@blocksuite/affine-block-surface';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import { Bound } from '@blocksuite/global/gfx';
-import type { Command } from '@blocksuite/std';
-import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
-
 import {
   EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
   EDGELESS_TEXT_BLOCK_MIN_WIDTH,
-  EdgelessTextBlockComponent,
-} from '../edgeless-text-block.js';
+  EdgelessTextBlockModel,
+} from '@blocksuite/affine-model';
+import { focusTextModel } from '@blocksuite/affine-rich-text';
+import { matchModels } from '@blocksuite/affine-shared/utils';
+import { Bound } from '@blocksuite/global/gfx';
+import type { Command } from '@blocksuite/std';
+import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
 
 export const insertEdgelessTextCommand: Command<
   {
@@ -59,8 +59,9 @@ export const insertEdgelessTextCommand: Command<
         const id = selection.selectedIds[0];
         if (!editing || id !== textId) {
           const textBlock = host.view.getBlock(textId);
-          if (textBlock instanceof EdgelessTextBlockComponent) {
-            textBlock.model.props.hasMaxWidth = true;
+          const model = textBlock?.model;
+          if (matchModels(model, [EdgelessTextBlockModel])) {
+            model.props.hasMaxWidth = true;
           }
 
           disposable.unsubscribe();
diff --git a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
index e0a524f9d..28fc95677 100644
--- a/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
+++ b/blocksuite/affine/gfx/text/src/edgeless-text-editor.ts
@@ -26,6 +26,8 @@ import { property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import * as Y from 'yjs';
 
+import { getCursorByCoord, getLineHeight } from './element-renderer/utils';
+
 export function mountTextElementEditor(
   textElement: TextElementModel,
   edgeless: BlockComponent,
@@ -34,7 +36,7 @@ export function mountTextElementEditor(
   let cursorIndex = textElement.text.length;
   if (focusCoord) {
     cursorIndex = Math.min(
-      TextUtils.getCursorByCoord(textElement, focusCoord),
+      getCursorByCoord(textElement, focusCoord),
       cursorIndex
     );
   }
@@ -413,11 +415,7 @@ export class EdgelessTextEditor extends WithDisposable(ShadowlessElement) {
       hasMaxWidth,
       w,
     } = this.element;
-    const lineHeight = TextUtils.getLineHeight(
-      fontFamily,
-      fontSize,
-      fontWeight
-    );
+    const lineHeight = getLineHeight(fontFamily, fontSize, fontWeight);
     const rect = getSelectedRect([this.element]);
 
     const { translateX, translateY, zoom } = this.gfx.viewport;
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts b/blocksuite/affine/gfx/text/src/element-renderer/index.ts
similarity index 86%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts
rename to blocksuite/affine/gfx/text/src/element-renderer/index.ts
index ca01d4628..7eb0b7045 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/index.ts
+++ b/blocksuite/affine/gfx/text/src/element-renderer/index.ts
@@ -1,7 +1,10 @@
+import {
+  type ElementRenderer,
+  ElementRendererExtension,
+} from '@blocksuite/affine-block-surface';
 import { DefaultTheme, type TextElementModel } from '@blocksuite/affine-model';
 import { deltaInsertsToChunks } from '@blocksuite/std/inline';
 
-import type { CanvasRenderer } from '../../canvas-renderer.js';
 import {
   getFontString,
   getLineHeight,
@@ -10,12 +13,12 @@ import {
   wrapTextDeltas,
 } from './utils.js';
 
-export function text(
-  model: TextElementModel,
-  ctx: CanvasRenderingContext2D,
-  matrix: DOMMatrix,
-  renderer: CanvasRenderer
-) {
+export const text: ElementRenderer<TextElementModel> = (
+  model,
+  ctx,
+  matrix,
+  renderer
+) => {
   const { fontSize, fontWeight, fontStyle, fontFamily, textAlign, rotate } =
     model;
   const [, , w, h] = model.deserializedXYWH;
@@ -81,4 +84,11 @@ export function text(
       }
     }
   }
-}
+};
+
+export const TextElementRendererExtension = ElementRendererExtension(
+  'text',
+  text
+);
+
+export * from './utils';
diff --git a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts b/blocksuite/affine/gfx/text/src/element-renderer/utils.ts
similarity index 99%
rename from blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts
rename to blocksuite/affine/gfx/text/src/element-renderer/utils.ts
index 0117b4d97..665972995 100644
--- a/blocksuite/affine/blocks/block-surface/src/renderer/elements/text/utils.ts
+++ b/blocksuite/affine/gfx/text/src/element-renderer/utils.ts
@@ -1,3 +1,4 @@
+import { TextUtils } from '@blocksuite/affine-block-surface';
 import type {
   FontFamily,
   FontStyle,
@@ -12,10 +13,7 @@ import {
 import { deltaInsertsToChunks } from '@blocksuite/std/inline';
 import type * as Y from 'yjs';
 
-import {
-  getFontFacesByFontFamily,
-  wrapFontFamily,
-} from '../../../utils/font.js';
+const { getFontFacesByFontFamily, wrapFontFamily } = TextUtils;
 
 export type TextDelta = {
   insert: string;
diff --git a/blocksuite/affine/gfx/text/src/index.ts b/blocksuite/affine/gfx/text/src/index.ts
index 070d14436..d95113d42 100644
--- a/blocksuite/affine/gfx/text/src/index.ts
+++ b/blocksuite/affine/gfx/text/src/index.ts
@@ -1,4 +1,6 @@
+export * from './commands';
 export * from './edgeless-text-editor';
+export * from './element-renderer';
 export * from './tool';
 export * from './toolbar';
 export * from './view';
diff --git a/blocksuite/affine/gfx/text/src/mount-text-editor.ts b/blocksuite/affine/gfx/text/src/mount-text-editor.ts
index ed9403dd0..38b078282 100644
--- a/blocksuite/affine/gfx/text/src/mount-text-editor.ts
+++ b/blocksuite/affine/gfx/text/src/mount-text-editor.ts
@@ -2,7 +2,6 @@ import {
   CanvasElementType,
   EdgelessCRUDIdentifier,
   type IModelCoord,
-  TextUtils,
 } from '@blocksuite/affine-block-surface';
 import { TextElementModel } from '@blocksuite/affine-model';
 import { Bound } from '@blocksuite/global/gfx';
@@ -11,6 +10,7 @@ import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
 import * as Y from 'yjs';
 
 import { EdgelessTextEditor } from './edgeless-text-editor';
+import { getCursorByCoord } from './element-renderer/utils';
 
 export function mountTextElementEditor(
   textElement: TextElementModel,
@@ -20,7 +20,7 @@ export function mountTextElementEditor(
   let cursorIndex = textElement.text.length;
   if (focusCoord) {
     cursorIndex = Math.min(
-      TextUtils.getCursorByCoord(textElement, focusCoord),
+      getCursorByCoord(textElement, focusCoord),
       cursorIndex
     );
   }
diff --git a/blocksuite/affine/gfx/text/src/tool.ts b/blocksuite/affine/gfx/text/src/tool.ts
index 75f8efa37..e0b77985e 100644
--- a/blocksuite/affine/gfx/text/src/tool.ts
+++ b/blocksuite/affine/gfx/text/src/tool.ts
@@ -1,4 +1,3 @@
-import { insertEdgelessTextCommand } from '@blocksuite/affine-block-edgeless-text';
 import type { TextElementModel } from '@blocksuite/affine-model';
 import {
   FeatureFlagService,
@@ -9,6 +8,7 @@ import type { PointerEventState } from '@blocksuite/std';
 import { BaseTool, type GfxController } from '@blocksuite/std/gfx';
 import * as Y from 'yjs';
 
+import { insertEdgelessTextCommand } from './commands/insert-edgeless-text';
 import { mountTextElementEditor } from './mount-text-editor';
 
 function addText(gfx: GfxController, event: PointerEventState) {
diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts b/blocksuite/affine/gfx/text/src/toolbar/actions.ts
similarity index 96%
rename from blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts
rename to blocksuite/affine/gfx/text/src/toolbar/actions.ts
index 644ad662b..67adebcb4 100644
--- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/text-common.ts
+++ b/blocksuite/affine/gfx/text/src/toolbar/actions.ts
@@ -25,6 +25,11 @@ import {
   getMostCommonResolvedValue,
   getMostCommonValue,
 } from '@blocksuite/affine-shared/utils';
+import {
+  type MenuItem,
+  renderCurrentMenuItemWith,
+  renderMenu,
+} from '@blocksuite/affine-widget-edgeless-toolbar';
 import {
   TextAlignCenterIcon,
   TextAlignLeftIcon,
@@ -35,8 +40,10 @@ import { signal } from '@preact/signals-core';
 import { html } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 
-import type { MenuItem } from './types';
-import { renderCurrentMenuItemWith, renderMenu } from './utils';
+import {
+  isFontStyleSupported,
+  isFontWeightSupported,
+} from '../element-renderer/utils';
 
 const FONT_WEIGHT_LIST = [
   {
@@ -133,10 +140,10 @@ export function createTextActions<
             getMostCommonValue(models.map(mapInto), 'fontStyle') ??
             FontStyle.Normal;
 
-          if (!TextUtils.isFontWeightSupported(fontFamily, fontWeight)) {
+          if (!isFontWeightSupported(fontFamily, fontWeight)) {
             fontWeight = FontWeight.Regular;
           }
-          if (!TextUtils.isFontStyleSupported(fontFamily, fontStyle)) {
+          if (!isFontStyleSupported(fontFamily, fontStyle)) {
             fontStyle = FontStyle.Normal;
           }
 
diff --git a/blocksuite/affine/gfx/text/src/toolbar/config.ts b/blocksuite/affine/gfx/text/src/toolbar/config.ts
index 4d34aabcb..3f65c2a5d 100644
--- a/blocksuite/affine/gfx/text/src/toolbar/config.ts
+++ b/blocksuite/affine/gfx/text/src/toolbar/config.ts
@@ -1,16 +1,15 @@
-import {
-  EdgelessCRUDIdentifier,
-  TextUtils,
-} from '@blocksuite/affine-block-surface';
+import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
 import { TextElementModel } from '@blocksuite/affine-model';
 import {
   type ToolbarModuleConfig,
   ToolbarModuleExtension,
 } from '@blocksuite/affine-shared/services';
-import { createTextActions } from '@blocksuite/affine-widget-edgeless-toolbar';
 import { Bound } from '@blocksuite/global/gfx';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
 
+import { normalizeTextBound } from '../element-renderer/utils';
+import { createTextActions } from './actions';
+
 export const textToolbarConfig = {
   actions: createTextActions(TextElementModel, 'text', (ctx, model, props) => {
     // No need to adjust element bounds
@@ -30,7 +29,7 @@ export const textToolbarConfig = {
 
     const { fontFamily, fontStyle, fontSize, fontWeight } = textStyle;
 
-    const bounds = TextUtils.normalizeTextBound(
+    const bounds = normalizeTextBound(
       {
         yText,
         fontFamily,
diff --git a/blocksuite/affine/gfx/text/src/toolbar/index.ts b/blocksuite/affine/gfx/text/src/toolbar/index.ts
index f03c2281a..8ef7e9232 100644
--- a/blocksuite/affine/gfx/text/src/toolbar/index.ts
+++ b/blocksuite/affine/gfx/text/src/toolbar/index.ts
@@ -1 +1,2 @@
+export * from './actions';
 export * from './config';
diff --git a/blocksuite/affine/gfx/text/tsconfig.json b/blocksuite/affine/gfx/text/tsconfig.json
index 0bc7689c4..df6d3f773 100644
--- a/blocksuite/affine/gfx/text/tsconfig.json
+++ b/blocksuite/affine/gfx/text/tsconfig.json
@@ -7,7 +7,6 @@
   },
   "include": ["./src"],
   "references": [
-    { "path": "../../blocks/block-edgeless-text" },
     { "path": "../../blocks/block-surface" },
     { "path": "../../components" },
     { "path": "../../model" },
diff --git a/blocksuite/affine/model/src/consts/edgeless-text.ts b/blocksuite/affine/model/src/consts/edgeless-text.ts
new file mode 100644
index 000000000..45eb8ae69
--- /dev/null
+++ b/blocksuite/affine/model/src/consts/edgeless-text.ts
@@ -0,0 +1,2 @@
+export const EDGELESS_TEXT_BLOCK_MIN_WIDTH = 50;
+export const EDGELESS_TEXT_BLOCK_MIN_HEIGHT = 50;
diff --git a/blocksuite/affine/model/src/consts/index.ts b/blocksuite/affine/model/src/consts/index.ts
index 4ee595904..e374e9398 100644
--- a/blocksuite/affine/model/src/consts/index.ts
+++ b/blocksuite/affine/model/src/consts/index.ts
@@ -1,5 +1,6 @@
 export * from './connector.js';
 export * from './doc.js';
+export * from './edgeless-text.js';
 export * from './image.js';
 export * from './line.js';
 export * from './mindmap.js';
diff --git a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/index.ts b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/index.ts
index b3c9d3372..ef0c50d21 100644
--- a/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/index.ts
+++ b/blocksuite/affine/widgets/widget-edgeless-toolbar/src/config/index.ts
@@ -1,4 +1,3 @@
 export * from './consts.js';
-export * from './text-common.js';
 export * from './types.js';
 export * from './utils.js';
diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts
index ab5b07cf7..c94b4ccbe 100644
--- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts
+++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts
@@ -1,17 +1,16 @@
-import {
-  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
-  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
-} from '@blocksuite/affine/blocks/edgeless-text';
 import { addImages } from '@blocksuite/affine/blocks/image';
-import { fitContent, getSurfaceBlock } from '@blocksuite/affine/blocks/surface';
+import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface';
 import { LightLoadingIcon } from '@blocksuite/affine/components/icons';
 import { addTree } from '@blocksuite/affine/gfx/mindmap';
+import { fitContent } from '@blocksuite/affine/gfx/shape';
 import { Bound } from '@blocksuite/affine/global/gfx';
 import type {
   MindmapElementModel,
   ShapeElementModel,
 } from '@blocksuite/affine/model';
 import {
+  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
+  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
   EdgelessTextBlockModel,
   ImageBlockModel,
   NoteDisplayMode,
diff --git a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts
index 8ec11376d..886afb565 100644
--- a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts
+++ b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts
@@ -1,9 +1,9 @@
 import { uploadBlobForImage } from '@blocksuite/affine/blocks/image';
 import {
-  fitContent,
   getSurfaceBlock,
   SurfaceBlockModel,
 } from '@blocksuite/affine/blocks/surface';
+import { fitContent } from '@blocksuite/affine/gfx/shape';
 import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx';
 import type {
   MindmapElementModel,
diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts
index d451325dc..4864cc7b4 100644
--- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts
+++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts
@@ -1,9 +1,9 @@
 /* oxlint-disable @typescript-eslint/no-non-null-assertion */
 import {
   CanvasRenderer,
-  fitContent,
   type SurfaceBlockModel,
 } from '@blocksuite/affine/blocks/surface';
+import { fitContent } from '@blocksuite/affine/gfx/shape';
 import type { Bound } from '@blocksuite/affine/global/gfx';
 import type { Color, ShapeElementModel } from '@blocksuite/affine/model';
 import { ThemeProvider } from '@blocksuite/affine/shared/services';
diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts
index e33ed8a4c..4c1d38025 100644
--- a/tools/utils/src/workspace.gen.ts
+++ b/tools/utils/src/workspace.gen.ts
@@ -173,6 +173,7 @@ export const PackageList = [
     workspaceDependencies: [
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
+      'blocksuite/affine/gfx/text',
       'blocksuite/affine/inlines/preset',
       'blocksuite/affine/model',
       'blocksuite/affine/rich-text',
@@ -475,6 +476,7 @@ export const PackageList = [
     workspaceDependencies: [
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
+      'blocksuite/affine/gfx/text',
       'blocksuite/affine/model',
       'blocksuite/affine/rich-text',
       'blocksuite/affine/shared',
@@ -490,6 +492,7 @@ export const PackageList = [
     workspaceDependencies: [
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
+      'blocksuite/affine/gfx/text',
       'blocksuite/affine/model',
       'blocksuite/affine/rich-text',
       'blocksuite/affine/shared',
@@ -508,6 +511,8 @@ export const PackageList = [
       'blocksuite/affine/blocks/block-image',
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
+      'blocksuite/affine/gfx/connector',
+      'blocksuite/affine/gfx/shape',
       'blocksuite/affine/gfx/text',
       'blocksuite/affine/model',
       'blocksuite/affine/rich-text',
@@ -542,7 +547,7 @@ export const PackageList = [
     workspaceDependencies: [
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
-      'blocksuite/affine/gfx/mindmap',
+      'blocksuite/affine/gfx/text',
       'blocksuite/affine/model',
       'blocksuite/affine/rich-text',
       'blocksuite/affine/shared',
@@ -556,7 +561,6 @@ export const PackageList = [
     location: 'blocksuite/affine/gfx/text',
     name: '@blocksuite/affine-gfx-text',
     workspaceDependencies: [
-      'blocksuite/affine/blocks/block-edgeless-text',
       'blocksuite/affine/blocks/block-surface',
       'blocksuite/affine/components',
       'blocksuite/affine/model',
diff --git a/yarn.lock b/yarn.lock
index b981a3e67..2f218d6c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2538,6 +2538,7 @@ __metadata:
   dependencies:
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
+    "@blocksuite/affine-gfx-text": "workspace:*"
     "@blocksuite/affine-inline-preset": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-rich-text": "workspace:*"
@@ -3049,6 +3050,7 @@ __metadata:
   dependencies:
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
+    "@blocksuite/affine-gfx-text": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-rich-text": "workspace:*"
     "@blocksuite/affine-shared": "workspace:*"
@@ -3076,6 +3078,7 @@ __metadata:
   dependencies:
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
+    "@blocksuite/affine-gfx-text": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-rich-text": "workspace:*"
     "@blocksuite/affine-shared": "workspace:*"
@@ -3106,6 +3109,8 @@ __metadata:
     "@blocksuite/affine-block-image": "workspace:*"
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
+    "@blocksuite/affine-gfx-connector": "workspace:*"
+    "@blocksuite/affine-gfx-shape": "workspace:*"
     "@blocksuite/affine-gfx-text": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-rich-text": "workspace:*"
@@ -3165,7 +3170,7 @@ __metadata:
   dependencies:
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
-    "@blocksuite/affine-gfx-mindmap": "workspace:*"
+    "@blocksuite/affine-gfx-text": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"
     "@blocksuite/affine-rich-text": "workspace:*"
     "@blocksuite/affine-shared": "workspace:*"
@@ -3191,7 +3196,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@blocksuite/affine-gfx-text@workspace:blocksuite/affine/gfx/text"
   dependencies:
-    "@blocksuite/affine-block-edgeless-text": "workspace:*"
     "@blocksuite/affine-block-surface": "workspace:*"
     "@blocksuite/affine-components": "workspace:*"
     "@blocksuite/affine-model": "workspace:*"