@formio/js 5.0.0-dev.5780.6637ffb → 5.0.0-dev.5789.2e50e03

package/lib/cjs/Webform.js

@@ -1245,10 +1245,10 @@ class Webform extends NestedDataComponent_1.default {
         }
         this.checkData(value.data, flags);
         const shouldValidate = !flags.noValidate ||
-            flags.fromIframe ||
+            flags.fromIFrame ||
             (flags.fromSubmission && this.rootPristine && this.pristine && flags.changed);
         const errors = shouldValidate
-            ? this.validate(value.data, Object.assign(Object.assign({}, flags), { noValidate: flags.fromIframe && this.submitted ? false : flags.noValidate, process: 'change' }))
+            ? this.validate(value.data, Object.assign(Object.assign({}, flags), { process: "change" }))
             : [];
         value.isValid = errors.length === 0;
         this.loading = false;

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

@@ -3024,7 +3024,7 @@ class Component extends Element_1.default {
                         this.parent.childErrors.push(...errors);
                     }
                     else {
-                        lodash_1.default.remove(this.parent.childErrors, (err) => { var _a, _b; return (((_a = err === null || err === void 0 ? void 0 : err.component) === null || _a === void 0 ? void 0 : _a.key) || ((_b = err === null || err === void 0 ? void 0 : err.context) === null || _b === void 0 ? void 0 : _b.key)) === this.component.key; });
+                        lodash_1.default.remove(this.parent.childErrors, (err) => err.component.key === this.component.key);
                     }
                 }
                 this.showValidationErrors(errors, data, row, flags);
@@ -3040,7 +3040,7 @@ class Component extends Element_1.default {
                     this.parent.childErrors.push(...errors);
                 }
                 else {
-                    lodash_1.default.remove(this.parent.childErrors, (err) => { var _a, _b; return (((_a = err === null || err === void 0 ? void 0 : err.component) === null || _a === void 0 ? void 0 : _a.key) || ((_b = err === null || err === void 0 ? void 0 : err.context) === null || _b === void 0 ? void 0 : _b.key)) === this.component.key; });
+                    lodash_1.default.remove(this.parent.childErrors, (err) => err.component.key === this.component.key);
                 }
             }
             return errors.length === 0;

package/lib/cjs/components/_classes/multivalue/Multivalue.d.ts

