@abgov/jsonforms-components 2.6.2 → 2.6.4

package/index.esm.js

@@ -8506,7 +8506,6 @@ const FileUploaderReview = props => {
 };
 const FileUploader = _ref => {
   let {
-      data,
       path,
       handleChange,
       uischema
@@ -8521,6 +8520,7 @@ const FileUploader = _ref => {
   const deleteTriggerFunction = (_c = enumerators === null || enumerators === void 0 ? void 0 : enumerators.functions) === null || _c === void 0 ? void 0 : _c.get('delete-file');
   const deleteTrigger = deleteTriggerFunction && deleteTriggerFunction();
   const fileListValue = enumerators === null || enumerators === void 0 ? void 0 : enumerators.data.get('file-list');
+  const [loadingFileName, setLoadingFileName] = useState(undefined);
   const countries = ['Argentina', 'Brazil', 'Canada', 'Denmark', 'Egypt', 'France', 'Greece', 'India', 'Japan', 'Kenya'];
   enumerators === null || enumerators === void 0 ? void 0 : enumerators.addFormContextData('countries', countries);
   const user = enumerators === null || enumerators === void 0 ? void 0 : enumerators.getFormContextData('user');
@@ -8544,6 +8544,7 @@ const FileUploader = _ref => {
           deleteTrigger(fileInList, propertyId);
         }
       }
+      setLoadingFileName(file === null || file === void 0 ? void 0 : file.name);
       // To support multipleFileUploader, the propertyId (path) is in propertyId.index format
       uploadTrigger(file, `${propertyId}.${fileListLength}`);
       setDeleteHide(false);
@@ -8568,6 +8569,9 @@ const FileUploader = _ref => {
     return (_a = fileList === null || fileList === void 0 ? void 0 : fileList[props.i18nKeyPrefix]) === null || _a === void 0 ? void 0 : _a[index];
   }
   useEffect(() => {
+    if (loadingFileName !== undefined) {
+      setLoadingFileName(undefined);
+    }
     // UseEffect is required because not having it causes a react update error, but
     // it doesn't function correctly within jsonforms unless there is a minor delay here
     const delayedFunction = () => {
@@ -8662,13 +8666,13 @@ const FileUploader = _ref => {
     }), helpText && jsx(HelpText, {
       children: helpText
     }), jsx("div", {
-      children: Array.isArray(data) && data[0] === 'Loading' ? jsx(GoAModal, {
-        open: Array.isArray(data) && data[0] === 'Loading',
+      children: loadingFileName !== undefined ? jsx(GoAModal, {
+        open: loadingFileName !== undefined,
         children: jsx("div", {
           className: "align-center",
           children: jsx(GoACircularProgress, {
             visible: true,
-            message: `Uploading ${data[1]}`,
+            message: `Uploading ${loadingFileName}`,
             size: "large"
           })
         })
@@ -9867,6 +9871,11 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
       };
     })
   };
+  const hasNoElements = () => {
+    var _a, _b, _c, _d;
+    const hasNoLayoutElements = ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.length) === 0 && ((_d = (_c = (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.detail) === null || _c === void 0 ? void 0 : _c.elements) === null || _d === void 0 ? void 0 : _d.length) === 0;
+    return hasNoLayoutElements;
+  };
   return jsxs(Fragment, {
     children: [
     // eslint-disable-next-line
@@ -9892,7 +9901,7 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
         renderers: renderers,
         cells: cells
       }, `${rowPath}-${index}`);
-    }), ((_e = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _e === void 0 ? void 0 : _e.length) > 0 && jsx(JsonFormsDispatch, {
+    }), hasNoElements() && ((_e = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _e === void 0 ? void 0 : _e.length) > 0 && jsx(JsonFormsDispatch, {
       schema: schema,
       uischema: uiSchemaElementsForNotDefined,
       path: rowPath,
@@ -9917,10 +9926,14 @@ const NonEmptyRowComponent = ({
   cells,
   uischema
 }) => {
+  var _a, _b;
+  const isHorizontal = ((_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.detail) === null || _b === void 0 ? void 0 : _b.type) === 'HorizontalLayout';
   return jsx("div", {
-    children: enabled ? jsx(GoAGrid, {
+    children: enabled && isHorizontal ? jsx(GoAGrid, {
       minChildWidth: "30ch",
       children: GenerateRows(NonEmptyCell, schema, childPath, enabled, cells, uischema)
+    }) : enabled && !isHorizontal ? jsx(Fragment, {
+      children: GenerateRows(NonEmptyCell, schema, childPath, enabled, cells, uischema)
     }) : null
   }, childPath);
 };

package/package.json

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