@rufous/ui 0.2.3 → 0.2.5

package/dist/main.cjs

@@ -41709,29 +41709,28 @@ var CustomTaskItem = import_extension_task_item.default.extend({
         }
         if (taskDepth === -1) {
           if (this.editor.storage.taskTodoEnabled === true) {
-            const schema2 = state.schema;
-            const taskItemType = schema2.nodes.taskItem;
-            const taskListType = schema2.nodes.taskList;
+            const schema = state.schema;
+            const taskItemType = schema.nodes.taskItem;
+            const taskListType = schema.nodes.taskList;
             if (!taskItemType || !taskListType) return false;
-            const statusText = schema2.text("Todo");
-            const newTaskItem = taskItemType.create({ status: "todo", checked: false }, schema2.nodes.paragraph.create(null, statusText));
+            const statusText = schema.text("Todo");
+            const newTaskItem = taskItemType.create({ status: "todo", checked: false }, schema.nodes.paragraph.create(null, statusText));
             const newTaskList = taskListType.create(null, newTaskItem);
-            const tr2 = state.tr;
-            const pos = $from.pos;
+            const tr = state.tr;
             const afterBlock = $from.after($from.depth > 0 ? 1 : 0);
-            tr2.insert(afterBlock, newTaskList);
-            tr2.setSelection(TextSelection.near(tr2.doc.resolve(afterBlock + 3 + 4)));
-            this.editor.view.dispatch(tr2);
+            tr.insert(afterBlock, newTaskList);
+            tr.setSelection(TextSelection.near(tr.doc.resolve(afterBlock + 3 + 4)));
+            this.editor.view.dispatch(tr);
             return true;
           }
           return false;
         }
         if (this.editor.storage.taskTodoEnabled === false) {
-          const afterContent2 = $from.parent.content.cut($from.parentOffset);
-          const schema2 = state.schema;
-          const tr2 = state.tr;
-          if (afterContent2.size > 0) {
-            tr2.delete($from.pos, $from.end());
+          const afterContent = $from.parent.content.cut($from.parentOffset);
+          const schema = state.schema;
+          const tr = state.tr;
+          if (afterContent.size > 0) {
+            tr.delete($from.pos, $from.end());
           }
           let taskListDepth = -1;
           for (let d = taskDepth - 1; d >= 0; d--) {
@@ -41740,31 +41739,14 @@ var CustomTaskItem = import_extension_task_item.default.extend({
               break;
             }
           }
-          const insertPos2 = taskListDepth !== -1 ? tr2.mapping.map($from.after(taskListDepth)) : tr2.mapping.map($from.after(taskDepth));
-          const newPara2 = afterContent2.size > 0 ? schema2.nodes.paragraph.create(null, afterContent2) : schema2.nodes.paragraph.create();
-          tr2.insert(insertPos2, newPara2);
-          tr2.setSelection(TextSelection.near(tr2.doc.resolve(insertPos2 + 1)));
-          this.editor.view.dispatch(tr2);
+          const insertPos = taskListDepth !== -1 ? tr.mapping.map($from.after(taskListDepth)) : tr.mapping.map($from.after(taskDepth));
+          const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create();
+          tr.insert(insertPos, newPara);
+          tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 1)));
+          this.editor.view.dispatch(tr);
           return true;
         }
-        const taskNode = $from.node(taskDepth);
-        const status = taskNode.attrs.status || "todo";
-        const schema = state.schema;
-        const tr = state.tr;
-        const afterContent = $from.parent.content.cut($from.parentOffset);
-        if (afterContent.size > 0) {
-          tr.delete($from.pos, $from.end());
-        }
-        const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create();
-        const newItem = schema.nodes.taskItem.create(
-          { status, checked: false },
-          newPara
-        );
-        const insertPos = tr.mapping.map($from.after(taskDepth));
-        tr.insert(insertPos, newItem);
-        tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 2)));
-        this.editor.view.dispatch(tr);
-        return true;
+        return this.editor.commands.splitListItem(this.name);
       },
       Backspace: () => {
         const { state } = this.editor;
@@ -41778,7 +41760,37 @@ var CustomTaskItem = import_extension_task_item.default.extend({
             break;
           }
         }
-        if (taskItemDepth === -1) return false;
+        if (taskItemDepth === -1) {
+          const parentDepth = $from.depth > 0 ? $from.depth - 1 : 0;
+          const indexInParent = $from.index(parentDepth);
+          if (indexInParent > 0) {
+            const prevNode = $from.node(parentDepth).child(indexInParent - 1);
+            if (prevNode.type.name === "taskList") {
+              const lastTaskItem = prevNode.lastChild;
+              if (lastTaskItem) {
+                const tr = state.tr;
+                const paraStart = $from.before($from.depth > 0 ? $from.depth : 1);
+                const paraEnd = $from.after($from.depth > 0 ? $from.depth : 1);
+                const paraContent = $from.parent.content;
+                const taskListStart = $from.before(parentDepth) !== void 0 ? paraStart - 1 : null;
+                if (taskListStart !== null) {
+                  const $taskListEnd = tr.doc.resolve(taskListStart);
+                  const lastItemParaEnd = $taskListEnd.end($taskListEnd.depth);
+                  tr.delete(paraStart, paraEnd);
+                  let insertAt = lastItemParaEnd;
+                  paraContent.forEach((inline) => {
+                    tr.insert(insertAt, inline);
+                    insertAt += inline.nodeSize;
+                  });
+                  tr.setSelection(TextSelection.create(tr.doc, lastItemParaEnd));
+                  this.editor.view.dispatch(tr);
+                  return true;
+                }
+              }
+            }
+          }
+          return false;
+        }
         const taskItem = $from.node(taskItemDepth);
         let taskListDepth = -1;
         for (let d = taskItemDepth - 1; d >= 0; d--) {
@@ -41793,8 +41805,8 @@ var CustomTaskItem = import_extension_task_item.default.extend({
             const from2 = $from.before(taskListDepth);
             const to2 = $from.after(taskListDepth);
             tr2.replaceWith(from2, to2, state.schema.nodes.paragraph.create());
-            const resolvedPos = tr2.doc.resolve(from2);
-            tr2.setSelection(TextSelection.near(resolvedPos));
+            const resolvedPos2 = tr2.doc.resolve(from2);
+            tr2.setSelection(TextSelection.near(resolvedPos2));
             this.editor.view.dispatch(tr2);
             return true;
           }
@@ -41802,37 +41814,12 @@ var CustomTaskItem = import_extension_task_item.default.extend({
           const from = $from.before(taskItemDepth);
           const to = $from.after(taskItemDepth);
           tr.delete(from, to);
-          const prevPos = Math.max(0, from - 1);
-          const $prev = tr.doc.resolve(prevPos);
-          const cursorPos = $prev.end($prev.depth);
-          tr.setSelection(TextSelection.create(tr.doc, cursorPos));
+          const resolvedPos = tr.doc.resolve(Math.max(0, from));
+          tr.setSelection(TextSelection.near(resolvedPos, -1));
           this.editor.view.dispatch(tr);
           return true;
         }
-        const indexInList = taskListDepth !== -1 ? $from.index(taskListDepth) : -1;
-        if (indexInList > 0 && taskListDepth !== -1) {
-          const tr = state.tr;
-          const itemStart = $from.before(taskItemDepth);
-          const itemEnd = $from.after(taskItemDepth);
-          if (tr.doc.resolve(itemStart).nodeBefore) {
-            const contentSlice = taskItem.content;
-            tr.delete(itemStart, itemEnd);
-            const prevPos = Math.max(0, itemStart - 1);
-            const $prevEnd = tr.doc.resolve(prevPos);
-            const prevParaEnd = $prevEnd.end($prevEnd.depth);
-            let insertAt = prevParaEnd;
-            contentSlice.forEach((child) => {
-              child.content.forEach((inline) => {
-                tr.insert(insertAt, inline);
-                insertAt += inline.nodeSize;
-              });
-            });
-            tr.setSelection(TextSelection.create(tr.doc, prevParaEnd));
-            this.editor.view.dispatch(tr);
-            return true;
-          }
-        }
-        return this.editor.commands.liftListItem(this.name);
+        return false;
       },
       "Shift-Tab": () => this.editor.commands.liftListItem(this.name),
       ...this.options.nested ? { Tab: () => this.editor.commands.sinkListItem(this.name) } : {}
@@ -43671,6 +43658,7 @@ var RufousTextEditor = ({
       editor.off("blur", handler);
     };
   }, [editor]);
+  const setLinkRef = (0, import_react59.useRef)(null);
   const [linkModalOpen, setLinkModalOpen] = (0, import_react59.useState)(false);
   const [linkUrl, setLinkUrl] = (0, import_react59.useState)("");
   const [linkText, setLinkText] = (0, import_react59.useState)("");
@@ -43715,6 +43703,22 @@ var RufousTextEditor = ({
     setLinkSelection({ from, to });
     setLinkModalOpen(true);
   }, [editor]);
+  (0, import_react59.useEffect)(() => {
+    setLinkRef.current = setLink;
+  }, [setLink]);
+  (0, import_react59.useEffect)(() => {
+    if (!editor?.view) return;
+    const handleKeyDown = (event) => {
+      if ((event.ctrlKey || event.metaKey) && event.key === "k") {
+        event.preventDefault();
+        setLinkRef.current?.();
+      }
+    };
+    editor.view.dom.addEventListener("keydown", handleKeyDown);
+    return () => {
+      editor.view.dom.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [editor]);
   const handleLinkSubmit = (0, import_react59.useCallback)(() => {
     if (!editor || !linkSelection) return;
     editor.chain().focus().setTextSelection(linkSelection).run();

package/dist/main.js

@@ -13039,29 +13039,28 @@ var CustomTaskItem = TaskItem.extend({
         }
         if (taskDepth === -1) {
           if (this.editor.storage.taskTodoEnabled === true) {
-            const schema2 = state.schema;
-            const taskItemType = schema2.nodes.taskItem;
-            const taskListType = schema2.nodes.taskList;
+            const schema = state.schema;
+            const taskItemType = schema.nodes.taskItem;
+            const taskListType = schema.nodes.taskList;
             if (!taskItemType || !taskListType) return false;
-            const statusText = schema2.text("Todo");
-            const newTaskItem = taskItemType.create({ status: "todo", checked: false }, schema2.nodes.paragraph.create(null, statusText));
+            const statusText = schema.text("Todo");
+            const newTaskItem = taskItemType.create({ status: "todo", checked: false }, schema.nodes.paragraph.create(null, statusText));
             const newTaskList = taskListType.create(null, newTaskItem);
-            const tr2 = state.tr;
-            const pos = $from.pos;
+            const tr = state.tr;
             const afterBlock = $from.after($from.depth > 0 ? 1 : 0);
-            tr2.insert(afterBlock, newTaskList);
-            tr2.setSelection(TextSelection.near(tr2.doc.resolve(afterBlock + 3 + 4)));
-            this.editor.view.dispatch(tr2);
+            tr.insert(afterBlock, newTaskList);
+            tr.setSelection(TextSelection.near(tr.doc.resolve(afterBlock + 3 + 4)));
+            this.editor.view.dispatch(tr);
             return true;
           }
           return false;
         }
         if (this.editor.storage.taskTodoEnabled === false) {
-          const afterContent2 = $from.parent.content.cut($from.parentOffset);
-          const schema2 = state.schema;
-          const tr2 = state.tr;
-          if (afterContent2.size > 0) {
-            tr2.delete($from.pos, $from.end());
+          const afterContent = $from.parent.content.cut($from.parentOffset);
+          const schema = state.schema;
+          const tr = state.tr;
+          if (afterContent.size > 0) {
+            tr.delete($from.pos, $from.end());
           }
           let taskListDepth = -1;
           for (let d = taskDepth - 1; d >= 0; d--) {
@@ -13070,31 +13069,14 @@ var CustomTaskItem = TaskItem.extend({
               break;
             }
           }
-          const insertPos2 = taskListDepth !== -1 ? tr2.mapping.map($from.after(taskListDepth)) : tr2.mapping.map($from.after(taskDepth));
-          const newPara2 = afterContent2.size > 0 ? schema2.nodes.paragraph.create(null, afterContent2) : schema2.nodes.paragraph.create();
-          tr2.insert(insertPos2, newPara2);
-          tr2.setSelection(TextSelection.near(tr2.doc.resolve(insertPos2 + 1)));
-          this.editor.view.dispatch(tr2);
+          const insertPos = taskListDepth !== -1 ? tr.mapping.map($from.after(taskListDepth)) : tr.mapping.map($from.after(taskDepth));
+          const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create();
+          tr.insert(insertPos, newPara);
+          tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 1)));
+          this.editor.view.dispatch(tr);
           return true;
         }
-        const taskNode = $from.node(taskDepth);
-        const status = taskNode.attrs.status || "todo";
-        const schema = state.schema;
-        const tr = state.tr;
-        const afterContent = $from.parent.content.cut($from.parentOffset);
-        if (afterContent.size > 0) {
-          tr.delete($from.pos, $from.end());
-        }
-        const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create();
-        const newItem = schema.nodes.taskItem.create(
-          { status, checked: false },
-          newPara
-        );
-        const insertPos = tr.mapping.map($from.after(taskDepth));
-        tr.insert(insertPos, newItem);
-        tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 2)));
-        this.editor.view.dispatch(tr);
-        return true;
+        return this.editor.commands.splitListItem(this.name);
       },
       Backspace: () => {
         const { state } = this.editor;
@@ -13108,7 +13090,37 @@ var CustomTaskItem = TaskItem.extend({
             break;
           }
         }
-        if (taskItemDepth === -1) return false;
+        if (taskItemDepth === -1) {
+          const parentDepth = $from.depth > 0 ? $from.depth - 1 : 0;
+          const indexInParent = $from.index(parentDepth);
+          if (indexInParent > 0) {
+            const prevNode = $from.node(parentDepth).child(indexInParent - 1);
+            if (prevNode.type.name === "taskList") {
+              const lastTaskItem = prevNode.lastChild;
+              if (lastTaskItem) {
+                const tr = state.tr;
+                const paraStart = $from.before($from.depth > 0 ? $from.depth : 1);
+                const paraEnd = $from.after($from.depth > 0 ? $from.depth : 1);
+                const paraContent = $from.parent.content;
+                const taskListStart = $from.before(parentDepth) !== void 0 ? paraStart - 1 : null;
+                if (taskListStart !== null) {
+                  const $taskListEnd = tr.doc.resolve(taskListStart);
+                  const lastItemParaEnd = $taskListEnd.end($taskListEnd.depth);
+                  tr.delete(paraStart, paraEnd);
+                  let insertAt = lastItemParaEnd;
+                  paraContent.forEach((inline) => {
+                    tr.insert(insertAt, inline);
+                    insertAt += inline.nodeSize;
+                  });
+                  tr.setSelection(TextSelection.create(tr.doc, lastItemParaEnd));
+                  this.editor.view.dispatch(tr);
+                  return true;
+                }
+              }
+            }
+          }
+          return false;
+        }
         const taskItem = $from.node(taskItemDepth);
         let taskListDepth = -1;
         for (let d = taskItemDepth - 1; d >= 0; d--) {
@@ -13123,8 +13135,8 @@ var CustomTaskItem = TaskItem.extend({
             const from2 = $from.before(taskListDepth);
             const to2 = $from.after(taskListDepth);
             tr2.replaceWith(from2, to2, state.schema.nodes.paragraph.create());
-            const resolvedPos = tr2.doc.resolve(from2);
-            tr2.setSelection(TextSelection.near(resolvedPos));
+            const resolvedPos2 = tr2.doc.resolve(from2);
+            tr2.setSelection(TextSelection.near(resolvedPos2));
             this.editor.view.dispatch(tr2);
             return true;
           }
@@ -13132,37 +13144,12 @@ var CustomTaskItem = TaskItem.extend({
           const from = $from.before(taskItemDepth);
           const to = $from.after(taskItemDepth);
           tr.delete(from, to);
-          const prevPos = Math.max(0, from - 1);
-          const $prev = tr.doc.resolve(prevPos);
-          const cursorPos = $prev.end($prev.depth);
-          tr.setSelection(TextSelection.create(tr.doc, cursorPos));
+          const resolvedPos = tr.doc.resolve(Math.max(0, from));
+          tr.setSelection(TextSelection.near(resolvedPos, -1));
           this.editor.view.dispatch(tr);
           return true;
         }
-        const indexInList = taskListDepth !== -1 ? $from.index(taskListDepth) : -1;
-        if (indexInList > 0 && taskListDepth !== -1) {
-          const tr = state.tr;
-          const itemStart = $from.before(taskItemDepth);
-          const itemEnd = $from.after(taskItemDepth);
-          if (tr.doc.resolve(itemStart).nodeBefore) {
-            const contentSlice = taskItem.content;
-            tr.delete(itemStart, itemEnd);
-            const prevPos = Math.max(0, itemStart - 1);
-            const $prevEnd = tr.doc.resolve(prevPos);
-            const prevParaEnd = $prevEnd.end($prevEnd.depth);
-            let insertAt = prevParaEnd;
-            contentSlice.forEach((child) => {
-              child.content.forEach((inline) => {
-                tr.insert(insertAt, inline);
-                insertAt += inline.nodeSize;
-              });
-            });
-            tr.setSelection(TextSelection.create(tr.doc, prevParaEnd));
-            this.editor.view.dispatch(tr);
-            return true;
-          }
-        }
-        return this.editor.commands.liftListItem(this.name);
+        return false;
       },
       "Shift-Tab": () => this.editor.commands.liftListItem(this.name),
       ...this.options.nested ? { Tab: () => this.editor.commands.sinkListItem(this.name) } : {}
@@ -15001,6 +14988,7 @@ var RufousTextEditor = ({
       editor.off("blur", handler);
     };
   }, [editor]);
+  const setLinkRef = useRef30(null);
   const [linkModalOpen, setLinkModalOpen] = useState34(false);
   const [linkUrl, setLinkUrl] = useState34("");
   const [linkText, setLinkText] = useState34("");
@@ -15045,6 +15033,22 @@ var RufousTextEditor = ({
     setLinkSelection({ from, to });
     setLinkModalOpen(true);
   }, [editor]);
+  useEffect27(() => {
+    setLinkRef.current = setLink;
+  }, [setLink]);
+  useEffect27(() => {
+    if (!editor?.view) return;
+    const handleKeyDown = (event) => {
+      if ((event.ctrlKey || event.metaKey) && event.key === "k") {
+        event.preventDefault();
+        setLinkRef.current?.();
+      }
+    };
+    editor.view.dom.addEventListener("keydown", handleKeyDown);
+    return () => {
+      editor.view.dom.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [editor]);
   const handleLinkSubmit = useCallback13(() => {
     if (!editor || !linkSelection) return;
     editor.chain().focus().setTextSelection(linkSelection).run();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rufous/ui",
   "private": false,
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "description": "Experimental: A lightweight React UI component library (Beta)",
   "style": "./dist/main.css",