@formio/js 5.0.0-rc.34 → 5.0.0-rc.35

package/lib/cjs/CDN.js

@@ -57,19 +57,25 @@ class CDN {
         this.updateUrls();
     }
     buildUrl(cdnUrl, lib, version) {
-        let url;
-        if (version === 'latest' || version === '') {
-            url = `${cdnUrl}/${lib}`;
+        let url = cdnUrl;
+        if (lib) {
+            url += `/${lib}`;
         }
-        else {
-            url = `${cdnUrl}/${lib}/${version}`;
+        if (version && version !== 'latest') {
+            url += `/${version}`;
         }
         return url;
     }
     updateUrls() {
         for (const lib in this.libs) {
             if (lib in this.overrides) {
-                this[lib] = this.buildUrl(this.overrides[lib], lib, this.libs[lib]);
+                if (typeof this.overrides[lib] === 'string') {
+                    this[lib] = this.buildUrl(this.overrides[lib], lib, this.libs[lib]);
+                }
+                else {
+                    const override = this.overrides[lib];
+                    this[lib] = this.buildUrl(override.cdn, override.lib || '', override.version || '');
+                }
             }
             else {
                 this[lib] = this.buildUrl(this.baseUrl, lib, this.libs[lib]);

package/lib/cjs/Webform.js

@@ -778,7 +778,10 @@ class Webform extends NestedDataComponent_1.default {
         this.component.input = false;
         this.addComponents();
         this.on('submitButton', options => {
-            this.submit(false, options).catch(e => e !== false && e !== undefined && console.log(e));
+            this.submit(false, options).catch(e => {
+                options.instance.loading = false;
+                return e !== false && e !== undefined && console.log(e);
+            });
         }, true);
         this.on('checkValidity', (data) => this.validate(data, { dirty: true, process: 'change' }), true);
         this.on('requestUrl', (args) => (this.submitUrl(args.url, args.headers)), true);

package/lib/cjs/Wizard.js

@@ -788,21 +788,18 @@ class Wizard extends Webform_1.default {
         }
     }
     setValue(submission, flags = {}, ignoreEstablishment) {
-        this._submission = submission;
-        if ((flags && flags.fromSubmission && (this.options.readOnly || this.editMode) && !this.isHtmlRenderMode()) ||
-            (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
-            (this.options.server && (this.prefixComps.length || this.suffixComps.length))) {
-            this._data = submission.data;
-        }
-        if (!ignoreEstablishment) {
-            this.establishPages(submission.data);
-        }
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
+        this.mergeData(this.data, submission.data);
         if (changed) {
             this.pageFieldLogic(this.page);
         }
+        submission.data = this.data;
+        this._submission = submission;
+        if (!ignoreEstablishment) {
+            this.establishPages(submission.data);
+        }
         this.setEditMode(submission);
         return changed;
     }

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

@@ -201,7 +201,12 @@ class Component extends Element_1.default {
         return {
             operators: ['isEqual', 'isNotEqual', 'isEmpty', 'isNotEmpty'],
             valueComponent() {
-                return { type: 'textfield' };
+                return {
+                    type: 'textfield',
+                    widget: {
+                        type: 'input'
+                    }
+                };
             }
         };
     }

package/lib/cjs/components/_classes/nested/NestedComponent.js

@@ -524,7 +524,7 @@ class NestedComponent extends Field_1.default {
     clearOnHide(show) {
         super.clearOnHide(show);
         if (this.component.clearOnHide) {
-            if (this.allowData && !this.hasValue()) {
+            if (this.allowData && !this.hasValue() && !(this.options.server && !this.visible)) {
                 this.dataValue = this.defaultValue;
             }
             if (this.hasValue()) {

package/lib/cjs/components/container/fixtures/comp4.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Checkbox',
+            tableView: false,
+            key: 'checkbox',
+            type: 'checkbox',
+            input: true,
+        },
+        {
+            label: 'Container',
+            tableView: false,
+            key: 'container',
+            conditional: {
+                show: true,
+                when: 'checkbox',
+                eq: 'true',
+            },
+            type: 'container',
+            input: true,
+            components: [
+                {
+                    label: 'Text Field',
+                    applyMaskOn: 'change',
+                    tableView: true,
+                    key: 'textField',
+                    type: 'textfield',
+                    input: true,
+                },
+            ],
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+};

package/lib/cjs/components/container/fixtures/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
 exports.comp2 = comp2_1.default;
 const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
+const comp4_1 = __importDefault(require("./comp4"));
+exports.comp4 = comp4_1.default;

package/lib/cjs/components/datetime/DateTime.js

@@ -154,8 +154,14 @@ class DateTimeComponent extends Input_1.default {
         format += format.match(/z$/) ? '' : ' z';
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
+            if (Array.isArray(value) && this.component.multiple) {
+                return value.map(item => lodash_1.default.trim(utils_1.default.momentDate(item, format, timezone).format(format))).join(', ');
+            }
             return lodash_1.default.trim(utils_1.default.momentDate(value, format, timezone).format(format));
         }
+        if (Array.isArray(value) && this.component.multiple) {
+            return value.map(item => lodash_1.default.trim((0, moment_1.default)(item).format(format))).join(', ');
+        }
         return (value ? lodash_1.default.trim((0, moment_1.default)(value).format(format)) : value) || '';
     }
 }