vditor 3.11.2 → 4.0.0

package/src/ts/undo/index.ts

@@ -52,7 +52,8 @@ class Undo {
     }
 
     public undo(vditor: IVditor) {
-        if (vditor[vditor.currentMode].element.getAttribute("contenteditable") === "false") {
+        if (vditor.currentMode === "sv" ? vditor.sv.element.disabled :
+            vditor[vditor.currentMode].element.getAttribute("contenteditable") === "false") {
             return;
         }
         if (this[vditor.currentMode].undoStack.length < 2) {
@@ -70,7 +71,8 @@ class Undo {
     }
 
     public redo(vditor: IVditor) {
-        if (vditor[vditor.currentMode].element.getAttribute("contenteditable") === "false") {
+        if (vditor.currentMode === "sv" ? vditor.sv.element.disabled :
+            vditor[vditor.currentMode].element.getAttribute("contenteditable") === "false") {
             return;
         }
         const state = this[vditor.currentMode].redoStack.pop();
@@ -82,7 +84,7 @@ class Undo {
     }
 
     public recordFirstPosition(vditor: IVditor, event: KeyboardEvent) {
-        if (getSelection().rangeCount === 0) {
+        if (vditor.currentMode !== "sv" && getSelection().rangeCount === 0) {
             return;
         }
         if (this[vditor.currentMode].undoStack.length !== 1 || this[vditor.currentMode].undoStack[0].length === 0 ||
@@ -147,8 +149,15 @@ class Undo {
         }
 
         this[vditor.currentMode].lastText = text;
-        vditor[vditor.currentMode].element.innerHTML = text;
-        if (vditor.currentMode !== "sv") {
+        if (vditor.currentMode === "sv") {
+            const caretIndex = text.indexOf("<wbr>");
+            vditor.sv.element.value = text.replace("<wbr>", "");
+            vditor.sv.element.focus();
+            if (caretIndex > -1) {
+                vditor.sv.element.setSelectionRange(caretIndex, caretIndex);
+            }
+        } else {
+            vditor[vditor.currentMode].element.innerHTML = text;
             vditor[vditor.currentMode].element.querySelectorAll(`.vditor-${vditor.currentMode}__preview`)
                 .forEach((blockElement: HTMLElement) => {
                     if (blockElement.parentElement.querySelector(".language-echarts")) {
@@ -163,17 +172,16 @@ class Undo {
                 .forEach((blockElement: HTMLElement) => {
                     processCodeRender(blockElement, vditor);
                 });
-        }
-
-        if (!vditor[vditor.currentMode].element.querySelector("wbr")) {
-            // Safari 第一次输入没有光标，需手动定位到结尾
-            const range = getSelection().getRangeAt(0);
-            range.setEndBefore(vditor[vditor.currentMode].element);
-            range.collapse(false);
-        } else {
-            setRangeByWbr(
-                vditor[vditor.currentMode].element, vditor[vditor.currentMode].element.ownerDocument.createRange());
-            scrollCenter(vditor);
+            if (!vditor[vditor.currentMode].element.querySelector("wbr")) {
+                // Safari 第一次输入没有光标，需手动定位到结尾
+                const range = getSelection().getRangeAt(0);
+                range.setEndBefore(vditor[vditor.currentMode].element);
+                range.collapse(false);
+            } else {
+                setRangeByWbr(
+                    vditor[vditor.currentMode].element, vditor[vditor.currentMode].element.ownerDocument.createRange());
+                scrollCenter(vditor);
+            }
         }
 
         renderToc(vditor);
@@ -183,7 +191,9 @@ class Undo {
             enableHint: false,
             enableInput: true,
         });
-        highlightToolbar(vditor);
+        if (vditor.currentMode !== "sv") {
+            highlightToolbar(vditor);
+        }
 
         vditor[vditor.currentMode].element.querySelectorAll(`.vditor-${vditor.currentMode}__preview[data-render='2']`)
             .forEach((item: HTMLElement) => {
@@ -225,6 +235,11 @@ class Undo {
     }
 
     private addCaret(vditor: IVditor, setFocus = false) {
+        if (vditor.currentMode === "sv") {
+            const element = vditor.sv.element;
+            return element.value.substring(0, element.selectionStart) + "<wbr>" +
+                element.value.substring(element.selectionStart);
+        }
         let cloneRange: Range;
         if (getSelection().rangeCount !== 0 && !vditor[vditor.currentMode].element.querySelector("wbr")) {
             const range = getSelection().getRangeAt(0);

package/src/ts/upload/index.ts

@@ -1,11 +1,14 @@
-import { getEditorRange, setSelectionFocus } from "../util/selection";
-import { getElement } from "./getElement";
-import { setHeaders } from "./setHeaders";
+import {getEditorRange, setSelectionFocus} from "../util/selection";
+import {processAfterRender as processSVAfterRender, processPaste} from "../sv/process";
+import {getElement} from "./getElement";
+import {setHeaders} from "./setHeaders";
 
 class Upload {
     public element: HTMLElement;
     public isUploading: boolean;
     public range: Range;
+    public selectionEnd: number;
+    public selectionStart: number;
 
     constructor() {
         this.isUploading = false;
@@ -146,9 +149,25 @@ const genUploadedLabel = (responseText: string, vditor: IVditor) => {
             }
         }
     });
-    setSelectionFocus(vditor.upload.range);
-    document.execCommand("insertHTML", false, succFileText);
-    vditor.upload.range = getSelection().getRangeAt(0).cloneRange();
+    if (!succFileText) {
+        if (vditor.currentMode === "sv") {
+            vditor.sv.element.setSelectionRange(vditor.upload.selectionStart, vditor.upload.selectionEnd);
+        } else {
+            setSelectionFocus(vditor.upload.range);
+        }
+        return;
+    }
+    if (vditor.currentMode === "sv") {
+        vditor.sv.element.setSelectionRange(vditor.upload.selectionStart, vditor.upload.selectionEnd);
+        processPaste(vditor, succFileText);
+        processSVAfterRender(vditor);
+        vditor.upload.selectionStart = vditor.sv.element.selectionStart;
+        vditor.upload.selectionEnd = vditor.sv.element.selectionEnd;
+    } else {
+        setSelectionFocus(vditor.upload.range);
+        document.execCommand("insertHTML", false, succFileText);
+        vditor.upload.range = getSelection().getRangeAt(0).cloneRange();
+    }
 };
 
 const uploadFiles =
@@ -197,7 +216,12 @@ const uploadFiles =
         }
         const editorElement = getElement(vditor);
 
-        vditor.upload.range = getEditorRange(vditor);
+        if (vditor.currentMode === "sv") {
+            vditor.upload.selectionStart = vditor.sv.element.selectionStart;
+            vditor.upload.selectionEnd = vditor.sv.element.selectionEnd;
+        } else {
+            vditor.upload.range = getEditorRange(vditor);
+        }
 
         const validateResult = validateFile(vditor, fileList);
         if (validateResult.length === 0) {
@@ -229,11 +253,19 @@ const uploadFiles =
         }
         setHeaders(vditor, xhr);
         vditor.upload.isUploading = true;
-        editorElement.setAttribute("contenteditable", "false");
+        if (vditor.currentMode === "sv") {
+            vditor.sv.element.disabled = true;
+        } else {
+            editorElement.setAttribute("contenteditable", "false");
+        }
         xhr.onreadystatechange = () => {
             if (xhr.readyState === XMLHttpRequest.DONE) {
                 vditor.upload.isUploading = false;
-                editorElement.setAttribute("contenteditable", "true");
+                if (vditor.currentMode === "sv") {
+                    vditor.sv.element.disabled = false;
+                } else {
+                    editorElement.setAttribute("contenteditable", "true");
+                }
                 if (xhr.status >= 200 && xhr.status < 300) {
                     if (vditor.options.upload.success) {
                         vditor.options.upload.success(editorElement, xhr.responseText);
@@ -270,4 +302,4 @@ const uploadFiles =
         xhr.send(formData);
     };
 
-export { Upload, uploadFiles };
+export {Upload, uploadFiles};

package/src/ts/util/Options.ts

@@ -290,7 +290,7 @@ export class Options {
                 hotkey: "⇧⌘H",
                 icon: '<svg><use xlink:href="#vditor-icon-line"></use></svg>',
                 name: "line",
-                prefix: "---",
+                prefix: "***",
                 tipPosition: "n",
             },
             {

package/src/ts/util/editorCommonEvent.ts

@@ -45,18 +45,22 @@ export const blurEvent = (vditor: IVditor, editorElement: HTMLElement) => {
             if (expandElement) {
                 expandElement.classList.remove("vditor-ir__node--expand");
             }
-        } else if (vditor.currentMode === "wysiwyg" &&
-            !vditor.wysiwyg.selectPopover.contains(event.relatedTarget as HTMLElement)) {
-            vditor.wysiwyg.hideComment();
+            vditor.ir.range = getEditorRange(vditor);
+        } else if (vditor.currentMode === "wysiwyg") {
+            if (!vditor.wysiwyg.selectPopover.contains(event.relatedTarget as HTMLElement)) {
+                vditor.wysiwyg.hideComment();
+            }
+            vditor.wysiwyg.range = getEditorRange(vditor);
         }
-        vditor[vditor.currentMode].range = getEditorRange(vditor);
         if (vditor.options.blur) {
             vditor.options.blur(getMarkdown(vditor));
         }
     });
 };
 
-export const dropEvent = (vditor: IVditor, editorElement: HTMLElement) => {
+export const dropEvent = (vditor: IVditor, editorElement: HTMLElement, pasteCode = (code: string) => {
+    document.execCommand("insertHTML", false, code);
+}) => {
     editorElement.addEventListener("dragstart", (event) => {
         // 选中编辑器中的文字进行拖拽
         event.dataTransfer.setData(Constants.DROP_EDITOR, Constants.DROP_EDITOR);
@@ -69,9 +73,7 @@ export const dropEvent = (vditor: IVditor, editorElement: HTMLElement) => {
             } else if (event.dataTransfer.types.includes("Files") || event.dataTransfer.types.includes("text/html")) {
                 // 外部文件拖入编辑器中或者编辑器内选中文字拖拽
                 paste(vditor, event, {
-                    pasteCode: (code: string) => {
-                        document.execCommand("insertHTML", false, code);
-                    },
+                    pasteCode,
                 });
             }
         });
@@ -102,7 +104,14 @@ export const scrollCenter = (vditor: IVditor) => {
         return;
     }
     const editorElement = vditor[vditor.currentMode].element;
-    const cursorTop = getCursorPosition(editorElement).top;
+    let cursorTop: number;
+    if (vditor.currentMode === "sv") {
+        const lineHeight = parseInt(getComputedStyle(vditor.sv.element).lineHeight, 10) || 22;
+        cursorTop = (vditor.sv.element.value.substring(0, vditor.sv.element.selectionStart).split("\n").length - 1) *
+            lineHeight;
+    } else {
+        cursorTop = getCursorPosition(editorElement).top;
+    }
     if (vditor.options.height === "auto" && !vditor.element.classList.contains("vditor--fullscreen")) {
         window.scrollTo(window.scrollX,
             cursorTop + vditor.element.offsetTop + vditor.toolbar.element.offsetHeight - window.innerHeight / 2 + 10);

package/src/ts/util/fixBrowserBehavior.ts

@@ -79,6 +79,21 @@ export const fixCursorDownInlineMath = (range: Range, key: string) => {
 };
 
 export const insertEmptyBlock = (vditor: IVditor, position: InsertPosition) => {
+    if (vditor.currentMode === "sv") {
+        const element = vditor.sv.element;
+        if (position === "beforebegin") {
+            const lineStart = element.value.lastIndexOf("\n", element.selectionStart - 1) + 1;
+            element.setRangeText("\n", lineStart, lineStart, "end");
+            element.setSelectionRange(lineStart, lineStart);
+        } else {
+            const lineEndIndex = element.value.indexOf("\n", element.selectionEnd);
+            const lineEnd = lineEndIndex === -1 ? element.value.length : lineEndIndex;
+            element.setRangeText("\n", lineEnd, lineEnd, "end");
+        }
+        element.focus();
+        processSVAfterRender(vditor);
+        return;
+    }
     const range = getEditorRange(vditor);
     const blockElement = hasClosestBlock(range.startContainer);
     if (blockElement) {
@@ -177,10 +192,40 @@ export const insertBeforeBlock = (vditor: IVditor, event: KeyboardEvent, range:
 
 export const listToggle = (vditor: IVditor, range: Range, type: string, cancel = true) => {
     const itemElement = hasClosestByMatchTag(range.startContainer, "LI");
+    const selectedBlockElements: HTMLElement[] = [];
+    const startBlockElement = hasClosestByAttribute(range.startContainer, "data-block", "0");
+    const endBlockElement = hasClosestByAttribute(range.endContainer, "data-block", "0");
+    if (startBlockElement && endBlockElement &&
+        startBlockElement.parentElement.isSameNode(endBlockElement.parentElement)) {
+        let blockElement: Element = startBlockElement;
+        while (blockElement) {
+            selectedBlockElements.push(blockElement as HTMLElement);
+            if (blockElement.isSameNode(endBlockElement)) {
+                break;
+            }
+            blockElement = blockElement.nextElementSibling;
+        }
+    }
     vditor[vditor.currentMode].element.querySelectorAll("wbr").forEach((wbr) => {
         wbr.remove();
     });
-    range.insertNode(document.createElement("wbr"));
+    const keepSelection = !range.collapsed;
+    if (keepSelection) {
+        // 列表转换会重建块元素，分别标记选区起止位置以便恢复原始选区
+        const endRange = range.cloneRange();
+        endRange.collapse(false);
+        const endElement = document.createElement("wbr");
+        endElement.setAttribute("data-type", "list-selection-end");
+        endRange.insertNode(endElement);
+
+        const startRange = range.cloneRange();
+        startRange.collapse(true);
+        const startElement = document.createElement("wbr");
+        startElement.setAttribute("data-type", "list-selection-start");
+        startRange.insertNode(startElement);
+    } else {
+        range.insertNode(document.createElement("wbr"));
+    }
 
     if (cancel && itemElement) {
         // 取消
@@ -197,25 +242,24 @@ export const listToggle = (vditor: IVditor, range: Range, type: string, cancel =
     } else {
         if (!itemElement) {
             // 添加
-            let blockElement = hasClosestByAttribute(range.startContainer, "data-block", "0");
-            if (!blockElement) {
+            if (selectedBlockElements.length === 0) {
                 vditor[vditor.currentMode].element.querySelector("wbr").remove();
-                blockElement = vditor[vditor.currentMode].element.querySelector("p");
+                const blockElement = vditor[vditor.currentMode].element.querySelector("p");
                 blockElement.innerHTML = "<wbr>";
+                selectedBlockElements.push(blockElement);
             }
-            if (type === "check") {
-                blockElement.insertAdjacentHTML("beforebegin",
-                    `<ul data-block="0"><li class="vditor-task"><input type="checkbox" /> ${blockElement.innerHTML}</li></ul>`);
-                blockElement.remove();
-            } else if (type === "list") {
-                blockElement.insertAdjacentHTML("beforebegin",
-                    `<ul data-block="0"><li>${blockElement.innerHTML}</li></ul>`);
-                blockElement.remove();
-            } else if (type === "ordered-list") {
-                blockElement.insertAdjacentHTML("beforebegin",
-                    `<ol data-block="0"><li>${blockElement.innerHTML}</li></ol>`);
-                blockElement.remove();
-            }
+            let listHTML = "";
+            selectedBlockElements.forEach((blockElement) => {
+                if (type === "check") {
+                    listHTML += `<li class="vditor-task"><input type="checkbox" /> ${blockElement.innerHTML}</li>`;
+                } else {
+                    listHTML += `<li>${blockElement.innerHTML}</li>`;
+                }
+            });
+            const listTagName = type === "ordered-list" ? "ol" : "ul";
+            selectedBlockElements[0].insertAdjacentHTML("beforebegin",
+                `<${listTagName} data-block="0">${listHTML}</${listTagName}>`);
+            selectedBlockElements.forEach((blockElement) => blockElement.remove());
         } else {
             // 切换
             if (type === "check") {
@@ -227,7 +271,14 @@ export const listToggle = (vditor: IVditor, range: Range, type: string, cancel =
             } else {
                 if (itemElement.querySelector("input")) {
                     itemElement.parentElement.querySelectorAll("li").forEach((item) => {
-                        item.querySelector("input").remove();
+                        const inputElement = item.querySelector("input");
+                        if (inputElement) {
+                            const nextSibling = inputElement.nextSibling;
+                            inputElement.remove();
+                            if (nextSibling && nextSibling.nodeType === 3 && nextSibling.textContent.startsWith(" ")) {
+                                nextSibling.textContent = nextSibling.textContent.substring(1);
+                            }
+                        }
                         item.classList.remove("vditor-task");
                     });
                 }
@@ -246,6 +297,18 @@ export const listToggle = (vditor: IVditor, range: Range, type: string, cancel =
             }
         }
     }
+    if (keepSelection) {
+        const editorElement = vditor[vditor.currentMode].element;
+        const startElement = editorElement.querySelector('[data-type="list-selection-start"]');
+        const endElement = editorElement.querySelector('[data-type="list-selection-end"]');
+        if (startElement && endElement) {
+            range.setStartAfter(startElement);
+            range.setEndBefore(endElement);
+            startElement.remove();
+            endElement.remove();
+            setSelectionFocus(range);
+        }
+    }
 };
 
 export const listIndent = (vditor: IVditor, liElement: HTMLElement, range: Range) => {
@@ -453,6 +516,41 @@ export const execAfterRender = (vditor: IVditor, options = {
     }
 };
 
+const isEmptyListItem = (liElement: HTMLElement) => {
+    if (liElement.textContent.split(Constants.ZWSP).join("").trim() !== "") {
+        return false;
+    }
+    return !liElement.querySelector([
+        "audio", "canvas", "embed", "hr", "iframe", "img", "object", "ol", "pre", "svg", "table", "ul", "video",
+        "input:not([type='checkbox'])",
+    ].join(", "));
+};
+
+export const exitEmptyListItem = (liElement: HTMLElement) => {
+    const listElement = liElement.parentElement;
+    const listParent = listElement.parentElement;
+    const paragraphElement = document.createElement("p");
+    paragraphElement.setAttribute("data-block", "0");
+    paragraphElement.innerHTML = "<wbr>";
+
+    let trailingListElement: HTMLElement | undefined;
+    if (liElement.nextElementSibling) {
+        trailingListElement = listElement.cloneNode(false) as HTMLElement;
+        while (liElement.nextElementSibling) {
+            trailingListElement.appendChild(liElement.nextElementSibling);
+        }
+        listParent.insertBefore(trailingListElement, listElement.nextSibling);
+    }
+
+    liElement.remove();
+    if (listElement.childElementCount === 0) {
+        listParent.replaceChild(paragraphElement, listElement);
+    } else {
+        listParent.insertBefore(paragraphElement, trailingListElement || listElement.nextSibling);
+    }
+    return paragraphElement;
+};
+
 export const fixList = (range: Range, vditor: IVditor, pElement: HTMLElement | false, event: KeyboardEvent) => {
     const startContainer = range.startContainer;
     const liElement = hasClosestByMatchTag(startContainer, "LI");
@@ -471,6 +569,28 @@ export const fixList = (range: Range, vditor: IVditor, pElement: HTMLElement | f
             return true;
         }
 
+        // 嵌套列表末尾的空列表项回车后转为父列表项中的段落
+        // https://github.com/Vanessa219/vditor/issues/939
+        if (!isCtrl(event) && !event.shiftKey && !event.altKey && event.key === "Enter" && range.collapsed &&
+            !liElement.nextElementSibling && liElement.parentElement.parentElement.tagName === "LI" &&
+            isEmptyListItem(liElement)) {
+            const paragraphElement = exitEmptyListItem(liElement);
+            setRangeByWbr(paragraphElement, range);
+            execAfterRender(vditor);
+            event.preventDefault();
+            return true;
+        }
+
+        // 空列表项删除标记后退出当前列表
+        if (!isCtrl(event) && !event.shiftKey && !event.altKey && event.key === "Backspace" &&
+            liElement.textContent.trim().replace(Constants.ZWSP, "") === "" && range.toString() === "") {
+            const paragraphElement = exitEmptyListItem(liElement);
+            setRangeByWbr(paragraphElement, range);
+            execAfterRender(vditor);
+            event.preventDefault();
+            return true;
+        }
+
         if (!isCtrl(event) && !event.shiftKey && !event.altKey && event.key === "Backspace" &&
             !liElement.previousElementSibling && range.toString() === "" &&
             getSelectPosition(liElement, vditor[vditor.currentMode].element, range).start === 0) {
@@ -488,20 +608,6 @@ export const fixList = (range: Range, vditor: IVditor, pElement: HTMLElement | f
             return true;
         }
 
-        // 空列表删除后与上一级段落对齐
-        if (!isCtrl(event) && !event.shiftKey && !event.altKey && event.key === "Backspace" &&
-            liElement.textContent.trim().replace(Constants.ZWSP, "") === "" &&
-            range.toString() === "" && liElement.previousElementSibling?.tagName === "LI") {
-            liElement.previousElementSibling.insertAdjacentText("beforeend", "\n\n");
-            range.selectNodeContents(liElement.previousElementSibling);
-            range.collapse(false);
-            liElement.remove();
-            setRangeByWbr(vditor[vditor.currentMode].element, range);
-            execAfterRender(vditor);
-            event.preventDefault();
-            return true;
-        }
-
         if (!isCtrl(event) && !event.altKey && event.key === "Tab") {
             // 光标位于第一/零字符时，tab 用于列表的缩进
             let isFirst = false;
@@ -1021,6 +1127,27 @@ export const fixBlockquote = (vditor: IVditor, range: Range, event: KeyboardEven
     const startContainer = range.startContainer;
     const blockquoteElement = hasClosestByMatchTag(startContainer, "BLOCKQUOTE");
     if (blockquoteElement && range.toString() === "") {
+        if (pElement && event.key === "Enter" && !isCtrl(event) && !event.shiftKey && !event.altKey &&
+            pElement.parentElement.isSameNode(blockquoteElement) &&
+            hasClosestByMatchTag(blockquoteElement.parentElement, "LI") &&
+            (range.collapsed || !range.cloneContents().firstElementChild) &&
+            pElement.innerHTML.replace(Constants.ZWSP, "") !== "\n" &&
+            pElement.innerHTML.replace(Constants.ZWSP, "") !== "") {
+            // 列表内的引用由浏览器处理回车时会新建列表项 https://github.com/Vanessa219/vditor/issues/1925
+            const trailingRange = range.cloneRange();
+            trailingRange.setEnd(pElement, pElement.childNodes.length);
+            const paragraphElement = document.createElement("p");
+            paragraphElement.setAttribute("data-block", "0");
+            paragraphElement.appendChild(trailingRange.extractContents());
+            pElement.insertAdjacentElement("afterend", paragraphElement);
+            range.setStart(paragraphElement, 0);
+            range.collapse(true);
+            setSelectionFocus(range);
+            execAfterRender(vditor);
+            event.preventDefault();
+            return true;
+        }
+
         if (event.key === "Backspace" && !isCtrl(event) && !event.shiftKey && !event.altKey &&
             getSelectPosition(blockquoteElement, vditor[vditor.currentMode].element, range).start === 0) {
             // Backspace: 光标位于引用中的第零个字符，仅删除引用标签
@@ -1068,9 +1195,15 @@ export const fixBlockquote = (vditor: IVditor, range: Range, event: KeyboardEven
             return true;
         }
 
-        if (insertAfterBlock(vditor, event, range, blockquoteElement, blockquoteElement)) {
+        const itemElement = blockquoteElement.parentElement.tagName === "LI" ? blockquoteElement.parentElement : null;
+        const afterBlockElement = !blockquoteElement.nextElementSibling && itemElement?.nextElementSibling?.tagName === "LI" ?
+            itemElement : blockquoteElement;
+        if (insertAfterBlock(vditor, event, range, blockquoteElement, afterBlockElement)) {
             return true;
         }
+        if (event.key === "ArrowUp" && itemElement && !blockquoteElement.previousElementSibling) {
+            return false;
+        }
         if (insertBeforeBlock(vditor, event, range, blockquoteElement, blockquoteElement)) {
             return true;
         }
@@ -1258,7 +1391,8 @@ export const fixFirefoxArrowUpTable = (event: KeyboardEvent, blockElement: false
 export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent) & {target: HTMLElement}, callback: {
     pasteCode(code: string): void,
 }) => {
-    if (vditor[vditor.currentMode].element.getAttribute("contenteditable") !== "true") {
+    if (vditor.currentMode === "sv" ? vditor.sv.element.disabled :
+        vditor[vditor.currentMode].element.getAttribute("contenteditable") !== "true") {
         return;
     }
     event.stopPropagation();
@@ -1283,13 +1417,18 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
         HTML2VditorIRDOM?: ILuteRender,
         Md2VditorDOM?: ILuteRender,
         Md2VditorIRDOM?: ILuteRender,
-        Md2VditorSVDOM?: ILuteRender,
     } = {};
     const renderLinkDest: ILuteRenderCallback = (node, entering) => {
         if (!entering) {
             return ["", Lute.WalkContinue];
         }
 
+        const parent = node.__internal_object__.Parent;
+        // 链接引用的目标地址由定义节点提供，不在引用位置重复渲染
+        if (parent.Type === 33 && parent.LinkType === 3) {
+            return ["", Lute.WalkContinue];
+        }
+
         if (vditor.options.upload.renderLinkDest) {
             return vditor.options.upload.renderLinkDest(vditor, node, entering);
         }
@@ -1321,12 +1460,11 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
                         }
                         const original = responseJSON.data.originalURL;
                         if (vditor.currentMode === "sv") {
-                            vditor.sv.element.querySelectorAll(".vditor-sv__marker--link")
-                                .forEach((item: HTMLElement) => {
-                                    if (item.textContent === original) {
-                                        item.textContent = responseJSON.data.url;
-                                    }
-                                });
+                            const selectionStart = vditor.sv.element.selectionStart;
+                            const selectionEnd = vditor.sv.element.selectionEnd;
+                            vditor.sv.element.value = vditor.sv.element.value.split(original)
+                                .join(responseJSON.data.url);
+                            vditor.sv.element.setSelectionRange(selectionStart, selectionEnd);
                         } else {
                             const imgElement: HTMLImageElement =
                                 vditor[vditor.currentMode].element.querySelector(`img[src="${original}"]`);
@@ -1352,7 +1490,7 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
         } else if (vditor.currentMode === "wysiwyg") {
             return ["", Lute.WalkContinue];
         } else {
-            return [`<span class="vditor-sv__marker--link">${Lute.EscapeHTMLStr(src)}</span>`, Lute.WalkContinue];
+            return ["", Lute.WalkContinue];
         }
     };
 
@@ -1378,7 +1516,13 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
     const codeElement = vditor.currentMode === "sv" ?
         hasClosestByAttribute(event.target, "data-type", "code-block") :
         hasClosestByMatchTag(event.target, "CODE");
-    if (codeElement) {
+    const cellElement = vditor.currentMode === "wysiwyg" &&
+        (hasClosestByMatchTag(getEditorRange(vditor).startContainer, "TD") ||
+            hasClosestByMatchTag(getEditorRange(vditor).startContainer, "TH"));
+    if (cellElement && /[\r\n]/.test(textPlain)) {
+        // 表格单元格内的换行使用 br 表示，避免自旋时解析为新的表格行
+        insertHTML(Lute.EscapeHTMLStr(textPlain).replace(/\r\n|\r|\n/g, "<br>"), vditor);
+    } else if (codeElement) {
         // 粘贴在代码位置
         if (vditor.currentMode === "sv") {
             document.execCommand("insertHTML", false, textPlain.replace(/&/g, "&amp;").replace(/</g, "&lt;"));
@@ -1424,8 +1568,6 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
                 vditor.lute.SetJSRenderers({renderers});
                 insertHTML(vditor.lute.HTML2VditorDOM(tempElement.innerHTML), vditor);
             } else {
-                renderers.Md2VditorSVDOM = {renderLinkDest};
-                vditor.lute.SetJSRenderers({renderers});
                 processPaste(vditor, vditor.lute.HTML2Md(tempElement.innerHTML).trimRight());
             }
             vditor.outline.render(vditor);
@@ -1451,14 +1593,20 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
                         } else {
                             imgHTML += `![${file.name}](${fileReader.result.toString()})\n`;
                         }
-                        document.execCommand("insertHTML", false, imgHTML);
+                        if (vditor.currentMode === "sv") {
+                            processPaste(vditor, imgHTML);
+                            execAfterRender(vditor);
+                        } else {
+                            document.execCommand("insertHTML", false, imgHTML);
+                        }
                     };
                 }
             }
         } else if (textPlain.trim() !== "" && files.length === 0) {
-            const range = getEditorRange(vditor);
-            if (range.toString() !== "" && vditor.lute.IsValidLinkDest(textPlain)) {
-                textPlain = `[${range.toString()}](${textPlain})`;
+            const selectedText = vditor.currentMode === "sv" ? vditor.sv.element.value.substring(
+                vditor.sv.element.selectionStart, vditor.sv.element.selectionEnd) : getEditorRange(vditor).toString();
+            if (selectedText !== "" && vditor.lute.IsValidLinkDest(textPlain)) {
+                textPlain = `[${selectedText}](${textPlain})`;
             }
             if (vditor.currentMode === "ir") {
                 renderers.Md2VditorIRDOM = {renderLinkDest};
@@ -1469,8 +1617,6 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
                 vditor.lute.SetJSRenderers({renderers});
                 insertHTML(Lute.Sanitize(vditor.lute.Md2VditorDOM(textPlain)), vditor);
             } else {
-                renderers.Md2VditorSVDOM = {renderLinkDest};
-                vditor.lute.SetJSRenderers({renderers});
                 processPaste(vditor, textPlain);
             }
             vditor.outline.render(vditor);

package/src/ts/util/processCode.ts

@@ -10,6 +10,7 @@ import {markmapRender} from "../markdown/markmapRender";
 import {mindmapRender} from "../markdown/mindmapRender";
 import {plantumlRender} from "../markdown/plantumlRender";
 import {SMILESRender} from "../markdown/SMILESRender";
+import {wavedromRender} from "../markdown/wavedromRender";
 
 export const processPasteCode = (html: string, text: string, type = "sv") => {
     const tempElement = document.createElement("div");
@@ -82,6 +83,8 @@ export const processCodeRender = (previewPanel: HTMLElement, vditor: IVditor) =>
         plantumlRender(previewPanel, vditor.options.cdn);
     } else if (language === "graphviz") {
         graphvizRender(previewPanel, vditor.options.cdn);
+    } else if (language === "wavedrom") {
+        wavedromRender(previewPanel, vditor.options.cdn);
     } else if (language === "math") {
         mathRender(previewPanel, {cdn: vditor.options.cdn, math: vditor.options.preview.math});
     } else {