@formio/js 5.1.0-dev.5984.de9f6d7 → 5.1.0-dev.5992.ff65eb8

package/lib/cjs/Webform.js

@@ -1530,7 +1530,7 @@ class Webform extends NestedDataComponent_1.default {
         }
     }
     triggerCaptcha() {
-        if (!this || !this.components) {
+        if (!this || !this.components || this.options.preview) {
             return;
         }
         const captchaComponent = [];
@@ -1540,7 +1540,15 @@ class Webform extends NestedDataComponent_1.default {
             }
         });
         if (captchaComponent.length > 0) {
-            captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+            if (this.parent) {
+                this.parent.subFormReady.then(() => {
+                    captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+                });
+            }
+            else {
+                captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+            }
+            ;
         }
     }
     set nosubmit(value) {

package/lib/cjs/Wizard.js

@@ -667,7 +667,7 @@ class Wizard extends Webform_1.default {
         return this.page - 1;
     }
     beforeSubmit() {
-        const pages = this.getPages();
+        const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
             page.options.beforeSubmit = true;
             return page.beforeSubmit();

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

@@ -1296,7 +1296,7 @@ class Component extends Element_1.default {
     detach() {
         // First iterate through each ref and delete the component so there are no dangling component references.
         lodash_1.default.each(this.refs, (ref) => {
-            if (typeof ref === NodeList) {
+            if (ref instanceof NodeList) {
                 ref.forEach((elem) => {
                     delete elem.component;
                 });

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.js

@@ -587,11 +587,21 @@ class FormComponent extends Component_1.default {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        return this.submitSubForm(false)
-            .then(() => {
-            return this.dataValue;
-        })
-            .then(() => super.beforeSubmit());
+        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
+            return this.createSubForm(true)
+                .then(this.submitSubForm(false))
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
+        else {
+            return this.submitSubForm(false)
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
     }
     isSubFormLazyLoad() {
         var _a, _b;

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/cjs/widgets/CalendarWidget.js

@@ -93,8 +93,6 @@ class CalendarWidget extends InputWidget_1.default {
         this.settings.disableWeekends ? this.settings.disable.push(this.disableWeekends) : '';
         this.settings.disableWeekdays ? this.settings.disable.push(this.disableWeekdays) : '';
         this.settings.disableFunction ? this.settings.disable.push(this.disableFunction) : '';
-        this.settings.wasDefaultValueChanged = false;
-        this.settings.defaultValue = '';
         this.settings.manualInputValue = '';
         this.settings.isManuallyOverriddenValue = false;
         this.settings.currentValue = '';
@@ -115,10 +113,6 @@ class CalendarWidget extends InputWidget_1.default {
                 this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
                 this.emit('update');
             }
-            if (this.settings.wasDefaultValueChanged) {
-                this.calendar._input.value = this.settings.defaultValue;
-                this.settings.wasDefaultValueChanged = false;
-            }
             if (this.calendar) {
                 this.emit('blur');
             }
@@ -360,14 +354,6 @@ class CalendarWidget extends InputWidget_1.default {
                 this.settings.currentValue = event.target.value;
                 this.emit('update');
             }
-            if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
-                this.settings.wasDefaultValueChanged = true;
-                this.settings.defaultValue = event.target.value;
-                this.calendar.clear();
-            }
-            else {
-                this.settings.wasDefaultValueChanged = false;
-            }
         });
         if (this.calendar.daysContainer) {
             this.calendar.daysContainer.addEventListener('click', () => {

package/lib/mjs/Webform.js

@@ -1530,7 +1530,7 @@ export default class Webform extends NestedDataComponent {
         }
     }
     triggerCaptcha() {
-        if (!this || !this.components) {
+        if (!this || !this.components || this.options.preview) {
             return;
         }
         const captchaComponent = [];
@@ -1540,7 +1540,15 @@ export default class Webform extends NestedDataComponent {
             }
         });
         if (captchaComponent.length > 0) {
-            captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+            if (this.parent) {
+                this.parent.subFormReady.then(() => {
+                    captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+                });
+            }
+            else {
+                captchaComponent[0].verify(`${this.form.name ? this.form.name : 'form'}Load`);
+            }
+            ;
         }
     }
     set nosubmit(value) {

package/lib/mjs/Wizard.js

@@ -657,7 +657,7 @@ export default class Wizard extends Webform {
         return this.page - 1;
     }
     beforeSubmit() {
-        const pages = this.getPages();
+        const pages = this.getPages({ all: true });
         return Promise.all(pages.map((page) => {
             page.options.beforeSubmit = true;
             return page.beforeSubmit();

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

@@ -1264,7 +1264,7 @@ export default class Component extends Element {
     detach() {
         // First iterate through each ref and delete the component so there are no dangling component references.
         _.each(this.refs, (ref) => {
-            if (typeof ref === NodeList) {
+            if (ref instanceof NodeList) {
                 ref.forEach((elem) => {
                     delete elem.component;
                 });

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.js

@@ -580,11 +580,21 @@ export default class FormComponent extends Component {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }
-        return this.submitSubForm(false)
-            .then(() => {
-            return this.dataValue;
-        })
-            .then(() => super.beforeSubmit());
+        if (this.isSubFormLazyLoad() && !this.subFormLoading) {
+            return this.createSubForm(true)
+                .then(this.submitSubForm(false))
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
+        else {
+            return this.submitSubForm(false)
+                .then(() => {
+                return this.dataValue;
+            })
+                .then(() => super.beforeSubmit());
+        }
     }
     isSubFormLazyLoad() {
         return this.root?._form?.display === 'wizard' && this.component.lazyLoad;

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/lib/mjs/widgets/CalendarWidget.js

@@ -87,8 +87,6 @@ export default class CalendarWidget extends InputWidget {
         this.settings.disableWeekends ? this.settings.disable.push(this.disableWeekends) : '';
         this.settings.disableWeekdays ? this.settings.disable.push(this.disableWeekdays) : '';
         this.settings.disableFunction ? this.settings.disable.push(this.disableFunction) : '';
-        this.settings.wasDefaultValueChanged = false;
-        this.settings.defaultValue = '';
         this.settings.manualInputValue = '';
         this.settings.isManuallyOverriddenValue = false;
         this.settings.currentValue = '';
@@ -109,10 +107,6 @@ export default class CalendarWidget extends InputWidget {
                 this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
                 this.emit('update');
             }
-            if (this.settings.wasDefaultValueChanged) {
-                this.calendar._input.value = this.settings.defaultValue;
-                this.settings.wasDefaultValueChanged = false;
-            }
             if (this.calendar) {
                 this.emit('blur');
             }
@@ -351,14 +345,6 @@ export default class CalendarWidget extends InputWidget {
                 this.settings.currentValue = event.target.value;
                 this.emit('update');
             }
-            if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
-                this.settings.wasDefaultValueChanged = true;
-                this.settings.defaultValue = event.target.value;
-                this.calendar.clear();
-            }
-            else {
-                this.settings.wasDefaultValueChanged = false;
-            }
         });
         if (this.calendar.daysContainer) {
             this.calendar.daysContainer.addEventListener('click', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.5984.de9f6d7",
+  "version": "5.1.0-dev.5992.ff65eb8",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {