@abgov/jsonforms-components 2.67.3 → 2.67.5

package/index.esm.js

@@ -5974,7 +5974,7 @@ const NoneGivenText = styled.span(_t1$2 || (_t1$2 = _$a`
 `));
 const NoneGivenTableText = styled.span(_t10$2 || (_t10$2 = _$a`
   padding-top: var(--goa-space-l);
-  padding-left: var(--goa-space-m);
+  padding-left: var(--goa-space-xs);
   color: var(--goa-color-greyscale-700);
   font-style: italic;
 `));
@@ -10037,7 +10037,7 @@ class ListWithDetailControl extends React.Component {
         children: [listTitle && jsx(MarginTop, {
           children: jsxs(ObjectArrayTitle, {
             children: [listTitle, " ", jsx("span", {
-              children: additionalProps.required && '(required)'
+              children: additionalProps.required && ' (required)'
             }), this.state.maxItemsError && jsx("span", {
               style: {
                 color: 'red',
@@ -11951,7 +11951,7 @@ const jsonPreviewStyle = {
   overflowX: 'auto'
 };
 function prettify(prop) {
-  return prop.replace(/([A-Z])/g, ' $1').replace(/[_-]/g, ' ').replace(/^./, c => c.toUpperCase());
+  return prop.replace(/([A-Z])/g, ' $1').replace(/[_-]/g, ' ').replace(/^./, c => c.toUpperCase()).trim();
 }
 /**
  * Extract Json data schema name attribute and the ui schema label name.
@@ -12038,7 +12038,7 @@ const renderCellColumn = ({
 }) => {
   const renderWarningCell = error => {
     return jsxs(HilightCellWarning, {
-      children: [renderNoneGivenText(data), jsxs(ObjectArrayWarningIconDiv, {
+      children: [renderNoneGivenText(data), error && jsxs(ObjectArrayWarningIconDiv, {
         children: [jsx(GoabIcon, {
           type: "warning",
           title: "warning",
@@ -12053,6 +12053,8 @@ const renderCellColumn = ({
   if (data === undefined && isRequired || error !== '' && error !== undefined) {
     const message = error || (isRequired && data === undefined ? 'Required' : data);
     return renderWarningCell(message);
+  } else if (data === undefined && !isRequired) {
+    return renderWarningCell('');
   } else if (data !== undefined && isRequired && error) {
     return renderWarningCell(error);
   }
@@ -12104,6 +12106,29 @@ const renderCellColumn = ({
   }
   return null;
 };
+const createHumanizeError = (error, schema, uischema) => {
+  let humanMessage;
+  if (error) {
+    try {
+      humanMessage = humanizeAjvError(error, schema, uischema);
+      if (typeof humanMessage === 'string' && (humanMessage.includes('must have required property') || humanMessage.includes(REQUIRED_PROPERTY_ERROR))) {
+        const propertyMatch = humanMessage.match(/'([^']+)'/);
+        if (propertyMatch && propertyMatch[1]) {
+          humanMessage = prettify(propertyMatch[1]) + ' is required';
+        }
+      }
+    } catch (err) {
+      const raw = error.message;
+      const propertyMatch = raw == null ? void 0 : raw.match(/'([^']+)'/);
+      if (propertyMatch && propertyMatch[1]) {
+        humanMessage = prettify(propertyMatch[1]) + ' is required';
+      } else {
+        humanMessage = raw;
+      }
+    }
+  }
+  return humanMessage;
+};
 
 const _excluded$4 = ["label", "path", "schema", "rootSchema", "uischema", "errors", "visible", "enabled", "cells", "data", "config", "isStepperReview", "handleChange", "removeItems"];
 const GenerateRows = (Cell, schema, rowPath, enabled, openDeleteDialog, handleChange, cells, uischema, isInReview, count, data, errors) => {
@@ -12268,7 +12293,6 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
                 return e.instancePath === fieldPath || e.instancePath === rowPathMatch && msg.includes(key) || e.instancePath === rowPathMatch && requiredProperty === key;
               });
               const isEmptyValue = value === undefined || value === null || value === '';
-              if (isEmptyValue && !isRequiredField && !fieldError) return null;
               let reviewError = '';
               if (fieldError) {
                 const raw = fieldError.message || '';
@@ -12319,7 +12343,7 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
                 const currentProperty = properties[value];
                 return jsx("th", {
                   children: jsxs("p", {
-                    children: [(currentProperty == null ? void 0 : currentProperty.title) || index, (required == null ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
+                    children: [(currentProperty == null ? void 0 : currentProperty.title) || index, ' ', (required == null ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
                       children: "(required)"
                     })]
                   })
@@ -12345,30 +12369,8 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
                     var _y$message;
                     return (y == null || (_y$message = y.message) == null ? void 0 : _y$message.includes(element)) || y.instancePath.includes(element);
                   });
-                  function prettify(prop) {
-                    return prop.replace(/([A-Z])/g, ' $1').replace(/[_-]/g, ' ').replace(/^./, c => c.toUpperCase());
-                  }
                   // Create a human-friendly error message for rendering
-                  let humanMessage;
-                  if (error) {
-                    try {
-                      humanMessage = humanizeAjvError(error, schema, uischema);
-                      if (typeof humanMessage === 'string' && (humanMessage.includes('must have required property') || humanMessage.includes(REQUIRED_PROPERTY_ERROR))) {
-                        const propertyMatch = humanMessage.match(/'([^']+)'/);
-                        if (propertyMatch && propertyMatch[1]) {
-                          humanMessage = prettify(propertyMatch[1]) + ' is required';
-                        }
-                      }
-                    } catch (err) {
-                      const raw = error.message;
-                      const propertyMatch = raw == null ? void 0 : raw.match(/'([^']+)'/);
-                      if (propertyMatch && propertyMatch[1]) {
-                        humanMessage = prettify(propertyMatch[1]) + ' is required';
-                      } else {
-                        humanMessage = raw;
-                      }
-                    }
-                  }
+                  let humanMessage = createHumanizeError(error, schema, uischema);
                   if (error != null && (_error$message = error.message) != null && _error$message.includes('must NOT have fewer') && required.find(r => r === schemaName) && (isEmptyBoolean(schema, currentData) || isEmptyNumber(schema, currentData))) {
                     humanMessage = `${capitalizeFirstLetter(schemaName)} is required`;
                   }
@@ -12715,7 +12717,7 @@ const ObjectArrayControl = props => {
             alignItems: 'center'
           },
           children: [jsxs(ReviewLabel, {
-            children: [listTitle, " ", jsx("span", {
+            children: [listTitle, jsx("span", {
               children: additionalProps.required && '(required)'
             }), maxItemsError && jsx("span", {
               style: {
@@ -12755,7 +12757,7 @@ const ObjectArrayControl = props => {
     "data-testid": "jsonforms-object-list-wrapper",
     children: [jsxs(ToolBarHeader, {
       children: [listTitle && jsxs(ObjectArrayTitle, {
-        children: [listTitle, " ", jsx("span", {
+        children: [listTitle, jsx("span", {
           children: additionalProps.required && '(required)'
         }), maxItemsError && jsx("span", {
           style: {
@@ -15134,7 +15136,6 @@ let _2 = t => t,
   _t3,
   _t4;
 const _excluded$1 = ["data", "path", "handleChange", "uischema"];
-const DELAY_DELETE_TIMEOUT_MS = 5;
 const FileUploaderReview = props => {
   return FileUploader(Object.assign({}, props, {
     isStepperReview: true
@@ -15176,6 +15177,7 @@ const FileUploader = _ref => {
   const noDownloadButtonInReview = uischema == null || (_uischema$options3 = uischema.options) == null || (_uischema$options3 = _uischema$options3.format) == null || (_uischema$options3 = _uischema$options3.review) == null ? void 0 : _uischema$options3.noDownloadButton;
   const noDeleteButton = uischema == null || (_uischema$options4 = uischema.options) == null || (_uischema$options4 = _uischema$options4.format) == null || (_uischema$options4 = _uischema$options4.review) == null ? void 0 : _uischema$options4.noDeleteButton;
   const [deleteHide, setDeleteHide] = useState(false);
+  const [deleteConfirmIndex, setDeleteConfirmIndex] = useState(null);
   const fileListLength = fileList && ((_fileList$path = fileList[path]) == null ? void 0 : _fileList$path.length) || 0;
   const maxFiles = (_uischema$options$com = uischema == null || (_uischema$options5 = uischema.options) == null || (_uischema$options5 = _uischema$options5.componentProps) == null ? void 0 : _uischema$options5.maximum) != null ? _uischema$options$com : 1;
   const isMultiFile = maxFiles > 1;
@@ -15242,11 +15244,9 @@ const FileUploader = _ref => {
   }
   const helpText = uischema == null || (_uischema$options9 = uischema.options) == null ? void 0 : _uischema$options9.help;
   const sentenceCaseLabel = label;
-  const DownloadFileWidget = ({
-    index
-  }) => {
+  const renderFileItem = index => {
     var _getFile2;
-    const [showFileDeleteConfirmation, setShowFileDeleteConfirmation] = useState(false);
+    const showFileDeleteConfirmation = deleteConfirmIndex === index;
     return jsx("div", {
       children: readOnly ? jsxs(AttachmentBorderDisabled, {
         children: [getFileName(index), noDownloadButtonInReview !== true && jsx(GoAContextMenuIcon, {
@@ -15269,22 +15269,20 @@ const FileUploader = _ref => {
             title: "Delete",
             type: "trash",
             onClick: () => {
-              setShowFileDeleteConfirmation(true);
+              setDeleteConfirmIndex(index);
             }
           })]
         }), jsx(DeleteFileModal, {
           isOpen: showFileDeleteConfirmation,
           title: "Delete file",
           content: `Delete file ${(_getFile2 = getFile(index)) == null ? void 0 : _getFile2.filename} ?`,
-          onCancel: () => setShowFileDeleteConfirmation(false),
+          onCancel: () => setDeleteConfirmIndex(null),
           onDelete: () => {
-            setShowFileDeleteConfirmation(false);
+            setDeleteConfirmIndex(null);
             deleteFile(getFile(index));
-            setDeleteHide(true);
-            const handleFunction = () => {
-              handleChange(path, undefined);
-            };
-            setTimeout(handleFunction, DELAY_DELETE_TIMEOUT_MS);
+            if (!isMultiFile) {
+              setDeleteHide(true);
+            }
             setUploadError(undefined);
           }
         })]
@@ -15324,11 +15322,9 @@ const FileUploader = _ref => {
             })
           })
         }) : jsx("div", {
-          children: fileList && isMultiFile ? (fileList[path] || []).map((_, index) => jsx(DownloadFileWidget, {
-            index: index
-          }, index)) : !deleteHide && getFile(fileListLength - 1) && fileListLength >= 0 && jsx(DownloadFileWidget, {
-            index: fileListLength - 1
-          })
+          children: (fileList && isMultiFile ? (fileList[path] || []).map((_, i) => i) : !deleteHide && getFile(fileListLength - 1) && fileListLength >= 0 ? [fileListLength - 1] : []).map(index => jsx(React.Fragment, {
+            children: renderFileItem(index)
+          }, index))
         })
       })]
     })
@@ -18779,7 +18775,8 @@ const createDefaultAjv = (...schemas) => {
     verbose: true,
     strict: 'log',
     strictRequired: false,
-    useDefaults: true
+    useDefaults: true,
+    multipleOfPrecision: 10
   });
   ajv.addSchema(schemas);
   addErrors(ajv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.67.3",
+  "version": "2.67.5",
   "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",

package/renderer-catalog.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-06-18T18:55:02.219Z",
-  "sourceCommit": "b528900b24c85fd02b5cf6adecf29649575f5d06",
+  "generatedAt": "2026-06-19T15:48:15.845Z",
+  "sourceCommit": "a7f4a980305903c0abae4128f5d5e5e6bd9c6360",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 33,
   "renderers": [

package/src/lib/Controls/ObjectArray/ObjectListControlUtils.d.ts

@@ -1,5 +1,8 @@
 import { DataObject, NestedItem, RenderCellColumnProps } from './ObjectListControlTypes';
+import { ErrorObject } from 'ajv';
+import { JsonSchema, UISchemaElement } from '@jsonforms/core';
 export declare const extractNestedFields: (properties: DataObject, propertyKeys: string[]) => Record<string, NestedItem>;
+export declare function prettify(prop: string): string;
 /**
  * Extract Json data schema name attribute and the ui schema label name.
  * @param obj
@@ -15,3 +18,4 @@ export interface TableProps {
 export declare const isObjectArrayEmpty: (currentData: string) => boolean;
 export declare const renderNoneGivenText: (data: string | undefined) => string | import("react/jsx-runtime").JSX.Element;
 export declare const renderCellColumn: ({ data, error, errors, index, rowPath, element, isRequired, }: RenderCellColumnProps) => string | import("react/jsx-runtime").JSX.Element | null;
+export declare const createHumanizeError: (error: ErrorObject, schema: JsonSchema, uischema: UISchemaElement) => string | undefined;