@use-kona/editor 0.1.9 → 0.1.11

package/dist/plugins/ListsPlugin/ListsPlugin.js

@@ -59,8 +59,9 @@ class ListsPlugin {
                 if (prevList) {
                     const currentDepth = this.getListDepth(editor, path);
                     const prevDepth = this.getListDepth(editor, prevList[1]);
-                    if (this.isList(editor, prevList[0]) && currentDepth === prevDepth) try {
+                    if (this.isList(editor, prevList[0]) && currentDepth === prevDepth && prevList[0].type === node.type) try {
                         Transforms.mergeNodes(editor, {
+                            at: path,
                             match: (n)=>this.isList(editor, n)
                         });
                     } catch (e) {}
@@ -131,7 +132,7 @@ class ListsPlugin {
                     children: props.children
                 }),
             serialize: (element, children)=>{
-                if (element.type === ListsPlugin.BULLETED_LIST_ELEMENT) return `<li>${children}</li>`;
+                if (element.type === ListsPlugin.LIST_ITEM_ELEMENT) return `<li>${children}</li>`;
             },
             deserialize: (element, children)=>{
                 const { nodeName } = element;
@@ -225,16 +226,26 @@ class ListsPlugin {
                     ].includes(n.type)
             });
             else {
-                Transforms.setNodes(editor, {
-                    type: listItemType
-                }, {
-                    mode: 'lowest'
-                });
+                const { selection } = editor;
+                if (!selection) return;
+                const nodes = Array.from(Editor.nodes(editor, {
+                    at: Editor.unhangRange(editor, selection),
+                    match: (n)=>Element.isElement(n),
+                    mode: 'highest'
+                }));
+                if (!nodes.length) return;
                 Transforms.wrapNodes(editor, {
                     type: listType,
                     children: []
                 }, {
-                    match: (n)=>n.type === listItemType
+                    mode: 'highest',
+                    match: (n)=>Element.isElement(n) && n.type === listItemType
+                });
+                Transforms.setNodes(editor, {
+                    type: listItemType
+                }, {
+                    at: nodes[0][1],
+                    split: true
                 });
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@use-kona/editor",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"

package/src/plugins/ListsPlugin/ListsPlugin.tsx

@@ -44,7 +44,7 @@ export class ListsPlugin implements IPlugin {
 
     editor.normalizeNode = (entry: NodeEntry) => {
       const [node, path] = entry;
-
+      //
       if (this.isList(editor, node as CustomElement)) {
         /* Unwrap lists around non-list-items */
         for (const [child, childPath] of Array.from(
@@ -99,7 +99,7 @@ export class ListsPlugin implements IPlugin {
 
         const prevList =
           prevListItemPath &&
-          Editor.above(editor, {
+          Editor.above<CustomElement>(editor, {
             at: prevListItemPath,
             match: (n) => this.isList(editor, n as CustomElement),
           });
@@ -110,10 +110,12 @@ export class ListsPlugin implements IPlugin {
 
           if (
             this.isList(editor, prevList[0] as CustomElement) &&
-            currentDepth === prevDepth
+            currentDepth === prevDepth &&
+            prevList[0].type === (node as CustomElement).type
           ) {
             try {
               Transforms.mergeNodes(editor, {
+                at: path,
                 match: (n) => this.isList(editor, n as CustomElement),
               });
             } catch (e) {}
@@ -218,7 +220,7 @@ export class ListsPlugin implements IPlugin {
         );
       },
       serialize: (element, children) => {
-        if (element.type === ListsPlugin.BULLETED_LIST_ELEMENT) {
+        if (element.type === ListsPlugin.LIST_ITEM_ELEMENT) {
           return `<li>${children}</li>`;
         }
       },
@@ -395,11 +397,39 @@ export class ListsPlugin implements IPlugin {
           },
         );
       } else {
-        Transforms.setNodes(editor, { type: listItemType }, { mode: 'lowest' });
+        const { selection } = editor;
+
+        if (!selection) {
+          return;
+        }
+
+        const nodes = Array.from(
+          Editor.nodes(editor, {
+            at: Editor.unhangRange(editor, selection),
+            match: (n) => Element.isElement(n),
+            mode: 'highest',
+          }),
+        );
+
+        if (!nodes.length) {
+          return;
+        }
+
         Transforms.wrapNodes(
           editor,
           { type: listType, children: [] },
-          { match: (n) => (n as CustomElement).type === listItemType },
+          {
+            mode: 'highest',
+            match: (n) => {
+              return Element.isElement(n) && n.type === listItemType;
+            },
+          },
+        );
+
+        Transforms.setNodes(
+          editor,
+          { type: listItemType },
+          { at: nodes[0][1], split: true },
         );
       }
     });