@anweb/nuxt-aneditor 0.1.6 → 0.1.7

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "AnEditor",
   "configKey": "aneditor",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/AnEditor/Editor.client.vue

@@ -57,6 +57,7 @@ const resetTypingStyle = () => {
   if (!refContent.value) return;
   const text = refContent.value.textContent ?? "";
   if (text.trim()) return;
+  if (refContent.value.querySelector("figure, table, pre, hr, .an-editor__youtube, .an-editor__html")) return;
   wasEmpty = true;
   const inlines = refContent.value.querySelectorAll("strong, em, s, b, i, u, span:not([class])");
   for (const el of inlines) {
@@ -513,37 +514,68 @@ const onKeydown = (e) => {
   }
   if (e.key === "Enter" && !e.shiftKey) {
     const sel = selection.getSelection();
-    if (sel) {
-      let node = sel.range.commonAncestorContainer;
-      if (node.nodeType === Node.TEXT_NODE) node = node.parentNode;
-      const cell = node?.closest?.("td, th");
-      if (cell && refContent.value?.contains(cell)) {
-        e.preventDefault();
-        const br = document.createElement("br");
-        sel.range.deleteContents();
-        sel.range.insertNode(br);
-        sel.range.setStartAfter(br);
-        sel.range.collapse(true);
-        sel.selection.removeAllRanges();
-        sel.selection.addRange(sel.range);
-        syncToModel();
-        return;
-      }
-      const heading = node?.closest?.("h1, h2, h3, h4, h5, h6");
-      if (heading && refContent.value?.contains(heading)) {
-        e.preventDefault();
-        const p = document.createElement("p");
-        p.innerHTML = "<br>";
-        heading.parentNode.insertBefore(p, heading.nextSibling);
-        const range = document.createRange();
-        range.setStart(p, 0);
-        range.collapse(true);
-        sel.selection.removeAllRanges();
-        sel.selection.addRange(range);
-        syncToModel();
-        return;
+    if (!sel) return;
+    let node = sel.range.commonAncestorContainer;
+    if (node.nodeType === Node.TEXT_NODE) node = node.parentNode;
+    const el = node;
+    const cell = el?.closest?.("td, th");
+    if (cell && refContent.value?.contains(cell)) {
+      e.preventDefault();
+      const br = document.createElement("br");
+      sel.range.deleteContents();
+      sel.range.insertNode(br);
+      sel.range.setStartAfter(br);
+      sel.range.collapse(true);
+      sel.selection.removeAllRanges();
+      sel.selection.addRange(sel.range);
+      syncToModel();
+      return;
+    }
+    if (el?.closest?.("pre") && refContent.value?.contains(el)) return;
+    if (el?.closest?.("li") && refContent.value?.contains(el)) return;
+    e.preventDefault();
+    if (!sel.range.collapsed) sel.range.deleteContents();
+    let block = sel.range.commonAncestorContainer;
+    if (block?.nodeType === Node.TEXT_NODE) block = block.parentNode;
+    while (block && block.parentNode !== refContent.value) {
+      block = block.parentNode;
+    }
+    const newP = document.createElement("p");
+    if (!block || block === refContent.value) {
+      newP.innerHTML = "<br>";
+      refContent.value.appendChild(newP);
+    } else {
+      const blockEl = block;
+      const tag = blockEl.tagName;
+      const isNonSplittable = tag === "FIGURE" || tag === "HR" || /^H[1-6]$/.test(tag) || blockEl.classList?.contains("an-editor__youtube") || blockEl.classList?.contains("an-editor__html");
+      if (isNonSplittable) {
+        newP.innerHTML = "<br>";
+        block.parentNode.insertBefore(newP, block);
+      } else {
+        const splitRange = document.createRange();
+        splitRange.setStart(sel.range.startContainer, sel.range.startOffset);
+        if (blockEl.lastChild) {
+          splitRange.setEndAfter(blockEl.lastChild);
+        } else {
+          splitRange.setEnd(blockEl, 0);
+        }
+        const afterContent = splitRange.extractContents();
+        newP.appendChild(afterContent);
+        if (!newP.textContent?.trim() && !newP.querySelector("img")) {
+          newP.innerHTML = "<br>";
+        }
+        block.parentNode.insertBefore(newP, block.nextSibling);
+        if (!blockEl.textContent?.trim() && !blockEl.querySelector("img")) {
+          blockEl.innerHTML = "<br>";
+        }
       }
     }
+    const newRange = document.createRange();
+    newRange.setStart(newP, 0);
+    newRange.collapse(true);
+    sel.selection.removeAllRanges();
+    sel.selection.addRange(newRange);
+    syncToModel();
   }
 };
 const updateActiveFormats = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anweb/nuxt-aneditor",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"description": "AnEditor Nuxt module — WYSIWYG markdown editor",
 	"repository": "https://github.com/ANLTD/aneditor",
 	"license": "MIT",