@pie-element/complex-rubric 3.1.5-next.2 → 3.1.5-next.3

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.0.14",
+    "@pie-lib/pie-toolbox": "2.0.15",
     "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@2.0.13/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@5.0.11/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@5.0.12/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -97537,6 +97537,14 @@ const require$$10$q = _dll_debug;
       }
     }, pluginProps);
     var filtered;
+    var handleFocus = function handleFocus(event) {
+      var _doneButtonRef$curren, _event$target;
+      var doneButtonClassName = doneButtonRef === null || doneButtonRef === void 0 ? void 0 : (_doneButtonRef$curren = doneButtonRef.current) === null || _doneButtonRef$curren === void 0 ? void 0 : _doneButtonRef$curren.className;
+      var isRawDoneButton = doneButtonClassName && ((_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest(("[class*=\"").concat(doneButtonClassName, "\"]")));
+      if (onFocus && !isRawDoneButton) {
+        onFocus(event);
+      }
+    };
     if (isHtmlMode) {
       filtered = plugins.filter(function (plugin) {
         return isActiveToolbarPlugin(pluginProps)(plugin) && (plugin.name === 'characters' || plugin.name === 'html');
@@ -97550,7 +97558,7 @@ const require$$10$q = _dll_debug;
     }
     return _react["default"].createElement("div", {
       className: classes.defaultToolbar,
-      onFocus: onFocus,
+      onFocus: handleFocus,
       tabIndex: "1",
       onBlur: onBlur
     }, _react["default"].createElement("div", {
@@ -105758,7 +105766,7 @@ var buildPlugins = function buildPlugins(activePlugins, customPlugins, opts) {
     key: 'n',
     type: 'ol_list',
     icon: _react$1e["default"].createElement(_FormatListNumbered["default"], null)
-  })), addIf('redo', UndoRedo('redo')), addIf('undo', UndoRedo('undo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
+  })), addIf('undo', UndoRedo('undo')), addIf('redo', UndoRedo('redo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
     shift: true
   })], builtCustomPlugins, [addIf('responseArea', respAreaPlugin), addIf('html', (0, _html$1["default"])(opts.html)), EnterHandlingPlugin()]));
 };
@@ -114408,10 +114416,11 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function (event) {
+        var _this$doneButtonRef$c;
         log('[onBlur]');
         var relatedTarget = event.relatedTarget;
         var toolbarElement = _this.toolbarRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]")));
-        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
+        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat((_this$doneButtonRef$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
         _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
@@ -114732,12 +114741,13 @@ const require$$23 = _dll_classnames;
         }
       };
       _this.keyPadCharacterRef = _react["default"].createRef();
+      _this.doneButtonRef = _react["default"].createRef();
       _this.keypadInteractionDetected = false;
       _this.toggleHtmlMode = _this.toggleHtmlMode.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarFocus = _this.handleToolbarFocus.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarBlur = _this.handleToolbarBlur.bind((0, _assertThisInitialized2["default"])(_this));
       _this.onResize = function () {
-        if (!_this.state.isHtmlMode) {
+        if (!_this.state.isHtmlMode && _props.onChange) {
           _props.onChange(_this.state.value, true);
         }
       };
@@ -114889,11 +114899,7 @@ const require$$23 = _dll_classnames;
               _this4.toolbarRef = r;
             }
           },
-          doneButtonRef: function doneButtonRef(r) {
-            if (r) {
-              _this4.doneButtonRef = r;
-            }
-          },
+          doneButtonRef: this.doneButtonRef,
           value: value,
           focusToolbar: this.state.focusToolbar,
           onToolbarFocus: this.handleToolbarFocus,
@@ -115222,7 +115228,7 @@ const require$$15$2 = _dll_debug;
       return false;
     }
   }
-  var log = (0, _debug["default"])('@pie-lib:editable-html');
+  (0, _debug["default"])('@pie-lib:editable-html');
   var EditableHtml = (function (_React$Component) {
     (0, _inherits2["default"])(EditableHtml, _React$Component);
     var _super = _createSuper(EditableHtml);
@@ -115242,11 +115248,10 @@ const require$$15$2 = _dll_debug;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (value, done) {
         var html = (0, _serialization.valueToHtml)(value);
         var htmlParsed = (0, _parseHtml.parseDegrees)(html);
-        log('value as html: ', html);
-        if (html !== _this.props.markup) {
+        if (html !== _this.props.markup && _this.props.onChange) {
           _this.props.onChange(htmlParsed);
         }
-        if (done) {
+        if (done && _this.props.onDone) {
           _this.props.onDone(htmlParsed);
         }
       });

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_accessible, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.13/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.11/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.12/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -87720,6 +87720,14 @@ const require$$10$r = _dll_debug;
       }
     }, pluginProps);
     var filtered;
+    var handleFocus = function handleFocus(event) {
+      var _doneButtonRef$curren, _event$target;
+      var doneButtonClassName = doneButtonRef === null || doneButtonRef === void 0 ? void 0 : (_doneButtonRef$curren = doneButtonRef.current) === null || _doneButtonRef$curren === void 0 ? void 0 : _doneButtonRef$curren.className;
+      var isRawDoneButton = doneButtonClassName && ((_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest(("[class*=\"").concat(doneButtonClassName, "\"]")));
+      if (onFocus && !isRawDoneButton) {
+        onFocus(event);
+      }
+    };
     if (isHtmlMode) {
       filtered = plugins.filter(function (plugin) {
         return isActiveToolbarPlugin(pluginProps)(plugin) && (plugin.name === 'characters' || plugin.name === 'html');
@@ -87733,7 +87741,7 @@ const require$$10$r = _dll_debug;
     }
     return _react["default"].createElement("div", {
       className: classes.defaultToolbar,
-      onFocus: onFocus,
+      onFocus: handleFocus,
       tabIndex: "1",
       onBlur: onBlur
     }, _react["default"].createElement("div", {
@@ -104024,7 +104032,7 @@ var buildPlugins = function buildPlugins(activePlugins, customPlugins, opts) {
     key: 'n',
     type: 'ol_list',
     icon: _react$1c["default"].createElement(_FormatListNumbered["default"], null)
-  })), addIf('redo', UndoRedo('redo')), addIf('undo', UndoRedo('undo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
+  })), addIf('undo', UndoRedo('undo')), addIf('redo', UndoRedo('redo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
     shift: true
   })], builtCustomPlugins, [addIf('responseArea', respAreaPlugin), addIf('html', (0, _html$1["default"])(opts.html)), EnterHandlingPlugin()]));
 };
@@ -112479,10 +112487,11 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function (event) {
+        var _this$doneButtonRef$c;
         log('[onBlur]');
         var relatedTarget = event.relatedTarget;
         var toolbarElement = _this.toolbarRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]")));
-        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
+        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat((_this$doneButtonRef$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
         _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
@@ -112803,12 +112812,13 @@ const require$$23 = _dll_classnames;
         }
       };
       _this.keyPadCharacterRef = _react["default"].createRef();
+      _this.doneButtonRef = _react["default"].createRef();
       _this.keypadInteractionDetected = false;
       _this.toggleHtmlMode = _this.toggleHtmlMode.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarFocus = _this.handleToolbarFocus.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarBlur = _this.handleToolbarBlur.bind((0, _assertThisInitialized2["default"])(_this));
       _this.onResize = function () {
-        if (!_this.state.isHtmlMode) {
+        if (!_this.state.isHtmlMode && _props.onChange) {
           _props.onChange(_this.state.value, true);
         }
       };
@@ -112960,11 +112970,7 @@ const require$$23 = _dll_classnames;
               _this4.toolbarRef = r;
             }
           },
-          doneButtonRef: function doneButtonRef(r) {
-            if (r) {
-              _this4.doneButtonRef = r;
-            }
-          },
+          doneButtonRef: this.doneButtonRef,
           value: value,
           focusToolbar: this.state.focusToolbar,
           onToolbarFocus: this.handleToolbarFocus,
@@ -113293,7 +113299,7 @@ const require$$15$2 = _dll_debug;
       return false;
     }
   }
-  var log = (0, _debug["default"])('@pie-lib:editable-html');
+  (0, _debug["default"])('@pie-lib:editable-html');
   var EditableHtml = (function (_React$Component) {
     (0, _inherits2["default"])(EditableHtml, _React$Component);
     var _super = _createSuper(EditableHtml);
@@ -113313,11 +113319,10 @@ const require$$15$2 = _dll_debug;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (value, done) {
         var html = (0, _serialization.valueToHtml)(value);
         var htmlParsed = (0, _parseHtml.parseDegrees)(html);
-        log('value as html: ', html);
-        if (html !== _this.props.markup) {
+        if (html !== _this.props.markup && _this.props.onChange) {
           _this.props.onChange(htmlParsed);
         }
-        if (done) {
+        if (done && _this.props.onDone) {
           _this.props.onDone(htmlParsed);
         }
       });

package/module/manifest.json

@@ -8,7 +8,7 @@
     },
     {
       "name": "@pie-lib/pie-toolbox-module",
-      "version": "5.0.11"
+      "version": "5.0.12"
     }
   ]
 }

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_accessible, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.13/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.11/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.12/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -87720,6 +87720,14 @@ const require$$10$r = _dll_debug;
       }
     }, pluginProps);
     var filtered;
