@formio/js 5.2.1-dev.6243.b3a30c7 → 5.2.1-dev.6247.62839b6

package/lib/cjs/WebformBuilder.js

@@ -552,7 +552,7 @@ class WebformBuilder extends Component_1.default {
                             const groupId = group.getAttribute('id').slice('group-'.length);
                             const groupParent = getAttribute(group, 'parent').slice('#builder-sidebar-'.length);
                             if (((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index)) {
-                                hideShow(group, ((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index));
+                                hideShow(group, false, true);
                             }
                         });
                     }, true);

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -165,7 +165,6 @@ declare class Component extends Element {
     get componentsMap(): object;
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear(): boolean;

package/lib/cjs/components/_classes/component/Component.js

@@ -424,7 +424,6 @@ class Component extends Element_1.default {
     }
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear() {

package/lib/cjs/components/day/Day.js

@@ -53,11 +53,13 @@ class DayComponent extends Field_1.default {
         return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.string];
     }
     constructor(component, options, data) {
-        if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
-            component.maxDate = (0, moment_1.default)(component.maxDate, 'YYYY-MM-DD').toISOString();
-        }
-        if (component.minDate && component.minDate.indexOf('moment(') === -1) {
-            component.minDate = (0, moment_1.default)(component.minDate, 'YYYY-MM-DD').toISOString();
+        if (!options.inFormBuilder && !options.building) {
+            if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
+                component.maxDate = (0, moment_1.default)(component.maxDate, 'YYYY-MM-DD').toISOString();
+            }
+            if (component.minDate && component.minDate.indexOf('moment(') === -1) {
+                component.minDate = (0, moment_1.default)(component.minDate, 'YYYY-MM-DD').toISOString();
+            }
         }
         super(component, options, data);
     }

package/lib/cjs/components/file/File.js

