vditor 3.11.0 → 3.11.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 B3log 开源, b3log.org
+Copyright (c) 2019-present B3log 开源, b3log.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -201,7 +201,7 @@ Markdown 输出的 HTML 所展现的外观。内置 ant-design, light，dark，w
 | minHeight | 编辑区域最小高度 | - |
 | width | 编辑器总宽度，支持 % | 'auto' |
 | placeholder | 输入区域为空时的提示 | '' |
-| lang | 语言种类：en_US, fr_FR, pt_BR, ja_JP, ko_KR, ru_RU, sv_SE, zh_CN, zh_TW | 'zh_CN' |
+| lang | 语言种类：de_DE, en_US, es_ES, fr_FR, ja_JP, ko_KR, pt_BR, ru_RU, sv_SE, vi_VN, zh_CN, zh_TW | 'zh_CN' |
 | input(value: string) | 输入后触发  | - |
 | focus(value: string) | 聚焦后触发 | - |
 | blur(value: string) | 失焦后触发 | - |
@@ -219,6 +219,7 @@ Markdown 输出的 HTML 所展现的外观。内置 ant-design, light，dark，w
 | theme | 主题：classic, dark | 'classic' |
 | icon | 图标风格：ant, material | 'ant' |
 | customRenders: {language: string, render: (element: HTMLElement, vditor: IVditor) => void}[] | 自定义渲染器 | [] |
+| customWysiwygToolbar(type: TWYSISYGToolbar, element: HTMLElement): void | 对 wysiwyg 模式下的工具栏进行自定义 | - |
 
 #### options.toolbar
 
@@ -465,6 +466,7 @@ if (xhr.status === 200) {
 
 |   | 说明 | 默认值 |
 | - | - | - |
+| xhr | 上传时使用的 XMLHttpRequest | - |
 | url | 上传 url，为空则不会触发上传相关事件 | '' |
 | max | 上传文件最大 Byte | 10 * 1024 * 1024 |
 | linkToImgUrl | 剪切板中包含图片地址时，使用此 url 重新上传 | '' |

package/dist/index.css

@@ -1,5 +1,5 @@
 /*!
- * Vditor v3.11.0 - A markdown editor written in TypeScript.
+ * Vditor v3.11.2 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -25,7 +25,7 @@
  *
  */
 /*!
- * Vditor v3.11.0 - A markdown editor written in TypeScript.
+ * Vditor v3.11.2 - A markdown editor written in TypeScript.
  *
  * MIT License
  *

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import VditorMethod from "./method";
 declare class Vditor extends VditorMethod {
     readonly version: string;
     vditor: IVditor;
+    private isDestroyed;
     /**
      * @param id 要挂载 Vditor 的元素或者元素 ID。
      * @param options Vditor 参数

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * Vditor v3.11.0 - A markdown editor written in TypeScript.
+ * Vditor v3.11.2 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -2471,7 +2471,7 @@ var previewRender = function (previewElement, markdown, options) { return __awai
                 previewElement.innerHTML = html;
                 previewElement.classList.add("vditor-reset");
                 if (!!mergedOptions.i18n) return [3 /*break*/, 5];
-                if (!!["en_US", "fr_FR", "pt_BR", "ja_JP", "ko_KR", "ru_RU", "sv_SE", "zh_CN", "zh_TW"].includes(mergedOptions.lang)) return [3 /*break*/, 2];
+                if (!!["de_DE", "en_US", "es_ES", "fr_FR", "ja_JP", "ko_KR", "pt_BR", "ru_RU", "sv_SE", "vi_VN", "zh_CN", "zh_TW"].includes(mergedOptions.lang)) return [3 /*break*/, 2];
                 throw new Error("options.lang error, see https://ld246.com/article/1549638745630#options");
             case 2:
                 i18nScriptPrefix = "vditorI18nScript";
@@ -2633,7 +2633,7 @@ var Vditor = /** @class */ (function () {
 /* harmony export */   "H": () => (/* binding */ _VDITOR_VERSION),
 /* harmony export */   "g": () => (/* binding */ Constants)
 /* harmony export */ });
-var _VDITOR_VERSION = "3.11.0";
+var _VDITOR_VERSION = "3.11.2";
 
 var Constants = /** @class */ (function () {
     function Constants() {
@@ -2681,7 +2681,7 @@ var Constants = /** @class */ (function () {
         // 别名
         "js", "ts", "html", "toml", "c#", "bat"
     ];
-    Constants.CDN = "https://unpkg.com/vditor@".concat("3.11.0");
+    Constants.CDN = "https://unpkg.com/vditor@".concat("3.11.2");
     Constants.MARKDOWN_OPTIONS = {
         autoSpace: false,
         gfmAutoLink: true,
@@ -4785,7 +4785,13 @@ var insertHTML = function (html, vditor) {
             vditor[vditor.currentMode].element.insertAdjacentHTML("beforeend", pasteElement.innerHTML);
         }
         else {
-            blockElement.insertAdjacentHTML("afterend", pasteElement.innerHTML);
+            var liElement = (0,_hasClosest__WEBPACK_IMPORTED_MODULE_1__/* .hasClosestByMatchTag */ .lG)(range.startContainer, "LI");
+            if (liElement && pasteElement.firstElementChild.tagName === "UL") {
+                liElement.insertAdjacentHTML("afterend", pasteElement.firstElementChild.innerHTML);
+            }
+            else {
+                blockElement.insertAdjacentHTML("afterend", pasteElement.innerHTML);
+            }
         }
         setRangeByWbr(vditor[vditor.currentMode].element, range);
     }
@@ -7132,6 +7138,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
         if (footnotesElement) {
             vditor.wysiwyg.popover.innerHTML = "";
             genClose(footnotesElement, vditor);
+            customWysiwygToolbar(vditor, "footnotes-block");
             setPopoverPosition(vditor, footnotesElement);
             return;
         }
@@ -7254,6 +7261,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
         if (tocElement) {
             vditor.wysiwyg.popover.innerHTML = "";
             genClose(tocElement, vditor);
+            customWysiwygToolbar(vditor, "vditor-toc");
             setPopoverPosition(vditor, tocElement);
             return;
         }
@@ -7264,6 +7272,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
             genUp(range, blockquoteElement, vditor);
             genDown(range, blockquoteElement, vditor);
             genClose(blockquoteElement, vditor);
+            customWysiwygToolbar(vditor, "blockquote");
             setPopoverPosition(vditor, blockquoteElement);
         }
         // list item popover
@@ -7272,6 +7281,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
             genUp(range, liElement, vditor);
             genDown(range, liElement, vditor);
             genClose(liElement, vditor);
+            customWysiwygToolbar(vditor, "li");
             setPopoverPosition(vditor, liElement);
         }
         // table popover
@@ -7586,6 +7596,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
             vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
             vditor.wysiwyg.popover.insertAdjacentHTML("beforeend", " x ");
             vditor.wysiwyg.popover.insertAdjacentElement("beforeend", input2Wrap);
+            customWysiwygToolbar(vditor, "table");
             setPopoverPosition(vditor, tableElement);
         }
         // link ref popover
@@ -7629,6 +7640,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
             };
             genClose(footnotesRefElement, vditor);
             vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
+            customWysiwygToolbar(vditor, "footnotes-ref");
             setPopoverPosition(vditor, footnotesRefElement);
         }
         // block popover: math-inline, math-block, html-block, html-inline, code-block, html-entity
@@ -7721,6 +7733,10 @@ var highlightToolbarWYSIWYG = function (vditor) {
                     event.preventDefault();
                 };
                 vditor.wysiwyg.popover.insertAdjacentElement("beforeend", languageWrap);
+                customWysiwygToolbar(vditor, "code-block");
+            }
+            else {
+                customWysiwygToolbar(vditor, "block");
             }
             setPopoverPosition(vditor, blockRenderElement);
         }
@@ -7759,6 +7775,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
             genDown(range, headingElement, vditor);
             genClose(headingElement, vditor);
             vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
+            customWysiwygToolbar(vditor, "heading");
             setPopoverPosition(vditor, headingElement);
         }
         // a popover
@@ -7781,6 +7798,7 @@ var highlightToolbarWYSIWYG = function (vditor) {
                 genUp(range, blockElement, vditor);
                 genDown(range, blockElement, vditor);
                 genClose(blockElement, vditor);
+                customWysiwygToolbar(vditor, "block");
                 setPopoverPosition(vditor, blockElement);
             }
             else {
@@ -7878,6 +7896,7 @@ var genLinkRefPopover = function (vditor, linkRefElement, range) {
     genClose(linkRefElement, vditor);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", input1Wrap);
+    customWysiwygToolbar(vditor, "link-ref");
     setPopoverPosition(vditor, linkRefElement);
 };
 var genUp = function (range, element, vditor) {
@@ -8051,6 +8070,7 @@ var genAPopover = function (vditor, aElement, range) {
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", input1Wrap);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", input2Wrap);
+    customWysiwygToolbar(vditor, "a");
     setPopoverPosition(vditor, aElement);
 };
 var genImagePopover = function (event, vditor) {
@@ -8111,6 +8131,7 @@ var genImagePopover = function (event, vditor) {
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", inputWrap);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", altWrap);
     vditor.wysiwyg.popover.insertAdjacentElement("beforeend", titleWrap);
+    customWysiwygToolbar(vditor, "image");
     setPopoverPosition(vditor, imgElement);
 };
 var focusToElement = function (event, range) {
@@ -8123,6 +8144,9 @@ var focusToElement = function (event, range) {
         return true;
     }
 };
+var customWysiwygToolbar = function (vditor, type) {
+    vditor.options.customWysiwygToolbar(type, vditor.wysiwyg.popover);
+};
 
 ;// CONCATENATED MODULE: ./src/ts/util/highlightToolbar.ts
 
@@ -9488,6 +9512,7 @@ var uploadFiles = function (vditor, files, element) { return __awaiter(void 0, v
                     formData.append(vditor.options.upload.fieldName, validateResult[i]);
                 }
                 xhr = new XMLHttpRequest();
+                vditor.upload.xhr = xhr;
                 xhr.open("POST", vditor.options.upload.url);
                 if (vditor.options.upload.token) {
                     xhr.setRequestHeader("X-Upload-Token", vditor.options.upload.token);
@@ -9526,6 +9551,7 @@ var uploadFiles = function (vditor, files, element) { return __awaiter(void 0, v
                             element.value = "";
                         }
                         vditor.upload.element.style.display = "none";
+                        vditor.upload.xhr = undefined;
                     }
                 };
                 xhr.upload.onprogress = function (event) {
@@ -9815,7 +9841,7 @@ var fixCJKPosition = function (range, vditor, event) {
     if (pLiElement && (0,selection/* getSelectPosition */.im)(pLiElement, vditor[vditor.currentMode].element, range).start === 0) {
         // https://github.com/Vanessa219/vditor/issues/1289 WKWebView切换输入法产生六分之一空格，造成光标错位
         if (pLiElement.nodeValue) {
-            pLiElement.nodeValue = pLiElement.nodeValue.replace(/\u2006/g, '');
+            pLiElement.nodeValue = pLiElement.nodeValue.replace(/\u2006/g, "");
         }
         var zwspNode = document.createTextNode(constants/* Constants.ZWSP */.g.ZWSP);
         range.insertNode(zwspNode);
@@ -10799,7 +10825,7 @@ var fixBlockquote = function (vditor, range, event, pElement) {
 };
 var fixTask = function (vditor, range, event) {
     var startContainer = range.startContainer;
-    var taskItemElement = (0,hasClosest/* hasClosestByMatchTag */.lG)(startContainer, "li");
+    var taskItemElement = (0,hasClosest/* hasClosestByMatchTag */.lG)(startContainer, "LI");
     if (taskItemElement && taskItemElement.classList.contains("vditor-task")) {
         if (matchHotKey("⇧⌘J", event)) {
             // ctrl + shift: toggle checked
@@ -11109,15 +11135,23 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                         processCodeRender(codeElement.parentElement.nextElementSibling, vditor);
                     }
                 }
-                return [3 /*break*/, 8];
+                return [3 /*break*/, 10];
             case 1:
                 if (!code) return [3 /*break*/, 2];
                 callback.pasteCode(code);
-                return [3 /*break*/, 8];
+                return [3 /*break*/, 10];
             case 2:
-                if (!(textHTML.trim() !== "")) return [3 /*break*/, 3];
+                if (!(textHTML.trim() !== "")) return [3 /*break*/, 5];
                 tempElement = document.createElement("div");
                 tempElement.innerHTML = textHTML;
+                if (!!vditor.options.upload.base64ToLink) return [3 /*break*/, 4];
+                // word 复制的图文混合，替换为 link: <v:imagedata src="file:///C:/Users/ADMINI~1/AppData/Local/Temp/msohtmlclip1/01/clip_image001.png" o:title="">
+                return [4 /*yield*/, processVMLImage(vditor, tempElement, ("clipboardData" in event ? event.clipboardData : event.dataTransfer).getData("text/rtf"))];
+            case 3:
+                // word 复制的图文混合，替换为 link: <v:imagedata src="file:///C:/Users/ADMINI~1/AppData/Local/Temp/msohtmlclip1/01/clip_image001.png" o:title="">
+                _b.sent();
+                _b.label = 4;
+            case 4:
                 tempElement.querySelectorAll("[style]").forEach(function (e) {
                     e.removeAttribute("style");
                 });
@@ -11140,15 +11174,15 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                     processPaste(vditor, vditor.lute.HTML2Md(tempElement.innerHTML).trimRight());
                 }
                 vditor.outline.render(vditor);
-                return [3 /*break*/, 8];
-            case 3:
-                if (!(files.length > 0)) return [3 /*break*/, 7];
-                if (!(vditor.options.upload.url || vditor.options.upload.handler)) return [3 /*break*/, 5];
+                return [3 /*break*/, 10];
+            case 5:
+                if (!(files.length > 0)) return [3 /*break*/, 9];
+                if (!(vditor.options.upload.url || vditor.options.upload.handler)) return [3 /*break*/, 7];
                 return [4 /*yield*/, uploadFiles(vditor, files)];
-            case 4:
+            case 6:
                 _b.sent();
-                return [3 /*break*/, 6];
-            case 5:
+                return [3 /*break*/, 8];
+            case 7:
                 fileReader_1 = new FileReader();
                 if ("clipboardData" in event) {
                     files = event.clipboardData.files;
@@ -11161,7 +11195,7 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                 if (file_1 && file_1.type.startsWith("image")) {
                     fileReader_1.readAsDataURL(file_1);
                     fileReader_1.onload = function () {
-                        var imgHTML = '';
+                        var imgHTML = "";
                         if (vditor.currentMode === "wysiwyg") {
                             imgHTML += "<img alt=\"".concat(file_1.name, "\" src=\"").concat(fileReader_1.result.toString(), "\">\n");
                         }
@@ -11171,9 +11205,9 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                         document.execCommand("insertHTML", false, imgHTML);
                     };
                 }
-                _b.label = 6;
-            case 6: return [3 /*break*/, 8];
-            case 7:
+                _b.label = 8;
+            case 8: return [3 /*break*/, 10];
+            case 9:
                 if (textPlain.trim() !== "" && files.length === 0) {
                     range = (0,selection/* getEditorRange */.zh)(vditor);
                     if (range.toString() !== "" && vditor.lute.IsValidLinkDest(textPlain)) {
@@ -11182,12 +11216,12 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                     if (vditor.currentMode === "ir") {
                         renderers.Md2VditorIRDOM = { renderLinkDest: renderLinkDest };
                         vditor.lute.SetJSRenderers({ renderers: renderers });
-                        (0,selection/* insertHTML */.oC)(vditor.lute.Md2VditorIRDOM(textPlain), vditor);
+                        (0,selection/* insertHTML */.oC)(Lute.Sanitize(vditor.lute.Md2VditorIRDOM(textPlain)), vditor);
                     }
                     else if (vditor.currentMode === "wysiwyg") {
                         renderers.Md2VditorDOM = { renderLinkDest: renderLinkDest };
                         vditor.lute.SetJSRenderers({ renderers: renderers });
-                        (0,selection/* insertHTML */.oC)(vditor.lute.Md2VditorDOM(textPlain), vditor);
+                        (0,selection/* insertHTML */.oC)(Lute.Sanitize(vditor.lute.Md2VditorDOM(textPlain)), vditor);
                     }
                     else {
                         renderers.Md2VditorSVDOM = { renderLinkDest: renderLinkDest };
@@ -11196,8 +11230,8 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
                     }
                     vditor.outline.render(vditor);
                 }
-                _b.label = 8;
-            case 8:
+                _b.label = 10;
+            case 10:
                 if (vditor.currentMode !== "sv") {
                     blockElement = (0,hasClosest/* hasClosestBlock */.F9)((0,selection/* getEditorRange */.zh)(vditor).startContainer);
                     if (blockElement) {
@@ -11229,6 +11263,81 @@ var paste = function (vditor, event, callback) { return fixBrowserBehavior_await
         }
     });
 }); };
+var processVMLImage = function (vditor, root, rtfData) { return fixBrowserBehavior_awaiter(void 0, void 0, void 0, function () {
+    var regexPictureHeader, regexPicture, regImages, images, _i, regImages_1, image, imageType, shapes, i, img, newSrc, imgs, i, src, _a;
+    return fixBrowserBehavior_generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (!rtfData) {
+                    return [2 /*return*/];
+                }
+                regexPictureHeader = /{\\pict[\s\S]+?\\bliptag-?\d+(\\blipupi-?\d+)?({\\\*\\blipuid\s?[\da-fA-F]+)?[\s}]*?/;
+                regexPicture = new RegExp("(?:(" + regexPictureHeader.source + "))([\\da-fA-F\\s]+)\\}", "g");
+                regImages = rtfData.match(regexPicture);
+                images = [];
+                if (regImages) {
+                    for (_i = 0, regImages_1 = regImages; _i < regImages_1.length; _i++) {
+                        image = regImages_1[_i];
+                        imageType = void 0;
+                        if (image.includes("\\pngblip")) {
+                            imageType = "image/png";
+                        }
+                        else if (image.includes("\\jpegblip")) {
+                            imageType = "image/jpeg";
+                        }
+                        if (imageType) {
+                            images.push({
+                                hex: image.replace(regexPictureHeader, "").replace(/[^\da-fA-F]/g, ""),
+                                type: imageType,
+                            });
+                        }
+                    }
+                }
+                shapes = [];
+                walk(root, function (child) {
+                    if (child.tagName === "V:SHAPE") {
+                        walk(child, function (sub) {
+                            if (sub.tagName === "V:IMAGEDATA")
+                                shapes.push({ shape: child, img: sub });
+                        });
+                        return false;
+                    }
+                });
+                for (i = 0; i < shapes.length; i++) {
+                    img = document.createElement("img");
+                    newSrc = "data:" + images[i].type + ";base64," + btoa((images[i].hex.match(/\w{2}/g) || []).map(function (char) {
+                        return String.fromCharCode(parseInt(char, 16));
+                    }).join(""));
+                    img.src = newSrc;
+                    img.title = shapes[i].img.getAttribute("title");
+                    shapes[i].shape.parentNode.replaceChild(img, shapes[i].shape);
+                }
+                imgs = root.querySelectorAll("img");
+                i = 0;
+                _b.label = 1;
+            case 1:
+                if (!(i < imgs.length)) return [3 /*break*/, 4];
+                src = imgs[i].src || "";
+                if (!src) return [3 /*break*/, 3];
+                _a = imgs[i];
+                return [4 /*yield*/, vditor.options.upload.base64ToLink(src)];
+            case 2:
+                _a.src = _b.sent();
+                _b.label = 3;
+            case 3:
+                i++;
+                return [3 /*break*/, 1];
+            case 4: return [2 /*return*/];
+        }
+    });
+}); };
+var walk = function (el, fn) {
+    var goNext = fn(el);
+    if (goNext !== false)
+        for (var i = 0; i < el.children.length; i++) {
+            walk(el.children[i], fn);
+        }
+};
 var templateObject_1;
 
 ;// CONCATENATED MODULE: ./src/ts/ir/process.ts
@@ -15409,6 +15518,7 @@ var Vditor = /** @class */ (function (_super) {
      */
     function Vditor(id, options) {
         var _this = _super.call(this) || this;
+        _this.isDestroyed = false;
         _this.version = constants/* VDITOR_VERSION */.H;
         if (typeof id === "string") {
             if (!options) {
@@ -15434,7 +15544,7 @@ var Vditor = /** @class */ (function (_super) {
         var mergedOptions = getOptions.merge();
         // 支持自定义国际化
         if (!mergedOptions.i18n) {
-            if (!["en_US", "fr_FR", "pt_BR", "ja_JP", "ko_KR", "ru_RU", "sv_SE", "zh_CN", "zh_TW"].includes(mergedOptions.lang)) {
+            if (!["de_DE", "en_US", "es_ES", "fr_FR", "ja_JP", "ko_KR", "pt_BR", "ru_RU", "sv_SE", "vi_VN", "zh_CN", "zh_TW"].includes(mergedOptions.lang)) {
                 throw new Error("options.lang error, see https://ld246.com/article/1549638745630#options");
             }
             else {
@@ -15706,6 +15816,7 @@ var Vditor = /** @class */ (function (_super) {
         UIUnbindListener();
         this.vditor.wysiwyg.unbindListener();
         this.vditor.options.after = undefined;
+        this.isDestroyed = true;
     };
     /** 获取评论 ID */
     Vditor.prototype.getCommentIds = function () {
@@ -15809,6 +15920,9 @@ var Vditor = /** @class */ (function (_super) {
     };
     Vditor.prototype.init = function (id, mergedOptions) {
         var _this = this;
+        if (this.isDestroyed) {
+            return;
+        }
         this.vditor = {
             currentMode: mergedOptions.mode,
             element: id,