@formio/js 5.0.0-dev.5842.5155aaa → 5.0.0-dev.5844.c491f7d

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

@@ -3469,14 +3469,16 @@ class Component extends Element_1.default {
         window.scrollTo(verticalOnly ? window.scrollX : left + window.scrollX, top + window.scrollY);
     }
     focus(index) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if ('beforeFocus' in this.parent) {
             this.parent.beforeFocus(this);
         }
-        index = index || ((_a = this.refs.input) === null || _a === void 0 ? void 0 : _a.length) - 1;
-        if ((_b = this.refs.input) === null || _b === void 0 ? void 0 : _b.length) {
+        if (!index && !lodash_1.default.isNumber(index) && ((_b = (_a = this.refs) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.length)) {
+            index = this.refs.input.length - 1;
+        }
+        if ((_c = this.refs.input) === null || _c === void 0 ? void 0 : _c.length) {
             const focusingInput = this.refs.input[index];
-            if (((_c = this.component.widget) === null || _c === void 0 ? void 0 : _c.type) === 'calendar') {
+            if (((_d = this.component.widget) === null || _d === void 0 ? void 0 : _d.type) === 'calendar') {
                 const sibling = focusingInput.nextSibling;
                 if (sibling) {
                     sibling.focus();

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

@@ -286,7 +286,7 @@ class DayComponent extends Field_1.default {
                 if (!this.component.fields.day.hide && maxDay) {
                     this.refs.day.max = maxDay;
                 }
-                if (maxDay && day > maxDay) {
+                if (maxDay && day > maxDay && this.refs.day) {
                     this.refs.day.value = this.refs.day.max;
                 }
                 updateValueAndSaveFocus(this.refs.month, 'month')();
@@ -496,28 +496,40 @@ class DayComponent extends Field_1.default {
         if (defaultValue) {
             defaults = defaultValue.split('/').map(x => parseInt(x, 10));
         }
+        const isModalEditClosed = this.component.modalEdit && !this.componentModal.isOpened;
         if (this.showDay && this.refs.day) {
-            day = this.refs.day.value === '' ? '' : parseInt(this.refs.day.value, 10);
+            day = (this.refs.day.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.day.value, 10);
         }
-        if (day === undefined || lodash_1.default.isNaN(day)) {
-            day = defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
+        if (day === undefined || lodash_1.default.isNaN(day) || value) {
+            day = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).day
+                : (defaults[DAY] && !lodash_1.default.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
-            month = this.refs.month.value === '' ? '' : parseInt(this.refs.month.value, 10);
+            month = (this.refs.month.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.month.value, 10);
         }
-        if (month === undefined || lodash_1.default.isNaN(month)) {
-            month = defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
+        if (month === undefined || lodash_1.default.isNaN(month) || value) {
+            month = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).month
+                : (defaults[MONTH] && !lodash_1.default.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
         }
         if (this.showYear && this.refs.year) {
-            year = this.refs.year.value === '' ? '' : parseInt(this.refs.year.value);
+            year = (this.refs.year.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.year.value);
         }
-        if (year === undefined || lodash_1.default.isNaN(year)) {
-            year = defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
+        if (year === undefined || lodash_1.default.isNaN(year) || value) {
+            year = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).year
+                : (defaults[YEAR] && !lodash_1.default.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
         }
         let result;
         if (!day && !month && !year) {
-            this.dataValue = this.emptyValue;
+            if (!isModalEditClosed) {
+                this.dataValue = this.emptyValue;
+                if (this.options.building) {
+                    this.triggerChange();
+                }
+            }
             return null;
         }
         // add trailing zeros if the data is showed

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

@@ -3434,7 +3434,9 @@ export default class Component extends Element {
         if ('beforeFocus' in this.parent) {
             this.parent.beforeFocus(this);
         }
-        index = index || this.refs.input?.length - 1;
+        if (!index && !_.isNumber(index) && this.refs?.input?.length) {
+            index = this.refs.input.length - 1;
+        }
         if (this.refs.input?.length) {
             const focusingInput = this.refs.input[index];
             if (this.component.widget?.type === 'calendar') {

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

@@ -284,7 +284,7 @@ export default class DayComponent extends Field {
                 if (!this.component.fields.day.hide && maxDay) {
                     this.refs.day.max = maxDay;
                 }
-                if (maxDay && day > maxDay) {
+                if (maxDay && day > maxDay && this.refs.day) {
                     this.refs.day.value = this.refs.day.max;
                 }
                 updateValueAndSaveFocus(this.refs.month, 'month')();
@@ -494,28 +494,40 @@ export default class DayComponent extends Field {
         if (defaultValue) {
             defaults = defaultValue.split('/').map(x => parseInt(x, 10));
         }
+        const isModalEditClosed = this.component.modalEdit && !this.componentModal.isOpened;
         if (this.showDay && this.refs.day) {
-            day = this.refs.day.value === '' ? '' : parseInt(this.refs.day.value, 10);
+            day = (this.refs.day.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.day.value, 10);
         }
-        if (day === undefined || _.isNaN(day)) {
-            day = defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0;
+        if (day === undefined || _.isNaN(day) || value) {
+            day = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).day
+                : (defaults[DAY] && !_.isNaN(defaults[DAY]) ? defaults[DAY] : 0);
         }
         if (this.showMonth && this.refs.month) {
             // Months are 0 indexed.
-            month = this.refs.month.value === '' ? '' : parseInt(this.refs.month.value, 10);
+            month = (this.refs.month.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.month.value, 10);
         }
-        if (month === undefined || _.isNaN(month)) {
-            month = defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0;
+        if (month === undefined || _.isNaN(month) || value) {
+            month = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).month
+                : (defaults[MONTH] && !_.isNaN(defaults[MONTH]) ? defaults[MONTH] : 0);
         }
         if (this.showYear && this.refs.year) {
-            year = this.refs.year.value === '' ? '' : parseInt(this.refs.year.value);
+            year = (this.refs.year.value === '' && !isModalEditClosed) ? '' : parseInt(this.refs.year.value);
         }
-        if (year === undefined || _.isNaN(year)) {
-            year = defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0;
+        if (year === undefined || _.isNaN(year) || value) {
+            year = (defaults.length !== 3)
+                ? this.getDayWithHiddenFields(defaults).year
+                : (defaults[YEAR] && !_.isNaN(defaults[YEAR]) ? defaults[YEAR] : 0);
         }
         let result;
         if (!day && !month && !year) {
-            this.dataValue = this.emptyValue;
+            if (!isModalEditClosed) {
+                this.dataValue = this.emptyValue;
+                if (this.options.building) {
+                    this.triggerChange();
+                }
+            }
             return null;
         }
         // add trailing zeros if the data is showed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5842.5155aaa",
+  "version": "5.0.0-dev.5844.c491f7d",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {