@abgov/jsonforms-components 1.7.0 → 1.8.0

package/index.esm.js

@@ -3819,7 +3819,7 @@ requiredFields) => elements.map((element, index) => {
   const clonedElement = JSON.parse(JSON.stringify(element));
   const lastSegment = (_a = clonedElement.scope) === null || _a === void 0 ? void 0 : _a.split('/').pop();
   if (clonedElement.type === 'Control' && clonedElement.scope) {
-    const label = resolveLabelFromScope(clonedElement.scope);
+    const label = clonedElement.label ? clonedElement.label : resolveLabelFromScope(clonedElement.scope);
     if (!label) return null;
     const value = getFormFieldValue(clonedElement.scope, data ? data : {}).toString();
     const asterisk = requiredFields.indexOf(lastSegment) !== -1 ? ' *' : '';
@@ -4216,9 +4216,12 @@ const FileUploader = _a => {
   const [showFileDeleteConfirmation, setShowFileDeleteConfirmation] = useState(false);
   function uploadFile(file) {
     if (uploadTrigger) {
-      const value = ['Loading', Array.isArray(data) ? data[1] : data, file === null || file === void 0 ? void 0 : file.name];
-      handleChange(propertyId, value);
       uploadTrigger(file, propertyId);
+      const handleFunction = () => {
+        const value = ['Loading', Array.isArray(data) ? data[1] : file === null || file === void 0 ? void 0 : file.name];
+        handleChange(propertyId, value);
+      };
+      setTimeout(handleFunction, 1);
     }
   }
   function downloadFile(file) {
@@ -4241,14 +4244,14 @@ const FileUploader = _a => {
     // 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 = () => {
-      var _a, _b;
-      if (fileList && Array.isArray(data) && data[1] !== ((_a = fileList[propertyId]) === null || _a === void 0 ? void 0 : _a.urn)) {
-        handleChange(propertyId, fileList && ((_b = fileList[propertyId]) === null || _b === void 0 ? void 0 : _b.urn));
+      var _a;
+      if (fileList) {
+        handleChange(propertyId, fileList && ((_a = fileList[propertyId]) === null || _a === void 0 ? void 0 : _a.urn));
       }
     };
     const timeoutId = setTimeout(delayedFunction, 1);
     return () => clearTimeout(timeoutId);
-  }, [data, handleChange, fileList, propertyId]);
+  }, [handleChange, fileList, propertyId]);
   return jsxs(FileUploaderStyle, {
     id: "file-upload",
     className: "FileUploader",
@@ -4271,7 +4274,7 @@ const FileUploader = _a => {
           className: "align-center",
           children: jsx(GoACircularProgress, {
             visible: true,
-            message: `Uploading ${data[2]}`,
+            message: `Uploading ${data[1]}`,
             size: "large"
           })
         })

package/package.json

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