@abgov/jsonforms-components 1.53.6 → 1.53.8

package/index.esm.js

@@ -2835,28 +2835,6 @@ const onKeyPressForTextControl = props => {
     handleChange(path, value);
   }
 };
-/**
- * Helper functions to process onKeyPress events for Numeric controls.
- * @param props - EventKeyPressControlProps
- */
-const onKeyPressNumericControl = props => {
-  const {
-    value,
-    key,
-    controlProps
-  } = props;
-  const {
-    handleChange,
-    path
-  } = controlProps;
-  if (isNotKeyPressTabOrShift(key)) {
-    let newValue = '';
-    if (value !== '') {
-      newValue = +value;
-    }
-    handleChange(path, newValue);
-  }
-};
 /**
  * Helper function to process onKeyPress events for Time controls
  * @param props - EventKeyPressControlProps
@@ -3013,9 +2991,7 @@ const onChangeForInputControl = props => {
     handleChange,
     path
   } = controlProps;
-  if (value && value !== null) {
-    handleChange(path, value);
-  }
+  handleChange(path, value);
 };
 /**
  * Helper function to process onChange event for Date controls.
@@ -4086,7 +4062,7 @@ let _$8 = t => t,
   _t$8,
   _t2$5,
   _t3$4,
-  _t4$3;
+  _t4$4;
 const GoADropdownTextbox = styled.div(_t$8 || (_t$8 = _$8`
   border-radius: var(--goa-space-2xs);
   box-shadow: ${0};
@@ -4126,7 +4102,7 @@ const GoADropdownListContainer = styled.div(_t3$4 || (_t3$4 = _$8`
     scrollbar-color: #a8a8a8 var(--goa-color-greyscale-100) !important;
   }
 `), p => p.optionListMaxHeight || '272px');
-const GoADropdownListOption = styled.div(_t4$3 || (_t4$3 = _$8`
+const GoADropdownListOption = styled.div(_t4$4 || (_t4$4 = _$8`
   padding: var(--goa-space-2xs) var(--goa-space-s);
   text-overflow: ellipsis;
   color: ${0} !important;
@@ -4508,14 +4484,7 @@ const GoAInputText = props => {
           controlProps: props
         });
       },
-      onKeyPress: (name, value, key) => {
-        onKeyPressForTextControl({
-          name,
-          value: autoCapitalize ? value.toUpperCase() : value,
-          key,
-          controlProps: props
-        });
-      },
+      onKeyPress: (name, value, key) => {},
       onBlur: (name, value) => {
         onBlurForTextControl({
           name,
@@ -4741,14 +4710,7 @@ const GoANumberInput = props => {
     width: width,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
-    onKeyPress: (name, value, key) => {
-      onKeyPressNumericControl({
-        name,
-        value,
-        key,
-        controlProps: props
-      });
-    },
+    onKeyPress: (name, value, key) => {},
     onBlur: (name, value) => {
       onBlurForNumericControl({
         name,
@@ -4809,14 +4771,7 @@ const GoAInputInteger = props => {
     placeholder: placeholder,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
-    onKeyPress: (name, value, key) => {
-      onKeyPressNumericControl({
-        name,
-        value,
-        key,
-        controlProps: props
-      });
-    },
+    onKeyPress: (name, value, key) => {},
     onBlur: (name, value) => {
       onBlurForNumericControl({
         name,
@@ -5408,7 +5363,7 @@ let _$5 = t => t,
   _t$5,
   _t2$4,
   _t3$3,
-  _t4$2,
+  _t4$3,
   _t5$2,
   _t6$2,
   _t7$1,
@@ -5444,7 +5399,7 @@ const ReviewItemHeader = styled.div(_t3$3 || (_t3$3 = _$5`
   justify-content: space-between;
   margin-bottom: var(--goa-space-xl);
 `));
-const ReviewItemTitle = styled.div(_t4$2 || (_t4$2 = _$5`
+const ReviewItemTitle = styled.div(_t4$3 || (_t4$3 = _$5`
   font-size: var(--goa-space-l);
   line-height: var(--goa-space-xl);
   font-weight: 300;
@@ -5817,15 +5772,15 @@ const pickPropertyValues = (obj, property, endWithType) => {
     } else if (_$b.isObject(obj[key])) {
       // if the object type is equal to end type, we are not going to continue the recursive approach
       if (endWithType && ((_a = obj[key]) === null || _a === void 0 ? void 0 : _a.type) === endWithType) {
-        if (obj[key]) {
-          values.push(obj[key]);
+        if (property in obj[key]) {
+          values.push(obj[key][property]);
         }
       } else {
-        values = [...values, ...pickPropertyValues(obj[key], property)];
+        values = [...values, ...pickPropertyValues(obj[key], property, endWithType)];
       }
     } else if (_$b.isArray(obj[key])) {
       const nextValues = obj[key].map(function (arrayObj) {
-        return pickPropertyValues(arrayObj, property);
+        return pickPropertyValues(arrayObj, property, endWithType);
       });
       values = [...values, ...nextValues];
     }
@@ -5945,8 +5900,14 @@ const subErrorInParent = (error, paths) => {
     For example: error with instance path /roadmap/0/when belongs to /roadmap
   */
   const errorPaths = error.instancePath.split('/');
