@formio/js 5.0.0-rc.89 → 5.0.0-rc.90

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,7 +20,7 @@
 
 /*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
 
-/*! formiojs v5.0.0-rc.89 | https://unpkg.com/formiojs@5.0.0-rc.89/LICENSE.txt */
+/*! formiojs v5.0.0-rc.90 | https://unpkg.com/formiojs@5.0.0-rc.90/LICENSE.txt */
 
 /**
  * @license

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,34 +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.length !== 3 && value)
+        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.length !== 3 && value)
+        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.length !== 3 && value)
+        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/cjs/utils/formUtils.d.ts

@@ -15,8 +15,8 @@ export const getComponentPath: typeof Utils.getComponentPath;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
 export const componentChildPath: any;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: AsyncComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: ComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => void;
+export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => Promise<void>;
+export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

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,34 +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.length !== 3 && value)
+        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.length !== 3 && value)
+        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.length !== 3 && value)
+        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/lib/mjs/utils/formUtils.d.ts

@@ -15,8 +15,8 @@ export const getComponentPath: typeof Utils.getComponentPath;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
 export const componentChildPath: any;
-export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: AsyncComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => Promise<void>;
-export const eachComponentData: (components: Component[], data: DataObject, fn: ComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => void;
+export const eachComponentDataAsync: (components: Component[], data: DataObject, fn: EachComponentDataAsyncCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => Promise<void>;
+export const eachComponentData: (components: Component[], data: DataObject, fn: EachComponentDataCallback, path?: string | undefined, index?: number | undefined, parent?: any, includeAll?: boolean | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.89",
+  "version": "5.0.0-rc.90",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-rc.37",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.0-rc.8",
+    "@formio/core": "2.3.0-rc.9",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",