@pie-element/complex-rubric 3.1.1-next.0 → 3.1.1-next.1

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.0.9",
+    "@pie-lib/pie-toolbox": "2.0.10",
     "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@2.0.7/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@2.0.8/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.6/module/index.js";
 function _mergeNamespaces(n, m) {
@@ -92076,7 +92076,7 @@ const require$$24 = _dll_pie_framework__mathquill;
         }
         if (keyPadElement) {
           keyPadElement.removeEventListener('touchstart', this.handleKeypadInteraction, true);
-          keyPadElement.addEventListener('mousedown', this.handleKeypadInteraction, true);
+          keyPadElement.removeEventListener('mousedown', this.handleKeypadInteraction, true);
         }
       }
     }, {
@@ -93597,7 +93597,7 @@ const require$$10$w = _dll_classnames;
     hideDoneButtonBackground: _propTypes["default"].bool,
     error: _propTypes["default"].any,
     maxResponseAreas: _propTypes["default"].number,
-    keyPadCharacterRef: _propTypes["default"].func,
+    keyPadCharacterRef: _propTypes["default"].object,
     setKeypadInteraction: _propTypes["default"].func
   });
   (0, _defineProperty2["default"])(RawPureToolbar, "defaultProps", {
@@ -103913,10 +103913,10 @@ var specialConfig = {
     write: 'Ç',
     label: 'Ç'
   }], [{
-    unicode: 'U+00A0',
-    description: 'NO-BREAK SPACE',
-    write: String.fromCodePoint('0x00A0'),
-    label: ' '
+    unicode: 'U+200A',
+    description: 'HAIR SPACE',
+    write: String.fromCodePoint('0x200A'),
+    label: ' '
   }, {
     unicode: 'U+00A7',
     description: 'SECTION SIGN',
@@ -104003,10 +104003,10 @@ var specialConfig = {
     write: '−',
     label: '−'
   }], [{
-    unicode: 'U+200A',
-    description: 'HAIR SPACE',
-    write: String.fromCodePoint('0x200A'),
-    label: ' '
+    unicode: 'U+00A0',
+    description: 'NO-BREAK SPACE',
+    write: String.fromCodePoint('0x00A0'),
+    label: ' '
   }, {
     unicode: 'U+2022',
     description: 'BULLET',
@@ -104053,10 +104053,10 @@ var specialConfig = {
     write: '–',
     label: '–'
   }], [{
-    unicode: 'U+0009',
-    description: 'TAB',
-    write: String.fromCodePoint('0x0009'),
-    label: 'TAB'
+    unicode: 'U+2003',
+    description: 'EM SPACE',
+    write: String.fromCodePoint('0x2003'),
+    label: ' '
   }, {
     unicode: 'U+25E6',
     description: 'WHITE BULLET',
@@ -113972,9 +113972,7 @@ const require$$23 = _dll_classnames;
       (0, _classCallCheck2["default"])(this, Editor);
       _this = _super.call(this, _props);
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setKeypadInteraction", function (interacted) {
-        _this.setState({
-          keypadInteractionDetected: interacted
-        });
+        _this.keypadInteractionDetected = interacted;
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDialog", function (open) {
         var extraDialogProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -114259,10 +114257,9 @@ const require$$23 = _dll_classnames;
         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 keypadInteractionDetected = _this.state.keypadInteractionDetected;
         var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
-        _this.skipBlurHandling = keypadInteractionDetected ? true : false;
-        if (toolbarElement && !isRawDoneButton) {
+        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
           });
@@ -114282,13 +114279,10 @@ const require$$23 = _dll_classnames;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDomBlur", function (e) {
         var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
         setTimeout(function () {
-          var _this$state2 = _this.state, stateValue = _this$state2.value, keypadInteractionDetected = _this$state2.keypadInteractionDetected;
+          var stateValue = _this.state.value;
           if (!_this.wrapperRef) {
             return;
           }
-          if (keypadInteractionDetected) {
-            _this.setKeypadInteraction(false);
-          }
           var editorElement = !editorDOM || document.activeElement.closest(("[class*=\"").concat(editorDOM.className, "\"]"));
           var toolbarElement = !_this.toolbarRef || document.activeElement.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]"));
           var isInCurrentComponent = _this.wrapperRef.contains(editorElement) || _this.wrapperRef.contains(toolbarElement);
@@ -114305,9 +114299,8 @@ const require$$23 = _dll_classnames;
           var _navigator;
           var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
           var isTouchDevice = typeof window !== 'undefined' && (('ontouchstart' in window) || ((_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.maxTouchPoints) > 0);
-          var keypadInteractionDetected = _this.state.keypadInteractionDetected;
           log('[onFocus]', document.activeElement);
-          if (keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
+          if (_this.keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
             _this.__TEMPORARY_CHANGE_DATA = null;
           }
           if (_this.__TEMPORARY_CHANGE_DATA) {
@@ -114330,9 +114323,14 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          if (!keypadInteractionDetected && !isTouchDevice) {
+          var isKeypadInteractionActive = _this.keypadInteractionDetected;
+          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
+          if (isKeypadInteractionActive) {
+            _this.setKeypadInteraction(false);
+          }
           resolve();
         });
       });
@@ -114345,7 +114343,7 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetValue", function (force) {
-        var _this$state3 = _this.state, value = _this$state3.value, focusedNode = _this$state3.focusedNode;
+        var _this$state2 = _this.state, value = _this$state2.value, focusedNode = _this$state2.focusedNode;
         var stopReset = _this.plugins.reduce(function (s, p) {
           return s || p.stopReset && p.stopReset(_this.state.value);
         }, false);
@@ -114574,12 +114572,12 @@ const require$$23 = _dll_classnames;
         isHtmlMode: false,
         isEditedInHtmlMode: false,
         focusToolbar: false,
-        keypadInteractionDetected: false,
         dialog: {
           open: false
         }
       };
       _this.keyPadCharacterRef = _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));
@@ -114594,6 +114592,9 @@ const require$$23 = _dll_classnames;
     (0, _createClass2["default"])(Editor, [{
       key: "handleToolbarFocus",
       value: function handleToolbarFocus() {
+        if (this.state.focusToolbar) {
+          return;
+        }
         this.setState({
           focusToolbar: true
         });
@@ -114608,7 +114609,7 @@ const require$$23 = _dll_classnames;
               focusToolbar: false
             });
           }
-        }, 10);
+        }, 0);
       }
     }, {
       key: "toolbarContainsFocus",
@@ -114647,7 +114648,7 @@ const require$$23 = _dll_classnames;
       key: "UNSAFE_componentWillReceiveProps",
       value: function UNSAFE_componentWillReceiveProps(nextProps) {
         var _nextProps$value, _nextProps$value$docu, _this$props$value;
-        var _this$state4 = this.state, isHtmlMode = _this$state4.isHtmlMode, toolbarOpts = _this$state4.toolbarOpts;
+        var _this$state3 = this.state, isHtmlMode = _this$state3.isHtmlMode, toolbarOpts = _this$state3.toolbarOpts;
         var newToolbarOpts = createToolbarOpts(nextProps.toolbarOpts, nextProps.error, isHtmlMode);
         if (!(0, _isEqual["default"])(newToolbarOpts, toolbarOpts)) {
           this.setState({
@@ -114703,7 +114704,7 @@ const require$$23 = _dll_classnames;
         var _ref4 = pluginProps || ({});
         _ref4.customPlugins;
         var otherPluginProps = (0, _objectWithoutProperties2["default"])(_ref4, _excluded);
-        var _this$state5 = this.state, value = _this$state5.value, focusedNode = _this$state5.focusedNode, toolbarOpts = _this$state5.toolbarOpts, dialog = _this$state5.dialog, scheduled = _this$state5.scheduled;
+        var _this$state4 = this.state, value = _this$state4.value, focusedNode = _this$state4.focusedNode, toolbarOpts = _this$state4.toolbarOpts, dialog = _this$state4.dialog, scheduled = _this$state4.scheduled;
         log('[render] value: ', value);
         var sizeStyle = this.buildSizeStyle();
         var names = (0, _classnames["default"])((_classNames = {}, (0, _defineProperty2["default"])(_classNames, classes.withBg, highlightShape), (0, _defineProperty2["default"])(_classNames, classes.toolbarOnTop, toolbarOpts.alwaysVisible && toolbarOpts.position === 'top'), (0, _defineProperty2["default"])(_classNames, classes.scheduled, scheduled), _classNames), className);

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@2.0.7/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@2.0.8/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.6/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -36719,7 +36719,7 @@ const require$$24 = _dll_pie_framework__mathquill;
         }
         if (keyPadElement) {
           keyPadElement.removeEventListener('touchstart', this.handleKeypadInteraction, true);
-          keyPadElement.addEventListener('mousedown', this.handleKeypadInteraction, true);
+          keyPadElement.removeEventListener('mousedown', this.handleKeypadInteraction, true);
         }
       }
     }, {
@@ -83663,7 +83663,7 @@ const require$$10$x = _dll_classnames;
     hideDoneButtonBackground: _propTypes["default"].bool,
     error: _propTypes["default"].any,
     maxResponseAreas: _propTypes["default"].number,
-    keyPadCharacterRef: _propTypes["default"].func,
+    keyPadCharacterRef: _propTypes["default"].object,
     setKeypadInteraction: _propTypes["default"].func
   });
   (0, _defineProperty2["default"])(RawPureToolbar, "defaultProps", {
@@ -102173,10 +102173,10 @@ var specialConfig = {
     write: 'Ç',
     label: 'Ç'
   }], [{
-    unicode: 'U+00A0',
-    description: 'NO-BREAK SPACE',
-    write: String.fromCodePoint('0x00A0'),
-    label: ' '
+    unicode: 'U+200A',
+    description: 'HAIR SPACE',
+    write: String.fromCodePoint('0x200A'),
+    label: ' '
   }, {
     unicode: 'U+00A7',
     description: 'SECTION SIGN',
@@ -102263,10 +102263,10 @@ var specialConfig = {
     write: '−',
     label: '−'
   }], [{
-    unicode: 'U+200A',
-    description: 'HAIR SPACE',
-    write: String.fromCodePoint('0x200A'),
-    label: ' '
+    unicode: 'U+00A0',
+    description: 'NO-BREAK SPACE',
+    write: String.fromCodePoint('0x00A0'),
+    label: ' '
   }, {
     unicode: 'U+2022',
     description: 'BULLET',
@@ -102313,10 +102313,10 @@ var specialConfig = {
     write: '–',
     label: '–'
   }], [{
-    unicode: 'U+0009',
-    description: 'TAB',
-    write: String.fromCodePoint('0x0009'),
-    label: 'TAB'
+    unicode: 'U+2003',
+    description: 'EM SPACE',
+    write: String.fromCodePoint('0x2003'),
+    label: ' '
   }, {
     unicode: 'U+25E6',
     description: 'WHITE BULLET',
@@ -112037,9 +112037,7 @@ const require$$23 = _dll_classnames;
       (0, _classCallCheck2["default"])(this, Editor);
       _this = _super.call(this, _props);
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setKeypadInteraction", function (interacted) {
-        _this.setState({
-          keypadInteractionDetected: interacted
-        });
+        _this.keypadInteractionDetected = interacted;
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDialog", function (open) {
         var extraDialogProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -112324,10 +112322,9 @@ const require$$23 = _dll_classnames;
         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 keypadInteractionDetected = _this.state.keypadInteractionDetected;
         var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
-        _this.skipBlurHandling = keypadInteractionDetected ? true : false;
-        if (toolbarElement && !isRawDoneButton) {
+        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
           });
@@ -112347,13 +112344,10 @@ const require$$23 = _dll_classnames;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDomBlur", function (e) {
         var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
         setTimeout(function () {
-          var _this$state2 = _this.state, stateValue = _this$state2.value, keypadInteractionDetected = _this$state2.keypadInteractionDetected;
+          var stateValue = _this.state.value;
           if (!_this.wrapperRef) {
             return;
           }
-          if (keypadInteractionDetected) {
-            _this.setKeypadInteraction(false);
-          }
           var editorElement = !editorDOM || document.activeElement.closest(("[class*=\"").concat(editorDOM.className, "\"]"));
           var toolbarElement = !_this.toolbarRef || document.activeElement.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]"));
           var isInCurrentComponent = _this.wrapperRef.contains(editorElement) || _this.wrapperRef.contains(toolbarElement);
@@ -112370,9 +112364,8 @@ const require$$23 = _dll_classnames;
           var _navigator;
           var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
           var isTouchDevice = typeof window !== 'undefined' && (('ontouchstart' in window) || ((_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.maxTouchPoints) > 0);
-          var keypadInteractionDetected = _this.state.keypadInteractionDetected;
           log('[onFocus]', document.activeElement);
-          if (keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
+          if (_this.keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
             _this.__TEMPORARY_CHANGE_DATA = null;
           }
           if (_this.__TEMPORARY_CHANGE_DATA) {
@@ -112395,9 +112388,14 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          if (!keypadInteractionDetected && !isTouchDevice) {
+          var isKeypadInteractionActive = _this.keypadInteractionDetected;
+          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
+          if (isKeypadInteractionActive) {
+            _this.setKeypadInteraction(false);
+          }
           resolve();
         });
       });
@@ -112410,7 +112408,7 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetValue", function (force) {
-        var _this$state3 = _this.state, value = _this$state3.value, focusedNode = _this$state3.focusedNode;
+        var _this$state2 = _this.state, value = _this$state2.value, focusedNode = _this$state2.focusedNode;
         var stopReset = _this.plugins.reduce(function (s, p) {
           return s || p.stopReset && p.stopReset(_this.state.value);
         }, false);
@@ -112639,12 +112637,12 @@ const require$$23 = _dll_classnames;
         isHtmlMode: false,
         isEditedInHtmlMode: false,
         focusToolbar: false,
-        keypadInteractionDetected: false,
         dialog: {
           open: false
         }
       };
       _this.keyPadCharacterRef = _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));
@@ -112659,6 +112657,9 @@ const require$$23 = _dll_classnames;
     (0, _createClass2["default"])(Editor, [{
       key: "handleToolbarFocus",
       value: function handleToolbarFocus() {
+        if (this.state.focusToolbar) {
+          return;
+        }
         this.setState({
           focusToolbar: true
         });
@@ -112673,7 +112674,7 @@ const require$$23 = _dll_classnames;
               focusToolbar: false
             });
           }
-        }, 10);
+        }, 0);
       }
     }, {
       key: "toolbarContainsFocus",
@@ -112712,7 +112713,7 @@ const require$$23 = _dll_classnames;
       key: "UNSAFE_componentWillReceiveProps",
       value: function UNSAFE_componentWillReceiveProps(nextProps) {
         var _nextProps$value, _nextProps$value$docu, _this$props$value;
-        var _this$state4 = this.state, isHtmlMode = _this$state4.isHtmlMode, toolbarOpts = _this$state4.toolbarOpts;
+        var _this$state3 = this.state, isHtmlMode = _this$state3.isHtmlMode, toolbarOpts = _this$state3.toolbarOpts;
         var newToolbarOpts = createToolbarOpts(nextProps.toolbarOpts, nextProps.error, isHtmlMode);
         if (!(0, _isEqual["default"])(newToolbarOpts, toolbarOpts)) {
           this.setState({
@@ -112768,7 +112769,7 @@ const require$$23 = _dll_classnames;
         var _ref4 = pluginProps || ({});
         _ref4.customPlugins;
         var otherPluginProps = (0, _objectWithoutProperties2["default"])(_ref4, _excluded);
-        var _this$state5 = this.state, value = _this$state5.value, focusedNode = _this$state5.focusedNode, toolbarOpts = _this$state5.toolbarOpts, dialog = _this$state5.dialog, scheduled = _this$state5.scheduled;
+        var _this$state4 = this.state, value = _this$state4.value, focusedNode = _this$state4.focusedNode, toolbarOpts = _this$state4.toolbarOpts, dialog = _this$state4.dialog, scheduled = _this$state4.scheduled;
         log('[render] value: ', value);
         var sizeStyle = this.buildSizeStyle();
         var names = (0, _classnames["default"])((_classNames = {}, (0, _defineProperty2["default"])(_classNames, classes.withBg, highlightShape), (0, _defineProperty2["default"])(_classNames, classes.toolbarOnTop, toolbarOpts.alwaysVisible && toolbarOpts.position === 'top'), (0, _defineProperty2["default"])(_classNames, classes.scheduled, scheduled), _classNames), className);

package/module/manifest.json

@@ -4,7 +4,7 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "2.0.7"
+      "version": "2.0.8"
     },
     {
       "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@2.0.7/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@2.0.8/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.6/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -36719,7 +36719,7 @@ const require$$24 = _dll_pie_framework__mathquill;
         }
         if (keyPadElement) {
           keyPadElement.removeEventListener('touchstart', this.handleKeypadInteraction, true);
-          keyPadElement.addEventListener('mousedown', this.handleKeypadInteraction, true);
+          keyPadElement.removeEventListener('mousedown', this.handleKeypadInteraction, true);
         }
       }
     }, {
@@ -83663,7 +83663,7 @@ const require$$10$x = _dll_classnames;
     hideDoneButtonBackground: _propTypes["default"].bool,
     error: _propTypes["default"].any,
     maxResponseAreas: _propTypes["default"].number,
-    keyPadCharacterRef: _propTypes["default"].func,
+    keyPadCharacterRef: _propTypes["default"].object,
     setKeypadInteraction: _propTypes["default"].func
   });
   (0, _defineProperty2["default"])(RawPureToolbar, "defaultProps", {
@@ -102173,10 +102173,10 @@ var specialConfig = {
     write: 'Ç',
     label: 'Ç'
   }], [{
-    unicode: 'U+00A0',
-    description: 'NO-BREAK SPACE',
-    write: String.fromCodePoint('0x00A0'),
-    label: ' '
+    unicode: 'U+200A',
+    description: 'HAIR SPACE',
+    write: String.fromCodePoint('0x200A'),
+    label: ' '
   }, {
     unicode: 'U+00A7',
     description: 'SECTION SIGN',
@@ -102263,10 +102263,10 @@ var specialConfig = {
     write: '−',
     label: '−'
   }], [{
-    unicode: 'U+200A',
-    description: 'HAIR SPACE',
-    write: String.fromCodePoint('0x200A'),
-    label: ' '
+    unicode: 'U+00A0',
+    description: 'NO-BREAK SPACE',
+    write: String.fromCodePoint('0x00A0'),
+    label: ' '
   }, {
     unicode: 'U+2022',
     description: 'BULLET',
@@ -102313,10 +102313,10 @@ var specialConfig = {
     write: '–',
     label: '–'
   }], [{
-    unicode: 'U+0009',
-    description: 'TAB',
-    write: String.fromCodePoint('0x0009'),
-    label: 'TAB'
+    unicode: 'U+2003',
+    description: 'EM SPACE',
+    write: String.fromCodePoint('0x2003'),
+    label: ' '
   }, {
     unicode: 'U+25E6',
     description: 'WHITE BULLET',
@@ -112037,9 +112037,7 @@ const require$$23 = _dll_classnames;
       (0, _classCallCheck2["default"])(this, Editor);
       _this = _super.call(this, _props);
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setKeypadInteraction", function (interacted) {
-        _this.setState({
-          keypadInteractionDetected: interacted
-        });
+        _this.keypadInteractionDetected = interacted;
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDialog", function (open) {
         var extraDialogProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -112324,10 +112322,9 @@ const require$$23 = _dll_classnames;
         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 keypadInteractionDetected = _this.state.keypadInteractionDetected;
         var isRawDoneButton = _this.doneButtonRef && (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.closest(("[class*=\"").concat(_this.doneButtonRef.className, "\"]")));
-        _this.skipBlurHandling = keypadInteractionDetected ? true : false;
-        if (toolbarElement && !isRawDoneButton) {
+        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
           });
@@ -112347,13 +112344,10 @@ const require$$23 = _dll_classnames;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleDomBlur", function (e) {
         var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
         setTimeout(function () {
-          var _this$state2 = _this.state, stateValue = _this$state2.value, keypadInteractionDetected = _this$state2.keypadInteractionDetected;
+          var stateValue = _this.state.value;
           if (!_this.wrapperRef) {
             return;
           }
-          if (keypadInteractionDetected) {
-            _this.setKeypadInteraction(false);
-          }
           var editorElement = !editorDOM || document.activeElement.closest(("[class*=\"").concat(editorDOM.className, "\"]"));
           var toolbarElement = !_this.toolbarRef || document.activeElement.closest(("[class*=\"").concat(_this.toolbarRef.className, "\"]"));
           var isInCurrentComponent = _this.wrapperRef.contains(editorElement) || _this.wrapperRef.contains(toolbarElement);
@@ -112370,9 +112364,8 @@ const require$$23 = _dll_classnames;
           var _navigator;
           var editorDOM = document.querySelector(("[data-key=\"").concat(_this.state.value.document.key, "\"]"));
           var isTouchDevice = typeof window !== 'undefined' && (('ontouchstart' in window) || ((_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.maxTouchPoints) > 0);
-          var keypadInteractionDetected = _this.state.keypadInteractionDetected;
           log('[onFocus]', document.activeElement);
-          if (keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
+          if (_this.keypadInteractionDetected && _this.__TEMPORARY_CHANGE_DATA) {
             _this.__TEMPORARY_CHANGE_DATA = null;
           }
           if (_this.__TEMPORARY_CHANGE_DATA) {
@@ -112395,9 +112388,14 @@ const require$$23 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          if (!keypadInteractionDetected && !isTouchDevice) {
+          var isKeypadInteractionActive = _this.keypadInteractionDetected;
+          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
+          if (isKeypadInteractionActive) {
+            _this.setKeypadInteraction(false);
+          }
           resolve();
         });
       });
@@ -112410,7 +112408,7 @@ const require$$23 = _dll_classnames;
         }
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetValue", function (force) {
-        var _this$state3 = _this.state, value = _this$state3.value, focusedNode = _this$state3.focusedNode;
+        var _this$state2 = _this.state, value = _this$state2.value, focusedNode = _this$state2.focusedNode;
         var stopReset = _this.plugins.reduce(function (s, p) {
           return s || p.stopReset && p.stopReset(_this.state.value);
         }, false);
@@ -112639,12 +112637,12 @@ const require$$23 = _dll_classnames;
         isHtmlMode: false,
         isEditedInHtmlMode: false,
         focusToolbar: false,
-        keypadInteractionDetected: false,
         dialog: {
           open: false
         }
       };
       _this.keyPadCharacterRef = _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));
@@ -112659,6 +112657,9 @@ const require$$23 = _dll_classnames;
     (0, _createClass2["default"])(Editor, [{
       key: "handleToolbarFocus",
       value: function handleToolbarFocus() {
+        if (this.state.focusToolbar) {
+          return;
+        }
         this.setState({
           focusToolbar: true
         });
@@ -112673,7 +112674,7 @@ const require$$23 = _dll_classnames;
               focusToolbar: false
             });
           }
-        }, 10);
+        }, 0);
       }
     }, {
       key: "toolbarContainsFocus",
@@ -112712,7 +112713,7 @@ const require$$23 = _dll_classnames;
       key: "UNSAFE_componentWillReceiveProps",
       value: function UNSAFE_componentWillReceiveProps(nextProps) {
         var _nextProps$value, _nextProps$value$docu, _this$props$value;
-        var _this$state4 = this.state, isHtmlMode = _this$state4.isHtmlMode, toolbarOpts = _this$state4.toolbarOpts;
+        var _this$state3 = this.state, isHtmlMode = _this$state3.isHtmlMode, toolbarOpts = _this$state3.toolbarOpts;
         var newToolbarOpts = createToolbarOpts(nextProps.toolbarOpts, nextProps.error, isHtmlMode);
         if (!(0, _isEqual["default"])(newToolbarOpts, toolbarOpts)) {
           this.setState({
@@ -112768,7 +112769,7 @@ const require$$23 = _dll_classnames;
         var _ref4 = pluginProps || ({});
         _ref4.customPlugins;
         var otherPluginProps = (0, _objectWithoutProperties2["default"])(_ref4, _excluded);
-        var _this$state5 = this.state, value = _this$state5.value, focusedNode = _this$state5.focusedNode, toolbarOpts = _this$state5.toolbarOpts, dialog = _this$state5.dialog, scheduled = _this$state5.scheduled;
+        var _this$state4 = this.state, value = _this$state4.value, focusedNode = _this$state4.focusedNode, toolbarOpts = _this$state4.toolbarOpts, dialog = _this$state4.dialog, scheduled = _this$state4.scheduled;
         log('[render] value: ', value);
         var sizeStyle = this.buildSizeStyle();
         var names = (0, _classnames["default"])((_classNames = {}, (0, _defineProperty2["default"])(_classNames, classes.withBg, highlightShape), (0, _defineProperty2["default"])(_classNames, classes.toolbarOnTop, toolbarOpts.alwaysVisible && toolbarOpts.position === 'top'), (0, _defineProperty2["default"])(_classNames, classes.scheduled, scheduled), _classNames), className);

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.1.1-next.0+a141032db",
+  "version": "3.1.1-next.1+2d60730eb",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.1.1-next.0+a141032db",
-    "@pie-element/rubric": "^4.1.1-next.0+a141032db",
+    "@pie-element/multi-trait-rubric": "^4.1.1-next.1+2d60730eb",
+    "@pie-element/rubric": "^4.1.1-next.1+2d60730eb",
     "@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": "a141032dbfc08b9bcba32b7cc63c789258c9a01b",
+  "gitHead": "2d60730eb6c3ade08e522c58218cff2f6cb496cb",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },