@use-kona/editor 0.1.6 → 0.1.7

package/dist/core/createEditable.js

@@ -39,6 +39,7 @@ const createEditable = (editor, plugins)=>({ readOnly })=>{
             return result;
         };
         const handleHotkey = (event)=>{
+            if ('Tab' === event.key) event.preventDefault();
             for (const plugin of plugins)if (plugin.hotkeys) {
                 for (const hotkey of plugin.hotkeys)if (is_hotkey(hotkey[0], event) && hotkey[1]) {
                     event.preventDefault();

package/dist/core/queries.d.ts

@@ -1,2 +1,5 @@
-import { Editor, NodeEntry, Node } from 'slate';
-export declare const getPrev: (editor: Editor, node: NodeEntry) => Node | null;
+import { Editor, type NodeEntry } from 'slate';
+/**
+ * @deprecated
+ */
+export declare const getPrev: (editor: Editor, node: NodeEntry) => NodeEntry<import("slate").Ancestor> | null | undefined;

package/dist/core/queries.js

@@ -1,8 +1,11 @@
-import { Node, Path } from "slate";
+import { Editor, Path } from "slate";
 const getPrev = (editor, node)=>{
     try {
         const [, path] = node;
-        return Node.get(editor, Path.previous(path));
+        return Editor.above(editor, {
+            at: Path.previous(path),
+            mode: 'lowest'
+        });
     } catch (e) {
         return null;
     }

package/dist/plugins/ListsPlugin/ListsPlugin.d.ts

@@ -30,6 +30,7 @@ export declare class ListsPlugin implements IPlugin {
     private isListItem;
     static toggleList: (editor: Editor, listType: string, listItemType?: string) => void;
     private getListItemDepth;
+    private getListDepth;
     private getListItem;
 }
 export {};

package/dist/plugins/ListsPlugin/ListsPlugin.js

@@ -1,7 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { Editor, Element, Node, Transforms } from "slate";
 import { jsx as external_slate_hyperscript_jsx } from "slate-hyperscript";
-import { getPrev } from "../../core/queries.js";
 import styles_module from "./styles.module.js";
 class ListsPlugin {
     options;
@@ -48,6 +47,24 @@ class ListsPlugin {
                     split: true
                 });
             }
+            if (this.isList(editor, node)) {
+                const prevListItemPath = Editor.before(editor, path, {
+                    unit: 'block'
+                });
+                const prevList = Editor.above(editor, {
+                    at: prevListItemPath,
+                    match: (n)=>this.isList(editor, n)
+                });
+                if (prevList) {
+                    const currentDepth = this.getListDepth(editor, path);
+                    const prevDepth = this.getListDepth(editor, prevList[1]);
+                    if (this.isList(editor, prevList[0]) && currentDepth === prevDepth) try {
+                        Transforms.mergeNodes(editor, {
+                            match: (n)=>this.isList(editor, n)
+                        });
+                    } catch (e) {}
+                }
+            }
             normalizeNode(entry);
         };
         editor.insertBreak = ()=>{
@@ -152,9 +169,15 @@ class ListsPlugin {
                     else if (!event.shiftKey) {
                         const currentListItem = this.getListItem(editor);
                         if (!currentListItem) return;
-                        const prevListItem = getPrev(editor, currentListItem);
-                        if (!prevListItem) return;
-                        if (currentListItem && prevListItem) {
+                        const prevListItemPath = Editor.before(editor, currentListItem[1], {
+                            unit: 'block'
+                        });
+                        if (currentListItem && prevListItemPath) {
+                            const prevListItem = Editor.above(editor, {
+                                at: prevListItemPath,
+                                match: (n)=>this.isListItem(editor, n)
+                            });
+                            if (!prevListItem) return;
                             const currentDepth = this.getListItemDepth(editor, currentListItem[1]);
                             const prevDepth = this.getListItemDepth(editor, prevListItem[1]);
                             if (prevListItem && prevDepth >= currentDepth) Transforms.wrapNodes(editor, {
@@ -220,9 +243,23 @@ class ListsPlugin {
         if (item) {
             let count = 0;
             let parent = Editor.parent(editor, item[1]);
-            while(null !== parent && this.isList(editor, parent[0])){
+            do {
                 parent = Editor.parent(editor, parent[1]);
                 count++;
+            }while (null !== parent && this.isList(editor, parent[0]));
+            return count;
+        }
+        return 0;
+    };
+    getListDepth = (editor, path)=>{
+        if (path) {
+            const node = Node.get(editor, path);
+            if (!this.isList(editor, node)) return 0;
+            let count = 0;
+            let parent = Editor.parent(editor, path);
+            while(parent && this.isList(editor, parent[0])){
+                count++;
+                parent = Editor.parent(editor, parent[1]);
             }
             return count;
         }

package/package.json

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

package/src/core/createEditable.tsx

@@ -80,6 +80,10 @@ export const createEditable =
     };
 
     const handleHotkey = (event: KeyboardEvent) => {
+      if (event.key === 'Tab') {
+        event.preventDefault();
+      }
+
       for (const plugin of plugins) {
         if (plugin.hotkeys) {
           for (const hotkey of plugin.hotkeys) {

package/src/core/queries.ts

@@ -1,9 +1,15 @@
-import { Editor, NodeEntry, Node, Path } from 'slate';
+import { Editor, type NodeEntry, Path } from 'slate';
 
+/**
+ * @deprecated
+ */
 export const getPrev = (editor: Editor, node: NodeEntry) => {
   try {
     const [, path] = node;
-    return Node.get(editor, Path.previous(path));
+    return Editor.above(editor, {
+      at: Path.previous(path),
+      mode: 'lowest',
+    });
   } catch (e) {
     return null;
   }

package/src/plugins/ListsPlugin/ListsPlugin.tsx

@@ -88,6 +88,33 @@ export class ListsPlugin implements IPlugin {
         }
       }
 
+      if (this.isList(editor, node as CustomElement)) {
+        const prevListItemPath = Editor.before(editor, path, {
+          unit: 'block',
+        });
+
+        const prevList = Editor.above(editor, {
+          at: prevListItemPath,
+          match: (n) => this.isList(editor, n as CustomElement),
+        });
+
+        if (prevList) {
+          const currentDepth = this.getListDepth(editor, path);
+          const prevDepth = this.getListDepth(editor, prevList[1]);
+
+          if (
+            this.isList(editor, prevList[0] as CustomElement) &&
+            currentDepth === prevDepth
+          ) {
+            try {
+              Transforms.mergeNodes(editor, {
+                match: (n) => this.isList(editor, n as CustomElement),
+              });
+            } catch (e) {}
+          }
+        }
+      }
+
       normalizeNode(entry);
     };
 
@@ -249,17 +276,25 @@ export class ListsPlugin implements IPlugin {
               return;
             }
 
-            const prevListItem = getPrev(editor, currentListItem);
+            const prevListItemPath = Editor.before(editor, currentListItem[1], {
+              unit: 'block',
+            });
 
-            if (!prevListItem) {
-              return;
-            }
+            if (currentListItem && prevListItemPath) {
+              const prevListItem = Editor.above(editor, {
+                at: prevListItemPath,
+                match: (n) => this.isListItem(editor, n as CustomElement),
+              });
+
+              if (!prevListItem) {
+                return;
+              }
 
-            if (currentListItem && prevListItem) {
               const currentDepth = this.getListItemDepth(
                 editor,
                 currentListItem[1],
               );
+
               const prevDepth = this.getListItemDepth(editor, prevListItem[1]);
 
               if (prevListItem && prevDepth >= currentDepth) {
@@ -370,17 +405,37 @@ export class ListsPlugin implements IPlugin {
     if (item) {
       let count = 0;
       let parent = Editor.parent(editor, item[1]);
-      while (
+      do {
+        parent = Editor.parent(editor, parent[1]);
+        count++;
+      } while (
         parent !== null &&
         this.isList(editor, parent[0] as CustomElement)
-      ) {
-        parent = Editor.parent(editor, parent[1]);
+      );
+
+      return count;
+    }
+
+    return 0;
+  };
+
+  private getListDepth = (editor: Editor, path?: Path) => {
+    if (path) {
+      const node = Node.get(editor, path) as CustomElement;
+      if (!this.isList(editor, node)) {
+        return 0;
+      }
+
+      let count = 0;
+      let parent = Editor.parent(editor, path);
+
+      while (parent && this.isList(editor, parent[0] as CustomElement)) {
         count++;
+        parent = Editor.parent(editor, parent[1]);
       }
 
       return count;
     }
-
     return 0;
   };