@@ -1,6 +1,5 @@
 export default class Multivalue extends Field {
     get addAnother(): string;
-    useWrapper(): any;
     /**
      * @returns {Field} - The created field.
      */

package/lib/cjs/components/_classes/multivalue/Multivalue.js

@@ -6,12 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../field/Field"));
 const lodash_1 = __importDefault(require("lodash"));
 class Multivalue extends Field_1.default {
-    get dataValue() {
-        const parent = super.dataValue;
-        if (!parent && this.component.multiple) {
-            return [];
+    /**
+     * Normalize values coming into updateValue.
+     * @param {*} value - The value to normalize before setting.
+     * @returns {*} - The normalized value.
+     */
+    normalizeValue(value) {
+        if (this.component.multiple) {
+            if (Array.isArray(value)) {
+                if (value.length === 0) {
+                    return [this.emptyValue];
+                }
+                if (this.component.storeas === 'array') {
+                    return super.normalizeValue([value]);
+                }
+                return super.normalizeValue(value);
+            }
+            else {
+                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+            }
+        }
+        else {
+            if (Array.isArray(value) && this.component.storeas !== 'array') {
+                if (this.component.storeas === 'string') {
+                    return super.normalizeValue(value.join(this.delimiter || ''));
+                }
+                return super.normalizeValue(value[0] || this.emptyValue);
+            }
+            else {
+                return super.normalizeValue(value);
+            }
         }
-        return parent;
+    }
+    get dataValue() {
+        return super.dataValue;
     }
     set dataValue(value) {
         super.dataValue = value;
@@ -31,30 +59,20 @@ class Multivalue extends Field_1.default {
     get addAnother() {
         return this.t(this.component.addAnother || 'Add Another');
     }
-    useWrapper() {
-        return this.component.hasOwnProperty('multiple') && this.component.multiple;
-    }
     /**
      * @returns {Field} - The created field.
      */
     render() {
-        // If single value field.
-        if (!this.useWrapper()) {
-            return super.render(`<div ${this._referenceAttributeName}="element">
-          ${this.renderElement(this.component.type !== 'hidden' ? this.dataValue : '')}
-        </div>`);
-        }
-        // Make sure dataValue is in the correct array format.
-        let dataValue = this.dataValue;
-        if (!Array.isArray(dataValue)) {
-            dataValue = dataValue ? [dataValue] : [];
-        }
-        // If multiple value field.
-        return super.render(this.renderTemplate('multiValueTable', {
-            rows: dataValue.map(this.renderRow.bind(this)).join(''),
-            disabled: this.disabled,
-            addAnother: this.addAnother,
-        }));
+        let dataValue = this.normalizeValue(this.dataValue);
+        return this.component.hasOwnProperty('multiple') && this.component.multiple
+            ? super.render(this.renderTemplate('multiValueTable', {
+                rows: dataValue.map(this.renderRow.bind(this)).join(''),
+                disabled: this.disabled,
+                addAnother: this.addAnother,
+            }))
+            : super.render(`<div ${this._referenceAttributeName}="element">
+            ${this.renderElement(this.component.type !== 'hidden' ? dataValue : '')}
+          </div>`);
     }
     renderElement() {
         return '';

package/lib/cjs/components/address/Address.d.ts

@@ -11,6 +11,12 @@ export default class AddressComponent extends ContainerComponent {
         weight: number;
         schema: any;
     };
+    static get serverConditionSettings(): {
+        operators: string[];
+    };
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+    };
     static get modeSwitcherRef(): string;
     static get removeValueIconRef(): string;
     static get searchInputRef(): string;

package/lib/cjs/components/address/Address.js

@@ -97,6 +97,12 @@ class AddressComponent extends Container_1.default {
             schema: AddressComponent.schema(),
         };
     }
+    static get serverConditionSettings() {
+        return AddressComponent.conditionOperatorsSettings;
+    }
+    static get conditionOperatorsSettings() {
+        return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { operators: ['isEmpty', 'isNotEmpty'] });
+    }
     mergeSchema(component = {}) {
         let { defaultSchema } = this;
         if (component.components) {
@@ -188,7 +194,7 @@ class AddressComponent extends Container_1.default {
         return (this.manualModeEnabled && this.dataValue) ? this.dataValue.address : this.dataValue;
     }
     set address(value) {
-        if (this.manualModeEnabled && !this.isMultiple) {
+        if (this.manualModeEnabled && !this.isMultiple && !lodash_1.default.isEqual(value, this.emptyValue)) {
             this.dataValue.address = value;
         }
         else {

package/lib/cjs/components/tags/Tags.js

@@ -118,12 +118,12 @@ class TagsComponent extends Input_1.default {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/lib/mjs/Webform.js

@@ -1247,14 +1247,10 @@ export default class Webform extends NestedDataComponent {
         }
         this.checkData(value.data, flags);
         const shouldValidate = !flags.noValidate ||
-            flags.fromIframe ||
+            flags.fromIFrame ||
             (flags.fromSubmission && this.rootPristine && this.pristine && flags.changed);
         const errors = shouldValidate
-            ? this.validate(value.data, {
-                ...flags,
-                noValidate: flags.fromIframe && this.submitted ? false : flags.noValidate,
-                process: 'change'
-            })
+            ? this.validate(value.data, { ...flags, process: "change" })
             : [];
         value.isValid = errors.length === 0;
         this.loading = false;

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

@@ -2988,7 +2988,7 @@ export default class Component extends Element {
                         this.parent.childErrors.push(...errors);
                     }
                     else {
-                        _.remove(this.parent.childErrors, (err) => (err?.component?.key || err?.context?.key) === this.component.key);
+                        _.remove(this.parent.childErrors, (err) => err.component.key === this.component.key);
                     }
                 }
                 this.showValidationErrors(errors, data, row, flags);
@@ -3004,7 +3004,7 @@ export default class Component extends Element {
                     this.parent.childErrors.push(...errors);
                 }
                 else {
-                    _.remove(this.parent.childErrors, (err) => (err?.component?.key || err?.context?.key) === this.component.key);
+                    _.remove(this.parent.childErrors, (err) => err.component.key === this.component.key);
                 }
             }
             return errors.length === 0;

package/lib/mjs/components/_classes/multivalue/Multivalue.d.ts

@@ -1,6 +1,5 @@
 export default class Multivalue extends Field {
     get addAnother(): string;
-    useWrapper(): any;
     /**
      * @returns {Field} - The created field.
      */

package/lib/mjs/components/_classes/multivalue/Multivalue.js

@@ -1,12 +1,40 @@
 import Field from '../field/Field';
 import _ from 'lodash';
 export default class Multivalue extends Field {
-    get dataValue() {
-        const parent = super.dataValue;
-        if (!parent && this.component.multiple) {
-            return [];
+    /**
+     * Normalize values coming into updateValue.
+     * @param {*} value - The value to normalize before setting.
+     * @returns {*} - The normalized value.
+     */
+    normalizeValue(value) {
+        if (this.component.multiple) {
+            if (Array.isArray(value)) {
+                if (value.length === 0) {
+                    return [this.emptyValue];
+                }
+                if (this.component.storeas === 'array') {
+                    return super.normalizeValue([value]);
+                }
+                return super.normalizeValue(value);
+            }
+            else {
+                return super.normalizeValue(value == null ? [this.emptyValue] : [value]);
+            }
+        }
+        else {
+            if (Array.isArray(value) && this.component.storeas !== 'array') {
+                if (this.component.storeas === 'string') {
+                    return super.normalizeValue(value.join(this.delimiter || ''));
+                }
+                return super.normalizeValue(value[0] || this.emptyValue);
+            }
+            else {
+                return super.normalizeValue(value);
+            }
         }
-        return parent;
+    }
+    get dataValue() {
+        return super.dataValue;
     }
     set dataValue(value) {
         super.dataValue = value;
@@ -26,30 +54,20 @@ export default class Multivalue extends Field {
     get addAnother() {
         return this.t(this.component.addAnother || 'Add Another');
     }
-    useWrapper() {
-        return this.component.hasOwnProperty('multiple') && this.component.multiple;
-    }
     /**
      * @returns {Field} - The created field.
      */
     render() {
-        // If single value field.
-        if (!this.useWrapper()) {
-            return super.render(`<div ${this._referenceAttributeName}="element">
-          ${this.renderElement(this.component.type !== 'hidden' ? this.dataValue : '')}
-        </div>`);
-        }
-        // Make sure dataValue is in the correct array format.
-        let dataValue = this.dataValue;
-        if (!Array.isArray(dataValue)) {
-            dataValue = dataValue ? [dataValue] : [];
-        }
-        // If multiple value field.
-        return super.render(this.renderTemplate('multiValueTable', {
-            rows: dataValue.map(this.renderRow.bind(this)).join(''),
-            disabled: this.disabled,
-            addAnother: this.addAnother,
-        }));
+        let dataValue = this.normalizeValue(this.dataValue);
+        return this.component.hasOwnProperty('multiple') && this.component.multiple
+            ? super.render(this.renderTemplate('multiValueTable', {
+                rows: dataValue.map(this.renderRow.bind(this)).join(''),
+                disabled: this.disabled,
+                addAnother: this.addAnother,
+            }))
+            : super.render(`<div ${this._referenceAttributeName}="element">
+            ${this.renderElement(this.component.type !== 'hidden' ? dataValue : '')}
+          </div>`);
     }
     renderElement() {
         return '';

package/lib/mjs/components/address/Address.d.ts

@@ -11,6 +11,12 @@ export default class AddressComponent extends ContainerComponent {
         weight: number;
         schema: any;
     };
+    static get serverConditionSettings(): {
+        operators: string[];
+    };
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+    };
     static get modeSwitcherRef(): string;
     static get removeValueIconRef(): string;
     static get searchInputRef(): string;

package/lib/mjs/components/address/Address.js

@@ -91,6 +91,15 @@ export default class AddressComponent extends ContainerComponent {
             schema: AddressComponent.schema(),
         };
     }
+    static get serverConditionSettings() {
+        return AddressComponent.conditionOperatorsSettings;
+    }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isEmpty', 'isNotEmpty'],
+        };
+    }
     mergeSchema(component = {}) {
         let { defaultSchema } = this;
         if (component.components) {
@@ -181,7 +190,7 @@ export default class AddressComponent extends ContainerComponent {
         return (this.manualModeEnabled && this.dataValue) ? this.dataValue.address : this.dataValue;
     }
     set address(value) {
-        if (this.manualModeEnabled && !this.isMultiple) {
+        if (this.manualModeEnabled && !this.isMultiple && !_.isEqual(value, this.emptyValue)) {
             this.dataValue.address = value;
         }
         else {

package/lib/mjs/components/tags/Tags.js

@@ -116,12 +116,12 @@ export default class TagsComponent extends Input {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5780.6637ffb",
+  "version": "5.0.0-dev.5789.2e50e03",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {