@8btc/mditor 0.0.3 → 0.0.5

package/src/ts/wysiwyg/input.ts

@@ -1,14 +1,16 @@
 import {
     getTopList,
-    hasClosestBlock, hasClosestByAttribute, hasTopClosestByTag,
+    hasClosestBlock,
+    hasClosestByAttribute,
+    hasTopClosestByTag,
 } from "../util/hasClosest";
-import {hasClosestByTag} from "../util/hasClosestByHeadings";
-import {log} from "../util/log";
-import {processCodeRender} from "../util/processCode";
-import {setRangeByWbr} from "../util/selection";
-import {renderToc} from "../util/toc";
-import {afterRenderEvent} from "./afterRenderEvent";
-import {previoueIsEmptyA} from "./inlineTag";
+import { hasClosestByTag } from "../util/hasClosestByHeadings";
+import { log } from "../util/log";
+import { processCodeRender } from "../util/processCode";
+import { setRangeByWbr } from "../util/selection";
+import { renderToc } from "../util/toc";
+import { afterRenderEvent } from "./afterRenderEvent";
+import { previoueIsEmptyA } from "./inlineTag";
 
 export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
     let blockElement = hasClosestBlock(range.startContainer);
@@ -18,18 +20,20 @@ export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
         blockElement = vditor.wysiwyg.element;
     }
 
-    if (event && event.inputType !== "formatItalic"
-        && event.inputType !== "deleteByDrag"
-        && event.inputType !== "insertFromDrop"
-        && event.inputType !== "formatBold"
-        && event.inputType !== "formatRemove"
-        && event.inputType !== "formatStrikeThrough"
-        && event.inputType !== "insertUnorderedList"
-        && event.inputType !== "insertOrderedList"
-        && event.inputType !== "formatOutdent"
-        && event.inputType !== "formatIndent"
-        && event.inputType !== ""   // document.execCommand('unlink', false)
-        || !event
+    if (
+        (event &&
+            event.inputType !== "formatItalic" &&
+            event.inputType !== "deleteByDrag" &&
+            event.inputType !== "insertFromDrop" &&
+            event.inputType !== "formatBold" &&
+            event.inputType !== "formatRemove" &&
+            event.inputType !== "formatStrikeThrough" &&
+            event.inputType !== "insertUnorderedList" &&
+            event.inputType !== "insertOrderedList" &&
+            event.inputType !== "formatOutdent" &&
+            event.inputType !== "formatIndent" &&
+            event.inputType !== "") || // document.execCommand('unlink', false)
+        !event
     ) {
         const previousAEmptyElement = previoueIsEmptyA(range.startContainer);
         if (previousAEmptyElement) {
@@ -51,17 +55,25 @@ export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
         // 移除空评论
         blockElement.querySelectorAll(".vditor-comment").forEach((item) => {
             if (item.textContent.trim() === "") {
-                item.classList.remove("vditor-comment", "vditor-comment--focus");
+                item.classList.remove(
+                    "vditor-comment",
+                    "vditor-comment--focus"
+                );
                 item.removeAttribute("data-cmtids");
             }
         });
         //  在有评论的行首换行后，该行的前一段会带有评论标识
-        blockElement.previousElementSibling?.querySelectorAll(".vditor-comment").forEach((item) => {
-            if (item.textContent.trim() === "") {
-                item.classList.remove("vditor-comment", "vditor-comment--focus");
-                item.removeAttribute("data-cmtids");
-            }
-        });
+        blockElement.previousElementSibling
+            ?.querySelectorAll(".vditor-comment")
+            .forEach((item) => {
+                if (item.textContent.trim() === "") {
+                    item.classList.remove(
+                        "vditor-comment",
+                        "vditor-comment--focus"
+                    );
+                    item.removeAttribute("data-cmtids");
+                }
+            });
 
         let html = "";
         if (blockElement.getAttribute("data-type") === "link-ref-defs-block") {
@@ -69,17 +81,27 @@ export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
             blockElement = vditor.wysiwyg.element;
         }
 
-        const isWYSIWYGElement = blockElement.isEqualNode(vditor.wysiwyg.element);
-        const footnoteElement = hasClosestByAttribute(blockElement, "data-type", "footnotes-block");
+        const isWYSIWYGElement = blockElement.isEqualNode(
+            vditor.wysiwyg.element
+        );
+        const footnoteElement = hasClosestByAttribute(
+            blockElement,
+            "data-type",
+            "footnotes-block"
+        );
 
         if (!isWYSIWYGElement) {
             // 列表需要到最顶层
             const topListElement = getTopList(range.startContainer);
             if (topListElement && !footnoteElement) {
-                const blockquoteElement = hasClosestByTag(range.startContainer, "BLOCKQUOTE");
+                const blockquoteElement = hasClosestByTag(
+                    range.startContainer,
+                    "BLOCKQUOTE"
+                );
                 if (blockquoteElement) {
                     // li 中有 blockquote 就只渲染 blockquote
-                    blockElement = hasClosestBlock(range.startContainer) || blockElement;
+                    blockElement =
+                        hasClosestBlock(range.startContainer) || blockElement;
                 } else {
                     blockElement = topListElement;
                 }
@@ -92,50 +114,81 @@ export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
 
             html = blockElement.outerHTML;
 
-            if (blockElement.tagName === "UL" || blockElement.tagName === "OL") {
+            if (
+                blockElement.tagName === "UL" ||
+                blockElement.tagName === "OL"
+            ) {
                 // 如果为列表的话，需要把上下的列表都重绘
                 const listPrevElement = blockElement.previousElementSibling;
                 const listNextElement = blockElement.nextElementSibling;
-                if (listPrevElement && (listPrevElement.tagName === "UL" || listPrevElement.tagName === "OL")) {
+                if (
+                    listPrevElement &&
+                    (listPrevElement.tagName === "UL" ||
+                        listPrevElement.tagName === "OL")
+                ) {
                     html = listPrevElement.outerHTML + html;
                     listPrevElement.remove();
                 }
-                if (listNextElement && (listNextElement.tagName === "UL" || listNextElement.tagName === "OL")) {
+                if (
+                    listNextElement &&
+                    (listNextElement.tagName === "UL" ||
+                        listNextElement.tagName === "OL")
+                ) {
                     html = html + listNextElement.outerHTML;
                     listNextElement.remove();
                 }
                 // firefox 列表回车不会产生新的 list item https://github.com/Vanessa219/vditor/issues/194
-                html = html.replace("<div><wbr><br></div>", "<li><p><wbr><br></p></li>");
+                html = html.replace(
+                    "<div><wbr><br></div>",
+                    "<li><p><wbr><br></p></li>"
+                );
             }
 
             if (!blockElement.innerText.startsWith("```")) {
                 // 添加链接引用
-                vditor.wysiwyg.element.querySelectorAll("[data-type='link-ref-defs-block']").forEach((item) => {
-                    if (item && !(blockElement as HTMLElement).isEqualNode(item)) {
-                        html += item.outerHTML;
-                        item.remove();
-                    }
-                });
+                vditor.wysiwyg.element
+                    .querySelectorAll("[data-type='link-ref-defs-block']")
+                    .forEach((item) => {
+                        if (
+                            item &&
+                            !(blockElement as HTMLElement).isEqualNode(item)
+                        ) {
+                            html += item.outerHTML;
+                            item.remove();
+                        }
+                    });
 
                 // 添加脚注
-                vditor.wysiwyg.element.querySelectorAll("[data-type='footnotes-block']").forEach((item) => {
-                    if (item && !(blockElement as HTMLElement).isEqualNode(item)) {
-                        html += item.outerHTML;
-                        item.remove();
-                    }
-                });
+                vditor.wysiwyg.element
+                    .querySelectorAll("[data-type='footnotes-block']")
+                    .forEach((item) => {
+                        if (
+                            item &&
+                            !(blockElement as HTMLElement).isEqualNode(item)
+                        ) {
+                            html += item.outerHTML;
+                            item.remove();
+                        }
+                    });
             }
         } else {
             html = blockElement.innerHTML;
         }
 
         // 合并多个 em， strong，s。以防止多个相同元素在一起时不满足 commonmark 规范，出现标记符
-        html = html.replace(/<\/(strong|b)><strong data-marker="\W{2}">/g, "")
+        html = html
+            .replace(/<\/(strong|b)><strong data-marker="\W{2}">/g, "")
             .replace(/<\/(em|i)><em data-marker="\W{1}">/g, "")
             .replace(/<\/(s|strike)><s data-marker="~{1,2}">/g, "");
 
-        if (html === '<p data-block="0">```<wbr></p>' && vditor.hint.recentLanguage) {
-            html = '<p data-block="0">```<wbr></p>'.replace("```", "```" + vditor.hint.recentLanguage);
+        if (
+            html === '<p data-block="0">```<wbr></p>' &&
+            vditor.hint.recentLanguage
+        ) {
+            html = '<p data-block="0">```<wbr></p>'.replace(
+                "```",
+                "```" + vditor.hint.recentLanguage
+            );
         }
 
         log("SpinVditorDOM", html, "argument", vditor.options.debugger);
@@ -149,58 +202,89 @@ export const input = (vditor: IVditor, range: Range, event?: InputEvent) => {
 
             if (footnoteElement) {
                 // 更新正文中的 tip
-                const footnoteItemElement = hasTopClosestByTag(vditor.wysiwyg.element.querySelector("wbr"), "LI");
+                const footnoteItemElement = hasTopClosestByTag(
+                    vditor.wysiwyg.element.querySelector("wbr"),
+                    "LI"
+                );
                 if (footnoteItemElement) {
-                    const footnoteRefElement = vditor.wysiwyg.element.querySelector(`sup[data-type="footnotes-ref"][data-footnotes-label="${footnoteItemElement.getAttribute("data-marker")}"]`);
+                    const footnoteRefElement =
+                        vditor.wysiwyg.element.querySelector(
+                            `sup[data-type="footnotes-ref"][data-footnotes-label="${footnoteItemElement.getAttribute("data-marker")}"]`
+                        );
                     if (footnoteRefElement) {
-                        footnoteRefElement.setAttribute("aria-label",
-                            footnoteItemElement.textContent.trim().substr(0, 24));
+                        footnoteRefElement.setAttribute(
+                            "aria-label",
+                            footnoteItemElement.textContent.trim().substr(0, 24)
+                        );
                     }
                 }
             }
         }
 
         let firstLinkRefDefElement: Element;
-        const allLinkRefDefsElement = vditor.wysiwyg.element.querySelectorAll("[data-type='link-ref-defs-block']");
+        const allLinkRefDefsElement = vditor.wysiwyg.element.querySelectorAll(
+            "[data-type='link-ref-defs-block']"
+        );
         allLinkRefDefsElement.forEach((item, index) => {
             if (index === 0) {
                 firstLinkRefDefElement = item;
             } else {
-                firstLinkRefDefElement.insertAdjacentHTML("beforeend", item.innerHTML);
+                firstLinkRefDefElement.insertAdjacentHTML(
+                    "beforeend",
+                    item.innerHTML
+                );
                 item.remove();
             }
         });
         if (allLinkRefDefsElement.length > 0) {
-            vditor.wysiwyg.element.insertAdjacentElement("beforeend", allLinkRefDefsElement[0]);
+            vditor.wysiwyg.element.insertAdjacentElement(
+                "beforeend",
+                allLinkRefDefsElement[0]
+            );
         }
 
         // 脚注合并后添加的末尾
         let firstFootnoteElement: Element;
-        const allFootnoteElement = vditor.wysiwyg.element.querySelectorAll("[data-type='footnotes-block']");
+        const allFootnoteElement = vditor.wysiwyg.element.querySelectorAll(
+            "[data-type='footnotes-block']"
+        );
         allFootnoteElement.forEach((item, index) => {
             if (index === 0) {
                 firstFootnoteElement = item;
             } else {
-                firstFootnoteElement.insertAdjacentHTML("beforeend", item.innerHTML);
+                firstFootnoteElement.insertAdjacentHTML(
+                    "beforeend",
+                    item.innerHTML
+                );
                 item.remove();
             }
         });
         if (allFootnoteElement.length > 0) {
-            vditor.wysiwyg.element.insertAdjacentElement("beforeend", allFootnoteElement[0]);
+            vditor.wysiwyg.element.insertAdjacentElement(
+                "beforeend",
+                allFootnoteElement[0]
+            );
         }
 
         // 设置光标
         setRangeByWbr(vditor.wysiwyg.element, range);
 
-        vditor.wysiwyg.element.querySelectorAll(".vditor-wysiwyg__preview[data-render='2']")
+        vditor.wysiwyg.element
+            .querySelectorAll(".vditor-wysiwyg__preview[data-render='2']")
             .forEach((item: HTMLElement) => {
                 processCodeRender(item, vditor);
             });
 
-        if (event && (event.inputType === "deleteContentBackward" || event.inputType === "deleteContentForward") &&
-            vditor.options.comment.enable) {
+        if (
+            event &&
+            (event.inputType === "deleteContentBackward" ||
+                event.inputType === "deleteContentForward") &&
+            vditor.options.comment.enable
+        ) {
             vditor.wysiwyg.triggerRemoveComment(vditor);
-            vditor.options.comment.adjustTop(vditor.wysiwyg.getComments(vditor, true));
+            vditor.options.comment.adjustTop(
+                vditor.wysiwyg.getComments(vditor, true)
+            );
         }
     }
     renderToc(vditor);

package/src/ts/wysiwyg/renderDomByMd.ts

@@ -1,18 +1,33 @@
-import {processCodeRender} from "../util/processCode";
-import {afterRenderEvent} from "./afterRenderEvent";
+import { processCodeRender } from "../util/processCode";
+import { afterRenderEvent } from "./afterRenderEvent";
+import { attachLineNumbersToBlocks } from "../util/attachLineNumbers";
 
-export const renderDomByMd = (vditor: IVditor, md: string, options = {
-    enableAddUndoStack: true,
-    enableHint: false,
-    enableInput: true,
-}) => {
+export const renderDomByMd = (
+    vditor: IVditor,
+    md: string,
+    options = {
+        enableAddUndoStack: true,
+        enableHint: false,
+        enableInput: true,
+    }
+) => {
     const editorElement = vditor.wysiwyg.element;
     editorElement.innerHTML = vditor.lute.Md2VditorDOM(md);
 
-    editorElement.querySelectorAll(".vditor-wysiwyg__preview[data-render='2']").forEach((item: HTMLElement) => {
-        processCodeRender(item, vditor);
-        item.previousElementSibling.setAttribute("style", "display:none");
-    });
+    editorElement
+        .querySelectorAll(".vditor-wysiwyg__preview[data-render='2']")
+        .forEach((item: HTMLElement) => {
+            processCodeRender(item, vditor);
+            item.previousElementSibling.setAttribute("style", "display:none");
+        });
+
+    if (vditor.options.lineNumber) {
+        try {
+            attachLineNumbersToBlocks(editorElement, md);
+        } catch {
+            void 0;
+        }
+    }
 
     afterRenderEvent(vditor, options);
 };