@formio/js 5.0.0-dev.5794.12ca15f → 5.0.0-dev.5797.3f96a70

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

@@ -342,6 +342,18 @@ export default class DayComponent extends Field {
         const valueParts = value.split('/');
         const [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
         const defaultValue = this.component.defaultValue ? this.component.defaultValue.split('/') : '';
+        let defaultDay = '';
+        let defaultMonth = '';
+        let defaultYear = '';
+        if (defaultValue) {
+            const hasHiddenFields = defaultValue.length !== 3;
+            defaultDay = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).day : defaultValue[DAY];
+            defaultMonth = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).month : defaultValue[MONTH];
+            defaultYear = hasHiddenFields ? this.getDayWithHiddenFields(defaultValue).year : defaultValue[YEAR];
+        }
+        if (this.options.building && defaultValue.length === 3) {
+            return this.component.defaultValue;
+        }
         const getNextPart = (shouldTake, defaultValue) => {
             // Only push the part if it's not an empty string
             const part = shouldTake ? valueParts.shift() : defaultValue;
@@ -350,13 +362,13 @@ export default class DayComponent extends Field {
             }
         };
         if (this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
+            getNextPart(this.showDay, defaultDay);
         }
-        getNextPart(this.showMonth, defaultValue ? defaultValue[MONTH] : '');
+        getNextPart(this.showMonth, defaultMonth);
         if (!this.dayFirst) {
-            getNextPart(this.showDay, defaultValue ? defaultValue[DAY] : '');
+            getNextPart(this.showDay, defaultDay);
         }
-        getNextPart(this.showYear, defaultValue ? defaultValue[YEAR] : '');
+        getNextPart(this.showYear, defaultYear);
         return dateParts.join('/');
     }
     /**
@@ -371,16 +383,23 @@ export default class DayComponent extends Field {
         if (value === 'Invalid date') {
             return null;
         }
+        let day, month, year;
         const parts = value.split('/');
-        let day;
-        if (this.component.dayFirst) {
-            day = parts.shift();
+        if (parts.length !== 3) {
+            day = this.getDayWithHiddenFields(parts).day;
+            month = this.getDayWithHiddenFields(parts).month;
+            year = this.getDayWithHiddenFields(parts).year;
         }
-        const month = parts.shift();
-        if (!this.component.dayFirst) {
-            day = parts.shift();
+        else {
+            if (this.component.dayFirst) {
+                day = parts.shift();
+            }
+            month = parts.shift();
+            if (!this.component.dayFirst) {
+                day = parts.shift();
+            }
+            year = parts.shift();
         }
-        const year = parts.shift();
         if (this.refs.day && this.showDay) {
             this.refs.day.value = day === '00' ? '' : parseInt(day, 10);
         }
@@ -391,6 +410,27 @@ export default class DayComponent extends Field {
             this.refs.year.value = year === '0000' ? '' : parseInt(year, 10);
         }
     }
+    getDayWithHiddenFields(parts) {
+        let [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
+        if (!this.showDay) {
+            MONTH = MONTH === 0 ? 0 : MONTH - 1;
+            YEAR = YEAR - 1;
+            DAY = null;
+        }
+        if (!this.showMonth) {
+            DAY = DAY === 0 ? 0 : DAY - 1;
+            YEAR = YEAR - 1;
+            MONTH = null;
+        }
+        if (!this.showYear) {
+            YEAR = null;
+        }
+        return {
+            month: _.isNull(MONTH) ? '' : parts[MONTH],
+            day: _.isNull(DAY) ? '' : parts[DAY],
+            year: _.isNull(YEAR) ? '' : parts[YEAR],
+        };
+    }
     getFieldValue(name) {
         const parts = this.dataValue ? this.dataValue.split('/') : [];
         let val = 0;

package/lib/mjs/components/day/editForm/Day.edit.day.d.ts

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,16 +26,32 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
     placeholder?: undefined;
+} | {
+    weight: number;
+    type: string;
+    label: string;
+    tooltip: string;
+    key: string;
+    input: boolean;
+    wieght?: undefined;
+    datasrc?: undefined;
+    data?: undefined;
+    placeholder?: undefined;
+    onChange?: undefined;
 })[];
 export default _default;

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

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -33,6 +34,21 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Day part of the component.',
         key: 'fields.day.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.day.hide && defaultValueParts.length !== 3) {
+                    const newDefaultValue = ['00'];
+                    if (!data.fields.month.hide) {
+                        data.dayFirst ? newDefaultValue.push(defaultValueParts[0]) : newDefaultValue.unshift(defaultValueParts[0]);
+                    }
+                    if (!data.fields.year.hide) {
+                        newDefaultValue.push(defaultValueParts[1]);
+                    }
+                    _.set(data, 'defaultValue', newDefaultValue.join('/'));
+                }
+            }
+        },
         input: true
     },
     {

package/lib/mjs/components/day/editForm/Day.edit.month.d.ts

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,12 +26,16 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;

package/lib/mjs/components/day/editForm/Day.edit.month.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -33,6 +34,21 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Month part of the component.',
         key: 'fields.month.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.month.hide && defaultValueParts.length !== 3) {
+                    const newDefaultValue = ['00'];
+                    if (!data.fields.day.hide) {
+                        data.dayFirst ? newDefaultValue.unshift(defaultValueParts[0]) : newDefaultValue.push(defaultValueParts[0]);
+                    }
+                    if (!data.fields.year.hide) {
+                        newDefaultValue.push(defaultValueParts[1]);
+                    }
+                    _.set(data, 'defaultValue', newDefaultValue.join('/'));
+                }
+            }
+        },
         input: true
     },
 ];

package/lib/mjs/components/day/editForm/Day.edit.year.d.ts

@@ -14,6 +14,7 @@ declare const _default: ({
     input?: undefined;
     placeholder?: undefined;
     tooltip?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
@@ -25,12 +26,16 @@ declare const _default: ({
     wieght?: undefined;
     datasrc?: undefined;
     data?: undefined;
+    onChange?: undefined;
 } | {
     weight: number;
     type: string;
     label: string;
     tooltip: string;
     key: string;
+    onChange: ({ data }: {
+        data: any;
+    }) => void;
     input: boolean;
     wieght?: undefined;
     datasrc?: undefined;

package/lib/mjs/components/day/editForm/Day.edit.year.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 export default [
     {
         wieght: 200,
@@ -51,6 +52,15 @@ export default [
         label: 'Hidden',
         tooltip: 'Hide the Year part of the component.',
         key: 'fields.year.hide',
+        onChange: ({ data }) => {
+            if (data.defaultValue) {
+                const defaultValueParts = data.defaultValue.split('/');
+                if (!data.fields.month.hide && defaultValueParts.length !== 3) {
+                    defaultValueParts.push('0000');
+                    _.set(data, 'defaultValue', defaultValueParts.join('/'));
+                }
+            }
+        },
         input: true
     },
 ];

package/lib/mjs/components/editgrid/fixtures/index.d.ts

@@ -1,22 +1,22 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-import comp10 from './comp10';
-import comp11 from './comp11';
-import comp12 from './comp12';
-import comp13 from './comp13';
-import comp14 from './comp14';
-import comp15 from './comp15';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
+import comp10 from './comp10';
+import comp11 from './comp11';
+import comp12 from './comp12';
+import comp13 from './comp13';
+import comp14 from './comp14';
+import comp15 from './comp15';
 import comp16 from './comp16';
 import comp17 from './comp17';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

package/lib/mjs/components/editgrid/fixtures/index.js

@@ -19,4 +19,4 @@ import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenE
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

package/lib/mjs/components/html/HTML.js

@@ -5,7 +5,7 @@ export default class HTMLComponent extends Component {
         return Component.schema({
             label: 'HTML',
             type: 'htmlelement',
-            tag: 'p',
+            tag: 'div',
             attrs: [],
             content: '',
             input: false,

package/lib/mjs/components/select/Select.js

@@ -1593,8 +1593,8 @@ export default class SelectComponent extends ListComponent {
         super.detach();
     }
     focus() {
+        super.focus.call(this);
         if (this.focusableElement) {
-            super.focus.call(this);
             this.focusableElement.focus();
         }
     }

package/lib/mjs/components/select/fixtures/comp25.d.ts

@@ -1,44 +1,59 @@
 declare namespace _default {
-    let title: string;
-    let name: string;
-    let path: string;
-    let type: string;
-    let display: string;
     let components: ({
         label: string;
-        widget: string;
         tableView: boolean;
-        data: {
-            values: {
-                label: string;
-                value: string;
-            }[];
-        };
-        dataType: string;
+        modal: boolean;
+        rowDrafts: boolean;
         key: string;
         type: string;
+        displayAsTable: boolean;
         input: boolean;
-        applyMaskOn?: undefined;
-        conditional?: undefined;
+        components: ({
+            label: string;
+            widget: string;
+            tableView: boolean;
+            data: {
+                values: {
+                    label: string;
+                    value: string;
+                }[];
+            };
+            validate: {
+                required: boolean;
+            };
+            key: string;
+            type: string;
+            input: boolean;
+            applyMaskOn?: undefined;
+            validateWhenHidden?: undefined;
+        } | {
+            label: string;
+            applyMaskOn: string;
+            tableView: boolean;
+            validate: {
+                required: boolean;
+            };
+            validateWhenHidden: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            widget?: undefined;
+            data?: undefined;
+        })[];
+        showValidations?: undefined;
+        saveOnEnter?: undefined;
     } | {
         label: string;
-        applyMaskOn: string;
+        showValidations: boolean;
         tableView: boolean;
         key: string;
         type: string;
         input: boolean;
-        conditional: {
-            show: boolean;
-            conjunction: string;
-            conditions: {
-                component: string;
-                operator: string;
-                value: number;
-            }[];
-        };
-        widget?: undefined;
-        data?: undefined;
-        dataType?: undefined;
+        saveOnEnter: boolean;
+        modal?: undefined;
+        rowDrafts?: undefined;
+        displayAsTable?: undefined;
+        components?: undefined;
     })[];
 }
 export default _default;

package/lib/mjs/components/select/fixtures/comp25.js

@@ -1,57 +1,64 @@
 export default {
-    title: 'FIO-8072',
-    name: 'fio8072',
-    path: 'fio8072',
-    type: 'form',
-    display: 'form',
-    components: [
+    "components": [
         {
-            label: 'Select',
-            widget: 'choicesjs',
-            tableView: true,
-            data: {
-                values: [
-                    {
-                        label: 'A',
-                        value: '1',
+            "label": "Edit Grid",
+            "tableView": false,
+            "modal": true,
+            "rowDrafts": true,
+            "key": "editGrid",
+            "type": "editgrid",
+            "displayAsTable": false,
+            "input": true,
+            "components": [
+                {
+                    "label": "Select",
+                    "widget": "choicesjs",
+                    "tableView": true,
+                    "data": {
+                        "values": [
+                            {
+                                "label": "a",
+                                "value": "a"
+                            },
+                            {
+                                "label": "b",
+                                "value": "b"
+                            },
+                            {
+                                "label": "c",
+                                "value": "c"
+                            }
+                        ]
                     },
-                    {
-                        label: 'B',
-                        value: '2',
+                    "validate": {
+                        "required": true
                     },
-                    {
-                        label: 'C',
-                        value: '10',
+                    "key": "select",
+                    "type": "select",
+                    "input": true
+                },
+                {
+                    "label": "Text Field",
+                    "applyMaskOn": "change",
+                    "tableView": true,
+                    "validate": {
+                        "required": true
                     },
-                    {
-                        label: 'D',
-                        value: '1d',
-                    },
-                ],
-            },
-            dataType: 'number',
-            key: 'select',
-            type: 'select',
-            input: true,
+                    "validateWhenHidden": false,
+                    "key": "textField",
+                    "type": "textfield",
+                    "input": true
+                }
+            ]
         },
         {
-            label: 'Text Field',
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true,
-            conditional: {
-                show: true,
-                conjunction: 'all',
-                conditions: [
-                    {
-                        component: 'select',
-                        operator: 'lessThan',
-                        value: 5,
-                    },
-                ],
-            },
-        },
-    ],
+            "label": "Submit",
+            "showValidations": false,
+            "tableView": false,
+            "key": "submit",
+            "type": "button",
+            "input": true,
+            "saveOnEnter": false
+        }
+    ]
 };

package/lib/mjs/components/select/fixtures/comp26.d.ts

@@ -0,0 +1,44 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        widget: string;
+        tableView: boolean;
+        data: {
+            values: {
+                label: string;
+                value: string;
+            }[];
+        };
+        dataType: string;
+        key: string;
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+        conditional?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        conditional: {
+            show: boolean;
+            conjunction: string;
+            conditions: {
+                component: string;
+                operator: string;
+                value: number;
+            }[];
+        };
+        widget?: undefined;
+        data?: undefined;
+        dataType?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/select/fixtures/comp26.js

@@ -0,0 +1,57 @@
+export default {
+    title: 'FIO-8072',
+    name: 'fio8072',
+    path: 'fio8072',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            data: {
+                values: [
+                    {
+                        label: 'A',
+                        value: '1',
+                    },
+                    {
+                        label: 'B',
+                        value: '2',
+                    },
+                    {
+                        label: 'C',
+                        value: '10',
+                    },
+                    {
+                        label: 'D',
+                        value: '1d',
+                    },
+                ],
+            },
+            dataType: 'number',
+            key: 'select',
+            type: 'select',
+            input: true,
+        },
+        {
+            label: 'Text Field',
+            applyMaskOn: 'change',
+            tableView: true,
+            key: 'textField',
+            type: 'textfield',
+            input: true,
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'select',
+                        operator: 'lessThan',
+                        value: 5,
+                    },
+                ],
+            },
+        },
+    ],
+};

package/lib/mjs/components/select/fixtures/index.d.ts

@@ -22,5 +22,6 @@ import comp22 from './comp22';
 import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './comp25';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25 };
+import comp26 from './comp26';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/mjs/components/select/fixtures/index.js

@@ -23,4 +23,5 @@ import comp22 from './comp22';
 import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './comp25';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25 };
+import comp26 from './comp26';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26 };