@kaitify/core 0.0.1-beta.32 → 0.0.1-beta.33

package/lib/kaitify-core.es.js

@@ -2123,6 +2123,7 @@ class History {
    * 更新当前记录的编辑器的光标
    */
   updateSelection(selection) {
+    if (this.records.length === 0) return;
     const record = this.records[this.records.length - 1];
     const newSelection = this.cloneSelection(record.nodes, selection);
     this.records[this.records.length - 1].selection = newSelection;
@@ -2969,18 +2970,17 @@ const formatPlaceholderMerge = ({ editor, node }) => {
 const formatLineBreakSpaceText = ({ editor, node }) => {
   if (node.isText() && !node.isEmpty()) {
     node.textContent = node.textContent.replace(/\r\n/g, "\n").replace(/\u00A0/g, " ").replace(/\uFEFF/g, getZeroWidthText());
-    let startInBreak = false;
-    let endInBreak = false;
+    let startPrevNumber = 0;
+    let endPrevNumber = 0;
+    const regExp = new RegExp(`\\n(?!${getZeroWidthText()})`, "g");
     if (editor.selection.focused()) {
       if (editor.selection.start.node.isEqual(node)) {
-        const offset = editor.selection.start.offset > 0 ? editor.selection.start.offset - 1 : 0;
-        const chart = node.textContent[offset];
-        startInBreak = chart === "\n";
+        const preText = editor.selection.start.offset > 0 ? node.textContent.slice(0, editor.selection.start.offset) : "";
+        startPrevNumber = (preText.match(regExp) || []).length;
       }
       if (editor.selection.end.node.isEqual(node)) {
-        const offset = editor.selection.end.offset > 0 ? editor.selection.end.offset - 1 : 0;
-        const chart = node.textContent[offset];
-        endInBreak = chart === "\n";
+        const preText = editor.selection.end.offset > 0 ? node.textContent.slice(0, editor.selection.end.offset) : "";
+        endPrevNumber = (preText.match(regExp) || []).length;
       }
     }
     node.textContent = node.textContent.replace(/\n/g, (chart, index) => {
@@ -2990,11 +2990,11 @@ const formatLineBreakSpaceText = ({ editor, node }) => {
       }
       return chart;
     });
-    if (startInBreak) {
-      editor.selection.start.offset += 1;
+    if (startPrevNumber > 0) {
+      editor.selection.start.offset += startPrevNumber;
     }
-    if (endInBreak) {
-      editor.selection.end.offset += 1;
+    if (endPrevNumber > 0) {
+      editor.selection.end.offset += endPrevNumber;
     }
   }
 };
@@ -35228,11 +35228,15 @@ const CodeBlockExtension = () => Extension.create({
       tag: "pre"
     });
     if (!!codeBlockNode && this.selection.start.node.isText()) {
-      const parentNode = this.selection.start.node.parent;
-      const previousNode = this.selection.start.node.getPrevious(parentNode.children);
-      const nextNode = this.selection.start.node.getNext(parentNode.children);
-      if (previousNode && previousNode.isText() && /\n(\s*)\n$/.test(previousNode.textContent) && !nextNode) {
-        previousNode.textContent = previousNode.textContent.replace(/\n(\s*)\n$/, "");
+      const index = this.selection.start.offset === 0 ? 0 : this.selection.start.offset - 1;
+      const textContent = this.selection.start.node.textContent;
+      const currentChar = textContent.charAt(index);
+      const p1Char = index - 1 >= 0 ? textContent.charAt(index - 1) : null;
+      const p2Char = index - 2 >= 0 ? textContent.charAt(index - 2) : null;
+      const isLastChar = index === textContent.length - 1;
+      const isLastText = this.selection.start.node.lastInTargetNode(codeBlockNode);
+      if (currentChar === "\n" && p1Char !== null && p2Char !== null && isZeroWidthText(p1Char) && p2Char === "\n" && isLastChar && isLastText) {
+        this.selection.start.node.textContent = this.selection.start.node.textContent.slice(0, index - 2);
         const paragraph = KNode.create({
           type: "block",
           tag: this.blockRenderTag,
@@ -38166,7 +38170,6 @@ class Editor {
     await delay();
     this.internalCauseSelectionChange = false;
     this.scrollViewToSelection();
-    this.history.updateSelection(this.selection);
     if (typeof this.onSelectionUpdate == "function") {
       this.onSelectionUpdate.apply(this, [this.selection]);
     }
@@ -38201,13 +38204,20 @@ class Editor {
     event.off(this.$el, "beforeinput.kaitify compositionstart.kaitify compositionupdate.kaitify compositionend.kaitify keydown.kaitify keyup.kaitify copy.kaitify focus.kaitify blur.kaitify");
   }
   /**
-   * 获取编辑器的纯文本内容
+   * 获取编辑器的纯文本内容，excludeBreak表示是否排除换行符\n，excludeZeroWidthText表示是否排除零宽度空白字符
    */
-  getContent() {
+  getContent(excludeBreak = false, excludeZeroWidthText = false) {
     if (!this.$el) {
       return "";
     }
-    return this.$el.textContent ?? "";
+    let text2 = this.$el.textContent ?? "";
+    if (excludeBreak) {
+      text2 = text2.split("\n").join("");
+    }
+    if (excludeZeroWidthText) {
+      text2 = text2.split(getZeroWidthText()).join("");
+    }
+    return text2;
   }
   /**
    * 获取编辑器的html内容，该方法会返回一个包含style标签和div标签的html内容。自行展示html内容时可保证样式与编辑器一致，但是对于附件等有交互事件的元素交互事件会失效