@8btc/mditor 0.0.32 → 0.0.34

package/dist/index.css

@@ -1,5 +1,5 @@
 /*!
- * Vditor v0.0.32 - A markdown editor written in TypeScript.
+ * Vditor v0.0.34 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -25,7 +25,7 @@
  *
  */
 /*!
- * Vditor v0.0.32 - A markdown editor written in TypeScript.
+ * Vditor v0.0.34 - A markdown editor written in TypeScript.
  *
  * MIT License
  *

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * Vditor v0.0.32 - A markdown editor written in TypeScript.
+ * Vditor v0.0.34 - A markdown editor written in TypeScript.
  *
  * MIT License
  *
@@ -2923,7 +2923,7 @@ var Vditor = /** @class */ (function () {
 /* harmony export */   "H": () => (/* binding */ _VDITOR_VERSION),
 /* harmony export */   "g": () => (/* binding */ Constants)
 /* harmony export */ });
-var _VDITOR_VERSION = "0.0.32";
+var _VDITOR_VERSION = "0.0.34";
 
 var Constants = /** @class */ (function () {
     function Constants() {
@@ -3225,7 +3225,7 @@ var Constants = /** @class */ (function () {
         "c#",
         "bat",
     ];
-    Constants.CDN = "https://webcdn.wujieai.com/vditor@".concat("0.0.32");
+    Constants.CDN = "https://webcdn.wujieai.com/vditor@".concat("0.0.34");
     Constants.MARKDOWN_OPTIONS = {
         autoSpace: false,
         gfmAutoLink: true,
@@ -5472,8 +5472,8 @@ var normalizeTex = function (tex) {
 /**
  * 数学公式渲染入口
  *
- * 默认使用 MathJax 渲染（SVG 输出），并在需要时按需加载相关脚本与样式。
- * 支持通过 options.math.engine 切换为 KaTeX。
+ * 默认使用 KaTeX 渲染，并在需要时按需加载相关脚本与样式。
+ * 支持通过 options.math.engine 切换为 MathJax。
  *
  * 参数说明：
  * - element: 需要进行数学渲染的根容器（默认 document）
@@ -5488,7 +5488,7 @@ var mathRender = function (element, options) {
     var defaultOptions = {
         cdn: _constants__WEBPACK_IMPORTED_MODULE_0__/* .Constants.CDN */ .g.CDN,
         math: {
-            engine: "MathJax",
+            engine: "KaTeX",
             inlineDigit: true,
             macros: {},
         },
@@ -5560,80 +5560,22 @@ var mathRender = function (element, options) {
             next();
         };
         if (!window.MathJax) {
-            // typeset 设为 true 以正常完成公式渲染；elements 限定为传入的容器，外部使用本包时仅处理该容器，不影响编辑器以外的公式。
-            // 渲染时会将 startup.elements 临时设为传入的 element（当前预览/编辑容器），再 clear/updateDocument。
             window.MathJax = {
                 loader: {
                     paths: { mathjax: "".concat(options.cdn, "/dist/js/mathjax") },
                 },
                 startup: {
-                    typeset: true,
+                    typeset: false,
                     elements: element instanceof HTMLElement ? [element] : [],
                 },
                 tex: {
-                    inlineMath: [
-                        ["$", "$"],
-                        ["\\(", "\\)"],
-                    ],
-                    displayMath: [
-                        ["$$", "$$"],
-                        ["\\[", "\\]"],
-                    ],
-                    processEscapes: true,
                     macros: options.math.macros,
-                    // 启用 ams 与 unicode，支持 \unicode 宏以渲染 ∯（oiint）
-                    packages: { "[+]": ["ams", "unicode", "noerrors"] },
-                },
-                // 关闭 MathJax 自带右键菜单，使用自定义菜单
-                options: {
-                    enableMenu: false,
                 },
             };
-            // https://github.com/Vanessa219/vditor/issues/1453
+            // https://github.com/Vanessa219/vditor/issues/1453 额外配置（packages、inlineMath、displayMath 等）由调用方通过 mathJaxOptions 传入
             Object.assign(window.MathJax, options.math.mathJaxOptions);
         }
-        var mathJaxScriptUrl = "".concat(options.cdn, "/dist/js/mathjax/tex-svg-full.js");
-        var mathJaxScriptId = "protyleMathJaxScript";
-        // Qt WebView 中同步 XHR 被限制，addScriptSync 无法加载脚本，改为异步 addScript
-        var isQtWebView_1 = typeof navigator !== "undefined" &&
-            /Qt|QtWebEngine/i.test(navigator.userAgent);
-        var runRenderChain = function () {
-            window.MathJax.startup.promise.then(function () {
-                if (window.MathJax.startup) {
-                    window.MathJax.startup.typeset = true;
-                    window.MathJax.startup.elements =
-                        element instanceof HTMLElement ? [element] : [];
-                }
-                var chains = [];
-                var _loop_1 = function (i) {
-                    var mathElement = mathElements[i];
-                    if (!mathElement.parentElement.classList.contains("vditor-wysiwyg__pre") &&
-                        !mathElement.parentElement.classList.contains("vditor-ir__marker--pre") &&
-                        !mathElement.getAttribute("data-math") &&
-                        (0,_util_code160to32__WEBPACK_IMPORTED_MODULE_5__/* .code160to32 */ .X)(mathElement.textContent).trim()) {
-                        chains.push(function (next) {
-                            if (i === mathElements.length - 1) {
-                                renderMath_1(mathElement);
-                            }
-                            else {
-                                renderMath_1(mathElement, next);
-                            }
-                        });
-                    }
-                };
-                for (var i = 0; i < mathElements.length; i++) {
-                    _loop_1(i);
-                }
-                chainAsync_1(chains);
-            });
-        };
-        if (isQtWebView_1) {
-            (0,_util_addScript__WEBPACK_IMPORTED_MODULE_4__/* .addScript */ .G)(mathJaxScriptUrl, mathJaxScriptId).then(runRenderChain);
-        }
-        else {
-            (0,_util_addScript__WEBPACK_IMPORTED_MODULE_4__/* .addScriptSync */ .J)(mathJaxScriptUrl, mathJaxScriptId);
-            runRenderChain();
-        }
+        (0,_util_addScript__WEBPACK_IMPORTED_MODULE_4__/* .addScriptSync */ .J)("".concat(options.cdn, "/dist/js/mathjax/tex-svg-full.js"), "protyleMathJaxScript");
         var renderMath_1 = function (mathElement, next) {
             var rawText = (0,_util_code160to32__WEBPACK_IMPORTED_MODULE_5__/* .code160to32 */ .X)(mathElement.textContent).trim();
             var math = normalizeTex(rawText);
@@ -5642,7 +5584,6 @@ var mathRender = function (element, options) {
             var mathOptions = window.MathJax.getMetricsFor(mathElement);
             mathOptions.display = inPreviewPre || mathElement.tagName === "DIV";
             window.MathJax.tex2svgPromise(math, mathOptions).then(function (node) {
-                var _a, _b;
                 mathElement.innerHTML = "";
                 mathElement.setAttribute("data-math", math);
                 mathElement.append(node);
@@ -5650,40 +5591,57 @@ var mathRender = function (element, options) {
                     var pre = mathElement.parentElement;
                     pre.classList.add("vditor-wysiwyg__preview--math");
                 }
-                // 绑定自定义右键菜单（编辑区生效，预览区自动跳过）
                 (0,_mathContextMenu__WEBPACK_IMPORTED_MODULE_2__/* .bindMathContextMenu */ .xX)(mathElement);
-                // 限定 document 范围为当前容器后再 clear/updateDocument，避免处理整页导致编辑器外的 $...$ 被重新渲染；不调用会导致同一公式被渲染 2 次
-                // Qt WebView 中 clear/updateDocument 可能清掉刚插入的节点或抛错，故跳过
-                if (!isQtWebView_1) {
-                    try {
-                        var startup = window.MathJax.startup;
-                        var prevElements = startup.elements;
-                        if (element instanceof HTMLElement) {
-                            startup.elements = [element];
-                        }
-                        startup.document.clear();
-                        startup.document.updateDocument();
-                        startup.elements =
-                            prevElements !== undefined ? prevElements : [];
-                    }
-                    catch (_) {
-                        if (((_b = (_a = window.MathJax) === null || _a === void 0 ? void 0 : _a.startup) === null || _b === void 0 ? void 0 : _b.elements) !== undefined) {
-                            window.MathJax.startup.elements = [];
-                        }
-                    }
-                }
+                var startup = window.MathJax.startup;
+                var prevElements = startup.elements;
+                if (element instanceof HTMLElement) {
+                    startup.elements = [element];
+                }
+                startup.document.clear();
+                startup.document.updateDocument();
+                startup.elements =
+                    prevElements !== undefined ? prevElements : [];
                 var errorTextElement = node.querySelector('[data-mml-node="merror"]');
                 if (errorTextElement &&
                     errorTextElement.textContent.trim() !== "") {
-                    // 渲染失败时按普通文本展示原始内容
-                    mathElement.textContent = rawText;
-                    mathElement.className = "language-math";
+                    mathElement.innerHTML =
+                        errorTextElement.textContent.trim();
+                    mathElement.className =
+                        "language-math vditor-reset--error";
                 }
                 if (next) {
                     next();
                 }
             });
         };
+        window.MathJax.startup.promise.then(function () {
+            if (window.MathJax.startup) {
+                window.MathJax.startup.typeset = true;
+                window.MathJax.startup.elements =
+                    element instanceof HTMLElement ? [element] : [];
+            }
+            var chains = [];
+            var _loop_1 = function (i) {
+                var mathElement = mathElements[i];
+                if (!mathElement.parentElement.classList.contains("vditor-wysiwyg__pre") &&
+                    !mathElement.parentElement.classList.contains("vditor-ir__marker--pre") &&
+                    !mathElement.getAttribute("data-math") &&
+                    (0,_util_code160to32__WEBPACK_IMPORTED_MODULE_5__/* .code160to32 */ .X)(mathElement.textContent).trim()) {
+                    chains.push(function (next) {
+                        if (i === mathElements.length - 1) {
+                            renderMath_1(mathElement);
+                        }
+                        else {
+                            renderMath_1(mathElement, next);
+                        }
+                    });
+                }
+            };
+            for (var i = 0; i < mathElements.length; i++) {
+                _loop_1(i);
+            }
+            chainAsync_1(chains);
+        });
     }
 };