@formio/js 5.0.0-dev.5838.99aa253 → 5.0.0-dev.5840.acb2be3

package/lib/cjs/components/Components.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Component_1 = __importDefault(require("./_classes/component/Component"));
 const utils_1 = __importDefault(require("./_classes/component/editForm/utils"));
 const Component_form_1 = __importDefault(require("./_classes/component/Component.form"));
+const utils_2 = require("../utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
 class Components {
     static set EditFormUtils(value) {
@@ -56,7 +57,8 @@ class Components {
     static getComponentPath(component) {
         var _a;
         let path = '';
-        if (component.component.key) {
+        const componentKey = (0, utils_2.getComponentKey)(component.component);
+        if (componentKey) {
             let thisPath = ((_a = component.options) === null || _a === void 0 ? void 0 : _a.parent) || component;
             while (thisPath && !thisPath.allowData && thisPath.parent) {
                 thisPath = thisPath.parent;
@@ -68,7 +70,7 @@ class Components {
             const rowIndex = component.row;
             const rowIndexPath = rowIndex && !['container'].includes(thisPath.component.type) ? `[${Number.parseInt(rowIndex)}]` : '';
             path = `${thisPath.path}${rowIndexPath}.`;
-            path += component.component.key;
+            path += componentKey;
             return lodash_1.default.trim(path, '.');
         }
         return path;

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

@@ -2965,7 +2965,7 @@ class Component extends Element_1.default {
         if (this.options.alwaysDirty) {
             flags.dirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data)) {
+        if (flags.fromSubmission && this.hasValue(data) && !(this.pristine && this.protected)) {
             flags.dirty = true;
         }
         this.setDirty(flags.dirty);
@@ -2992,6 +2992,7 @@ class Component extends Element_1.default {
             value: this.validationValue,
             path: this.path || this.component.key,
             instance: this,
+            form: this.root ? this.root._form : {},
             scope: { errors: [] },
             processors: [
                 process_1.validateProcessInfo

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

@@ -214,6 +214,16 @@ class AddressComponent extends Container_1.default {
     isValueInLegacyFormat(value) {
         return value && !value.mode;
     }
+    set dataValue(value) {
+        super.dataValue = value;
+    }
+    get dataValue() {
+        const resultValue = lodash_1.default.get(this._data, this.component.path);
+        if (!lodash_1.default.isArray(resultValue) && this.component.multiple) {
+            return [resultValue];
+        }
+        return super.dataValue;
+    }
     normalizeValue(value) {
         return (this.manualModeEnabled && this.isValueInLegacyFormat(value))
             ? {

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

@@ -500,26 +500,20 @@ class DayComponent extends Field_1.default {
             day = parseInt(this.refs.day.value, 10);
         }
         if (day === undefined || lodash_1.default.isNaN(day)) {
-            day = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).day
-                : (defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
+            day = defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
             month = parseInt(this.refs.month.value, 10);
         }
         if (month === undefined || lodash_1.default.isNaN(month)) {
-            month = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).month
-                : (defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
+            month = defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
         }
         if (this.showYear && this.refs.year) {
             year = parseInt(this.refs.year.value);
         }
         if (year === undefined || lodash_1.default.isNaN(year)) {
-            year = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).year
-                : (defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
+            year = defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
         }
         let result;
         if (!day && !month && !year) {

package/lib/mjs/components/Components.js

@@ -1,6 +1,7 @@
 import Component from './_classes/component/Component';
 import EditFormUtils from './_classes/component/editForm/utils';
 import BaseEditForm from './_classes/component/Component.form';
+import { getComponentKey } from '../utils/utils';
 import _ from 'lodash';
 export default class Components {
     static _editFormUtils = EditFormUtils;
@@ -52,7 +53,8 @@ export default class Components {
      */
     static getComponentPath(component) {
         let path = '';
-        if (component.component.key) {
+        const componentKey = getComponentKey(component.component);
+        if (componentKey) {
             let thisPath = component.options?.parent || component;
             while (thisPath && !thisPath.allowData && thisPath.parent) {
                 thisPath = thisPath.parent;
@@ -64,7 +66,7 @@ export default class Components {
             const rowIndex = component.row;
             const rowIndexPath = rowIndex && !['container'].includes(thisPath.component.type) ? `[${Number.parseInt(rowIndex)}]` : '';
             path = `${thisPath.path}${rowIndexPath}.`;
-            path += component.component.key;
+            path += componentKey;
             return _.trim(path, '.');
         }
         return path;

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

@@ -2929,7 +2929,7 @@ export default class Component extends Element {
         if (this.options.alwaysDirty) {
             flags.dirty = true;
         }
-        if (flags.fromSubmission && this.hasValue(data)) {
+        if (flags.fromSubmission && this.hasValue(data) && !(this.pristine && this.protected)) {
             flags.dirty = true;
         }
         this.setDirty(flags.dirty);
@@ -2956,6 +2956,7 @@ export default class Component extends Element {
             value: this.validationValue,
             path: this.path || this.component.key,
             instance: this,
+            form: this.root ? this.root._form : {},
             scope: { errors: [] },
             processors: [
                 validateProcessInfo

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

@@ -210,6 +210,16 @@ export default class AddressComponent extends ContainerComponent {
     isValueInLegacyFormat(value) {
         return value && !value.mode;
     }
+    set dataValue(value) {
+        super.dataValue = value;
+    }
+    get dataValue() {
+        const resultValue = _.get(this._data, this.component.path);
+        if (!_.isArray(resultValue) && this.component.multiple) {
+            return [resultValue];
+        }
+        return super.dataValue;
+    }
     normalizeValue(value) {
         return (this.manualModeEnabled && this.isValueInLegacyFormat(value))
             ? {

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

@@ -498,26 +498,20 @@ export default class DayComponent extends Field {
             day = parseInt(this.refs.day.value, 10);
         }
         if (day === undefined || _.isNaN(day)) {
-            day = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).day
-                : (defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
+            day = defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
             month = parseInt(this.refs.month.value, 10);
         }
         if (month === undefined || _.isNaN(month)) {
-            month = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).month
-                : (defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
+            month = defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
         }
         if (this.showYear && this.refs.year) {
             year = parseInt(this.refs.year.value);
         }
         if (year === undefined || _.isNaN(year)) {
-            year = (defaults.length !== 3 && value) ?
-                this.getDayWithHiddenFields(defaults).year
-                : (defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
+            year = defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
         }
         let result;
         if (!day && !month && !year) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5838.99aa253",
+  "version": "5.0.0-dev.5840.acb2be3",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {