@pie-element/complex-rubric 2.16.3-next.0 → 2.16.3-next.10

package/controller/package.json

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

package/module/configure.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_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.17.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} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.0/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@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
@@ -44154,7 +44154,7 @@ const require$$12$s = _dll_prop_types;
 getDefaultExportFromCjs(feedback);
 const require$$9$T = _dll_react;
 const require$$10$R = _dll_prop_types;
-const require$$15$7 = _dll_debug;
+const require$$15$8 = _dll_debug;
 var _interopRequireDefault$3s = interopRequireDefault.exports;
 var _typeof$i = _typeof$s.exports;
 Object.defineProperty(responseIndicators, "__esModule", {
@@ -44174,7 +44174,7 @@ var icons$3 = _interopRequireWildcard$6(icons$4);
 var _Popover$1 = _interopRequireDefault$3s(Popover$2);
 var _styles$a = styles$1J;
 var _feedback = _interopRequireDefault$3s(feedback);
-var _debug$3 = _interopRequireDefault$3s(require$$15$7);
+var _debug$3 = _interopRequireDefault$3s(require$$15$8);
 function _getRequireWildcardCache$3(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();
@@ -110923,7 +110923,7 @@ var Arrow = (0, _styles$9.withStyles)(function (theme) {
 common.Arrow = Arrow;
 const require$$8$s = _dll_react;
 const require$$9$I = _dll_prop_types;
-const require$$15$6 = _dll_pie_lib__pie_toolbox_render_ui;
+const require$$15$7 = _dll_pie_lib__pie_toolbox_render_ui;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -110944,7 +110944,7 @@ const require$$15$6 = _dll_pie_lib__pie_toolbox_render_ui;
   var _Menu = _interopRequireDefault(Menu$2);
   var _MenuItem = _interopRequireDefault(MenuItem$2);
   var _MoreVert = _interopRequireDefault(MoreVert);
-  var _renderUi = require$$15$6;
+  var _renderUi = require$$15$7;
   var _common = common;
   function _createSuper(Derived) {
     var hasNativeReflectConstruct = _isNativeReflectConstruct();
@@ -112653,7 +112653,7 @@ var InfoDialog = (0, _styles$8.withStyles)(styles$1d)(RawInfoDialog);
 modals.InfoDialog = InfoDialog;
 const require$$9$F = _dll_react;
 const require$$10$C = _dll_prop_types;
-const require$$15$5 = _dll_pie_lib__pie_toolbox_render_ui;
+const require$$15$6 = _dll_pie_lib__pie_toolbox_render_ui;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -112674,7 +112674,7 @@ const require$$15$5 = _dll_pie_lib__pie_toolbox_render_ui;
   var _ArrowBackIos = _interopRequireDefault(ArrowBackIos);
   var _ArrowForwardIos = _interopRequireDefault(ArrowForwardIos);
   var _drag = drag$1;
-  var _renderUi = require$$15$5;
+  var _renderUi = require$$15$6;
   var _traitsHeader = _interopRequireDefault(traitsHeader);
   var _trait = _interopRequireDefault(trait);
   var _common = common;
@@ -113101,7 +113101,8 @@ const require$$11$D = _dll_react;
 const require$$12$k = _dll_prop_types;
 const {cloneDeep: require$$13$a} = _dll_lodash;
 const {isEmpty: require$$14$6} = _dll_lodash;
-const require$$17$3 = _dll_pie_lib__pie_toolbox_config_ui;
+const {debounce: require$$15$5} = _dll_lodash;
+const require$$18$4 = _dll_pie_lib__pie_toolbox_config_ui;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -113122,9 +113123,10 @@ const require$$17$3 = _dll_pie_lib__pie_toolbox_config_ui;
   var _propTypes = _interopRequireDefault(require$$12$k);
   var _cloneDeep = _interopRequireDefault(require$$13$a);
   var _isEmpty = _interopRequireDefault(require$$14$6);
+  var _debounce = _interopRequireDefault(require$$15$5);
   var _styles = styles$1J;
   var _drag = drag$1;
-  var _configUi = require$$17$3;
+  var _configUi = require$$18$4;
   var _scale = _interopRequireDefault(scale);
   var _common = common;
   var _modals = modals;
@@ -113225,6 +113227,9 @@ const require$$17$3 = _dll_pie_lib__pie_toolbox_config_ui;
         adjustedWidth: MIN_WIDTH,
         initialUpdateCompleted: false
       });
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "updateDivWidthDebounced", (0, _debounce["default"])(function () {
+        return _this.updateDivWidth();
+      }, 50));
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onScaleAdded", function () {
         var _scales$;
         var _this$props = _this.props, model = _this$props.model, onModelChanged = _this$props.onModelChanged, configuration = _this$props.configuration;
@@ -113418,14 +113423,14 @@ const require$$17$3 = _dll_pie_lib__pie_toolbox_config_ui;
     (0, _createClass2["default"])(Main, [{
       key: "componentDidMount",
       value: function componentDidMount() {
-        window.addEventListener('resize', this.updateDivWidth);
+        window.addEventListener('resize', this.updateDivWidthDebounced);
         window.addEventListener('load', this.updateDivWidth);
         setTimeout(this.updateDivWidth, 0);
       }
     }, {
       key: "componentWillUnmount",
       value: function componentWillUnmount() {
-        window.removeEventListener('resize', this.updateDivWidth);
+        window.removeEventListener('resize', this.updateDivWidthDebounced);
         window.removeEventListener('load', this.updateDivWidth);
       }
     }, {
@@ -113443,9 +113448,11 @@ const require$$17$3 = _dll_pie_lib__pie_toolbox_config_ui;
       value: function updateDivWidth() {
         if (this.divRef && this.divRef.current) {
           var divWidth = this.divRef.current.offsetWidth;
-          this.set({
-            adjustedWidth: divWidth
-          });
+          if (divWidth !== this.state.adjustedWidth) {
+            this.set({
+              adjustedWidth: divWidth
+            });
+          }
         }
       }
     }, {
@@ -144346,6 +144353,7 @@ const require$$3$v = _dll_prop_types;
   var _react = _interopRequireDefault(require$$2$c);
   var _propTypes = _interopRequireDefault(require$$3$v);
   var _styles = styles$1J;
+  var _mathInput = mathInput;
   var MathTemplated = function MathTemplated(_ref) {
     var attributes = _ref.attributes, value = _ref.value, classes = _ref.classes, keyToDisplay = _ref.keyToDisplay;
     return _react["default"].createElement("span", (0, _extends2["default"])({}, attributes, {
@@ -144353,11 +144361,10 @@ const require$$3$v = _dll_prop_types;
     }), _react["default"].createElement("div", {
       className: classes.responseBox
     }, keyToDisplay), _react["default"].createElement("div", {
-      className: classes.mathBlock,
-      dangerouslySetInnerHTML: {
-        __html: value || '<div>&nbsp;</div>'
-      }
-    }));
+      className: classes.mathBlock
+    }, _react["default"].createElement(_mathInput.mq.Static, {
+      latex: value
+    })));
   };
   MathTemplated.propTypes = {
     attributes: _propTypes["default"].object,
@@ -144375,6 +144382,7 @@ const require$$3$v = _dll_prop_types;
         boxSizing: 'border-box',
         overflow: 'hidden',
         fontSize: '12px',
+        minHeight: '36px',
         height: '100%',
         alignItems: 'center',
         fontFamily: 'Symbola, Times New Roman, serif',
@@ -144389,7 +144397,7 @@ const require$$3$v = _dll_prop_types;
         justifyContent: 'center',
         minWidth: '50px',
         minHeight: '36px',
-        height: '36px'
+        height: 'fit-content'
       },
       mathBlock: {
         flex: 8,
@@ -148582,6 +148590,7 @@ const require$$13$5 = _dll_prop_types;
         }
         log('[render] inFocus: ', inFocus, 'value.isFocused:', value.isFocused, 'focused node: ', focusedNode);
         return _react["default"].createElement("div", {
+          tabIndex: 0,
           className: (0, _classnames["default"])((_classNames2 = {}, (0, _defineProperty2["default"])(_classNames2, classes.noBorder, toolbarOpts && toolbarOpts.noBorder), (0, _defineProperty2["default"])(_classNames2, classes.error, toolbarOpts && toolbarOpts.error), _classNames2), classes.root)
         }, _react["default"].createElement("div", {
           className: holderNames
@@ -158022,7 +158031,9 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          change === null || change === void 0 ? void 0 : change.focus();
+          if (!_this.isRelatedTargetButton(event)) {
+            change === null || change === void 0 ? void 0 : change.focus();
+          }
           resolve();
         });
       });
@@ -158365,6 +158376,12 @@ const require$$23 = _dll_classnames;
       value: function componentWillUnmount() {
         window.removeEventListener('resize', this.onResize);
       }
+    }, {
+      key: "isRelatedTargetButton",
+      value: function isRelatedTargetButton(event) {
+        var relatedTarget = event === null || event === void 0 ? void 0 : event.relatedTarget;
+        return relatedTarget && relatedTarget.tagName.toLowerCase() === 'button';
+      }
     }, {
       key: "buildSizeStyle",
       value: function buildSizeStyle() {

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.17.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -142613,6 +142613,7 @@ const require$$3$v = _dll_prop_types;
   var _react = _interopRequireDefault(require$$2$c);
   var _propTypes = _interopRequireDefault(require$$3$v);
   var _styles = styles$1K;
+  var _mathInput = mathInput;
   var MathTemplated = function MathTemplated(_ref) {
     var attributes = _ref.attributes, value = _ref.value, classes = _ref.classes, keyToDisplay = _ref.keyToDisplay;
     return _react["default"].createElement("span", (0, _extends2["default"])({}, attributes, {
@@ -142620,11 +142621,10 @@ const require$$3$v = _dll_prop_types;
     }), _react["default"].createElement("div", {
       className: classes.responseBox
     }, keyToDisplay), _react["default"].createElement("div", {
-      className: classes.mathBlock,
-      dangerouslySetInnerHTML: {
-        __html: value || '<div>&nbsp;</div>'
-      }
-    }));
+      className: classes.mathBlock
+    }, _react["default"].createElement(_mathInput.mq.Static, {
+      latex: value
+    })));
   };
   MathTemplated.propTypes = {
     attributes: _propTypes["default"].object,
@@ -142642,6 +142642,7 @@ const require$$3$v = _dll_prop_types;
         boxSizing: 'border-box',
         overflow: 'hidden',
         fontSize: '12px',
+        minHeight: '36px',
         height: '100%',
         alignItems: 'center',
         fontFamily: 'Symbola, Times New Roman, serif',
@@ -142656,7 +142657,7 @@ const require$$3$v = _dll_prop_types;
         justifyContent: 'center',
         minWidth: '50px',
         minHeight: '36px',
-        height: '36px'
+        height: 'fit-content'
       },
       mathBlock: {
         flex: 8,
@@ -146849,6 +146850,7 @@ const require$$13$5 = _dll_prop_types;
         }
         log('[render] inFocus: ', inFocus, 'value.isFocused:', value.isFocused, 'focused node: ', focusedNode);
         return _react["default"].createElement("div", {
+          tabIndex: 0,
           className: (0, _classnames["default"])((_classNames2 = {}, (0, _defineProperty2["default"])(_classNames2, classes.noBorder, toolbarOpts && toolbarOpts.noBorder), (0, _defineProperty2["default"])(_classNames2, classes.error, toolbarOpts && toolbarOpts.error), _classNames2), classes.root)
         }, _react["default"].createElement("div", {
           className: holderNames
@@ -156094,7 +156096,9 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          change === null || change === void 0 ? void 0 : change.focus();
+          if (!_this.isRelatedTargetButton(event)) {
+            change === null || change === void 0 ? void 0 : change.focus();
+          }
           resolve();
         });
       });
@@ -156437,6 +156441,12 @@ const require$$23 = _dll_classnames;
       value: function componentWillUnmount() {
         window.removeEventListener('resize', this.onResize);
       }
+    }, {
+      key: "isRelatedTargetButton",
+      value: function isRelatedTargetButton(event) {
+        var relatedTarget = event === null || event === void 0 ? void 0 : event.relatedTarget;
+        return relatedTarget && relatedTarget.tagName.toLowerCase() === 'button';
+      }
     }, {
       key: "buildSizeStyle",
       value: function buildSizeStyle() {

package/module/manifest.json

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

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.17.2/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.18.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -142613,6 +142613,7 @@ const require$$3$v = _dll_prop_types;
   var _react = _interopRequireDefault(require$$2$c);
   var _propTypes = _interopRequireDefault(require$$3$v);
   var _styles = styles$1K;
+  var _mathInput = mathInput;
   var MathTemplated = function MathTemplated(_ref) {
     var attributes = _ref.attributes, value = _ref.value, classes = _ref.classes, keyToDisplay = _ref.keyToDisplay;
     return _react["default"].createElement("span", (0, _extends2["default"])({}, attributes, {
@@ -142620,11 +142621,10 @@ const require$$3$v = _dll_prop_types;
     }), _react["default"].createElement("div", {
       className: classes.responseBox
     }, keyToDisplay), _react["default"].createElement("div", {
-      className: classes.mathBlock,
-      dangerouslySetInnerHTML: {
-        __html: value || '<div>&nbsp;</div>'
-      }
-    }));
+      className: classes.mathBlock
+    }, _react["default"].createElement(_mathInput.mq.Static, {
+      latex: value
+    })));
   };
   MathTemplated.propTypes = {
     attributes: _propTypes["default"].object,
@@ -142642,6 +142642,7 @@ const require$$3$v = _dll_prop_types;
         boxSizing: 'border-box',
         overflow: 'hidden',
         fontSize: '12px',
+        minHeight: '36px',
         height: '100%',
         alignItems: 'center',
         fontFamily: 'Symbola, Times New Roman, serif',
@@ -142656,7 +142657,7 @@ const require$$3$v = _dll_prop_types;
         justifyContent: 'center',
         minWidth: '50px',
         minHeight: '36px',
-        height: '36px'
+        height: 'fit-content'
       },
       mathBlock: {
         flex: 8,
@@ -146849,6 +146850,7 @@ const require$$13$5 = _dll_prop_types;
         }
         log('[render] inFocus: ', inFocus, 'value.isFocused:', value.isFocused, 'focused node: ', focusedNode);
         return _react["default"].createElement("div", {
+          tabIndex: 0,
           className: (0, _classnames["default"])((_classNames2 = {}, (0, _defineProperty2["default"])(_classNames2, classes.noBorder, toolbarOpts && toolbarOpts.noBorder), (0, _defineProperty2["default"])(_classNames2, classes.error, toolbarOpts && toolbarOpts.error), _classNames2), classes.root)
         }, _react["default"].createElement("div", {
           className: holderNames
@@ -156094,7 +156096,9 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          change === null || change === void 0 ? void 0 : change.focus();
+          if (!_this.isRelatedTargetButton(event)) {
+            change === null || change === void 0 ? void 0 : change.focus();
+          }
           resolve();
         });
       });
@@ -156437,6 +156441,12 @@ const require$$23 = _dll_classnames;
       value: function componentWillUnmount() {
         window.removeEventListener('resize', this.onResize);
       }
+    }, {
+      key: "isRelatedTargetButton",
+      value: function isRelatedTargetButton(event) {
+        var relatedTarget = event === null || event === void 0 ? void 0 : event.relatedTarget;
+        return relatedTarget && relatedTarget.tagName.toLowerCase() === 'button';
+      }
     }, {
       key: "buildSizeStyle",
       value: function buildSizeStyle() {

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "2.16.3-next.0+eb9349f8e",
+  "version": "2.16.3-next.10+3df4c62d6",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^3.16.3-next.0+eb9349f8e",
-    "@pie-element/rubric": "^3.16.2-next.4+eb9349f8e",
+    "@pie-element/multi-trait-rubric": "^3.16.3-next.10+3df4c62d6",
+    "@pie-element/rubric": "^3.16.2-next.14+3df4c62d6",
     "@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": "eb9349f8edc90694b38c443dde19b869197cebdd",
+  "gitHead": "3df4c62d6b28d53b40f6a39ae2de4ce86c3d08e4",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },