@8btc/mditor 0.0.15 → 0.0.17

package/dist/css/content-theme/dark.css

@@ -196,3 +196,21 @@
         color: #0a0a0a !important;
     }
 }
+
+.vditor-reset .mermaid-error {
+    border: 1px dashed rgba(255, 255, 255, 0.2);
+}
+
+.vditor-reset .mermaid-error .mermaid-error-icon {
+    border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.vditor-reset .mermaid-error .mermaid-error-title {
+    color: rgba(252, 252, 252, 0.9);
+}
+.vditor-reset .mermaid-error .mermaid-error-message {
+    color: #a3a3a3;
+}
+.vditor-reset .mermaid-error .mermaid-error-icon {
+    color: rgba(252, 252, 252, 0.9);
+}

package/dist/index.css

@@ -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
  *
@@ -25,7 +25,7 @@
  *
  */
 /*!
- * Vditor v0.0.15 - A markdown editor written in TypeScript.
+ * Vditor v0.0.17 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -115,7 +115,7 @@
   }
 }
 .vditor-tooltipped {
-  position: relative;
+  position: relative !important;
   cursor: pointer;
 }
 .vditor-tooltipped::after {
@@ -2124,6 +2124,37 @@
 .vditor--dark .vditor-reset .vditor-selection-tag .vditor-selection-tag__lines {
   color: #b9b9b9;
 }
+.mermaid-error {
+  border: 1px dashed #E5E5E5;
+  border-radius: 0.625rem;
+  padding: 3rem 1.5rem;
+  text-align: center;
+}
+.mermaid-error .mermaid-error-icon {
+  display: inline-block;
+  color: #0A0A0A;
+  padding: 0.5rem;
+  border-radius: 0.5rem;
+  margin-bottom: 1.5rem;
+  border: 1px solid #E5E5E5;
+  line-height: 1;
+}
+.mermaid-error .mermaid-error-icon > svg {
+  display: block;
+  stroke-width: 2;
+}
+.mermaid-error .mermaid-error-title {
+  font-size: 1.25rem;
+  color: #0A0A0A;
+  font-weight: 700;
+  line-height: 140%;
+  margin-bottom: 0.5rem;
+}
+.mermaid-error .mermaid-error-message {
+  font-size: 0.875rem;
+  line-height: 140%;
+  color: #737373;
+}
 details > summary {
   list-style: none;
 }

package/dist/index.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
  *
@@ -2564,13 +2564,13 @@ var mergeOptions = function (options) {
         speech: {
             enable: false,
         },
-        runHtml: {
+        runCode: {
             enable: false,
         },
         render: {
             media: {
                 enable: true,
-            }
+            },
         },
         theme: constants/* Constants.THEME_OPTIONS */.g.THEME_OPTIONS,
     };
@@ -2635,12 +2635,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);
                     }
@@ -2664,7 +2679,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,
@@ -2697,7 +2712,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);
@@ -2828,7 +2844,7 @@ var Vditor = /** @class */ (function () {
 /* harmony export */   "H": () => (/* binding */ _VDITOR_VERSION),
 /* harmony export */   "g": () => (/* binding */ Constants)
 /* harmony export */ });
-var _VDITOR_VERSION = "0.0.15";
+var _VDITOR_VERSION = "0.0.17";
 
 var Constants = /** @class */ (function () {
     function Constants() {
@@ -3130,7 +3146,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,
@@ -4491,9 +4507,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") ||
@@ -4542,14 +4558,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) || "运行", "')"));
@@ -4557,10 +4577,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);
         }
@@ -5726,19 +5748,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";
@@ -5750,7 +5772,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)();
@@ -5765,7 +5788,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: