@pie-element/math-templated 3.2.3-next.3 → 3.3.0

package/module/element.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.1.5/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@5.1.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_framework__mathquill, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.2.0/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@5.2.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -29436,7 +29436,7 @@ TexError$1.default = TexError;
           }
         },
         loader: {
-          load: ["input/mml", '[mml]/mml3'],
+          load: ["input/mml"],
           preLoad: function preLoad() {},
           failed: function failed(error) {
             return console.log(("MathJax(").concat(error["package"] || '?', "): ").concat(error.message));
@@ -73010,7 +73010,7 @@ var _interopRequireDefault$3c = interopRequireDefault.exports;
 Object.defineProperty(color$1, "__esModule", {
   value: true
 });
-color$1.white = color$1.v = color$1.transparent = color$1.text = color$1.secondaryText = color$1.secondaryLight = color$1.secondaryDark = color$1.secondaryBackground = color$1.secondary = color$1.primaryText = color$1.primaryLight = color$1.primaryDark = color$1.primary = color$1.missingWithIcon = color$1.missing = color$1.incorrectWithIcon = color$1.incorrectSecondary = color$1.incorrect = color$1.disabledSecondary = color$1.disabled = color$1.defaults = color$1.correctWithIcon = color$1.correctSecondary = color$1.correct = color$1.borderLight = color$1.borderDark = color$1.border = color$1.black = color$1.backgroundDark = color$1.background = void 0;
+color$1.white = color$1.v = color$1.transparent = color$1.text = color$1.tertiaryLight = color$1.tertiary = color$1.secondaryText = color$1.secondaryLight = color$1.secondaryDark = color$1.secondaryBackground = color$1.secondary = color$1.primaryText = color$1.primaryLight = color$1.primaryDark = color$1.primary = color$1.missingWithIcon = color$1.missing = color$1.incorrectWithIcon = color$1.incorrectSecondary = color$1.incorrect = color$1.disabledSecondary = color$1.disabled = color$1.defaults = color$1.correctWithIcon = color$1.correctSecondary = color$1.correct = color$1.borderLight = color$1.borderDark = color$1.border = color$1.black = color$1.backgroundDark = color$1.background = void 0;
 var _green = _interopRequireDefault$3c(green$1);
 var _orange = _interopRequireDefault$3c(orange$1);
 var _pink = _interopRequireDefault$3c(pink$1);
@@ -73034,6 +73034,8 @@ var defaults = {
   SECONDARY: _pink["default"].A400,
   SECONDARY_LIGHT: _pink["default"][200],
   SECONDARY_DARK: _pink["default"][900],
+  TERTIARY: '#146EB3',
+  TERTIARY_LIGHT: '#D0E2F0',
   BACKGROUND: 'rgba(255,255,255,0)',
   BACKGROUND_DARK: '#ECEDF1',
   SECONDARY_BACKGROUND: 'rgba(241,241,241,1)',
@@ -73147,6 +73149,14 @@ var secondaryBackground = function secondaryBackground() {
   return pv('secondary-background', defaults.SECONDARY_BACKGROUND);
 };
 color$1.secondaryBackground = secondaryBackground;
+var tertiary = function tertiary() {
+  return pv('tertiary', defaults.TERTIARY);
+};
+color$1.tertiary = tertiary;
+var tertiaryLight = function tertiaryLight() {
+  return pv('tertiary-light', defaults.TERTIARY_LIGHT);
+};
+color$1.tertiaryLight = tertiaryLight;
 var border = function border() {
   return pv('border', defaults.BORDER);
 };
@@ -76813,9 +76823,9 @@ const require$$11$r = _dll_prop_types;
             color: theme.palette.common.black
           }
         },
-        '&:not(.MathJax) > table td, &:not(.MathJax) > table th': {
+        '&:not(.MathJax) table td, &:not(.MathJax) table th': {
           padding: '.6em 1em',
-          textAlign: 'center'
+          textAlign: 'left'
         },
         '&:not(.MathJax) > table td > p.kds-indent': {
           textAlign: 'initial'
@@ -81051,18 +81061,23 @@ const require$$17$2 = _dll_classnames;
     }, {
       key: "updateDimensions",
       value: function updateDimensions() {
-        var _this$spanRef2, _this$spanRef3;
-        var height = ((_this$spanRef2 = this.spanRef) === null || _this$spanRef2 === void 0 ? void 0 : _this$spanRef2.offsetHeight) || 0;
-        var width = ((_this$spanRef3 = this.spanRef) === null || _this$spanRef3 === void 0 ? void 0 : _this$spanRef3.offsetWidth) || 0;
-        var responseAreaHeight = parseFloat(this.props.emptyResponseAreaHeight) || 0;
-        var responseAreaWidth = parseFloat(this.props.emptyResponseAreaWidth) || 0;
-        if (height > responseAreaHeight || width > responseAreaWidth) {
+        if (this.spanRef && this.rootRef) {
+          this.rootRef.style.width = 'auto';
+          var width = this.spanRef.offsetWidth || 0;
+          var height = this.spanRef.offsetHeight || 0;
+          var widthWithPadding = width + 24;
+          var responseAreaWidth = parseFloat(this.props.emptyResponseAreaWidth) || 0;
+          var responseAreaHeight = parseFloat(this.props.emptyResponseAreaHeight) || 0;
+          var adjustedWidth = widthWithPadding <= responseAreaWidth ? responseAreaWidth : widthWithPadding;
+          var adjustedHeight = height <= responseAreaHeight ? responseAreaHeight : height;
           this.setState(function (prevState) {
             return {
-              width: width > responseAreaWidth ? width + 24 : prevState.width,
-              height: height > responseAreaHeight ? height : prevState.height
+              width: adjustedWidth > responseAreaWidth ? adjustedWidth : prevState.width,
+              height: adjustedHeight > responseAreaHeight ? adjustedHeight : prevState.height
             };
           });
+          this.rootRef.style.width = ("").concat(adjustedWidth, "px");
+          this.rootRef.style.height = ("").concat(adjustedHeight, "px");
         }
       }
     }, {
@@ -81077,13 +81092,15 @@ const require$$17$2 = _dll_classnames;
     }, {
       key: "getRootDimensions",
       value: function getRootDimensions() {
+        var responseAreaWidth = !isNaN(parseFloat(this.props.emptyResponseAreaWidth)) ? parseFloat(this.props.emptyResponseAreaWidth) : 0;
+        var responseAreaHeight = !isNaN(parseFloat(this.props.emptyResponseAreaHeight)) ? parseFloat(this.props.emptyResponseAreaHeight) : 0;
         var rootStyle = {
-          height: this.state.height || this.props.emptyResponseAreaHeight,
-          width: this.state.width || this.props.emptyResponseAreaWidth
+          height: this.state.height || responseAreaHeight,
+          width: this.state.width || responseAreaWidth
         };
-        return _objectSpread(_objectSpread(_objectSpread({}, rootStyle), this.props.emptyResponseAreaWidth ? {} : {
+        return _objectSpread(_objectSpread(_objectSpread({}, rootStyle), responseAreaWidth ? {} : {
           minWidth: 90
-        }), this.props.emptyResponseAreaHeight ? {} : {
+        }), responseAreaHeight ? {} : {
           minHeight: 32
         });
       }

package/module/manifest.json

@@ -4,11 +4,11 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",
-      "version": "5.1.2"
+      "version": "5.2.0"
     }
   ]
 }

package/module/print.js

@@ -1,5 +1,5 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.1.5/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@5.1.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_framework__mathquill, _dll_pie_lib__pie_toolbox_math_rendering_accessible} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.2.0/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@5.2.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -29399,7 +29399,7 @@ TexError$1.default = TexError;
           }
         },
         loader: {
-          load: ["input/mml", '[mml]/mml3'],
+          load: ["input/mml"],
           preLoad: function preLoad() {},
           failed: function failed(error) {
             return console.log(("MathJax(").concat(error["package"] || '?', "): ").concat(error.message));
@@ -72973,7 +72973,7 @@ var _interopRequireDefault$3c = interopRequireDefault.exports;
 Object.defineProperty(color$1, "__esModule", {
   value: true
 });
-color$1.white = color$1.v = color$1.transparent = color$1.text = color$1.secondaryText = color$1.secondaryLight = color$1.secondaryDark = color$1.secondaryBackground = color$1.secondary = color$1.primaryText = color$1.primaryLight = color$1.primaryDark = color$1.primary = color$1.missingWithIcon = color$1.missing = color$1.incorrectWithIcon = color$1.incorrectSecondary = color$1.incorrect = color$1.disabledSecondary = color$1.disabled = color$1.defaults = color$1.correctWithIcon = color$1.correctSecondary = color$1.correct = color$1.borderLight = color$1.borderDark = color$1.border = color$1.black = color$1.backgroundDark = color$1.background = void 0;
+color$1.white = color$1.v = color$1.transparent = color$1.text = color$1.tertiaryLight = color$1.tertiary = color$1.secondaryText = color$1.secondaryLight = color$1.secondaryDark = color$1.secondaryBackground = color$1.secondary = color$1.primaryText = color$1.primaryLight = color$1.primaryDark = color$1.primary = color$1.missingWithIcon = color$1.missing = color$1.incorrectWithIcon = color$1.incorrectSecondary = color$1.incorrect = color$1.disabledSecondary = color$1.disabled = color$1.defaults = color$1.correctWithIcon = color$1.correctSecondary = color$1.correct = color$1.borderLight = color$1.borderDark = color$1.border = color$1.black = color$1.backgroundDark = color$1.background = void 0;
 var _green = _interopRequireDefault$3c(green$1);
 var _orange = _interopRequireDefault$3c(orange$1);
 var _pink = _interopRequireDefault$3c(pink$1);
@@ -72997,6 +72997,8 @@ var defaults = {
   SECONDARY: _pink["default"].A400,
   SECONDARY_LIGHT: _pink["default"][200],
   SECONDARY_DARK: _pink["default"][900],
+  TERTIARY: '#146EB3',
+  TERTIARY_LIGHT: '#D0E2F0',
   BACKGROUND: 'rgba(255,255,255,0)',
   BACKGROUND_DARK: '#ECEDF1',
   SECONDARY_BACKGROUND: 'rgba(241,241,241,1)',
@@ -73110,6 +73112,14 @@ var secondaryBackground = function secondaryBackground() {
   return pv('secondary-background', defaults.SECONDARY_BACKGROUND);
 };
 color$1.secondaryBackground = secondaryBackground;
+var tertiary = function tertiary() {
+  return pv('tertiary', defaults.TERTIARY);
+};
+color$1.tertiary = tertiary;
+var tertiaryLight = function tertiaryLight() {
+  return pv('tertiary-light', defaults.TERTIARY_LIGHT);
+};
+color$1.tertiaryLight = tertiaryLight;
 var border = function border() {
   return pv('border', defaults.BORDER);
 };
@@ -76776,9 +76786,9 @@ const require$$11$r = _dll_prop_types;
             color: theme.palette.common.black
           }
         },
-        '&:not(.MathJax) > table td, &:not(.MathJax) > table th': {
+        '&:not(.MathJax) table td, &:not(.MathJax) table th': {
           padding: '.6em 1em',
-          textAlign: 'center'
+          textAlign: 'left'
         },
         '&:not(.MathJax) > table td > p.kds-indent': {
           textAlign: 'initial'
@@ -81014,18 +81024,23 @@ const require$$17$2 = _dll_classnames;
     }, {
       key: "updateDimensions",
       value: function updateDimensions() {
-        var _this$spanRef2, _this$spanRef3;
-        var height = ((_this$spanRef2 = this.spanRef) === null || _this$spanRef2 === void 0 ? void 0 : _this$spanRef2.offsetHeight) || 0;
-        var width = ((_this$spanRef3 = this.spanRef) === null || _this$spanRef3 === void 0 ? void 0 : _this$spanRef3.offsetWidth) || 0;
-        var responseAreaHeight = parseFloat(this.props.emptyResponseAreaHeight) || 0;
-        var responseAreaWidth = parseFloat(this.props.emptyResponseAreaWidth) || 0;
-        if (height > responseAreaHeight || width > responseAreaWidth) {
+        if (this.spanRef && this.rootRef) {
+          this.rootRef.style.width = 'auto';
+          var width = this.spanRef.offsetWidth || 0;
+          var height = this.spanRef.offsetHeight || 0;
+          var widthWithPadding = width + 24;
+          var responseAreaWidth = parseFloat(this.props.emptyResponseAreaWidth) || 0;
+          var responseAreaHeight = parseFloat(this.props.emptyResponseAreaHeight) || 0;
+          var adjustedWidth = widthWithPadding <= responseAreaWidth ? responseAreaWidth : widthWithPadding;
+          var adjustedHeight = height <= responseAreaHeight ? responseAreaHeight : height;
           this.setState(function (prevState) {
             return {
-              width: width > responseAreaWidth ? width + 24 : prevState.width,
-              height: height > responseAreaHeight ? height : prevState.height
+              width: adjustedWidth > responseAreaWidth ? adjustedWidth : prevState.width,
+              height: adjustedHeight > responseAreaHeight ? adjustedHeight : prevState.height
             };
           });
+          this.rootRef.style.width = ("").concat(adjustedWidth, "px");
+          this.rootRef.style.height = ("").concat(adjustedHeight, "px");
         }
       }
     }, {
@@ -81040,13 +81055,15 @@ const require$$17$2 = _dll_classnames;
     }, {
       key: "getRootDimensions",
       value: function getRootDimensions() {
+        var responseAreaWidth = !isNaN(parseFloat(this.props.emptyResponseAreaWidth)) ? parseFloat(this.props.emptyResponseAreaWidth) : 0;
+        var responseAreaHeight = !isNaN(parseFloat(this.props.emptyResponseAreaHeight)) ? parseFloat(this.props.emptyResponseAreaHeight) : 0;
         var rootStyle = {
-          height: this.state.height || this.props.emptyResponseAreaHeight,
-          width: this.state.width || this.props.emptyResponseAreaWidth
+          height: this.state.height || responseAreaHeight,
+          width: this.state.width || responseAreaWidth
         };
-        return _objectSpread(_objectSpread(_objectSpread({}, rootStyle), this.props.emptyResponseAreaWidth ? {} : {
+        return _objectSpread(_objectSpread(_objectSpread({}, rootStyle), responseAreaWidth ? {} : {
           minWidth: 90
-        }), this.props.emptyResponseAreaHeight ? {} : {
+        }), responseAreaHeight ? {} : {
           minHeight: 32
         });
       }

package/package.json

@@ -4,19 +4,19 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "3.2.3-next.3+ace661f34",
+  "version": "3.3.0",
   "description": "",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.1.3",
+    "@pie-lib/pie-toolbox": "2.2.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "ace661f34b6e59271949e848ce2474dce65c4d64",
+  "gitHead": "20cc12d3d06ad5318bfa4c6994cf7c7614dfed2f",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },