@pie-element/complex-rubric 3.3.4-next.9 → 3.3.4

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric@3.3.3...@pie-element/complex-rubric@3.3.4) (2024-12-20)
+
+
+### Bug Fixes
+
+* update pie-lib/pie-toolbox PD-3843, PD-4518, PD-4588, PD-4210, PD-4362, PD-4618 ([c213141](https://github.com/pie-framework/pie-elements/commit/c2131410e19605093ca77afb8234b31708db01b1))
+
+
+
+
+
 ## [3.3.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric@3.3.2...@pie-element/complex-rubric@3.3.3) (2024-12-10)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric-configure@2.4.3...@pie-element/complex-rubric-configure@2.4.4) (2024-12-20)
+
+**Note:** Version bump only for package @pie-element/complex-rubric-configure
+
+
+
+
+
 ## [2.4.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric-configure@2.4.2...@pie-element/complex-rubric-configure@2.4.3) (2024-12-10)
 
 **Note:** Version bump only for package @pie-element/complex-rubric-configure

package/configure/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pie-element/complex-rubric-configure",
   "private": true,
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "Complex Rubric authoring view",
   "main": "lib/index.js",
   "module": "src/index.js",
   "author": "Pie Framework Authors",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.2.5",
-    "@pie-element/rubric": "^4.3.3",
+    "@pie-element/multi-trait-rubric": "^4.2.6",
+    "@pie-element/rubric": "^4.3.4",
     "@pie-framework/pie-configure-events": "^1.3.0",
     "@pie-lib/config-ui": "^11.9.25-next.0",
     "@pie-lib/editable-html": "^11.1.2-next.0",

package/controller/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.13](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric-controller@3.0.12...@pie-element/complex-rubric-controller@3.0.13) (2024-12-20)
+
+
+### Bug Fixes
+
+* update pie-lib/pie-toolbox PD-3843, PD-4518, PD-4588, PD-4210, PD-4362, PD-4618 ([c213141](https://github.com/pie-framework/pie-elements/commit/c2131410e19605093ca77afb8234b31708db01b1))
+
+
+
+
+
 ## [3.0.12](https://github.com/pie-framework/pie-elements/compare/@pie-element/complex-rubric-controller@3.0.11...@pie-element/complex-rubric-controller@3.0.12) (2024-12-10)
 
 

package/controller/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/complex-rubric-controller",
   "private": true,
-  "version": "3.0.12",
+  "version": "3.0.13",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.4.1",
+    "@pie-lib/pie-toolbox": "2.5.0",
     "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.4.1/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.4.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@5.4.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -115090,7 +115090,7 @@ const require$$24 = _dll_classnames;
         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$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
-        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        _this.skipBlurHandling = _this.keypadInteractionDetected && relatedTarget !== null;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
@@ -115100,6 +115100,7 @@ const require$$24 = _dll_classnames;
         log('[onBlur] node: ', node);
         return new Promise(function (resolve) {
           if (!_this.skipBlurHandling) {
+            _this.setKeypadInteraction(false);
             _this.setState({
               preBlurValue: _this.state.value,
               focusedNode: !node ? null : node
@@ -115155,14 +115156,10 @@ const require$$24 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          var isKeypadInteractionActive = _this.keypadInteractionDetected;
-          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          var shouldFocusEditor = !_this.keypadInteractionDetected && !isTouchDevice;
           if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
-          if (isKeypadInteractionActive) {
-            _this.setKeypadInteraction(false);
-          }
           resolve();
         });
       });
@@ -115237,10 +115234,11 @@ const require$$24 = _dll_classnames;
         if (!v) {
           return;
         }
+        var calcRegex = /^calc\((.*)\)$/;
         if (typeof v === 'string') {
           if (v.endsWith('%')) {
             return undefined;
-          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw')) {
+          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw') || v.endsWith('ch') || v.match(calcRegex)) {
             return v;
           } else {
             var value = parseInt(v, 10);

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.4.1/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.4.0/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.4.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -113167,7 +113167,7 @@ const require$$24 = _dll_classnames;
         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$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
-        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        _this.skipBlurHandling = _this.keypadInteractionDetected && relatedTarget !== null;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
@@ -113177,6 +113177,7 @@ const require$$24 = _dll_classnames;
         log('[onBlur] node: ', node);
         return new Promise(function (resolve) {
           if (!_this.skipBlurHandling) {
+            _this.setKeypadInteraction(false);
             _this.setState({
               preBlurValue: _this.state.value,
               focusedNode: !node ? null : node
@@ -113232,14 +113233,10 @@ const require$$24 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          var isKeypadInteractionActive = _this.keypadInteractionDetected;
-          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          var shouldFocusEditor = !_this.keypadInteractionDetected && !isTouchDevice;
           if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
-          if (isKeypadInteractionActive) {
-            _this.setKeypadInteraction(false);
-          }
           resolve();
         });
       });
@@ -113314,10 +113311,11 @@ const require$$24 = _dll_classnames;
         if (!v) {
           return;
         }
+        var calcRegex = /^calc\((.*)\)$/;
         if (typeof v === 'string') {
           if (v.endsWith('%')) {
             return undefined;
-          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw')) {
+          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw') || v.endsWith('ch') || v.match(calcRegex)) {
             return v;
           } else {
             var value = parseInt(v, 10);

package/module/manifest.json

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

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.4.1/module/index.js";
-import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.4.0/module/index.js";
+import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.4.1/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -113167,7 +113167,7 @@ const require$$24 = _dll_classnames;
         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$c = _this.doneButtonRef.current) === null || _this$doneButtonRef$c === void 0 ? void 0 : _this$doneButtonRef$c.className, "\"]")));
-        _this.skipBlurHandling = _this.keypadInteractionDetected ? true : false;
+        _this.skipBlurHandling = _this.keypadInteractionDetected && relatedTarget !== null;
         if (toolbarElement && !isRawDoneButton && !_this.state.focusToolbar) {
           _this.setState({
             focusToolbar: true
@@ -113177,6 +113177,7 @@ const require$$24 = _dll_classnames;
         log('[onBlur] node: ', node);
         return new Promise(function (resolve) {
           if (!_this.skipBlurHandling) {
+            _this.setKeypadInteraction(false);
             _this.setState({
               preBlurValue: _this.state.value,
               focusedNode: !node ? null : node
@@ -113232,14 +113233,10 @@ const require$$24 = _dll_classnames;
           }
           _this.stashValue();
           _this.props.onFocus();
-          var isKeypadInteractionActive = _this.keypadInteractionDetected;
-          var shouldFocusEditor = !isKeypadInteractionActive && !isTouchDevice;
+          var shouldFocusEditor = !_this.keypadInteractionDetected && !isTouchDevice;
           if (shouldFocusEditor) {
             change === null || change === void 0 ? void 0 : change.focus();
           }
-          if (isKeypadInteractionActive) {
-            _this.setKeypadInteraction(false);
-          }
           resolve();
         });
       });
@@ -113314,10 +113311,11 @@ const require$$24 = _dll_classnames;
         if (!v) {
           return;
         }
+        var calcRegex = /^calc\((.*)\)$/;
         if (typeof v === 'string') {
           if (v.endsWith('%')) {
             return undefined;
-          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw')) {
+          } else if (v.endsWith('px') || v.endsWith('vh') || v.endsWith('vw') || v.endsWith('ch') || v.match(calcRegex)) {
             return v;
           } else {
             var value = parseInt(v, 10);

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.3.4-next.9+0e4534490",
+  "version": "3.3.4",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.2.6-next.9+0e4534490",
-    "@pie-element/rubric": "^4.3.4-next.9+0e4534490",
+    "@pie-element/multi-trait-rubric": "^4.2.6",
+    "@pie-element/rubric": "^4.3.4",
     "@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": "0e45344900790b405c12993941b7ef4a03f99ef7",
+  "gitHead": "9fc5748c74eb6cc3633d9cf31576c58fae9f4843",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },