@8btc/mditor 0.0.32 → 0.0.33

package/src/ts/markdown/mathRender.ts

@@ -212,50 +212,11 @@ export const mathRender = (
             // https://github.com/Vanessa219/vditor/issues/1453
             Object.assign(window.MathJax, options.math.mathJaxOptions);
         }
-        const mathJaxScriptUrl = `${options.cdn}/dist/js/mathjax/tex-svg-full.js`;
-        const mathJaxScriptId = "protyleMathJaxScript";
-        // Qt WebView 中同步 XHR 被限制，addScriptSync 无法加载脚本，改为异步 addScript
-        const isQtWebView =
-            typeof navigator !== "undefined" &&
-            /Qt|QtWebEngine/i.test(navigator.userAgent);
-        const runRenderChain = () => {
-            window.MathJax.startup.promise.then(() => {
-                if (window.MathJax.startup) {
-                    window.MathJax.startup.typeset = true;
-                    window.MathJax.startup.elements =
-                        element instanceof HTMLElement ? [element] : [];
-                }
-                const chains: any[] = [];
-                for (let i = 0; i < mathElements.length; i++) {
-                    const mathElement = mathElements[i];
-                    if (
-                        !mathElement.parentElement.classList.contains(
-                            "vditor-wysiwyg__pre"
-                        ) &&
-                        !mathElement.parentElement.classList.contains(
-                            "vditor-ir__marker--pre"
-                        ) &&
-                        !mathElement.getAttribute("data-math") &&
-                        code160to32(mathElement.textContent).trim()
-                    ) {
-                        chains.push((next: () => void) => {
-                            if (i === mathElements.length - 1) {
-                                renderMath(mathElement);
-                            } else {
-                                renderMath(mathElement, next);
-                            }
-                        });
-                    }
-                }
-                chainAsync(chains);
-            });
-        };
-        if (isQtWebView) {
-            addScript(mathJaxScriptUrl, mathJaxScriptId).then(runRenderChain);
-        } else {
-            addScriptSync(mathJaxScriptUrl, mathJaxScriptId);
-            runRenderChain();
-        }
+        // 循环加载会抛异常
+        addScriptSync(
+            `${options.cdn}/dist/js/mathjax/tex-svg-full.js`,
+            "protyleMathJaxScript"
+        );
         const renderMath = (mathElement: Element, next?: () => void) => {
             const rawText = code160to32(mathElement.textContent).trim();
             const math = normalizeTex(rawText);
@@ -276,26 +237,15 @@ export const mathRender = (
                     // 绑定自定义右键菜单（编辑区生效，预览区自动跳过）
                     bindMathContextMenu(mathElement as HTMLElement);
                     // 限定 document 范围为当前容器后再 clear/updateDocument，避免处理整页导致编辑器外的 $...$ 被重新渲染；不调用会导致同一公式被渲染 2 次
-                    // Qt WebView 中 clear/updateDocument 可能清掉刚插入的节点或抛错，故跳过
-                    if (!isQtWebView) {
-                        try {
-                            const startup = window.MathJax.startup;
-                            const prevElements = startup.elements;
-                            if (element instanceof HTMLElement) {
-                                startup.elements = [element];
-                            }
-                            startup.document.clear();
-                            startup.document.updateDocument();
-                            startup.elements =
-                                prevElements !== undefined ? prevElements : [];
-                        } catch (_) {
-                            if (
-                                window.MathJax?.startup?.elements !== undefined
-                            ) {
-                                window.MathJax.startup.elements = [];
-                            }
-                        }
+                    const startup = window.MathJax.startup;
+                    const prevElements = startup.elements;
+                    if (element instanceof HTMLElement) {
+                        startup.elements = [element];
                     }
+                    startup.document.clear();
+                    startup.document.updateDocument();
+                    startup.elements =
+                        prevElements !== undefined ? prevElements : [];
                     const errorTextElement = node.querySelector(
                         '[data-mml-node="merror"]'
                     );
@@ -313,5 +263,36 @@ export const mathRender = (
                 }
             );
         };
+        window.MathJax.startup.promise.then(() => {
+            // 限定仅处理当前容器，避免组件内部或用户配置导致处理整页、影响编辑器以外的公式
+            if (window.MathJax.startup) {
+                window.MathJax.startup.typeset = true;
+                window.MathJax.startup.elements =
+                    element instanceof HTMLElement ? [element] : [];
+            }
+            const chains: any[] = [];
+            for (let i = 0; i < mathElements.length; i++) {
+                const mathElement = mathElements[i];
+                if (
+                    !mathElement.parentElement.classList.contains(
+                        "vditor-wysiwyg__pre"
+                    ) &&
+                    !mathElement.parentElement.classList.contains(
+                        "vditor-ir__marker--pre"
+                    ) &&
+                    !mathElement.getAttribute("data-math") &&
+                    code160to32(mathElement.textContent).trim()
+                ) {
+                    chains.push((next: () => void) => {
+                        if (i === mathElements.length - 1) {
+                            renderMath(mathElement);
+                        } else {
+                            renderMath(mathElement, next);
+                        }
+                    });
+                }
+            }
+            chainAsync(chains);
+        });
     }
 };

package/src/ts/util/addScript.ts

@@ -4,10 +4,8 @@ export const addScriptSync = (path: string, id: string) => {
     }
     const xhrObj = new XMLHttpRequest();
     xhrObj.open("GET", path, false);
-    xhrObj.setRequestHeader(
-        "Accept",
-        "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript, */*; q=0.01"
-    );
+    xhrObj.setRequestHeader("Accept",
+        "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript, */*; q=0.01");
     xhrObj.send("");
     const scriptElement = document.createElement("script");
     scriptElement.type = "text/javascript";
@@ -30,7 +28,7 @@ export const addScript = (path: string, id: string) => {
         document.head.appendChild(scriptElement);
         scriptElement.onerror = (event) => {
             reject(event);
-        };
+        }
         scriptElement.onload = () => {
             if (document.getElementById(id)) {
                 // 循环调用需清除 DOM 中的 script 标签