@cyberyozh/text-editor 0.1.7 → 0.1.8

package/dist/editor.js

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(editor_exports);
 
 // src/editor/editor.tsx
 var import_react36 = require("react");
-var import_state5 = require("@tiptap/pm/state");
+var import_state6 = require("@tiptap/pm/state");
 var import_model = require("@tiptap/pm/model");
 var import_react37 = require("@tiptap/react");
 var import_menus = require("@tiptap/react/menus");
@@ -5165,36 +5165,30 @@ function getEditorExtensions(options) {
 }
 
 // src/editor/handlers/dialog-handlers.ts
+var import_state5 = require("@tiptap/pm/state");
 var createHandleImageAdd = (editor, closeDialogCommand, savedPos) => {
   return (attrs) => {
     if (!editor) return;
     const { state } = editor;
-    const { $from } = state.selection;
-    const text = $from.parent.textContent;
-    if (text.lastIndexOf("/") !== -1) {
-      editor.chain().focus().command(({ tr }) => {
-        const node = editor.schema.nodes.image.create({ ...attrs });
-        tr.replaceWith($from.before(), $from.after(), node);
-        return true;
-      }).scrollIntoView().run();
-    } else {
-      const insertPos = savedPos ?? state.selection.from;
-      editor.chain().focus().command(({ tr, state: state2 }) => {
-        const $pos = state2.doc.resolve(insertPos);
-        const figureNode = state2.schema.nodes.figure.create({ ...attrs });
-        if ($pos.parent.type.name === "paragraph" && $pos.parent.textContent === "") {
-          tr.replaceWith($pos.before(), $pos.after(), figureNode);
-        } else {
-          tr.insert(insertPos, figureNode);
-        }
-        return true;
-      }).scrollIntoView().run();
-    }
+    const insertPos = savedPos ?? state.selection.from;
+    editor.chain().focus().command(({ tr, state: state2 }) => {
+      const $pos = state2.doc.resolve(insertPos);
+      const imageNode = state2.schema.nodes.image.create({ ...attrs });
+      if ($pos.parent.type.name === "paragraph" && $pos.parent.textContent === "") {
+        tr.replaceWith($pos.before(), $pos.after(), imageNode);
+        tr.setSelection(import_state5.TextSelection.near(tr.doc.resolve($pos.before())));
+      } else {
+        tr.insert(insertPos, imageNode);
+        tr.setSelection(import_state5.TextSelection.near(tr.doc.resolve(insertPos)));
+      }
+      return true;
+    }).run();
     closeDialogCommand();
   };
 };
 var createHandleImageEdit = (editor, closeDialogCommand, pos) => {
   return (attrs) => {
+    console.log("\u{1F440} ~ createHandleImageEdit ~ attrs:", attrs);
     if (!editor || pos === void 0) return;
     editor.chain().focus().setNodeSelection(pos).updateFigure(attrs).run();
     closeDialogCommand();
@@ -5204,30 +5198,19 @@ var createHandleVideoAdd = (editor, closeDialogCommand, savedPos) => {
   return (url) => {
     if (!editor) return;
     const { state } = editor;
-    const { $from } = state.selection;
-    const text = $from.parent.textContent;
-    if (text.lastIndexOf("/") !== -1) {
-      editor.chain().focus().command(({ tr }) => {
-        tr.replaceWith(
-          $from.before(),
-          $from.after(),
-          editor.schema.nodes.video.create({ src: url })
-        );
-        return true;
-      }).scrollIntoView().run();
-    } else {
-      const insertPos = savedPos ?? state.selection.from;
-      editor.chain().focus().command(({ tr, state: state2 }) => {
-        const $pos = state2.doc.resolve(insertPos);
-        const videoNode = state2.schema.nodes.video.create({ src: url });
-        if ($pos.parent.type.name === "paragraph" && $pos.parent.textContent === "") {
-          tr.replaceWith($pos.before(), $pos.after(), videoNode);
-        } else {
-          tr.insert(insertPos, videoNode);
-        }
-        return true;
-      }).scrollIntoView().run();
-    }
+    const insertPos = savedPos ?? state.selection.from;
+    editor.chain().focus().command(({ tr, state: state2 }) => {
+      const $pos = state2.doc.resolve(insertPos);
+      const videoNode = state2.schema.nodes.video.create({ src: url });
+      if ($pos.parent.type.name === "paragraph" && $pos.parent.textContent === "") {
+        tr.replaceWith($pos.before(), $pos.after(), videoNode);
+        tr.setSelection(import_state5.TextSelection.near(tr.doc.resolve($pos.before())));
+      } else {
+        tr.insert(insertPos, videoNode);
+        tr.setSelection(import_state5.TextSelection.near(tr.doc.resolve(insertPos)));
+      }
+      return true;
+    }).run();
     closeDialogCommand();
   };
 };
@@ -5244,25 +5227,14 @@ var createHandleLinkAdd = (editor, closeDialogCommand, savedPos) => {
       }).run();
     } else {
       const { state } = editor;
-      const { $from } = state.selection;
-      const text = $from.parent.textContent;
-      const nodeStart = $from.start();
-      const beforeCursor = text.substring(0, $from.pos - nodeStart);
-      const slashIndex = beforeCursor.lastIndexOf("/");
-      if (slashIndex !== -1) {
-        editor.chain().focus().command(({ tr }) => {
-          tr.delete(nodeStart + slashIndex, $from.pos);
-          return true;
-        }).extendMarkRange("link").setLink({ href: url }).insertContent(title).scrollIntoView().run();
-      } else {
-        const insertPos = savedPos ?? state.selection.from;
-        editor.chain().focus().command(({ tr }) => {
-          const linkMark = editor.schema.marks.link.create({ href: url });
-          const textNode = editor.schema.text(title, [linkMark]);
-          tr.insert(insertPos, textNode);
-          return true;
-        }).scrollIntoView().run();
-      }
+      const insertPos = savedPos ?? state.selection.from;
+      editor.chain().focus().command(({ tr }) => {
+        const linkMark = editor.schema.marks.link.create({ href: url });
+        const textNode = editor.schema.text(title, [linkMark]);
+        tr.insert(insertPos, textNode);
+        tr.setSelection(import_state5.TextSelection.create(tr.doc, insertPos, insertPos + title.length));
+        return true;
+      }).run();
     }
     closeDialogCommand();
   };
@@ -5274,27 +5246,13 @@ var createHandleKatexAdd = (editor, closeDialogCommand, savedPos) => {
       editor.chain().setNodeSelection(pos).updateInlineMath({ latex }).focus().run();
     } else {
       const { state } = editor;
-      const { $from } = state.selection;
-      const text = $from.parent.textContent;
-      const nodeStart = $from.start();
-      const beforeCursor = text.substring(0, $from.pos - nodeStart);
-      const slashIndex = beforeCursor.lastIndexOf("/");
-      if (slashIndex !== -1) {
-        const deleteFrom = nodeStart + slashIndex;
-        const deleteTo = $from.pos;
-        editor.chain().focus().command(({ tr, state: state2 }) => {
-          const inlineMathNode = state2.schema.nodes.inlineMath.create({ latex });
-          tr.replaceRangeWith(deleteFrom, deleteTo, inlineMathNode);
-          return true;
-        }).scrollIntoView().run();
-      } else {
-        const insertPos = savedPos ?? state.selection.from;
-        editor.chain().focus().command(({ tr, state: state2 }) => {
-          const inlineMathNode = state2.schema.nodes.inlineMath.create({ latex });
-          tr.insert(insertPos, inlineMathNode);
-          return true;
-        }).scrollIntoView().run();
-      }
+      const insertPos = savedPos ?? state.selection.from;
+      editor.chain().focus().command(({ tr, state: state2 }) => {
+        const inlineMathNode = state2.schema.nodes.inlineMath.create({ latex });
+        tr.insert(insertPos, inlineMathNode);
+        tr.setSelection(import_state5.TextSelection.near(tr.doc.resolve(insertPos)));
+        return true;
+      }).run();
     }
     closeDialogCommand();
   };
@@ -6119,10 +6077,16 @@ function TiptapContent({
     setSavedDialogCursorPos(void 0);
     closeDialogCommand();
   };
-  const handleImageAdd = createHandleImageAdd(editor, handleCloseDialog, savedDialogCursorPos);
+  const handleImageAdd = (attrs) => {
+    createHandleImageAdd(editor, handleCloseDialog, savedDialogCursorPos)(attrs);
+  };
   const handleImageEdit = createHandleImageEdit(editor, handleCloseDialog, editFigureContext?.pos);
-  const handleVideoAdd = createHandleVideoAdd(editor, handleCloseDialog, savedDialogCursorPos);
-  const handleLinkAdd = createHandleLinkAdd(editor, handleCloseDialog, savedDialogCursorPos);
+  const handleVideoAdd = (url) => {
+    createHandleVideoAdd(editor, handleCloseDialog, savedDialogCursorPos)(url);
+  };
+  const handleLinkAdd = (title, url) => {
+    createHandleLinkAdd(editor, handleCloseDialog, savedDialogCursorPos)(title, url);
+  };
   const handleKatexAdd = (latex) => {
     const katexHandler = createHandleKatexAdd(editor, handleCloseDialog, savedDialogCursorPos);
     katexHandler(latex, katexDialogContext?.pos);
@@ -6134,7 +6098,7 @@ function TiptapContent({
     });
   }, [content, editor]);
   const shouldBubbleMenuShow = ({ state }) => {
-    if (state.selection instanceof import_state5.NodeSelection) {
+    if (state.selection instanceof import_state6.NodeSelection) {
       return false;
     }
     if (state.selection.empty) {