@kaitify/core 0.0.1-beta.34 → 0.0.1-beta.35

package/lib/kaitify-core.es.js

@@ -7488,6 +7488,34 @@ const IndentExtension = () => Extension.create({
     };
   }
 });
+const horizontalFocus = (editor) => {
+  event.off(editor.$el, "click.horizontal_focus");
+  event.on(editor.$el, "click.horizontal_focus", (e) => {
+    if (!editor.isEditable()) {
+      return;
+    }
+    const event2 = e;
+    const elm = event2.target;
+    if (elm === editor.$el) {
+      return;
+    }
+    const node = editor.findNode(elm);
+    const matchNode = node.getMatchNode({
+      tag: "hr"
+    });
+    if (matchNode) {
+      const nextSelectionNode = editor.getNextSelectionNode(matchNode);
+      const previousSelectionNode = editor.getPreviousSelectionNode(matchNode);
+      if (nextSelectionNode) {
+        editor.setSelectionBefore(nextSelectionNode, "all");
+        editor.updateRealSelection();
+      } else if (previousSelectionNode) {
+        editor.setSelectionAfter(previousSelectionNode, "all");
+        editor.updateRealSelection();
+      }
+    }
+  });
+};
 const HorizontalExtension = () => Extension.create({
   name: "horizontal",
   extraKeepTags: ["hr"],
@@ -7498,17 +7526,58 @@ const HorizontalExtension = () => Extension.create({
     return node;
   },
   formatRules: [
-    ({ node }) => {
+    ({ editor, node }) => {
       if (node.isMatch({ tag: "hr" })) {
         node.type = "closed";
+        if (node.hasMarks()) {
+          node.marks["contenteditable"] = "false";
+        } else {
+          node.marks = {
+            contenteditable: "false"
+          };
+        }
+        const previousNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+        const nextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+        if (!previousNode || !previousNode.isZeroWidthText()) {
+          const zeroWidthText = KNode.createZeroWidthText();
+          editor.addNodeBefore(zeroWidthText, node);
+        }
+        if (!nextNode || !nextNode.isZeroWidthText()) {
+          const zeroWidthText = KNode.createZeroWidthText();
+          editor.addNodeAfter(zeroWidthText, node);
+        }
+        if (editor.isSelectionInTargetNode(node, "start")) {
+          if (editor.selection.start && editor.selection.start.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "start");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "start");
+          }
+        }
+        if (editor.isSelectionInTargetNode(node, "end")) {
+          if (editor.selection.end && editor.selection.end.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "end");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "end");
+          }
+        }
       }
     }
   ],
+  afterUpdateView() {
+    horizontalFocus(this);
+  },
   addCommands() {
     const setHorizontal = async () => {
       const node = KNode.create({
         type: "closed",
-        tag: "hr"
+        tag: "hr",
+        marks: {
+          contenteditable: "false"
+        }
       });
       this.insertNode(node);
       await this.updateView();
@@ -22731,9 +22800,13 @@ const mathFocus = (editor) => {
       }
     });
     if (matchNode) {
-      editor.setSelectionBefore(matchNode, "start");
-      editor.setSelectionAfter(matchNode, "end");
-      editor.updateRealSelection();
+      const previousNode = editor.getPreviousSelectionNode(matchNode);
+      const nextNode = editor.getNextSelectionNode(matchNode);
+      if (previousNode && nextNode) {
+        editor.setSelectionAfter(previousNode, "start");
+        editor.setSelectionBefore(nextNode, "end");
+        editor.updateRealSelection();
+      }
     }
   });
 };
@@ -22817,9 +22890,7 @@ const MathExtension = () => Extension.create({
             }
           }
         });
-        if (node.marks["contenteditable"] != "false") {
-          node.marks["contenteditable"] = "false";
-        }
+        node.marks["contenteditable"] = "false";
         const previousNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
         const nextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
         if (!previousNode || !previousNode.isZeroWidthText()) {
@@ -22831,12 +22902,24 @@ const MathExtension = () => Extension.create({
           editor.addNodeAfter(zeroWidthText, node);
         }
         if (editor.isSelectionInTargetNode(node, "start")) {
-          const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
-          if (newTextNode) editor.setSelectionBefore(newTextNode, "start");
+          const firstNode = editor.getFirstSelectionNode(node);
+          if (firstNode && editor.selection.start && firstNode.isEqual(editor.selection.start.node) && editor.selection.start.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "start");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "start");
+          }
         }
         if (editor.isSelectionInTargetNode(node, "end")) {
-          const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
-          if (newTextNode) editor.setSelectionBefore(newTextNode, "end");
+          const firstNode = editor.getFirstSelectionNode(node);
+          if (firstNode && editor.selection.end && firstNode.isEqual(editor.selection.end.node) && editor.selection.end.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "end");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "end");
+          }
         }
       }
     }
@@ -35387,9 +35470,13 @@ const attachmentFocus = (editor) => {
       }
     });
     if (matchNode) {
-      editor.setSelectionBefore(matchNode, "start");
-      editor.setSelectionAfter(matchNode, "end");
-      editor.updateRealSelection();
+      const previousNode = editor.getPreviousSelectionNode(matchNode);
+      const nextNode = editor.getNextSelectionNode(matchNode);
+      if (previousNode && nextNode) {
+        editor.setSelectionAfter(previousNode, "start");
+        editor.setSelectionBefore(nextNode, "end");
+        editor.updateRealSelection();
+      }
     }
   });
 };
@@ -35446,9 +35533,7 @@ const AttachmentExtension = (props) => Extension.create({
             }
           }
         });
-        if (node.marks["contenteditable"] != "false") {
-          node.marks["contenteditable"] = "false";
-        }
+        node.marks["contenteditable"] = "false";
         const previousNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
         const nextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
         if (!previousNode || !previousNode.isZeroWidthText()) {
@@ -35460,12 +35545,22 @@ const AttachmentExtension = (props) => Extension.create({
           editor.addNodeAfter(zeroWidthText, node);
         }
         if (editor.isSelectionInTargetNode(node, "start")) {
-          const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
-          if (newTextNode) editor.setSelectionBefore(newTextNode, "start");
+          if (editor.selection.start && editor.selection.start.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "start");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "start");
+          }
         }
         if (editor.isSelectionInTargetNode(node, "end")) {
-          const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
-          if (newTextNode) editor.setSelectionBefore(newTextNode, "end");
+          if (editor.selection.end && editor.selection.end.offset === 0) {
+            const newTextNode = node.getPrevious(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionAfter(newTextNode, "end");
+          } else {
+            const newTextNode = node.getNext(node.parent ? node.parent.children : editor.stackNodes);
+            if (newTextNode) editor.setSelectionBefore(newTextNode, "end");
+          }
         }
       }
     }