@kaitify/core 0.0.1-beta.14 → 0.0.1-beta.16

package/lib/kaitify-core.es.js

@@ -7930,6 +7930,26 @@ const listMergeHandler = ({ editor, node }) => {
 const isOnlyTab = (e) => {
   return e.key.toLocaleLowerCase() == "tab" && !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey;
 };
+const getUnsetListItemNode = (matchNode, options) => {
+  while (true) {
+    if (!matchNode) {
+      break;
+    }
+    const params = {
+      tag: options.ordered ? "ol" : "ul"
+    };
+    if (options.listType) {
+      params.styles = {
+        listStyleType: options.listType
+      };
+    }
+    if (matchNode.parent.isMatch(params)) {
+      break;
+    }
+    matchNode = matchNode.parent.getMatchNode({ tag: "li" });
+  }
+  return matchNode;
+};
 const ListExtension = () => Extension.create({
   name: "list",
   extraKeepTags: ["ul", "ol", "li"],
@@ -7948,6 +7968,13 @@ const ListExtension = () => Extension.create({
     ({ node }) => {
       if (node.isMatch({ tag: "ol" }) || node.isMatch({ tag: "ul" })) {
         node.type = "block";
+        if (!node.hasStyles()) {
+          node.styles = {
+            listStyleType: node.isMatch({ tag: "ol" }) ? "decimal" : "disc"
+          };
+        } else if (!node.styles.listStyleType) {
+          node.styles.listStyleType = node.isMatch({ tag: "ol" }) ? "decimal" : "disc";
+        }
       }
     },
     //列表项处理
@@ -8003,37 +8030,37 @@ const ListExtension = () => Extension.create({
   },
   addCommands() {
     const getList = (options) => {
+      const params = {
+        tag: options.ordered ? "ol" : "ul"
+      };
       if (options.listType) {
-        return this.getMatchNodeBySelection({
-          tag: options.ordered ? "ol" : "ul",
-          styles: {
-            listStyleType: options.listType
-          }
-        });
+        params.styles = {
+          listStyleType: options.listType
+        };
       }
-      return this.getMatchNodeBySelection({ tag: options.ordered ? "ol" : "ul" });
+      return this.getMatchNodeBySelection(params);
     };
     const hasList = (options) => {
+      const params = {
+        tag: options.ordered ? "ol" : "ul"
+      };
       if (options.listType) {
-        return this.isSelectionNodesSomeMatch({
-          tag: options.ordered ? "ol" : "ul",
-          styles: {
-            listStyleType: options.listType
-          }
-        });
+        params.styles = {
+          listStyleType: options.listType
+        };
       }
-      return this.isSelectionNodesSomeMatch({ tag: options.ordered ? "ol" : "ul" });
+      return this.isSelectionNodesSomeMatch(params);
     };
     const allList = (options) => {
+      const params = {
+        tag: options.ordered ? "ol" : "ul"
+      };
       if (options.listType) {
-        return this.isSelectionNodesAllMatch({
-          tag: options.ordered ? "ol" : "ul",
-          styles: {
-            listStyleType: options.listType
-          }
-        });
+        params.styles = {
+          listStyleType: options.listType
+        };
       }
-      return this.isSelectionNodesAllMatch({ tag: options.ordered ? "ol" : "ul" });
+      return this.isSelectionNodesAllMatch(params);
     };
     const setList = async (options) => {
       if (allList(options)) {
@@ -8056,12 +8083,12 @@ const ListExtension = () => Extension.create({
       }
       if (this.selection.collapsed()) {
         const blockNode = this.selection.start.node.getBlock();
-        const matchNode = blockNode.getMatchNode({ tag: "li" });
+        const matchNode = getUnsetListItemNode(blockNode.getMatchNode({ tag: "li" }), options);
         if (matchNode) ListItemToParagraph(this, matchNode);
       } else {
         const blockNodes = getSelectionBlockNodes.apply(this);
         blockNodes.forEach((item) => {
-          const matchNode = item.getMatchNode({ tag: "li" });
+          const matchNode = getUnsetListItemNode(item.getMatchNode({ tag: "li" }), options);
           if (matchNode) ListItemToParagraph(this, matchNode);
         });
       }