@@ -109,7 +109,8 @@ class FileComponent extends Field_1.default {
         if (this.component.privateDownload) {
             fileInfo.private = true;
         }
-        return this.fileService.downloadFile(fileInfo).then((result) => result.url);
+        // pass the component to the downloadFile method
+        return this.fileService.downloadFile(fileInfo, this.component).then((result) => result.url);
     }
     get emptyValue() {
         return [];

package/lib/cjs/components/form/Form.d.ts

@@ -13,7 +13,7 @@ export default class FormComponent extends Component {
     valueChanged: boolean | undefined;
     subForm: any;
     formSrc: any;
-    get dataReady(): Promise<any>;
+    get dataReady(): any;
     get emptyValue(): {
         data: {};
     };

package/lib/cjs/components/form/Form.js

@@ -105,7 +105,8 @@ class FormComponent extends Component_1.default {
         return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
     }
     get dataReady() {
-        return this.subFormReady || Promise.resolve();
+        var _a;
+        return ((_a = this.subFormReady) === null || _a === void 0 ? void 0 : _a.dataReady) || this.subFormReady || Promise.resolve();
     }
     get defaultValue() {
         // Not not provide a default value unless the subform is ready so that it will initialize correctly.
@@ -695,6 +696,9 @@ class FormComponent extends Component_1.default {
      */
     onSetSubFormValue(submission, flags) {
         this.subForm.setValue(submission, flags);
+        if (flags === null || flags === void 0 ? void 0 : flags.fromSubmission) {
+            this.subForm.submissionReadyResolve(submission);
+        }
     }
     isEmpty(value = this.dataValue) {
         return value === null || lodash_1.default.isEqual(value, this.emptyValue);

package/lib/cjs/components/number/Number.js

@@ -91,10 +91,14 @@ class NumberComponent extends Input_1.default {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
+        if (typeof defaultValue === 'string' && defaultValue) {
             // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
             // parseNumber on it
             defaultValue = this.parseNumber(defaultValue);
+            // If default value does not contain valid value that could be parsed to number, set it to null to prevent errors
+            if (lodash_1.default.isNaN(defaultValue)) {
+                defaultValue = null;
+            }
         }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;

package/lib/cjs/providers/storage/googleDrive.js

@@ -52,10 +52,11 @@ function googledrive(formio) {
                 xhr.send(fd);
             }));
         },
-        downloadFile(file) {
+        downloadFile(file, component) {
             const token = formio.getToken();
+            // Constructed the url with the fileId, fileName, displayImage, imageSize if applicable
             file.url =
-                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}`;
+                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}${component.image ? '&displayImage=true' : ''}${component.imageSize ? `&imageSize=${component.imageSize}` : ''}`;
             return Promise.resolve(file);
         },
         deleteFile: function deleteFile(fileInfo) {

package/lib/mjs/WebformBuilder.js

@@ -538,7 +538,7 @@ export default class WebformBuilder extends Component {
                             const groupId = group.getAttribute('id').slice('group-'.length);
                             const groupParent = getAttribute(group, 'parent').slice('#builder-sidebar-'.length);
                             if (((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index)) {
-                                hideShow(group, ((openByDefault && groupParent === clickedId) || groupId === clickedParentId || groupIndex === index));
+                                hideShow(group, false, true);
                             }
                         });
                     }, true);

package/lib/mjs/components/_classes/component/Component.d.ts

@@ -165,7 +165,6 @@ declare class Component extends Element {
     get componentsMap(): object;
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear(): boolean;

package/lib/mjs/components/_classes/component/Component.js

@@ -420,7 +420,6 @@ export default class Component extends Element {
     }
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear() {

package/lib/mjs/components/day/Day.js

@@ -53,11 +53,13 @@ export default class DayComponent extends Field {
     // Empty value used before 9.3.x
     static oldEmptyValue = '00/00/0000';
     constructor(component, options, data) {
-        if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
-            component.maxDate = moment(component.maxDate, 'YYYY-MM-DD').toISOString();
-        }
-        if (component.minDate && component.minDate.indexOf('moment(') === -1) {
-            component.minDate = moment(component.minDate, 'YYYY-MM-DD').toISOString();
+        if (!options.inFormBuilder && !options.building) {
+            if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
+                component.maxDate = moment(component.maxDate, 'YYYY-MM-DD').toISOString();
+            }
+            if (component.minDate && component.minDate.indexOf('moment(') === -1) {
+                component.minDate = moment(component.minDate, 'YYYY-MM-DD').toISOString();
+            }
         }
         super(component, options, data);
     }

package/lib/mjs/components/file/File.js

@@ -98,7 +98,8 @@ export default class FileComponent extends Field {
         if (this.component.privateDownload) {
             fileInfo.private = true;
         }
-        return this.fileService.downloadFile(fileInfo).then((result) => result.url);
+        // pass the component to the downloadFile method
+        return this.fileService.downloadFile(fileInfo, this.component).then((result) => result.url);
     }
     get emptyValue() {
         return [];

package/lib/mjs/components/form/Form.d.ts

@@ -13,7 +13,7 @@ export default class FormComponent extends Component {
     valueChanged: boolean | undefined;
     subForm: any;
     formSrc: any;
-    get dataReady(): Promise<any>;
+    get dataReady(): any;
     get emptyValue(): {
         data: {};
     };

package/lib/mjs/components/form/Form.js

@@ -100,7 +100,7 @@ export default class FormComponent extends Component {
         return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
     }
     get dataReady() {
-        return this.subFormReady || Promise.resolve();
+        return this.subFormReady?.dataReady || this.subFormReady || Promise.resolve();
     }
     get defaultValue() {
         // Not not provide a default value unless the subform is ready so that it will initialize correctly.
@@ -684,6 +684,9 @@ export default class FormComponent extends Component {
      */
     onSetSubFormValue(submission, flags) {
         this.subForm.setValue(submission, flags);
+        if (flags?.fromSubmission) {
+            this.subForm.submissionReadyResolve(submission);
+        }
     }
     isEmpty(value = this.dataValue) {
         return value === null || _.isEqual(value, this.emptyValue);

package/lib/mjs/components/number/Number.js

@@ -89,10 +89,14 @@ export default class NumberComponent extends Input {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
+        if (typeof defaultValue === 'string' && defaultValue) {
             // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
             // parseNumber on it
             defaultValue = this.parseNumber(defaultValue);
+            // If default value does not contain valid value that could be parsed to number, set it to null to prevent errors
+            if (_.isNaN(defaultValue)) {
+                defaultValue = null;
+            }
         }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;

package/lib/mjs/providers/storage/googleDrive.js

@@ -50,10 +50,11 @@ function googledrive(formio) {
                 xhr.send(fd);
             }));
         },
-        downloadFile(file) {
+        downloadFile(file, component) {
             const token = formio.getToken();
+            // Constructed the url with the fileId, fileName, displayImage, imageSize if applicable
             file.url =
-                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}`;
+                `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}${component.image ? '&displayImage=true' : ''}${component.imageSize ? `&imageSize=${component.imageSize}` : ''}`;
             return Promise.resolve(file);
         },
         deleteFile: function deleteFile(fileInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.2.1-dev.6243.b3a30c7",
+  "version": "5.2.1-dev.6247.62839b6",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {