vditor 3.8.4 → 3.8.8

package/src/ts/util/Options.ts

@@ -1,5 +1,5 @@
-import {Constants} from "../constants";
-import {merge} from "./merge";
+import { Constants } from "../constants";
+import { merge } from "./merge";
 
 export class Options {
     public options: IOptions;
@@ -106,7 +106,8 @@ export class Options {
                     "info",
                     "help",
                 ],
-            }],
+            },
+        ],
         toolbarConfig: {
             hide: false,
             pin: false,
@@ -152,211 +153,269 @@ export class Options {
         const mergedOptions = merge(this.defaultOptions, this.options);
 
         if (mergedOptions.cache.enable && !mergedOptions.cache.id) {
-            throw new Error("need options.cache.id, see https://ld246.com/article/1549638745630#options");
+            throw new Error(
+                "need options.cache.id, see https://ld246.com/article/1549638745630#options",
+            );
         }
 
         return mergedOptions;
     }
 
     private mergeToolbar(toolbar: Array<string | IMenuItem>) {
-        const toolbarItem = [{
-            icon: '<svg><use xlink:href="#vditor-icon-export"></use></svg>',
-            name: "export",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘E",
-            icon: '<svg><use xlink:href="#vditor-icon-emoji"></use></svg>',
-            name: "emoji",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘H",
-            icon: '<svg><use xlink:href="#vditor-icon-headings"></use></svg>',
-            name: "headings",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘B",
-            icon: '<svg><use xlink:href="#vditor-icon-bold"></use></svg>',
-            name: "bold",
-            prefix: "**",
-            suffix: "**",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘I",
-            icon: '<svg><use xlink:href="#vditor-icon-italic"></use></svg>',
-            name: "italic",
-            prefix: "*",
-            suffix: "*",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘D",
-            icon: '<svg><use xlink:href="#vditor-icon-strike"></use></svg>',
-            name: "strike",
-            prefix: "~~",
-            suffix: "~~",
-            tipPosition: "ne",
-        }, {
-            hotkey: "⌘K",
-            icon: '<svg><use xlink:href="#vditor-icon-link"></use></svg>',
-            name: "link",
-            prefix: "[",
-            suffix: "](https://)",
-            tipPosition: "n",
-        }, {
-            name: "|",
-        }, {
-            hotkey: "⌘L",
-            icon: '<svg><use xlink:href="#vditor-icon-list"></use></svg>',
-            name: "list",
-            prefix: "* ",
-            tipPosition: "n",
-        }, {
-            hotkey: "⌘O",
-            icon: '<svg><use xlink:href="#vditor-icon-ordered-list"></use></svg>',
-            name: "ordered-list",
-            prefix: "1. ",
-            tipPosition: "n",
-        }, {
-            hotkey: "⌘J",
-            icon: '<svg><use xlink:href="#vditor-icon-check"></use></svg>',
-            name: "check",
-            prefix: "* [ ] ",
-            tipPosition: "n",
-        }, {
-            hotkey: "⇧⌘I",
-            icon: '<svg><use xlink:href="#vditor-icon-outdent"></use></svg>',
-            name: "outdent",
-            tipPosition: "n",
-        }, {
-            hotkey: "⇧⌘O",
-            icon: '<svg><use xlink:href="#vditor-icon-indent"></use></svg>',
-            name: "indent",
-            tipPosition: "n",
-        }, {
-            name: "|",
-        }, {
-            hotkey: "⌘;",
-            icon: '<svg><use xlink:href="#vditor-icon-quote"></use></svg>',
-            name: "quote",
-            prefix: "> ",
-            tipPosition: "n",
-        }, {
-            hotkey: "⇧⌘H",
-            icon: '<svg><use xlink:href="#vditor-icon-line"></use></svg>',
-            name: "line",
-            prefix: "---",
-            tipPosition: "n",
-        }, {
-            hotkey: "⌘U",
-            icon: '<svg><use xlink:href="#vditor-icon-code"></use></svg>',
-            name: "code",
-            prefix: "```",
-            suffix: "\n```",
-            tipPosition: "n",
-        }, {
-            hotkey: "⌘G",
-            icon: '<svg><use xlink:href="#vditor-icon-inline-code"></use></svg>',
-            name: "inline-code",
-            prefix: "`",
-            suffix: "`",
-            tipPosition: "n",
-        }, {
-            hotkey: "⇧⌘B",
-            icon: '<svg><use xlink:href="#vditor-icon-before"></use></svg>',
-            name: "insert-before",
-            tipPosition: "n",
-        }, {
-            hotkey: "⇧⌘E",
-            icon: '<svg><use xlink:href="#vditor-icon-after"></use></svg>',
-            name: "insert-after",
-            tipPosition: "n",
-        }, {
-            name: "|",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-upload"></use></svg>',
-            name: "upload",
-            tipPosition: "n",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-record"></use></svg>',
-            name: "record",
-            tipPosition: "n",
-        }, {
-            hotkey: "⌘M",
-            icon: '<svg><use xlink:href="#vditor-icon-table"></use></svg>',
-            name: "table",
-            prefix: "| col1",
-            suffix: " | col2 | col3 |\n| --- | --- | --- |\n|  |  |  |\n|  |  |  |",
-            tipPosition: "n",
-        }, {
-            name: "|",
-        }, {
-            hotkey: "⌘Z",
-            icon: '<svg><use xlink:href="#vditor-icon-undo"></use></svg>',
-            name: "undo",
-            tipPosition: "nw",
-        }, {
-            hotkey: "⌘Y",
-            icon: '<svg><use xlink:href="#vditor-icon-redo"></use></svg>',
-            name: "redo",
-            tipPosition: "nw",
-        }, {
-            name: "|",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-more"></use></svg>',
-            name: "more",
-            tipPosition: "e",
-        }, {
-            hotkey: "⌘'",
-            icon: '<svg><use xlink:href="#vditor-icon-fullscreen"></use></svg>',
-            name: "fullscreen",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-edit"></use></svg>',
-            name: "edit-mode",
-            tipPosition: "nw",
-        }, {
-            hotkey: "⌘P",
-            icon: '<svg><use xlink:href="#vditor-icon-both"></use></svg>',
-            name: "both",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-preview"></use></svg>',
-            name: "preview",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-align-center"></use></svg>',
-            name: "outline",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-theme"></use></svg>',
-            name: "content-theme",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-code-theme"></use></svg>',
-            name: "code-theme",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-bug"></use></svg>',
-            name: "devtools",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-info"></use></svg>',
-            name: "info",
-            tipPosition: "nw",
-        }, {
-            icon: '<svg><use xlink:href="#vditor-icon-help"></use></svg>',
-            name: "help",
-            tipPosition: "nw",
-        }, {
-            name: "br",
-        }];
+        const toolbarItem = [
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-export"></use></svg>',
+                name: "export",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘E",
+                icon: '<svg><use xlink:href="#vditor-icon-emoji"></use></svg>',
+                name: "emoji",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘H",
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-headings"></use></svg>',
+                name: "headings",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘B",
+                icon: '<svg><use xlink:href="#vditor-icon-bold"></use></svg>',
+                name: "bold",
+                prefix: "**",
+                suffix: "**",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘I",
+                icon: '<svg><use xlink:href="#vditor-icon-italic"></use></svg>',
+                name: "italic",
+                prefix: "*",
+                suffix: "*",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘D",
+                icon: '<svg><use xlink:href="#vditor-icon-strike"></use></svg>',
+                name: "strike",
+                prefix: "~~",
+                suffix: "~~",
+                tipPosition: "ne",
+            },
+            {
+                hotkey: "⌘K",
+                icon: '<svg><use xlink:href="#vditor-icon-link"></use></svg>',
+                name: "link",
+                prefix: "[",
+                suffix: "](https://)",
+                tipPosition: "n",
+            },
+            {
+                name: "|",
+            },
+            {
+                hotkey: "⌘L",
+                icon: '<svg><use xlink:href="#vditor-icon-list"></use></svg>',
+                name: "list",
+                prefix: "* ",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⌘O",
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-ordered-list"></use></svg>',
+                name: "ordered-list",
+                prefix: "1. ",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⌘J",
+                icon: '<svg><use xlink:href="#vditor-icon-check"></use></svg>',
+                name: "check",
+                prefix: "* [ ] ",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⇧⌘I",
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-outdent"></use></svg>',
+                name: "outdent",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⇧⌘O",
+                icon: '<svg><use xlink:href="#vditor-icon-indent"></use></svg>',
+                name: "indent",
+                tipPosition: "n",
+            },
+            {
+                name: "|",
+            },
+            {
+                hotkey: "⌘;",
+                icon: '<svg><use xlink:href="#vditor-icon-quote"></use></svg>',
+                name: "quote",
+                prefix: "> ",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⇧⌘H",
+                icon: '<svg><use xlink:href="#vditor-icon-line"></use></svg>',
+                name: "line",
+                prefix: "---",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⌘U",
+                icon: '<svg><use xlink:href="#vditor-icon-code"></use></svg>',
+                name: "code",
+                prefix: "```",
+                suffix: "\n```",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⌘G",
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-inline-code"></use></svg>',
+                name: "inline-code",
+                prefix: "`",
+                suffix: "`",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⇧⌘B",
+                icon: '<svg><use xlink:href="#vditor-icon-before"></use></svg>',
+                name: "insert-before",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⇧⌘E",
+                icon: '<svg><use xlink:href="#vditor-icon-after"></use></svg>',
+                name: "insert-after",
+                tipPosition: "n",
+            },
+            {
+                name: "|",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-upload"></use></svg>',
+                name: "upload",
+                tipPosition: "n",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-record"></use></svg>',
+                name: "record",
+                tipPosition: "n",
+            },
+            {
+                hotkey: "⌘M",
+                icon: '<svg><use xlink:href="#vditor-icon-table"></use></svg>',
+                name: "table",
+                prefix: "| col1",
+                suffix:
+                    " | col2 | col3 |\n| --- | --- | --- |\n|  |  |  |\n|  |  |  |",
+                tipPosition: "n",
+            },
+            {
+                name: "|",
+            },
+            {
+                hotkey: "⌘Z",
+                icon: '<svg><use xlink:href="#vditor-icon-undo"></use></svg>',
+                name: "undo",
+                tipPosition: "nw",
+            },
+            {
+                hotkey: "⌘Y",
+                icon: '<svg><use xlink:href="#vditor-icon-redo"></use></svg>',
+                name: "redo",
+                tipPosition: "nw",
+            },
+            {
+                name: "|",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-more"></use></svg>',
+                name: "more",
+                tipPosition: "e",
+            },
+            {
+                hotkey: "⌘'",
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-fullscreen"></use></svg>',
+                name: "fullscreen",
+                tipPosition: "nw",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-edit"></use></svg>',
+                name: "edit-mode",
+                tipPosition: "nw",
+            },
+            {
+                hotkey: "⌘P",
+                icon: '<svg><use xlink:href="#vditor-icon-both"></use></svg>',
+                name: "both",
+                tipPosition: "nw",
+            },
+            {
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-preview"></use></svg>',
+                name: "preview",
+                tipPosition: "nw",
+            },
+            {
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-align-center"></use></svg>',
+                name: "outline",
+                tipPosition: "nw",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-theme"></use></svg>',
+                name: "content-theme",
+                tipPosition: "nw",
+            },
+            {
+                icon:
+                    '<svg><use xlink:href="#vditor-icon-code-theme"></use></svg>',
+                name: "code-theme",
+                tipPosition: "nw",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-bug"></use></svg>',
+                name: "devtools",
+                tipPosition: "nw",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-info"></use></svg>',
+                name: "info",
+                tipPosition: "nw",
+            },
+            {
+                icon: '<svg><use xlink:href="#vditor-icon-help"></use></svg>',
+                name: "help",
+                tipPosition: "nw",
+            },
+            {
+                name: "br",
+            },
+        ];
         const toolbarResult: IMenuItem[] = [];
         toolbar.forEach((menuItem: IMenuItem) => {
             let currentMenuItem = menuItem;
             toolbarItem.forEach((defaultMenuItem: IMenuItem) => {
-                if (typeof menuItem === "string" && defaultMenuItem.name === menuItem) {
+                if (
+                    typeof menuItem === "string" &&
+                    defaultMenuItem.name === menuItem
+                ) {
                     currentMenuItem = defaultMenuItem;
                 }
-                if (typeof menuItem === "object" && defaultMenuItem.name === menuItem.name) {
+                if (
+                    typeof menuItem === "object" &&
+                    defaultMenuItem.name === menuItem.name
+                ) {
                     currentMenuItem = Object.assign({}, defaultMenuItem, menuItem);
                 }
             });

package/src/ts/util/editorCommonEvent.ts

@@ -22,7 +22,7 @@ export const focusEvent = (vditor: IVditor, editorElement: HTMLElement) => {
         if (vditor.options.focus) {
             vditor.options.focus(getMarkdown(vditor));
         }
-        hidePanel(vditor, ["subToolbar"]);
+        hidePanel(vditor, ["subToolbar", "hint"]);
     });
 };
 
@@ -62,7 +62,7 @@ export const dropEvent = (vditor: IVditor, editorElement: HTMLElement) => {
             if (event.dataTransfer.getData(Constants.DROP_EDITOR)) {
                 // 编辑器内选中文字拖拽
                 execAfterRender(vditor);
-            } else if (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html")) {
+            } else if (event.dataTransfer.types.includes("Files") || event.dataTransfer.types.includes("text/html")) {
                 // 外部文件拖入编辑器中或者编辑器内选中文字拖拽
                 paste(vditor, event, {
                     pasteCode: (code: string) => {

package/src/ts/util/fixBrowserBehavior.ts

@@ -2,7 +2,7 @@ import {Constants} from "../constants";
 import {input as IRInput} from "../ir/input";
 import {processAfterRender} from "../ir/process";
 import {processAfterRender as processSVAfterRender, processPaste} from "../sv/process";
-import {uploadFiles} from "../upload";
+import {uploadFiles} from "../upload/index";
 import {setHeaders} from "../upload/setHeaders";
 import {afterRenderEvent} from "../wysiwyg/afterRenderEvent";
 import {input} from "../wysiwyg/input";
@@ -228,9 +228,13 @@ export const listToggle = (vditor: IVditor, range: Range, type: string, cancel =
                 let element;
                 if (type === "list") {
                     element = document.createElement("ul");
+                    element.setAttribute("data-marker", "*");
                 } else {
                     element = document.createElement("ol");
+                    element.setAttribute("data-marker", "1.");
                 }
+                element.setAttribute("data-block", "0");
+                element.setAttribute("data-tight", itemElement.parentElement.getAttribute("data-tight"));
                 element.innerHTML = itemElement.parentElement.innerHTML;
                 itemElement.parentElement.parentNode.replaceChild(element, itemElement.parentElement);
             }
@@ -973,7 +977,7 @@ export const fixCodeBlock = (vditor: IVditor, event: KeyboardEvent, codeRenderEl
     if (event.key === "Backspace" && !isCtrl(event) && !event.shiftKey && !event.altKey) {
         const codePosition = getSelectPosition(codeRenderElement, vditor[vditor.currentMode].element, range);
         if ((codePosition.start === 0 ||
-            (codePosition.start === 1 && codeRenderElement.innerText === "\n")) // 空代码块，光标在 \n 后
+                (codePosition.start === 1 && codeRenderElement.innerText === "\n")) // 空代码块，光标在 \n 后
             && range.toString() === "") {
             codeRenderElement.parentElement.outerHTML =
                 `<p data-block="0"><wbr>${codeRenderElement.firstElementChild.innerHTML}</p>`;
@@ -1089,7 +1093,7 @@ export const fixTask = (vditor: IVditor, range: Range, event: KeyboardEvent) =>
         if (event.key === "Backspace" && !isCtrl(event) && !event.shiftKey && !event.altKey && range.toString() === ""
             && range.startOffset === 1
             && ((startContainer.nodeType === 3 && startContainer.previousSibling &&
-                (startContainer.previousSibling as HTMLElement).tagName === "INPUT")
+                    (startContainer.previousSibling as HTMLElement).tagName === "INPUT")
                 || startContainer.nodeType !== 3)) {
             const previousElement = taskItemElement.previousElementSibling;
             taskItemElement.querySelector("input").remove();
@@ -1260,7 +1264,7 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
     } else {
         textHTML = event.dataTransfer.getData("text/html");
         textPlain = event.dataTransfer.getData("text/plain");
-        if (event.dataTransfer.types[0] === "Files") {
+        if (event.dataTransfer.types.includes("Files")) {
             files = event.dataTransfer.items;
         }
     }
@@ -1351,7 +1355,7 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
     if (doc.body) {
         textHTML = doc.body.innerHTML;
     }
-
+    textHTML = Lute.Sanitize(textHTML);
     vditor.wysiwyg.getComments(vditor);
 
     // process code
@@ -1406,7 +1410,7 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
                 processPaste(vditor, vditor.lute.HTML2Md(tempElement.innerHTML).trimRight());
             }
             vditor.outline.render(vditor);
-        } else if (files.length > 0 && vditor.options.upload.url) {
+        } else if (files.length > 0 && (vditor.options.upload.url || vditor.options.upload.handler)) {
             await uploadFiles(vditor, files);
         } else if (textPlain.trim() !== "" && files.length === 0) {
             if (vditor.currentMode === "ir") {

package/src/ts/util/processCode.ts

@@ -83,7 +83,7 @@ export const processCodeRender = (previewPanel: HTMLElement, vditor: IVditor) =>
         mathRender(previewPanel, {cdn: vditor.options.cdn, math: vditor.options.preview.math});
     } else {
         highlightRender(Object.assign({}, vditor.options.preview.hljs), previewPanel, vditor.options.cdn);
-        codeRender(previewPanel, vditor.options.lang);
+        codeRender(previewPanel);
     }
 
     previewPanel.setAttribute("data-render", "1");