+    var handleFocus = function handleFocus(event) {
+      var _doneButtonRef$curren, _event$target;
+      var doneButtonClassName = doneButtonRef === null || doneButtonRef === void 0 ? void 0 : (_doneButtonRef$curren = doneButtonRef.current) === null || _doneButtonRef$curren === void 0 ? void 0 : _doneButtonRef$curren.className;
+      var isRawDoneButton = doneButtonClassName && ((_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest(("[class*=\"").concat(doneButtonClassName, "\"]")));
+      if (onFocus && !isRawDoneButton) {
+        onFocus(event);
+      }
+    };
     if (isHtmlMode) {
       filtered = plugins.filter(function (plugin) {
         return isActiveToolbarPlugin(pluginProps)(plugin) && (plugin.name === 'characters' || plugin.name === 'html');
@@ -87733,7 +87741,7 @@ const require$$10$r = _dll_debug;
     }
     return _react["default"].createElement("div", {
       className: classes.defaultToolbar,
-      onFocus: onFocus,
+      onFocus: handleFocus,
       tabIndex: "1",
       onBlur: onBlur
     }, _react["default"].createElement("div", {
@@ -104024,7 +104032,7 @@ var buildPlugins = function buildPlugins(activePlugins, customPlugins, opts) {
     key: 'n',
     type: 'ol_list',
     icon: _react$1c["default"].createElement(_FormatListNumbered["default"], null)
-  })), addIf('redo', UndoRedo('redo')), addIf('undo', UndoRedo('undo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
+  })), addIf('undo', UndoRedo('undo')), addIf('redo', UndoRedo('redo')), (0, _toolbar["default"])(opts.toolbar), (0, _slateSoftBreak["default"])({
     shift: true
   })], builtCustomPlugins, [addIf('responseArea', respAreaPlugin), addIf('html', (0, _html$1["default"])(opts.html)), EnterHandlingPlugin()]));
 };
@@ -112479,10 +112487,11 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function (event) {
+        var _this$doneButtonRef$c;
         log('[onBlur]');
         var relatedTarget = event.relatedTarget;
         var toolbarElement = _this.toolbarRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]")));
-        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
+        var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat((_this$doneButtonRef$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
         _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
@@ -112803,12 +112812,13 @@ const require$$23 = _dll_classnames;
         }
       };
       _this.keyPadCharacterRef = _react["default"].createRef();
+      _this.doneButtonRef = _react["default"].createRef();
       _this.keypadInteractionDetected = false;
       _this.toggleHtmlMode = _this.toggleHtmlMode.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarFocus = _this.handleToolbarFocus.bind((0, _assertThisInitialized2["default"])(_this));
       _this.handleToolbarBlur = _this.handleToolbarBlur.bind((0, _assertThisInitialized2["default"])(_this));
       _this.onResize = function () {
-        if (!_this.state.isHtmlMode) {
+        if (!_this.state.isHtmlMode && _props.onChange) {
           _props.onChange(_this.state.value, true);
         }
       };
@@ -112960,11 +112970,7 @@ const require$$23 = _dll_classnames;
               _this4.toolbarRef = r;
             }
           },
-          doneButtonRef: function doneButtonRef(r) {
-            if (r) {
-              _this4.doneButtonRef = r;
-            }
-          },
+          doneButtonRef: this.doneButtonRef,
           value: value,
           focusToolbar: this.state.focusToolbar,
           onToolbarFocus: this.handleToolbarFocus,
@@ -113293,7 +113299,7 @@ const require$$15$2 = _dll_debug;
       return false;
     }
   }
-  var log = (0, _debug["default"])('@pie-lib:editable-html');
+  (0, _debug["default"])('@pie-lib:editable-html');
   var EditableHtml = (function (_React$Component) {
     (0, _inherits2["default"])(EditableHtml, _React$Component);
     var _super = _createSuper(EditableHtml);
@@ -113313,11 +113319,10 @@ const require$$15$2 = _dll_debug;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (value, done) {
         var html = (0, _serialization.valueToHtml)(value);
         var htmlParsed = (0, _parseHtml.parseDegrees)(html);
-        log('value as html: ', html);
-        if (html !== _this.props.markup) {
+        if (html !== _this.props.markup && _this.props.onChange) {
           _this.props.onChange(htmlParsed);
         }
-        if (done) {
+        if (done && _this.props.onDone) {
           _this.props.onDone(htmlParsed);
         }
       });

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.1.5-next.2+547adaaf1",
+  "version": "3.1.5-next.3+08eac95fd",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.1.5-next.2+547adaaf1",
-    "@pie-element/rubric": "^4.1.5-next.2+547adaaf1",
+    "@pie-element/multi-trait-rubric": "^4.1.5-next.3+08eac95fd",
+    "@pie-element/rubric": "^4.1.5-next.3+08eac95fd",
     "@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": "547adaaf173ce192d1a6ae45a3165ad60dea02f5",
+  "gitHead": "08eac95fd3e1a79b420fbc88cd0c7436ba284c3c",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },