@pie-element/math-templated 2.22.3-next.8 → 2.22.3

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.23.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.24.2/module/index.js";
 import {_dll_pie_lib__pie_toolbox_math_input, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_correct_answer_toggle} from "../../../@pie-lib/pie-toolbox-module@4.24.3/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
@@ -21848,49 +21848,34 @@ var mathjaxScript = {};
 Object.defineProperty(mathjaxScript, "__esModule", {
   value: true
 });
-mathjaxScript.mathRenderingKEY = mathjaxScript.mathRenderingAccessibleKEY = mathjaxScript.initializeMathJax = mathjaxScript.MathJaxVersion = void 0;
+mathjaxScript.initializeMathJax = mathjaxScript.MathJaxVersion = void 0;
 var _renderMath = renderMath$2;
 var MathJaxVersion = '3.2.2';
 mathjaxScript.MathJaxVersion = MathJaxVersion;
-var mathRenderingKEY = '@pie-lib/math-rendering@2';
-mathjaxScript.mathRenderingKEY = mathRenderingKEY;
-var mathRenderingAccessibleKEY = '@pie-lib/math-rendering-accessible@1';
-mathjaxScript.mathRenderingAccessibleKEY = mathRenderingAccessibleKEY;
-var getMathJaxCustomKey = function getMathJaxCustomKey() {
-  var _window, _window$MathJax, _window2, _window2$MathJax, _window2$MathJax$conf;
-  return ((_window = window) === null || _window === void 0 ? void 0 : (_window$MathJax = _window.MathJax) === null || _window$MathJax === void 0 ? void 0 : _window$MathJax.customKey) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$MathJax = _window2.MathJax) === null || _window2$MathJax === void 0 ? void 0 : (_window2$MathJax$conf = _window2$MathJax.config) === null || _window2$MathJax$conf === void 0 ? void 0 : _window2$MathJax$conf.customKey);
-};
-var mathJaxCustomKey = getMathJaxCustomKey();
-var defaultOpts = function defaultOpts() {
-  return (0, _renderMath.getGlobal)().opts || ({});
-};
-var initializeMathJax = function initializeMathJax(renderOpts, processMathJaxFullPage) {
-  window.MathJaxInitialised = true;
-  renderOpts = renderOpts || defaultOpts();
-  if ((!window.MathJax || window.MathJax.version !== MathJaxVersion) && !window.mathjaxLoadedP || mathJaxCustomKey && mathJaxCustomKey !== mathRenderingAccessibleKEY) {
-    var _renderOpts, _renderOpts2;
-    if ((_renderOpts = renderOpts) !== null && _renderOpts !== void 0 && _renderOpts.useSingleDollar) {
-      console.warn('[math-rendering] using $ is not advisable, please use $$..$$ or \\(...\\)');
-    }
-    var texConfig = (_renderOpts2 = renderOpts) !== null && _renderOpts2 !== void 0 && _renderOpts2.useSingleDollar ? {
-      macros: {
-        parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
-        overarc: '\\overparen',
-        napprox: '\\not\\approx',
-        longdiv: '\\enclose{longdiv}'
-      },
-      inlineMath: [['$', '$'], ['\\(', '\\)']],
-      processEscapes: true,
-      displayMath: [['$$', '$$'], ['\\[', '\\]']]
-    } : {
-      macros: {
-        parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
-        overarc: '\\overparen',
-        napprox: '\\not\\approx',
-        longdiv: '\\enclose{longdiv}'
-      },
-      displayMath: [['$$', '$$'], ['\\[', '\\]']]
-    };
+var initializeMathJax = function initializeMathJax(renderOpts) {
+  if (renderOpts !== null && renderOpts !== void 0 && renderOpts.useSingleDollar) {
+    console.warn('[math-rendering] using $ is not advisable, please use $$..$$ or \\(...\\)');
+  }
+  var texConfig = renderOpts !== null && renderOpts !== void 0 && renderOpts.useSingleDollar ? {
+    macros: {
+      parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
+      overarc: '\\overparen',
+      napprox: '\\not\\approx',
+      longdiv: '\\enclose{longdiv}'
+    },
+    inlineMath: [['$', '$'], ['\\(', '\\)']],
+    processEscapes: true,
+    displayMath: [['$$', '$$'], ['\\[', '\\]']]
+  } : {
+    macros: {
+      parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
+      overarc: '\\overparen',
+      napprox: '\\not\\approx',
+      longdiv: '\\enclose{longdiv}'
+    },
+    displayMath: [['$$', '$$'], ['\\[', '\\]']]
+  };
+  window.mathjaxLoadedP = new Promise(function (resolve) {
     window.MathJax = {
       startup: {
         typeset: false,
@@ -21909,10 +21894,7 @@ var initializeMathJax = function initializeMathJax(renderOpts, processMathJaxFul
           MathJax.startup.defaultReady();
           var globalObj = (0, _renderMath.getGlobal)();
           globalObj.instance = MathJax;
-          if (processMathJaxFullPage) {
-            processMathJaxFullPage();
-          }
-          window.MathJaxLoaded = true;
+          resolve();
         }
       },
       loader: {
@@ -21943,7 +21925,7 @@ var initializeMathJax = function initializeMathJax(renderOpts, processMathJaxFul
     script.src = ("https://cdn.jsdelivr.net/npm/mathjax@").concat(MathJaxVersion, "/es5/tex-chtml-full.js");
     script.async = true;
     document.body.appendChild(script);
-  }
+  });
 };
 mathjaxScript.initializeMathJax = initializeMathJax;
 var normalization$1 = {};
@@ -81621,7 +81603,7 @@ getDefaultExportFromCjs(mathRendering);
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  exports.initializeMathJaxScript = exports.getGlobal = exports.fixMathElements = exports.fixMathElement = exports["default"] = void 0;
+  exports.getGlobal = exports.fixMathElements = exports.fixMathElement = exports["default"] = void 0;
   var _typeof2 = _interopRequireDefault(_typeof$b.exports);
   var _mathjaxScript = mathjaxScript;
   var _normalization = normalization$1;
@@ -81672,17 +81654,22 @@ getDefaultExportFromCjs(mathRendering);
   };
   var NEWLINE_BLOCK_REGEX = /\\embed\{newLine\}\[\]/g;
   var NEWLINE_LATEX = '\\newline ';
+  var mathRenderingKEY = '@pie-lib/math-rendering@2';
+  var mathRenderingAccessibleKEY = '@pie-lib/math-rendering-accessible@1';
   var getGlobal = function getGlobal() {
     if (typeof window !== 'undefined') {
-      if (!window[_mathjaxScript.mathRenderingAccessibleKEY]) {
-        window[_mathjaxScript.mathRenderingAccessibleKEY] = {};
+      if (!window[mathRenderingAccessibleKEY]) {
+        window[mathRenderingAccessibleKEY] = {};
       }
-      return window[_mathjaxScript.mathRenderingAccessibleKEY];
+      return window[mathRenderingAccessibleKEY];
     } else {
       return {};
     }
   };
   exports.getGlobal = getGlobal;
+  var defaultOpts = function defaultOpts() {
+    return getGlobal().opts || ({});
+  };
   var fixMathElement = function fixMathElement(element) {
     if (element.dataset.mathHandled) {
       return;
@@ -81747,84 +81734,80 @@ getDefaultExportFromCjs(mathRendering);
       }
     });
   };
-  var processMathJaxFullPage = function processMathJaxFullPage(executeOn) {
-    executeOn = executeOn || document.body;
-    var mathJaxInstance = getGlobal().instance;
-    if (mathJaxInstance) {
-      mathJaxInstance.texReset();
-      mathJaxInstance.typesetClear();
-      mathJaxInstance.typesetPromise([executeOn]).then(function () {
-        try {
-          removeExcessMjxContainers(executeOn);
-          removePlaceholdersAndRestoreDisplay();
-          var updatedDocument = mathJaxInstance.startup.document;
-          var list = updatedDocument.math.list;
-          for (var item = list.next; (0, _typeof2["default"])(item.data) !== 'symbol'; item = item.next) {
-            var mathMl = toMMl(item.data.root);
-            var parsedMathMl = mathMl.replaceAll('\n', '');
-            item.data.typesetRoot.setAttribute('data-mathml', parsedMathMl);
-          }
-        } catch (e) {
-          console.error('Error post-processing MathJax typesetting:', e.toString());
-        }
-        mathJaxInstance.startup.document.clear();
-      })["catch"](function (error) {
-        console.error('Error in typesetting with MathJax:', error);
-      });
-    }
-  };
-  var initializeMathJaxScript = function initializeMathJaxScript(renderOpts) {
-    if (!window.MathJaxInitialised) {
-      (0, _mathjaxScript.initializeMathJax)(renderOpts, processMathJaxFullPage);
-    }
+  var getMathJaxCustomKey = function getMathJaxCustomKey() {
+    var _window, _window$MathJax, _window2, _window2$MathJax, _window2$MathJax$conf;
+    return ((_window = window) === null || _window === void 0 ? void 0 : (_window$MathJax = _window.MathJax) === null || _window$MathJax === void 0 ? void 0 : _window$MathJax.customKey) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$MathJax = _window2.MathJax) === null || _window2$MathJax === void 0 ? void 0 : (_window2$MathJax$conf = _window2$MathJax.config) === null || _window2$MathJax$conf === void 0 ? void 0 : _window2$MathJax$conf.customKey);
   };
-  exports.initializeMathJaxScript = initializeMathJaxScript;
   var renderMath = function renderMath(el, renderOpts) {
     var isString = typeof el === 'string';
-    var _ref = renderOpts || ({}), skipWaitForMathRenderingLib = _ref.skipWaitForMathRenderingLib;
     var executeOn = document.body;
     if (isString) {
       var div = document.createElement('div');
       div.innerHTML = el;
       executeOn = div;
     }
+    var _ref = renderOpts || ({}), skipWaitForMathRenderingLib = _ref.skipWaitForMathRenderingLib;
     var renderMathAccessible = function renderMathAccessible() {
       fixMathElements(executeOn);
       adjustMathMLStyle(executeOn);
-      if (!window.MathJaxInitialised) {
-        (0, _mathjaxScript.initializeMathJax)(renderOpts, function () {
-          return processMathJaxFullPage(executeOn);
-        });
-        return;
+      var mathJaxCustomKey = getMathJaxCustomKey();
+      if ((!window.MathJax || window.MathJax.version !== _mathjaxScript.MathJaxVersion) && !window.mathjaxLoadedP || mathJaxCustomKey && mathJaxCustomKey !== mathRenderingAccessibleKEY) {
+        renderOpts = renderOpts || defaultOpts();
+        (0, _mathjaxScript.initializeMathJax)(renderOpts);
       }
-      if (window.MathJaxLoaded) {
-        if (isString) {
-          try {
-            MathJax.texReset();
-            MathJax.typesetClear();
-            window.MathJax.typeset([executeOn]);
-            var updatedDocument = window.MathJax.startup.document;
-            var list = updatedDocument.math.list;
-            var item = list.next;
-            var mathMl = toMMl(item.data.root);
-            var parsedMathMl = mathMl.replaceAll('\n', '');
-            return parsedMathMl;
-          } catch (error) {
-            console.error('Error rendering math:', error.message);
-            return '';
-          }
+      if (isString && window.MathJax && window.mathjaxLoadedP) {
+        try {
+          MathJax.texReset();
+          MathJax.typesetClear();
+          window.MathJax.typeset([executeOn]);
+          var updatedDocument = window.MathJax.startup.document;
+          var list = updatedDocument.math.list;
+          var item = list.next;
+          var mathMl = toMMl(item.data.root);
+          var parsedMathMl = mathMl.replaceAll('\n', '');
+          return parsedMathMl;
+        } catch (error) {
+          console.error('Error rendering math:', error.message);
         }
-        processMathJaxFullPage(executeOn);
+      }
+      if (window.mathjaxLoadedP) {
+        window.mathjaxLoadedP.then(function () {
+          var mathJaxInstance = getGlobal().instance;
+          if (mathJaxInstance) {
+            mathJaxInstance.texReset();
+            mathJaxInstance.typesetClear();
+            mathJaxInstance.typesetPromise([executeOn]).then(function () {
+              try {
+                removeExcessMjxContainers(executeOn);
+                removePlaceholdersAndRestoreDisplay();
+                var _updatedDocument = mathJaxInstance.startup.document;
+                var _list = _updatedDocument.math.list;
+                for (var _item = _list.next; (0, _typeof2["default"])(_item.data) !== 'symbol'; _item = _item.next) {
+                  var _mathMl = toMMl(_item.data.root);
+                  var _parsedMathMl = _mathMl.replaceAll('\n', '');
+                  _item.data.typesetRoot.setAttribute('data-mathml', _parsedMathMl);
+                }
+              } catch (e) {
+                console.error('Error post-processing MathJax typesetting:', e.toString());
+              }
+              mathJaxInstance.startup.document.clear();
+            })["catch"](function (error) {
+              console.error('Error in typesetting with MathJax:', error);
+            });
+          }
+        })["catch"](function (error) {
+          console.error('Error in initializing MathJax:', error);
+        });
       }
     };
     if (skipWaitForMathRenderingLib) {
       return renderMathAccessible();
     } else {
-      if (window.hasOwnProperty(_mathjaxScript.mathRenderingKEY) && window[_mathjaxScript.mathRenderingKEY].instance) {
+      if (window.hasOwnProperty(mathRenderingKEY) && window[mathRenderingKEY].instance) {
         removePlaceholdersAndRestoreDisplay();
         return mr.renderMath(executeOn, renderOpts);
       }
-      if (window.hasOwnProperty(_mathjaxScript.mathRenderingAccessibleKEY) && window[_mathjaxScript.mathRenderingAccessibleKEY].instance) {
+      if (window.hasOwnProperty(mathRenderingAccessibleKEY) && window[mathRenderingAccessibleKEY].instance) {
         return renderMathAccessible();
       }
       var waitForMathRenderingLib = function waitForMathRenderingLib(renderMathAccessibleCallback) {
@@ -81834,7 +81817,7 @@ getDefaultExportFromCjs(mathRendering);
         var maxWaitTime = 500;
         var startTime = Date.now();
         var checkForLib = function checkForLib() {
-          var mathRenderingHasLoaded = window.hasOwnProperty(_mathjaxScript.mathRenderingKEY) && window[_mathjaxScript.mathRenderingKEY].instance;
+          var mathRenderingHasLoaded = window.hasOwnProperty(mathRenderingKEY) && window[mathRenderingKEY].instance;
           var hasExceededMaxWait = Date.now() - startTime > maxWaitTime;
           if (mathRenderingHasLoaded || hasExceededMaxWait) {
             clearInterval(checkIntervalId);
@@ -81869,16 +81852,9 @@ var mmlToLatex = {};
 getDefaultExportFromCjs(mmlToLatex);
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
-  var _typeof = _typeof$b.exports;
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  Object.defineProperty(exports, "initializeMathJaxScript", {
-    enumerable: true,
-    get: function get() {
-      return _renderMath.initializeMathJaxScript;
-    }
-  });
   Object.defineProperty(exports, "mmlToLatex", {
     enumerable: true,
     get: function get() {
@@ -81903,48 +81879,9 @@ getDefaultExportFromCjs(mmlToLatex);
       return _normalization.wrapMath;
     }
   });
-  var _renderMath = _interopRequireWildcard(renderMath$2);
+  var _renderMath = _interopRequireDefault(renderMath$2);
   var _mmlToLatex = _interopRequireDefault(mmlToLatex);
   var _normalization = normalization$1;
-  function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) {
-      return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-  }
-  function _interopRequireWildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-      return obj;
-    }
-    if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") {
-      return {
-        "default": obj
-      };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-      return cache.get(obj);
-    }
-    var newObj = {};
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for (var key in obj) {
-      if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-        var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-        if (desc && (desc.get || desc.set)) {
-          Object.defineProperty(newObj, key, desc);
-        } else {
-          newObj[key] = obj[key];
-        }
-      }
-    }
-    newObj["default"] = obj;
-    if (cache) {
-      cache.set(obj, newObj);
-    }
-    return newObj;
-  }
 })(mathRenderingAccessible);
 getDefaultExportFromCjs(mathRenderingAccessible);
 var choices = {};

package/module/manifest.json

@@ -4,7 +4,7 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.23.2"
+      "version": "1.24.2"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",