-  if (errorPaths.length < 3) return false;
-  if (isNumber(errorPaths[errorPaths.length - 2])) {
+  if (errorPaths.length < 2) return false;
+  // For case /roadmap/0
+  if (errorPaths.length > 1 && isNumber(errorPaths[errorPaths.length - 1])) {
+    const parentPath = errorPaths.slice(0, errorPaths.length - 1).join('/');
+    return paths.includes(parentPath);
+  }
+  // For case /roadmap/0/when
+  if (errorPaths.length > 2 && isNumber(errorPaths[errorPaths.length - 2])) {
     const parentPath = errorPaths.slice(0, errorPaths.length - 2).join('/');
     return paths.includes(parentPath);
   }
@@ -6059,9 +6020,9 @@ const createStepperContextInitData = props => {
   const categorization = uischema;
   const valid = ajv.validate(schema, data || {});
   const categories = (_a = categorization.elements) === null || _a === void 0 ? void 0 : _a.map((c, id) => {
-    const scopes = pickPropertyValues(c, 'scope');
+    const scopes = pickPropertyValues(c, 'scope', 'ListWithDetail');
     // ListWithDetail path might have conflicts with others. The errors in ListWithDetail will still be caught in the ctx.core.errors
-    const incompletePaths = getIncompletePaths(ajv, pickPropertyValues(c, 'scope', 'ListWithDetail'));
+    const incompletePaths = getIncompletePaths(ajv, scopes);
     return {
       id,
       label: deriveLabelForUISchemaElement(c, t),
@@ -6424,7 +6385,8 @@ const DeleteFileModal = ({
 let _$3 = t => t,
   _t$3,
   _t2$3,
-  _t3$2;
+  _t3$2,
+  _t4$2;
 const DELAY_UPLOAD_TIMEOUT_MS = 5;
 const DELAY_DELETE_TIMEOUT_MS = 5;
 const FileUploaderReview = props => {
@@ -6433,7 +6395,7 @@ const FileUploaderReview = props => {
   }));
 };
 const FileUploader = _a => {
-  var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
   var {
       data,
       path,
@@ -6506,6 +6468,7 @@ const FileUploader = _a => {
   if (!enumerators) {
     return jsx(Fragment, {});
   }
+  const helpText = (_p = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _p === void 0 ? void 0 : _p.help;
   const sentenceCaseLabel = convertToSentenceCase(label);
   return jsxs(FileUploaderStyle, {
     id: "file-upload",
@@ -6524,6 +6487,8 @@ const FileUploader = _a => {
         maxFileSize: maxFileSize,
         accept: accept
       })
+    }), helpText && jsx(HelpText, {
+      children: helpText
     }), jsx("div", {
       children: Array.isArray(data) && data[0] === 'Loading' ? jsx(GoAModal, {
         open: Array.isArray(data) && data[0] === 'Loading',
@@ -6581,7 +6546,12 @@ const FileUploader = _a => {
     })]
   });
 };
-const AttachmentBorderDisabled = styled.div(_t$3 || (_t$3 = _$3`
+const HelpText = styled.div(_t$3 || (_t$3 = _$3`
+  margin-top: var(--goa-space-xs);
+  font-size: var(--goa-font-size-3);
+  color: var(--goa-color-text-secondary);
+`));
+const AttachmentBorderDisabled = styled.div(_t2$3 || (_t2$3 = _$3`
   display: flex;
   flex-direction: row;
   border: var(--goa-border-width-s) solid #dcdcdc;
@@ -6590,7 +6560,7 @@ const AttachmentBorderDisabled = styled.div(_t$3 || (_t$3 = _$3`
   width: fit-content;
   background-color: #f1f1f1;
 `));
-const AttachmentBorder = styled.div(_t2$3 || (_t2$3 = _$3`
+const AttachmentBorder = styled.div(_t3$2 || (_t3$2 = _$3`
   display: flex;
   flex-direction: row;
   border: var(--goa-border-width-s) solid #dcdcdc;
@@ -6599,7 +6569,7 @@ const AttachmentBorder = styled.div(_t2$3 || (_t2$3 = _$3`
   width: fit-content;
   margin-top: var(--goa-space-2xs);
 `));
-const FileUploaderStyle = styled.div(_t3$2 || (_t3$2 = _$3`
+const FileUploaderStyle = styled.div(_t4$2 || (_t4$2 = _$3`
   margin-bottom: var(--goa-space-l);
   .label {
     display: block;
@@ -6837,6 +6807,11 @@ const ToolBarHeader = styled.div(_t3$1 || (_t3$1 = _$2`
 `));
 const ObjectArrayTitle = styled.h3(_t4$1 || (_t4$1 = _$2`
   margin-bottom: var(--goa-space-l);
+
+  span {
+    color: #666666;
+    font-size: var(--goa-font-size-2);
+  }
 `));
 const TextCenter = styled.div(_t5$1 || (_t5$1 = _$2`
   text-align: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.53.6",
+  "version": "1.53.8",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",