fix: drawing & toolbar override

Author: WindRunnerMax

packages/plugin/src/text/drawing.ts

@@ -110,13 +110,14 @@ export const drawingBackground = (
     let backgroundWidth = item.width + halfGap;
     let isStart = true;
     let isEnd = true;
-    
+
     // 检查是否是代码块的开始和结束
     if (i > 0) {
       const prev = matrix.items[i - 1];
-      isStart = !prev.config[TEXT_ATTRS.BACKGROUND] || prev.config[TEXT_ATTRS.BACKGROUND] !== background;
+      isStart =
+        !prev.config[TEXT_ATTRS.BACKGROUND] || prev.config[TEXT_ATTRS.BACKGROUND] !== background;
     }
-    
+
     // 合并连续的相同背景色
     for (let k = i + 1; k < matrix.items.length; ++k) {
       const next = matrix.items[k];
@@ -128,16 +129,17 @@ export const drawingBackground = (
         break;
       }
     }
-    
+
     ctx.fillStyle = background;
-    
+
     // 计算代码块的位置和尺寸，添加水平内边距
     const x = offsetX - halfGap - (isStart ? HORIZONTAL_PADDING : 0);
     const y = offsetYBaseLine - matrix.originHeight - BACKGROUND_OFFSET - 1;
-    const width = backgroundWidth + (isStart ? HORIZONTAL_PADDING : 0) + (isEnd ? HORIZONTAL_PADDING : 0);
+    const width =
+      backgroundWidth + (isStart ? HORIZONTAL_PADDING : 0) + (isEnd ? HORIZONTAL_PADDING : 0);
     const height = matrix.originHeight + BACKGROUND_OFFSET * 2;
     const borderRadius = 4;
-    
+
     // 根据是否是代码块的开始和结束来调整圆角
     if (isStart && isEnd) {
       // 单个字符的代码块，四个角都是圆角
@@ -172,7 +174,7 @@ export const drawingBackground = (
       // 代码块中间，没有圆角
       ctx.rect(x, y, width, height);
     }
-    
+
     ctx.fill();
     ctx.closePath();
   }

packages/plugin/src/text/rich-text.ts

@@ -63,7 +63,7 @@ export class RichText {
       let matrix: TextMatrix = getDefaultMatrix();
       for (const fragment of line.chars) {
         for (const character of fragment.char) {
-          const item = { char: character, config: fragment.config };
+          const item = { char: character, config: { ...fragment.config } };
           const { metric, font } = this.measure(item.char, item.config);
           if (!metric) continue;
           const text: TextMatrixItem = {

packages/react/package.json

@@ -22,11 +22,11 @@
   "license": "MIT",
   "dependencies": {
     "@arco-design/web-react": "2.60.3",
-    "@block-kit/core": "1.0.4",
-    "@block-kit/delta": "1.0.4",
-    "@block-kit/plugin": "1.0.4",
-    "@block-kit/react": "1.0.4",
-    "@block-kit/utils": "1.0.4",
+    "@block-kit/core": "1.0.5",
+    "@block-kit/delta": "1.0.5",
+    "@block-kit/plugin": "1.0.5",
+    "@block-kit/react": "1.0.5",
+    "@block-kit/utils": "1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "sketching-core": "workspace: *",

packages/react/src/components/right-panel/components/text/modules/editor.tsx

@@ -102,7 +102,7 @@ export const RichTextEditor: FC<{
     e && setMountDOM(blockEditor, e);
   });
 
-  const overridePosition = (l: number, t: number) => {
+  const overridePosition = () => {
     const rect = blockEditor.rect.getRawSelectionRect();
     if (rect) {
       const t = rect.top - 8;
@@ -112,7 +112,7 @@ export const RichTextEditor: FC<{
       }
       return { top: t, left: l };
     }
-    return { top: t, left: l };
+    return { top: -999999, left: -999999 };
   };
 
   return (

packages/react/src/components/right-panel/components/text/modules/short-cut.ts

@@ -1,25 +1,9 @@
-import { Point, Range, RawPoint } from "@block-kit/core";
-import { Delta } from "@block-kit/delta";
 import type { ShortcutFuncMap } from "@block-kit/plugin";
-import { DIVIDER_KEY, isKeyCode } from "@block-kit/plugin";
-import { KEY_CODE, TRULY } from "@block-kit/utils";
+import { HEADING_KEY } from "@block-kit/plugin";
 
 export const PRESET_SHORTCUT: ShortcutFuncMap = {
-  [DIVIDER_KEY]: (event, payload) => {
-    if (isKeyCode(event, KEY_CODE.SPACE) && payload.sel && payload.sel.isCollapsed) {
-      const { editor, sel } = payload;
-      const line = editor.state.block.getLine(sel.start.line);
-      const firstLeaf = line && line.getFirstLeaf();
-      const text = firstLeaf && firstLeaf.getText();
-      if (text === "---") {
-        editor.perform.deleteForward(Range.fromTuple([sel.start.line, 0], [sel.start.line, 3]));
-        const start = RawPoint.fromPoint(editor, new Point(sel.start.line, 0));
-        if (!start) return void 0;
-        const delta = new Delta().retain(start.offset).insert(" ", { [DIVIDER_KEY]: TRULY });
-        editor.state.apply(delta);
-        event.preventDefault();
-        return true;
-      }
-    }
+  [HEADING_KEY]: () => {
+    // 覆盖默认的标题快捷键
+    return void 0;
   },
 };