@rufous/ui 0.2.2 → 0.2.4

package/dist/main.cjs

@@ -41713,7 +41713,25 @@ var CustomTaskItem = import_extension_task_item.default.extend({
             break;
           }
         }
-        if (taskDepth === -1) return false;
+        if (taskDepth === -1) {
+          if (this.editor.storage.taskTodoEnabled === true) {
+            const schema2 = state.schema;
+            const taskItemType = schema2.nodes.taskItem;
+            const taskListType = schema2.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 newTaskList = taskListType.create(null, newTaskItem);
+            const tr2 = state.tr;
+            const pos = $from.pos;
+            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);
+            return true;
+          }
+          return false;
+        }
         if (this.editor.storage.taskTodoEnabled === false) {
           const afterContent2 = $from.parent.content.cut($from.parentOffset);
           const schema2 = state.schema;
@@ -41740,10 +41758,8 @@ var CustomTaskItem = import_extension_task_item.default.extend({
         const schema = state.schema;
         const tr = state.tr;
         const afterContent = $from.parent.content.cut($from.parentOffset);
-        const cursorPos = $from.pos;
-        const paraEnd = $from.end();
         if (afterContent.size > 0) {
-          tr.delete(cursorPos, paraEnd);
+          tr.delete($from.pos, $from.end());
         }
         const statusLabel = STATUS_LABELS[status] || STATUS_LABELS.todo;
         const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create(null, schema.text(statusLabel));
@@ -41753,8 +41769,8 @@ var CustomTaskItem = import_extension_task_item.default.extend({
         );
         const insertPos = tr.mapping.map($from.after(taskDepth));
         tr.insert(insertPos, newItem);
-        const textLen = afterContent.size > 0 ? 0 : statusLabel.length;
-        tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 2 + textLen)));
+        const cursorOffset = afterContent.size > 0 ? 0 : statusLabel.length;
+        tr.setSelection(TextSelection.create(tr.doc, insertPos + 2 + cursorOffset));
         this.editor.view.dispatch(tr);
         return true;
       },
@@ -41785,8 +41801,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;
           }
@@ -41794,39 +41810,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);
-          const posBefore = itemStart;
-          if (tr.doc.resolve(posBefore).nodeBefore) {
-            const textContent = taskItem.textContent;
-            const contentSlice = taskItem.content;
-            tr.delete(itemStart, itemEnd);
-            const prevItemEndPos = Math.max(0, itemStart - 1);
-            const $prevEnd = tr.doc.resolve(prevItemEndPos);
-            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) } : {}
@@ -43665,6 +43654,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)("");
@@ -43709,6 +43699,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

@@ -13043,7 +13043,25 @@ var CustomTaskItem = TaskItem.extend({
             break;
           }
         }
-        if (taskDepth === -1) return false;
+        if (taskDepth === -1) {
+          if (this.editor.storage.taskTodoEnabled === true) {
+            const schema2 = state.schema;
+            const taskItemType = schema2.nodes.taskItem;
+            const taskListType = schema2.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 newTaskList = taskListType.create(null, newTaskItem);
+            const tr2 = state.tr;
+            const pos = $from.pos;
+            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);
+            return true;
+          }
+          return false;
+        }
         if (this.editor.storage.taskTodoEnabled === false) {
           const afterContent2 = $from.parent.content.cut($from.parentOffset);
           const schema2 = state.schema;
@@ -13070,10 +13088,8 @@ var CustomTaskItem = TaskItem.extend({
         const schema = state.schema;
         const tr = state.tr;
         const afterContent = $from.parent.content.cut($from.parentOffset);
-        const cursorPos = $from.pos;
-        const paraEnd = $from.end();
         if (afterContent.size > 0) {
-          tr.delete(cursorPos, paraEnd);
+          tr.delete($from.pos, $from.end());
         }
         const statusLabel = STATUS_LABELS[status] || STATUS_LABELS.todo;
         const newPara = afterContent.size > 0 ? schema.nodes.paragraph.create(null, afterContent) : schema.nodes.paragraph.create(null, schema.text(statusLabel));
@@ -13083,8 +13099,8 @@ var CustomTaskItem = TaskItem.extend({
         );
         const insertPos = tr.mapping.map($from.after(taskDepth));
         tr.insert(insertPos, newItem);
-        const textLen = afterContent.size > 0 ? 0 : statusLabel.length;
-        tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 2 + textLen)));
+        const cursorOffset = afterContent.size > 0 ? 0 : statusLabel.length;
+        tr.setSelection(TextSelection.create(tr.doc, insertPos + 2 + cursorOffset));
         this.editor.view.dispatch(tr);
         return true;
       },
@@ -13115,8 +13131,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;
           }
@@ -13124,39 +13140,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);
-          const posBefore = itemStart;
-          if (tr.doc.resolve(posBefore).nodeBefore) {
-            const textContent = taskItem.textContent;
-            const contentSlice = taskItem.content;
-            tr.delete(itemStart, itemEnd);
-            const prevItemEndPos = Math.max(0, itemStart - 1);
-            const $prevEnd = tr.doc.resolve(prevItemEndPos);
-            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) } : {}
@@ -14995,6 +14984,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("");
@@ -15039,6 +15029,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.2",
+  "version": "0.2.4",
   "type": "module",
   "description": "Experimental: A lightweight React UI component library (Beta)",
   "style": "./dist/main.css",