@8btc/mditor 0.0.15 → 0.0.17

package/dist/js/icons/ant.js

@@ -1,4 +1,6 @@
-document.body.insertAdjacentHTML('afterbegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg">
+document.body.insertAdjacentHTML(
+    "afterbegin",
+    `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <symbol id="vditor-icon-comment" viewBox="0 0 32 32">
       <path d="M18.177 12.965c-0.825 0-1.464 0.639-1.464 1.428s0.639 1.428 1.464 1.428c0.754 0 1.393-0.639 1.393-1.428s-0.639-1.428-1.393-1.428zM8.178 12.965c-0.825 0-1.464 0.639-1.464 1.428s0.639 1.428 1.464 1.428c0.754 0 1.393-0.639 1.393-1.428s-0.639-1.428-1.393-1.428z"></path>
@@ -170,5 +172,10 @@ document.body.insertAdjacentHTML('afterbegin', `<svg style="position: absolute;
     <symbol id="vditor-icon-zhihu" viewBox="0 0 32 32">
       <path d="M18.245 3.993v24.401h2.555l1.073 3.041 4.532-3.041h5.601v-24.401h-13.761zM28.795 25.162h-2.551l-3.199 2.147-0.758-2.147h-0.767v-17.837h7.27v17.837zM16.601 14.931h-5.656c0.089-1.912 0.183-4.442 0.281-7.364h5.575l-0.004-0.345c0-0.026-0.009-0.626-0.098-1.239-0.089-0.639-0.281-1.486-0.894-1.486h-9.353c0.187-0.877 0.669-2.969 1.252-3.995l0.273-0.477-0.549-0.030c-0.034 0-0.835-0.038-1.763 0.451-1.521 0.809-2.202 2.402-2.5 3.595-0.784 3.113-1.9 5.277-2.372 6.201-0.141 0.273-0.226 0.434-0.264 0.545-0.077 0.209-0.034 0.417 0.119 0.554 0.447 0.405 1.627-0.124 1.64-0.128 0.026-0.013 0.055-0.026 0.094-0.043 0.592-0.268 2.347-1.065 2.973-3.599h2.415c0.030 1.371 0.132 5.895 0.124 7.364h-6.005l-0.089 0.064c-0.984 0.72-1.299 2.692-1.312 2.777l-0.060 0.392h7.113c-0.524 3.335-1.129 4.83-1.448 5.426-0.158 0.298-0.311 0.596-0.456 0.886-0.907 1.797-1.849 3.654-5.379 6.542-0.153 0.119-0.298 0.341-0.204 0.584 0.102 0.268 0.396 0.388 1.048 0.388 0.23 0 0.503-0.013 0.826-0.043 2.125-0.187 4.293-0.767 5.754-3.731 0.724-1.495 1.35-3.054 1.87-4.638l5.814 6.815 0.213-0.511c0.034-0.081 0.809-1.972 0.217-4.085l-0.021-0.077-4.604-5.239-0.937 0.707c0.273-1.112 0.451-2.125 0.532-3.028h6.759v-0.341c0-1.708-0.788-2.722-0.818-2.764l-0.102-0.128z"></path>
     </symbol>
+    <symbol id="vditor-icon-run" viewBox="0 0 32 32">
+      <path d="M12 12.004a1.333 1.333 0 0 1 2.023-1.145l6.663 3.996a1.333 1.333 0 0 1 0 2.291l-6.663 3.996A1.333 1.333 0 0 1 12 19.995z" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></path>
+      <circle cx="16" cy="16" r="13.333" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></circle>
+    </symbol>
   </defs>
-</svg>`)
+</svg>`
+);

package/dist/js/icons/material.js

@@ -143,9 +143,13 @@ document.body.insertAdjacentHTML(
     <symbol id="vditor-icon-pause" viewBox="0 0 32 32">
       <path d="M20.617 0h9.128v32h-9.128v-32zM2.255 32v-32h9.128v32h-9.128z"></path>
     </symbol>
-    <symbol id="vditor-icon-run" viewBox="0 0 24 24">
-      <path d="M9 9.003a1 1 0 0 1 1.517-.859l4.997 2.997a1 1 0 0 1 0 1.718l-4.997 2.997A1 1 0 0 1 9 14.996z" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-      <circle cx="12" cy="12" r="10" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></circle>
+    <symbol id="vditor-icon-run" viewBox="0 0 32 32">
+      <path d="M12 12.004a1.333 1.333 0 0 1 2.023-1.145l6.663 3.996a1.333 1.333 0 0 1 0 2.291l-6.663 3.996A1.333 1.333 0 0 1 12 19.995z" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></path>
+      <circle cx="16" cy="16" r="13.333" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></circle>
+    </symbol>
+    <symbol id="vditor-icon-play" viewBox="0 0 32 32">
+      <path d="M12 12.004a1.333 1.333 0 0 1 2.023-1.145l6.663 3.996a1.333 1.333 0 0 1 0 2.291l-6.663 3.996A1.333 1.333 0 0 1 12 19.995z" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></path>
+      <circle cx="16" cy="16" r="13.333" fill="none" stroke="currentColor" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round"></circle>
     </symbol>
     <symbol id="vditor-icon-emoji" viewBox="0 0 32 32">
       <path d="M16 24.789q-2.779 0-4.995-1.54t-3.192-4.019h2.629q1.878 3.155 5.559 3.155t5.559-3.155h2.629q-0.977 2.479-3.192 4.019t-4.995 1.54zM16 28.845q5.258 0 9.052-3.793t3.793-9.052-3.793-9.052-9.052-3.793-9.052 3.793-3.793 9.052 3.793 9.052 9.052 3.793zM16 0q6.61 0 11.305 4.695t4.695 11.305-4.695 11.305-11.305 4.695-11.305-4.695-4.695-11.305 4.695-11.305 11.305-4.695zM10.366 14.423q-0.977 0-1.69-0.714t-0.714-1.69 0.714-1.69 1.69-0.714 1.69 0.714 0.714 1.69-0.714 1.69-1.69 0.714zM21.634 14.423q-0.977 0-1.69-0.714t-0.714-1.69 0.714-1.69 1.69-0.714 1.69 0.714 0.714 1.69-0.714 1.69-1.69 0.714z"></path>

package/dist/method.d.ts

@@ -5,9 +5,13 @@ declare class Vditor {
     /** 点击图片放大 */
     static previewImage: (oldImgElement: HTMLImageElement, lang?: keyof II18n, theme?: string) => void;
     /** 为 element 中的代码块添加复制按钮 */
-    static codeRender: (element: HTMLElement, option?: IHljs, runHtml?: {
+    static codeRender: (element: HTMLElement, option?: IHljs, runCode?: {
         enable?: boolean;
-        callback?(html: string): void;
+        items?: string[];
+        callback?(payload: {
+            code: string;
+            lang: string;
+        }): void;
     }) => void;
     /** 对 graphviz 进行渲染 */
     static graphvizRender: (element: HTMLElement, cdn?: string) => void;

package/dist/method.js

@@ -1,5 +1,5 @@
 /*!
- * Vditor v0.0.15 - A markdown editor written in TypeScript.
+ * Vditor v0.0.17 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -45,7 +45,7 @@ return /******/ (() => { // webpackBootstrap
 /* harmony export */   "g": () => (/* binding */ Constants)
 /* harmony export */ });
 /* unused harmony export VDITOR_VERSION */
-var _VDITOR_VERSION = (/* unused pure expression or super */ null && ("0.0.15"));
+var _VDITOR_VERSION = (/* unused pure expression or super */ null && ("0.0.17"));
 
 var Constants = /** @class */ (function () {
     function Constants() {
@@ -347,7 +347,7 @@ var Constants = /** @class */ (function () {
         "c#",
         "bat",
     ];
-    Constants.CDN = "https://webcdn.wujieai.com/vditor@".concat("0.0.15");
+    Constants.CDN = "https://webcdn.wujieai.com/vditor@".concat("0.0.17");
     Constants.MARKDOWN_OPTIONS = {
         autoSpace: false,
         gfmAutoLink: true,
@@ -1703,9 +1703,9 @@ var attachEchartsContextMenu = function (el, option, chart, cdn) {
 /**
  * 为预览区域中的代码块添加辅助操作：
  * - 复制按钮：一键复制代码文本
- * - 运行按钮：当启用 runHtml 时，向外部回调当前代码块的 HTML 字符串
+ * - 运行按钮：当启用 runCode 时，向外部回调当前代码块的 HTML 字符串
  */
-var codeRender = function (element, option, runHtml) {
+var codeRender = function (element, option, runCode) {
     Array.from(element.querySelectorAll("pre > code"))
         .filter(function (e, index) {
         if (e.parentElement.classList.contains("vditor-wysiwyg__pre") ||
@@ -1754,14 +1754,18 @@ var codeRender = function (element, option, runHtml) {
                 '<svg viewBox="0 0 32 32"><path d="M22.545-0h-17.455c-1.6 0-2.909 1.309-2.909 2.909v20.364h2.909v-20.364h17.455v-2.909zM26.909 5.818h-16c-1.6 0-2.909 1.309-2.909 2.909v20.364c0 1.6 1.309 2.909 2.909 2.909h16c1.6 0 2.909-1.309 2.909-2.909v-20.364c0-1.6-1.309-2.909-2.909-2.909zM26.909 29.091h-16v-20.364h16v20.364z"></path></svg>';
         }
         var playIconHTML = document.getElementById("vditorIconScript")
-            ? '<svg><use xlink:href="#vditor-icon-play"></use></svg>'
+            ? '<svg><use xlink:href="#vditor-icon-run"></use></svg>'
             : '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-play-icon lucide-circle-play"><path d="M9 9.003a1 1 0 0 1 1.517-.859l4.997 2.997a1 1 0 0 1 0 1.718l-4.997 2.997A1 1 0 0 1 9 14.996z"/><circle cx="12" cy="12" r="10"/></svg>';
         var divElement = document.createElement("div");
         divElement.className = "vditor-copy";
         var textarea = document.createElement("textarea");
         textarea.value = (0,_util_code160to32__WEBPACK_IMPORTED_MODULE_1__/* .code160to32 */ .X)(codeText);
         divElement.appendChild(textarea);
-        if (runHtml === null || runHtml === void 0 ? void 0 : runHtml.enable) {
+        var langMatch = e.className.match(/language-([^\s]+)/);
+        var lang = langMatch ? langMatch[1] : "";
+        var allowRun = !!(runCode === null || runCode === void 0 ? void 0 : runCode.enable) &&
+            (!runCode.items || (lang && runCode.items.includes(lang)));
+        if (allowRun) {
             var runSpan = document.createElement("span");
             runSpan.setAttribute("aria-label", ((_a = window.VditorI18n) === null || _a === void 0 ? void 0 : _a.run) || "运行");
             runSpan.setAttribute("onmouseover", "this.setAttribute('aria-label', '".concat(((_b = window.VditorI18n) === null || _b === void 0 ? void 0 : _b.run) || "运行", "')"));
@@ -1769,10 +1773,12 @@ var codeRender = function (element, option, runHtml) {
                 "vditor-copy__item vditor-tooltipped vditor-tooltipped__w";
             runSpan.innerHTML = playIconHTML;
             runSpan.addEventListener("click", function (evt) {
+                var _a;
                 evt.stopPropagation();
-                if (typeof runHtml.callback === "function") {
-                    runHtml.callback((0,_util_code160to32__WEBPACK_IMPORTED_MODULE_1__/* .code160to32 */ .X)(codeText));
-                }
+                (_a = runCode === null || runCode === void 0 ? void 0 : runCode.callback) === null || _a === void 0 ? void 0 : _a.call(runCode, {
+                    code: (0,_util_code160to32__WEBPACK_IMPORTED_MODULE_1__/* .code160to32 */ .X)(codeText),
+                    lang: lang,
+                });
             });
             divElement.appendChild(runSpan);
         }
@@ -2928,19 +2934,19 @@ var mermaidRender = function (element, cdn, theme) {
             startOnLoad: false,
             flowchart: {
                 htmlLabels: true,
-                useMaxWidth: !0
+                useMaxWidth: !0,
             },
             sequence: {
                 useMaxWidth: true,
                 diagramMarginX: 8,
                 diagramMarginY: 8,
                 boxMargin: 8,
-                showSequenceNumbers: true // Mermaid 时序图增加序号 https://github.com/siyuan-note/siyuan/pull/6992 https://mermaid.js.org/syntax/sequenceDiagram.html#sequencenumbers
+                showSequenceNumbers: true, // Mermaid 时序图增加序号 https://github.com/siyuan-note/siyuan/pull/6992 https://mermaid.js.org/syntax/sequenceDiagram.html#sequencenumbers
             },
             gantt: {
                 leftPadding: 75,
-                rightPadding: 20
-            }
+                rightPadding: 20,
+            },
         };
         if (theme === "dark") {
             config.theme = "dark";
@@ -2952,7 +2958,8 @@ var mermaidRender = function (element, cdn, theme) {
                 switch (_a.label) {
                     case 0:
                         code = _adapterRender__WEBPACK_IMPORTED_MODULE_1__.mermaidRenderAdapter.getCode(item);
-                        if (item.getAttribute("data-processed") === "true" || code.trim() === "") {
+                        if (item.getAttribute("data-processed") === "true" ||
+                            code.trim() === "") {
                             return [2 /*return*/];
                         }
                         id = "mermaid" + (0,_util_function__WEBPACK_IMPORTED_MODULE_3__/* .genUUID */ .Wb)();
@@ -2967,7 +2974,7 @@ var mermaidRender = function (element, cdn, theme) {
                     case 3:
                         e_1 = _a.sent();
                         errorElement = document.querySelector("#" + id);
-                        item.innerHTML = "".concat(errorElement.outerHTML, "<br>\n<div style=\"text-align: left\"><small>").concat(e_1.message.replace(/\n/, "<br>"), "</small></div>");
+                        item.innerHTML = "\n<div class=\"mermaid-error\">\n<div class=\"mermaid-error-icon\"><svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" class=\"lucide lucide-bug-icon lucide-bug\"><path d=\"M12 20v-9\"/><path d=\"M14 7a4 4 0 0 1 4 4v3a6 6 0 0 1-12 0v-3a4 4 0 0 1 4-4z\"/><path d=\"M14.12 3.88 16 2\"/><path d=\"M21 21a4 4 0 0 0-3.81-4\"/><path d=\"M21 5a4 4 0 0 1-3.55 3.97\"/><path d=\"M22 13h-4\"/><path d=\"M3 21a4 4 0 0 1 3.81-4\"/><path d=\"M3 5a4 4 0 0 0 3.55 3.97\"/><path d=\"M6 13H2\"/><path d=\"m8 2 1.88 1.88\"/><path d=\"M9 7.13V6a3 3 0 1 1 6 0v1.13\"/></svg></div>\n<div class=\"mermaid-error-title\">\u56FE\u8868\u52A0\u8F7D\u5931\u8D25</div>\n<div class=\"mermaid-error-message\">".concat(e_1.message.replace(/\n/, "<br>"), "</div>\n</div>");
                         errorElement.parentElement.remove();
                         return [3 /*break*/, 4];
                     case 4:
@@ -5143,13 +5150,13 @@ var mergeOptions = function (options) {
         speech: {
             enable: false,
         },
-        runHtml: {
+        runCode: {
             enable: false,
         },
         render: {
             media: {
                 enable: true,
-            }
+            },
         },
         theme: constants/* Constants.THEME_OPTIONS */.g.THEME_OPTIONS,
     };
@@ -5214,12 +5221,27 @@ var previewRender = function (previewElement, markdown, options) { return __awai
                 previewElement.innerHTML = html;
                 previewElement.classList.add("vditor-reset");
                 if (!!mergedOptions.i18n) return [3 /*break*/, 5];
-                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];
+                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";
                 i18nScriptID_1 = i18nScriptPrefix + mergedOptions.lang;
-                document.querySelectorAll("head script[id^=\"".concat(i18nScriptPrefix, "\"]")).forEach(function (el) {
+                document
+                    .querySelectorAll("head script[id^=\"".concat(i18nScriptPrefix, "\"]"))
+                    .forEach(function (el) {
                     if (el.id !== i18nScriptID_1) {
                         document.head.removeChild(el);
                     }
@@ -5243,7 +5265,7 @@ var previewRender = function (previewElement, markdown, options) { return __awai
                 if (mergedOptions.anchor === 1) {
                     previewElement.classList.add("vditor-reset--anchor");
                 }
-                (0,codeRender/* codeRender */.O)(previewElement, mergedOptions.hljs, mergedOptions.runHtml);
+                (0,codeRender/* codeRender */.O)(previewElement, mergedOptions.hljs, mergedOptions.runCode);
                 (0,highlightRender/* highlightRender */.s)(mergedOptions.hljs, previewElement, mergedOptions.cdn);
                 (0,mathRender/* mathRender */.H)(previewElement, {
                     cdn: mergedOptions.cdn,
@@ -5276,7 +5298,8 @@ var previewRender = function (previewElement, markdown, options) { return __awai
                 }
                 previewElement.addEventListener("click", function (event) {
                     var spanElement = (0,hasClosest/* hasClosestByMatchTag */.lG)(event.target, "SPAN");
-                    if (spanElement && (0,hasClosest/* hasClosestByClassName */.fb)(spanElement, "vditor-toc")) {
+                    if (spanElement &&
+                        (0,hasClosest/* hasClosestByClassName */.fb)(spanElement, "vditor-toc")) {
                         var headingElement = previewElement.querySelector("#" + spanElement.getAttribute("data-target-id"));
                         if (headingElement) {
                             window.scrollTo(window.scrollX, headingElement.offsetTop);