@pie-element/complex-rubric 3.6.7-next.4 → 3.6.7-next.8

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.16.0",
+    "@pie-lib/pie-toolbox": "2.17.4",
     "lodash": "^4.17.15"
   },
   "author": "",

package/module/configure.js

@@ -1,6 +1,6 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.9.0/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@4.1.3/module/index.js";
 import RubricConfigure from '@pie-element/rubric/configure/lib';
-import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@6.2.0/module/index.js";
+import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@7.0.2/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -114760,6 +114760,10 @@ const require$$23$2 = _dll_debug;
   }
   if (typeof window !== 'undefined') {
     (0, _html.RegisterHTMLHandler)((0, _browserAdaptor.browserAdaptor)());
+    if (window.MathJax && window.MathJax.Menu) {
+      console.log('Prevent MathJax v2 from interfering with v3 MenuHandler');
+      delete window.MathJax.Menu;
+    }
   }
   var sreReady = false;
   (0, _system.engineReady)().then(function () {
@@ -114877,7 +114881,9 @@ const require$$23$2 = _dll_debug;
     };
     var mml = new _mathml.MathML(mmlConfig);
     var customMmlFactory = new _MmlFactory.MmlFactory(_objectSpread(_objectSpread({}, _MmlFactory.MmlFactory.defaultNodes), _mstack.mmlNodes));
-    var classFactory = (0, _semanticEnrich.EnrichHandler)((0, _MenuHandler.MenuHandler)((0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided))), mml);
+    var withAssistive = (0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided));
+    var handler = window.MathJax && window.MathJax.Menu ? withAssistive : (0, _MenuHandler.MenuHandler)(withAssistive);
+    var classFactory = (0, _semanticEnrich.EnrichHandler)(handler, mml);
     var html = classFactory.create(docProvided, {
       compileError: function compileError(mj, math, err) {
         console.log('bad math?:', math);
@@ -114888,6 +114894,13 @@ const require$$23$2 = _dll_debug;
         console.error(err);
         doc.typesetError(math, err);
       },
+      menuOptions: {
+        settings: {
+          assistiveMml: true,
+          collapsible: false,
+          explorer: false
+        }
+      },
       sre: {
         speech: 'deep'
       },
@@ -114922,13 +114935,19 @@ const require$$23$2 = _dll_debug;
         var attemptRender = function attemptRender() {
           var _updatedDocument$math, _updatedDocument$math2;
           var temporary = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+          var usesMenuHandler = !(window.MathJax && window.MathJax.Menu);
           var updatedDocument = _this.html.findMath(elements.length ? {
             elements: elements
           } : {}).compile();
           if (!temporary && sreReady) {
             updatedDocument = updatedDocument.enrich();
           }
-          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech().addMenu().updateDocument();
+          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech();
+          if (usesMenuHandler) {
+            console.log('Using MenuHandler');
+            updatedDocument = updatedDocument.addMenu();
+          }
+          updatedDocument = updatedDocument.updateDocument();
           if (!enrichSpeechInitialized && (0, _typeof2["default"])((_updatedDocument$math = updatedDocument.math.list) === null || _updatedDocument$math === void 0 ? void 0 : (_updatedDocument$math2 = _updatedDocument$math.next) === null || _updatedDocument$math2 === void 0 ? void 0 : _updatedDocument$math2.data) === 'object') {
             enrichSpeechInitialized = true;
           }

package/module/element.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.9.0/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@6.2.0/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@4.1.3/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@7.0.2/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -132366,6 +132366,10 @@ const require$$23$2 = _dll_debug;
   }
   if (typeof window !== 'undefined') {
     (0, _html.RegisterHTMLHandler)((0, _browserAdaptor.browserAdaptor)());
+    if (window.MathJax && window.MathJax.Menu) {
+      console.log('Prevent MathJax v2 from interfering with v3 MenuHandler');
+      delete window.MathJax.Menu;
+    }
   }
   var sreReady = false;
   (0, _system.engineReady)().then(function () {
@@ -132483,7 +132487,9 @@ const require$$23$2 = _dll_debug;
     };
     var mml = new _mathml.MathML(mmlConfig);
     var customMmlFactory = new _MmlFactory.MmlFactory(_objectSpread(_objectSpread({}, _MmlFactory.MmlFactory.defaultNodes), _mstack.mmlNodes));
-    var classFactory = (0, _semanticEnrich.EnrichHandler)((0, _MenuHandler.MenuHandler)((0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided))), mml);
+    var withAssistive = (0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided));
+    var handler = window.MathJax && window.MathJax.Menu ? withAssistive : (0, _MenuHandler.MenuHandler)(withAssistive);
+    var classFactory = (0, _semanticEnrich.EnrichHandler)(handler, mml);
     var html = classFactory.create(docProvided, {
       compileError: function compileError(mj, math, err) {
         console.log('bad math?:', math);
@@ -132494,6 +132500,13 @@ const require$$23$2 = _dll_debug;
         console.error(err);
         doc.typesetError(math, err);
       },
+      menuOptions: {
+        settings: {
+          assistiveMml: true,
+          collapsible: false,
+          explorer: false
+        }
+      },
       sre: {
         speech: 'deep'
       },
@@ -132528,13 +132541,19 @@ const require$$23$2 = _dll_debug;
         var attemptRender = function attemptRender() {
           var _updatedDocument$math, _updatedDocument$math2;
           var temporary = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+          var usesMenuHandler = !(window.MathJax && window.MathJax.Menu);
           var updatedDocument = _this.html.findMath(elements.length ? {
             elements: elements
           } : {}).compile();
           if (!temporary && sreReady) {
             updatedDocument = updatedDocument.enrich();
           }
-          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech().addMenu().updateDocument();
+          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech();
+          if (usesMenuHandler) {
+            console.log('Using MenuHandler');
+            updatedDocument = updatedDocument.addMenu();
+          }
+          updatedDocument = updatedDocument.updateDocument();
           if (!enrichSpeechInitialized && (0, _typeof2["default"])((_updatedDocument$math = updatedDocument.math.list) === null || _updatedDocument$math === void 0 ? void 0 : (_updatedDocument$math2 = _updatedDocument$math.next) === null || _updatedDocument$math2 === void 0 ? void 0 : _updatedDocument$math2.data) === 'object') {
             enrichSpeechInitialized = true;
           }

package/module/manifest.json

@@ -4,11 +4,11 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "3.9.0"
+      "version": "4.1.3"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",
-      "version": "6.2.0"
+      "version": "7.0.2"
     }
   ]
 }

package/module/print.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@3.9.0/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@6.2.0/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_pie_lib__pie_toolbox_math_rendering, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@4.1.3/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@7.0.2/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -132366,6 +132366,10 @@ const require$$23$2 = _dll_debug;
   }
   if (typeof window !== 'undefined') {
     (0, _html.RegisterHTMLHandler)((0, _browserAdaptor.browserAdaptor)());
+    if (window.MathJax && window.MathJax.Menu) {
+      console.log('Prevent MathJax v2 from interfering with v3 MenuHandler');
+      delete window.MathJax.Menu;
+    }
   }
   var sreReady = false;
   (0, _system.engineReady)().then(function () {
@@ -132483,7 +132487,9 @@ const require$$23$2 = _dll_debug;
     };
     var mml = new _mathml.MathML(mmlConfig);
     var customMmlFactory = new _MmlFactory.MmlFactory(_objectSpread(_objectSpread({}, _MmlFactory.MmlFactory.defaultNodes), _mstack.mmlNodes));
-    var classFactory = (0, _semanticEnrich.EnrichHandler)((0, _MenuHandler.MenuHandler)((0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided))), mml);
+    var withAssistive = (0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided));
+    var handler = window.MathJax && window.MathJax.Menu ? withAssistive : (0, _MenuHandler.MenuHandler)(withAssistive);
+    var classFactory = (0, _semanticEnrich.EnrichHandler)(handler, mml);
     var html = classFactory.create(docProvided, {
       compileError: function compileError(mj, math, err) {
         console.log('bad math?:', math);
@@ -132494,6 +132500,13 @@ const require$$23$2 = _dll_debug;
         console.error(err);
         doc.typesetError(math, err);
       },
+      menuOptions: {
+        settings: {
+          assistiveMml: true,
+          collapsible: false,
+          explorer: false
+        }
+      },
       sre: {
         speech: 'deep'
       },
@@ -132528,13 +132541,19 @@ const require$$23$2 = _dll_debug;
         var attemptRender = function attemptRender() {
           var _updatedDocument$math, _updatedDocument$math2;
           var temporary = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+          var usesMenuHandler = !(window.MathJax && window.MathJax.Menu);
           var updatedDocument = _this.html.findMath(elements.length ? {
             elements: elements
           } : {}).compile();
           if (!temporary && sreReady) {
             updatedDocument = updatedDocument.enrich();
           }
-          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech().addMenu().updateDocument();
+          updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech();
+          if (usesMenuHandler) {
+            console.log('Using MenuHandler');
+            updatedDocument = updatedDocument.addMenu();
+          }
+          updatedDocument = updatedDocument.updateDocument();
           if (!enrichSpeechInitialized && (0, _typeof2["default"])((_updatedDocument$math = updatedDocument.math.list) === null || _updatedDocument$math === void 0 ? void 0 : (_updatedDocument$math2 = _updatedDocument$math.next) === null || _updatedDocument$math2 === void 0 ? void 0 : _updatedDocument$math2.data) === 'object') {
             enrichSpeechInitialized = true;
           }

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.6.7-next.4+ce7898271",
+  "version": "3.6.7-next.8+a98d9306e",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.5.7-next.4+ce7898271",
-    "@pie-element/rubric": "^4.7.2-next.4+ce7898271",
+    "@pie-element/multi-trait-rubric": "^4.5.7-next.8+a98d9306e",
+    "@pie-element/rubric": "^4.7.2-next.8+a98d9306e",
     "@pie-framework/pie-player-events": "^0.1.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2"
   },
-  "gitHead": "ce7898271621e769a4c5eeeb148f9176615dc034",
+  "gitHead": "a98d9306e52686234b7c27133fcca6f04500c448",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },