@pie-element/math-templated 2.22.7-next.1 → 2.22.7-next.10

package/configure/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "next",
+    "@pie-lib/pie-toolbox": "2.0.3",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",

package/controller/package.json

@@ -7,7 +7,7 @@
   "module": "src/index.js",
   "dependencies": {
     "@pie-framework/math-validation": "^1.2.2",
-    "@pie-lib/pie-toolbox": "next",
+    "@pie-lib/pie-toolbox": "2.0.3",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },

package/module/configure.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.26.1/module/index.js";
-import {_dll_pie_lib__pie_toolbox_config_ui, _dll_pie_lib__pie_toolbox_math_toolbar, _dll_pie_lib__pie_toolbox_editable_html} from "../../../@pie-lib/pie-toolbox-module@4.28.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.1/module/index.js";
+import {_dll_pie_lib__pie_toolbox_config_ui, _dll_pie_lib__pie_toolbox_math_toolbar, _dll_pie_lib__pie_toolbox_editable_html} from "../../../@pie-lib/pie-toolbox-module@5.0.1/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -43049,90 +43049,6 @@ Collapse$1.default = _default$l;
 getDefaultExportFromCjs(Collapse$2);
 var mathRenderingAccessible = {};
 var renderMath$1 = {};
-var mathjaxScript = {};
-Object.defineProperty(mathjaxScript, "__esModule", {
-  value: true
-});
-mathjaxScript.initializeMathJax = mathjaxScript.MathJaxVersion = void 0;
-var _renderMath = renderMath$1;
-var MathJaxVersion = '3.2.2';
-mathjaxScript.MathJaxVersion = MathJaxVersion;
-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,
-        ready: function ready() {
-          var mathjax = MathJax._.mathjax.mathjax;
-          var STATE = MathJax._.core.MathItem.STATE;
-          var Menu = MathJax._.ui.menu.Menu.Menu;
-          var rerender = Menu.prototype.rerender;
-          Menu.prototype.rerender = function () {
-            var _this = this;
-            var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : STATE.TYPESET;
-            mathjax.handleRetriesFor(function () {
-              return rerender.call(_this, start);
-            });
-          };
-          MathJax.startup.defaultReady();
-          var globalObj = (0, _renderMath.getGlobal)();
-          globalObj.instance = MathJax;
-          resolve();
-        }
-      },
-      loader: {
-        load: ['input/mml']
-      },
-      tex: texConfig,
-      chtml: {
-        fontURL: 'https://unpkg.com/mathjax-full@3.2.2/ts/output/chtml/fonts/tex-woff-v2',
-        displayAlign: 'center'
-      },
-      customKey: '@pie-lib/math-rendering-accessible@1',
-      options: {
-        enableEnrichment: true,
-        sre: {
-          speech: 'deep'
-        },
-        menuOptions: {
-          settings: {
-            assistiveMml: true,
-            collapsible: false,
-            explorer: false
-          }
-        }
-      }
-    };
-    var script = document.createElement('script');
-    script.type = 'text/javascript';
-    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 = {};
 var _interopRequireDefault$o = interopRequireDefault.exports;
 Object.defineProperty(normalization$1, "__esModule", {
@@ -102668,9 +102584,8 @@ getDefaultExportFromCjs(mathRendering);
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  exports.getGlobal = exports.fixMathElements = exports.fixMathElement = exports["default"] = void 0;
+  exports.initializeMathJax = exports.getGlobal = exports.fixMathElements = exports.fixMathElement = exports["default"] = exports.MathJaxVersion = void 0;
   var _typeof2 = _interopRequireDefault(_typeof$3.exports);
-  var _mathjaxScript = mathjaxScript;
   var _normalization = normalization$1;
   var mr = _interopRequireWildcard(mathRendering);
   var _SerializedMmlVisitor = SerializedMmlVisitor;
@@ -102718,11 +102633,13 @@ getDefaultExportFromCjs(mathRendering);
     return visitor.visitTree(node);
   };
   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 NEWLINE_LATEX = "\\newline ";
+  var mathRenderingKEY = "@pie-lib/math-rendering@2";
+  var mathRenderingAccessibleKEY = "@pie-lib/math-rendering-accessible@1";
+  var MathJaxVersion = "3.2.2";
+  exports.MathJaxVersion = MathJaxVersion;
   var getGlobal = function getGlobal() {
-    if (typeof window !== 'undefined') {
+    if (typeof window !== "undefined") {
       if (!window[mathRenderingAccessibleKEY]) {
         window[mathRenderingAccessibleKEY] = {};
       }
@@ -102732,16 +102649,13 @@ getDefaultExportFromCjs(mathRendering);
     }
   };
   exports.getGlobal = getGlobal;
-  var defaultOpts = function defaultOpts() {
-    return getGlobal().opts || ({});
-  };
   var fixMathElement = function fixMathElement(element) {
     if (element.dataset.mathHandled) {
       return;
     }
-    var property = 'innerText';
+    var property = "innerText";
     if (element.textContent) {
-      property = 'textContent';
+      property = "textContent";
     }
     if (element[property]) {
       element[property] = (0, _normalization.wrapMath)((0, _normalization.unWrapMath)(element[property]).unwrapped);
@@ -102752,7 +102666,7 @@ getDefaultExportFromCjs(mathRendering);
   exports.fixMathElement = fixMathElement;
   var fixMathElements = function fixMathElements() {
     var el = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document;
-    var mathElements = el.querySelectorAll('[data-latex]');
+    var mathElements = el.querySelectorAll("[data-latex]");
     mathElements.forEach(function (item) {
       return fixMathElement(item);
     });
@@ -102760,25 +102674,25 @@ getDefaultExportFromCjs(mathRendering);
   exports.fixMathElements = fixMathElements;
   var adjustMathMLStyle = function adjustMathMLStyle() {
     var el = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document;
-    var nodes = el.querySelectorAll('math');
+    var nodes = el.querySelectorAll("math");
     nodes.forEach(function (node) {
-      return node.setAttribute('displaystyle', 'true');
+      return node.setAttribute("displaystyle", "true");
     });
   };
   var createPlaceholder = function createPlaceholder(element) {
     var _element$previousSibl;
-    if (!element.previousSibling || !((_element$previousSibl = element.previousSibling.classList) !== null && _element$previousSibl !== void 0 && _element$previousSibl.contains('math-placeholder'))) {
+    if (!element.previousSibling || !((_element$previousSibl = element.previousSibling.classList) !== null && _element$previousSibl !== void 0 && _element$previousSibl.contains("math-placeholder"))) {
       var _element$parentNode;
-      element.dataset.originalDisplay = element.style.display || '';
-      element.style.display = 'none';
-      var placeholder = document.createElement('span');
-      placeholder.style.cssText = 'height: 10px; width: 50px; display: inline-block; vertical-align: middle; justify-content: center; background: #fafafa; border-radius: 4px;';
-      placeholder.classList.add('math-placeholder');
+      element.dataset.originalDisplay = element.style.display || "";
+      element.style.display = "none";
+      var placeholder = document.createElement("span");
+      placeholder.style.cssText = "height: 10px; width: 50px; display: inline-block; vertical-align: middle; justify-content: center; background: #fafafa; border-radius: 4px;";
+      placeholder.classList.add("math-placeholder");
       (_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 ? void 0 : _element$parentNode.insertBefore(placeholder, element);
     }
   };
   var removePlaceholdersAndRestoreDisplay = function removePlaceholdersAndRestoreDisplay() {
-    document.querySelectorAll('.math-placeholder').forEach(function (placeholder) {
+    document.querySelectorAll(".math-placeholder").forEach(function (placeholder) {
       var _targetElement$datase;
       var targetElement = placeholder.nextElementSibling;
       if (targetElement && ((_targetElement$datase = targetElement.dataset) === null || _targetElement$datase === void 0 ? void 0 : _targetElement$datase.originalDisplay) !== undefined) {
@@ -102789,9 +102703,9 @@ getDefaultExportFromCjs(mathRendering);
     });
   };
   var removeExcessMjxContainers = function removeExcessMjxContainers(content) {
-    var elements = content.querySelectorAll('[data-latex][data-math-handled="true"]');
+    var elements = content.querySelectorAll("[data-latex][data-math-handled=\"true\"]");
     elements.forEach(function (element) {
-      var mjxContainers = element.querySelectorAll('mjx-container');
+      var mjxContainers = element.querySelectorAll("mjx-container");
       if (mjxContainers.length > 1) {
         for (var i = 1; i < mjxContainers.length; i++) {
           mjxContainers[i].parentNode.removeChild(mjxContainers[i]);
@@ -102799,28 +102713,124 @@ getDefaultExportFromCjs(mathRendering);
       }
     });
   };
-  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 renderContentWithMathJax = function renderContentWithMathJax(executeOn) {
+    executeOn = executeOn || document.body;
+    fixMathElements(executeOn);
+    adjustMathMLStyle(executeOn);
+    var mathJaxInstance = getGlobal().instance;
+    if (mathJaxInstance) {
+      mathJaxInstance.texReset();
+      mathJaxInstance.typesetClear();
+      mathJaxInstance.typesetPromise([executeOn]).then(function () {
+        try {
+          removeExcessMjxContainers(executeOn);
+          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 initializeMathJax = function initializeMathJax(callback) {
+    var texConfig = {
+      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,
+          ready: function ready() {
+            var mathjax = MathJax._.mathjax.mathjax;
+            var STATE = MathJax._.core.MathItem.STATE;
+            var Menu = MathJax._.ui.menu.Menu.Menu;
+            var rerender = Menu.prototype.rerender;
+            Menu.prototype.rerender = function () {
+              var _this = this;
+              var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : STATE.TYPESET;
+              mathjax.handleRetriesFor(function () {
+                return rerender.call(_this, start);
+              });
+            };
+            MathJax.startup.defaultReady();
+            var globalObj = getGlobal();
+            globalObj.instance = MathJax;
+            window.mathjaxLoadedComplete = true;
+            console.log("MathJax has initialised!", new Date().toString());
+            if (callback) {
+              callback();
+            }
+            resolve();
+          }
+        },
+        loader: {
+          load: ["input/mml"],
+          preLoad: function preLoad() {}
+        },
+        tex: texConfig,
+        chtml: {
+          fontURL: "https://unpkg.com/mathjax-full@3.2.2/ts/output/chtml/fonts/tex-woff-v2",
+          displayAlign: "center"
+        },
+        customKey: "@pie-lib/math-rendering-accessible@1",
+        options: {
+          enableEnrichment: true,
+          sre: {
+            speech: "deep"
+          },
+          menuOptions: {
+            settings: {
+              assistiveMml: true,
+              collapsible: false,
+              explorer: false
+            }
+          }
+        }
+      };
+      var script = document.createElement("script");
+      script.type = "text/javascript";
+      script.src = ("https://cdn.jsdelivr.net/npm/mathjax@").concat(MathJaxVersion, "/es5/tex-chtml-full.js");
+      script.async = true;
+      document.body.appendChild(script);
+    });
+  };
+  exports.initializeMathJax = initializeMathJax;
   var renderMath = function renderMath(el, renderOpts) {
-    var isString = typeof el === 'string';
+    var usedForMmlOutput = typeof el === "string";
     var executeOn = document.body;
-    if (isString) {
-      var div = document.createElement('div');
-      div.innerHTML = el;
-      executeOn = div;
+    if (window.hasOwnProperty(mathRenderingKEY) && window[mathRenderingKEY].instance) {
+      return mr.renderMath(el, renderOpts);
     }
-    var _ref = renderOpts || ({}), skipWaitForMathRenderingLib = _ref.skipWaitForMathRenderingLib;
-    var renderMathAccessible = function renderMathAccessible() {
-      fixMathElements(executeOn);
-      adjustMathMLStyle(executeOn);
-      var mathJaxCustomKey = getMathJaxCustomKey();
-      if ((!window.MathJax || window.MathJax.version !== _mathjaxScript.MathJaxVersion) && !window.mathjaxLoadedP || mathJaxCustomKey && mathJaxCustomKey !== mathRenderingAccessibleKEY) {
-        renderOpts = renderOpts || defaultOpts();
-        (0, _mathjaxScript.initializeMathJax)(renderOpts);
+    if (!usedForMmlOutput) {
+      if (window.mathjaxLoadedComplete) {
+        renderContentWithMathJax(el);
+      } else if (window.mathjaxLoadedP) {
+        window.mathjaxLoadedP.then(function () {
+          window.mathjaxLoadedComplete = true;
+          renderContentWithMathJax(el);
+        })["catch"](function (error) {
+          return console.error("Error in initializing MathJax:", error);
+        });
       }
-      if (isString && window.MathJax && window.mathjaxLoadedP) {
+    } else {
+      if (window.MathJax && window.mathjaxLoadedP) {
+        var div = document.createElement("div");
+        div.innerHTML = el;
+        executeOn = div;
         try {
           MathJax.texReset();
           MathJax.typesetClear();
@@ -102829,76 +102839,38 @@ getDefaultExportFromCjs(mathRendering);
           var list = updatedDocument.math.list;
           var item = list.next;
           var mathMl = toMMl(item.data.root);
-          var parsedMathMl = mathMl.replaceAll('\n', '');
+          var parsedMathMl = mathMl.replaceAll("\n", "");
           return parsedMathMl;
         } catch (error) {
-          console.error('Error rendering math:', error.message);
+          console.error("Error rendering math:", error.message);
         }
         return el;
       }
-      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(mathRenderingKEY) && window[mathRenderingKEY].instance) {
-        removePlaceholdersAndRestoreDisplay();
-        return mr.renderMath(executeOn, renderOpts);
-      }
-      if (window.hasOwnProperty(mathRenderingAccessibleKEY) && window[mathRenderingAccessibleKEY].instance) {
-        return renderMathAccessible();
-      }
-      var waitForMathRenderingLib = function waitForMathRenderingLib(renderMathAccessibleCallback) {
-        var mathElements = executeOn.querySelectorAll('[data-latex]');
-        mathElements.forEach(createPlaceholder);
-        var checkIntervalId;
-        var maxWaitTime = 500;
-        var startTime = Date.now();
-        var checkForLib = function checkForLib() {
-          var mathRenderingHasLoaded = window.hasOwnProperty(mathRenderingKEY) && window[mathRenderingKEY].instance;
-          var hasExceededMaxWait = Date.now() - startTime > maxWaitTime;
-          if (mathRenderingHasLoaded || hasExceededMaxWait) {
-            clearInterval(checkIntervalId);
-            if (mathRenderingHasLoaded) {
-              removePlaceholdersAndRestoreDisplay();
-              return mr.renderMath(executeOn, renderOpts);
-            }
-            renderMathAccessibleCallback();
-          }
-        };
-        checkIntervalId = setInterval(checkForLib, 100);
-      };
-      waitForMathRenderingLib(renderMathAccessible);
+      return el;
     }
   };
+  (function () {
+    if (window.checkIntervalId) {
+      return;
+    }
+    window.checkIntervalId = undefined;
+    var maxWaitTime = 5000;
+    var startTime = Date.now();
+    var checkForLib = function checkForLib() {
+      var mathElements = document.body.querySelectorAll("[data-latex]");
+      mathElements.forEach(createPlaceholder);
+      var mathRenderingHasLoaded = window.hasOwnProperty(mathRenderingKEY) && window[mathRenderingKEY].instance;
+      var hasExceededMaxWait = Date.now() - startTime > maxWaitTime;
+      if (mathRenderingHasLoaded || hasExceededMaxWait) {
+        clearInterval(window.checkIntervalId);
+        removePlaceholdersAndRestoreDisplay();
+      }
+      if (hasExceededMaxWait) {
+        initializeMathJax(renderContentWithMathJax);
+      }
+    };
+    window.checkIntervalId = setInterval(checkForLib, 50);
+  })();
   var _default = renderMath;
   exports["default"] = _default;
 })(renderMath$1);