@formio/js 5.0.0-dev.5798.beb3cc0 → 5.0.0-dev.5799.552d965

package/lib/cjs/components/datetime/fixtures/comp14.d.ts

@@ -0,0 +1,35 @@
+declare namespace _default {
+    let components: {
+        label: string;
+        tableView: boolean;
+        datePicker: {
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+        };
+        enableMinDateInput: boolean;
+        enableMaxDateInput: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        widget: {
+            type: string;
+            displayInTimezone: string;
+            locale: string;
+            useLocaleSettings: boolean;
+            allowInput: boolean;
+            mode: string;
+            enableTime: boolean;
+            noCalendar: boolean;
+            format: string;
+            hourIncrement: number;
+            minuteIncrement: number;
+            time_24hr: boolean;
+            minDate: null;
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+            maxDate: null;
+        };
+    }[];
+}
+export default _default;

package/lib/cjs/components/datetime/fixtures/comp14.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    components: [
+        {
+            "label": "Date / Time",
+            "tableView": false,
+            "datePicker": {
+                "disableWeekends": false,
+                "disableWeekdays": false
+            },
+            "enableMinDateInput": false,
+            "enableMaxDateInput": false,
+            "validateWhenHidden": false,
+            "key": "dateTime",
+            "type": "datetime",
+            "input": true,
+            "widget": {
+                "type": "calendar",
+                "displayInTimezone": "viewer",
+                "locale": "en",
+                "useLocaleSettings": false,
+                "allowInput": true,
+                "mode": "single",
+                "enableTime": true,
+                "noCalendar": false,
+                "format": "yyyy-MM-dd hh:mm a",
+                "hourIncrement": 1,
+                "minuteIncrement": 1,
+                "time_24hr": false,
+                "minDate": null,
+                "disableWeekends": false,
+                "disableWeekdays": false,
+                "maxDate": null
+            }
+        }
+    ]
+};

package/lib/cjs/components/datetime/fixtures/index.d.ts

@@ -1,8 +1,4 @@
 import comp1 from './comp1';
-import comp10 from './comp10';
-import comp11 from './comp11';
-import comp12 from './comp12';
-import comp13 from './comp13';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp5 from './comp5';
@@ -10,4 +6,9 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-export { comp1, comp10, comp11, comp12, comp13, comp2, comp3, comp5, comp6, comp7, comp8, comp9 };
+import comp10 from './comp10';
+import comp11 from './comp11';
+import comp12 from './comp12';
+import comp13 from './comp13';
+import comp14 from './comp14';
+export { comp1, comp2, comp3, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14 };

package/lib/cjs/components/datetime/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp3 = exports.comp2 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp1 = void 0;
+exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -28,3 +28,5 @@ const comp12_1 = __importDefault(require("./comp12"));
 exports.comp12 = comp12_1.default;
 const comp13_1 = __importDefault(require("./comp13"));
 exports.comp13 = comp13_1.default;
+const comp14_1 = __importDefault(require("./comp14"));
+exports.comp14 = comp14_1.default;

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

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

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

@@ -1487,7 +1487,7 @@ class SelectComponent extends ListComponent_1.default {
                 if (Array.isArray(data)) {
                     data.forEach((item) => item[valueProperty] = item[valueProperty].toString());
                 }
-                else {
+                else if (lodash_1.default.isObject(data)) {
                     data[valueProperty] = data[valueProperty].toString();
                 }
                 return data;
@@ -1522,7 +1522,7 @@ class SelectComponent extends ListComponent_1.default {
             };
             value = (this.component.multiple && Array.isArray(value))
                 ? lodash_1.default.filter(items, (item) => value.includes(item.value))
-                : valueProperty
+                : (valueProperty && items)
                     ? (_a = getFromValues()) !== null && _a !== void 0 ? _a : { value, label: value }
                     : value;
         }

package/lib/cjs/components/select/fixtures/comp27.d.ts

@@ -0,0 +1,18 @@
+declare namespace _default {
+    let type: string;
+    let label: string;
+    let widget: string;
+    let tableView: boolean;
+    let dataSrc: string;
+    namespace data {
+        let custom: string;
+    }
+    let dataType: string;
+    let idPath: string;
+    let valueProperty: string;
+    let template: string;
+    let validateWhenHidden: boolean;
+    let key: string;
+    let input: boolean;
+}
+export default _default;

package/lib/cjs/components/select/fixtures/comp27.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    type: 'select',
+    label: 'Select',
+    widget: 'choicesjs',
+    tableView: true,
+    dataSrc: 'custom',
+    data: {
+        custom: 'values = data.dataSource;'
+    },
+    dataType: 'string',
+    idPath: 'name',
+    valueProperty: 'name',
+    template: '<span>{{ item.name }}</span>',
+    validateWhenHidden: false,
+    key: 'select',
+    input: true
+};

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

@@ -23,5 +23,6 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './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 };
+import comp27 from './comp27';
+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, comp27 };
 export { multiSelect, multiSelectOptions } from "./comp3";

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp26 = exports.comp25 = exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
+exports.comp27 = exports.comp26 = exports.comp25 = exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -57,3 +57,5 @@ const comp25_1 = __importDefault(require("./comp25"));
 exports.comp25 = comp25_1.default;
 const comp26_1 = __importDefault(require("./comp26"));
 exports.comp26 = comp26_1.default;
+const comp27_1 = __importDefault(require("./comp27"));
+exports.comp27 = comp27_1.default;

package/lib/cjs/widgets/CalendarWidget.js

@@ -102,14 +102,8 @@ class CalendarWidget extends InputWidget_1.default {
         this.settings.dateFormat = (0, utils_1.convertFormatToFlatpickr)(this.settings.dateFormat);
         this.settings.position = 'auto center';
         this.settings.onChange = () => {
-            if (this.settings.allowInput) {
-                if (this.settings.isManuallyOverriddenValue && this.settings.enableTime) {
-                    this.calendar._input.value = this.settings.manualInputValue;
-                }
-                else {
-                    this.settings.manualInputValue = '';
-                }
-                this.settings.isManuallyOverriddenValue = false;
+            if (this.settings.allowInput && this.settings.enableTime) {
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
             }
             this.emit('update');
         };
@@ -118,8 +112,7 @@ class CalendarWidget extends InputWidget_1.default {
             this.hook('onCalendarClose');
             this.closedOn = Date.now();
             if (this.settings.allowInput && this.settings.enableTime) {
-                this.calendar._input.value = this.settings.manualInputValue || this.calendar._input.value;
-                this.settings.isManuallyOverriddenValue = false;
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
                 this.emit('update');
             }
             if (this.settings.wasDefaultValueChanged) {
@@ -358,9 +351,14 @@ class CalendarWidget extends InputWidget_1.default {
         this.calendar = new Flatpickr(this._input, Object.assign(Object.assign({}, this.settings), { disableMobile: true }));
         this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
+                if (event.target.mask) {
+                    event.target.mask.textMaskInputElement.update();
+                }
                 this.settings.manualInputValue = event.target.value;
+                this._input.value = this.settings.manualInputValue;
                 this.settings.isManuallyOverriddenValue = true;
                 this.settings.currentValue = event.target.value;
+                this.emit('update');
             }
             if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
                 this.settings.wasDefaultValueChanged = true;
@@ -371,6 +369,18 @@ class CalendarWidget extends InputWidget_1.default {
                 this.settings.wasDefaultValueChanged = false;
             }
         });
+        if (this.calendar.daysContainer) {
+            this.calendar.daysContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
+        if (this.calendar.timeContainer) {
+            this.calendar.timeContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !lodash_1.default.some(excludedFromMaskFormats, format => lodash_1.default.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.
@@ -397,6 +407,10 @@ class CalendarWidget extends InputWidget_1.default {
         // Make sure we commit the value after a blur event occurs.
         this.addEventListener(this.calendar._input, 'blur', (event) => {
             var _a, _b, _c, _d;
+            // If we have manually overridden the value then we shouldn't call setDate because this will fill the input mask
+            if (this.settings.isManuallyOverriddenValue) {
+                return;
+            }
             const activeElement = this.settings.shadowRoot ? this.settings.shadowRoot.activeElement : document.activeElement;
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {

package/lib/mjs/components/datetime/fixtures/comp14.d.ts

@@ -0,0 +1,35 @@
+declare namespace _default {
+    let components: {
+        label: string;
+        tableView: boolean;
+        datePicker: {
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+        };
+        enableMinDateInput: boolean;
+        enableMaxDateInput: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        widget: {
+            type: string;
+            displayInTimezone: string;
+            locale: string;
+            useLocaleSettings: boolean;
+            allowInput: boolean;
+            mode: string;
+            enableTime: boolean;
+            noCalendar: boolean;
+            format: string;
+            hourIncrement: number;
+            minuteIncrement: number;
+            time_24hr: boolean;
+            minDate: null;
+            disableWeekends: boolean;
+            disableWeekdays: boolean;
+            maxDate: null;
+        };
+    }[];
+}
+export default _default;

package/lib/mjs/components/datetime/fixtures/comp14.js

@@ -0,0 +1,36 @@
+export default {
+    components: [
+        {
+            "label": "Date / Time",
+            "tableView": false,
+            "datePicker": {
+                "disableWeekends": false,
+                "disableWeekdays": false
+            },
+            "enableMinDateInput": false,
+            "enableMaxDateInput": false,
+            "validateWhenHidden": false,
+            "key": "dateTime",
+            "type": "datetime",
+            "input": true,
+            "widget": {
+                "type": "calendar",
+                "displayInTimezone": "viewer",
+                "locale": "en",
+                "useLocaleSettings": false,
+                "allowInput": true,
+                "mode": "single",
+                "enableTime": true,
+                "noCalendar": false,
+                "format": "yyyy-MM-dd hh:mm a",
+                "hourIncrement": 1,
+                "minuteIncrement": 1,
+                "time_24hr": false,
+                "minDate": null,
+                "disableWeekends": false,
+                "disableWeekdays": false,
+                "maxDate": null
+            }
+        }
+    ]
+};

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

@@ -1,8 +1,4 @@
 import comp1 from './comp1';
-import comp10 from './comp10';
-import comp11 from './comp11';
-import comp12 from './comp12';
-import comp13 from './comp13';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp5 from './comp5';
@@ -10,4 +6,9 @@ import comp6 from './comp6';
 import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
-export { comp1, comp10, comp11, comp12, comp13, comp2, comp3, comp5, comp6, comp7, comp8, comp9 };
+import comp10 from './comp10';
+import comp11 from './comp11';
+import comp12 from './comp12';
+import comp13 from './comp13';
+import comp14 from './comp14';
+export { comp1, comp2, comp3, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14 };

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

@@ -10,4 +10,5 @@ import comp10 from './comp10';
 import comp11 from './comp11';
 import comp12 from './comp12';
 import comp13 from './comp13';
-export { comp1, comp10, comp11, comp12, comp13, comp2, comp3, comp5, comp6, comp7, comp8, comp9 };
+import comp14 from './comp14';
+export { comp1, comp2, comp3, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14 };

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

@@ -1514,7 +1514,7 @@ export default class SelectComponent extends ListComponent {
                 if (Array.isArray(data)) {
                     data.forEach((item) => item[valueProperty] = item[valueProperty].toString());
                 }
-                else {
+                else if (_.isObject(data)) {
                     data[valueProperty] = data[valueProperty].toString();
                 }
                 return data;
@@ -1549,7 +1549,7 @@ export default class SelectComponent extends ListComponent {
             };
             value = (this.component.multiple && Array.isArray(value))
                 ? _.filter(items, (item) => value.includes(item.value))
-                : valueProperty
+                : (valueProperty && items)
                     ? getFromValues() ?? { value, label: value }
                     : value;
         }

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

@@ -0,0 +1,18 @@
+declare namespace _default {
+    let type: string;
+    let label: string;
+    let widget: string;
+    let tableView: boolean;
+    let dataSrc: string;
+    namespace data {
+        let custom: string;
+    }
+    let dataType: string;
+    let idPath: string;
+    let valueProperty: string;
+    let template: string;
+    let validateWhenHidden: boolean;
+    let key: string;
+    let input: boolean;
+}
+export default _default;

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

@@ -0,0 +1,17 @@
+export default {
+    type: 'select',
+    label: 'Select',
+    widget: 'choicesjs',
+    tableView: true,
+    dataSrc: 'custom',
+    data: {
+        custom: 'values = data.dataSource;'
+    },
+    dataType: 'string',
+    idPath: 'name',
+    valueProperty: 'name',
+    template: '<span>{{ item.name }}</span>',
+    validateWhenHidden: false,
+    key: 'select',
+    input: true
+};

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

@@ -23,5 +23,6 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './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 };
+import comp27 from './comp27';
+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, comp27 };
 export { multiSelect, multiSelectOptions } from "./comp3";

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

@@ -24,4 +24,5 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './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 };
+import comp27 from './comp27';
+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, comp27 };

package/lib/mjs/widgets/CalendarWidget.js

@@ -96,14 +96,8 @@ export default class CalendarWidget extends InputWidget {
         this.settings.dateFormat = convertFormatToFlatpickr(this.settings.dateFormat);
         this.settings.position = 'auto center';
         this.settings.onChange = () => {
-            if (this.settings.allowInput) {
-                if (this.settings.isManuallyOverriddenValue && this.settings.enableTime) {
-                    this.calendar._input.value = this.settings.manualInputValue;
-                }
-                else {
-                    this.settings.manualInputValue = '';
-                }
-                this.settings.isManuallyOverriddenValue = false;
+            if (this.settings.allowInput && this.settings.enableTime) {
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
             }
             this.emit('update');
         };
@@ -112,8 +106,7 @@ export default class CalendarWidget extends InputWidget {
             this.hook('onCalendarClose');
             this.closedOn = Date.now();
             if (this.settings.allowInput && this.settings.enableTime) {
-                this.calendar._input.value = this.settings.manualInputValue || this.calendar._input.value;
-                this.settings.isManuallyOverriddenValue = false;
+                this.calendar._input.value = this.settings.isManuallyOverriddenValue ? this.settings.manualInputValue : this.calendar.altInput.value;
                 this.emit('update');
             }
             if (this.settings.wasDefaultValueChanged) {
@@ -349,9 +342,14 @@ export default class CalendarWidget extends InputWidget {
         this.calendar = new Flatpickr(this._input, { ...this.settings, disableMobile: true });
         this.addEventListener(this.calendar.altInput, 'input', (event) => {
             if (this.settings.allowInput && this.settings.currentValue !== event.target.value) {
+                if (event.target.mask) {
+                    event.target.mask.textMaskInputElement.update();
+                }
                 this.settings.manualInputValue = event.target.value;
+                this._input.value = this.settings.manualInputValue;
                 this.settings.isManuallyOverriddenValue = true;
                 this.settings.currentValue = event.target.value;
+                this.emit('update');
             }
             if (event.target.value === '' && this.calendar.selectedDates.length > 0) {
                 this.settings.wasDefaultValueChanged = true;
@@ -362,6 +360,18 @@ export default class CalendarWidget extends InputWidget {
                 this.settings.wasDefaultValueChanged = false;
             }
         });
+        if (this.calendar.daysContainer) {
+            this.calendar.daysContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
+        if (this.calendar.timeContainer) {
+            this.calendar.timeContainer.addEventListener('click', () => {
+                this.settings.isManuallyOverriddenValue = false;
+                this.calendar.updateValue(false);
+            });
+        }
         const excludedFromMaskFormats = ['MMMM'];
         if (!this.settings.readOnly && !_.some(excludedFromMaskFormats, format => _.includes(this.settings.format, format))) {
             // Enforce the input mask of the format.
@@ -387,6 +397,10 @@ export default class CalendarWidget extends InputWidget {
         }
         // Make sure we commit the value after a blur event occurs.
         this.addEventListener(this.calendar._input, 'blur', (event) => {
+            // If we have manually overridden the value then we shouldn't call setDate because this will fill the input mask
+            if (this.settings.isManuallyOverriddenValue) {
+                return;
+            }
             const activeElement = this.settings.shadowRoot ? this.settings.shadowRoot.activeElement : document.activeElement;
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5798.beb3cc0",
+  "version": "5.0.0-dev.5799.552d965",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {