@formio/js 5.0.0-dev.5754.c86e9f5 → 5.0.0-dev.5755.a188b21

package/lib/mjs/components/selectboxes/SelectBoxes.js

@@ -27,15 +27,22 @@ export default class SelectBoxesComponent extends RadioComponent {
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: 'string',
-                    data: {
-                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
-                    },
-                };
+                const isValuesSrc = !classComp.dataSrc || classComp.dataSrc === 'values';
+                return isValuesSrc
+                    ? {
+                        type: 'select',
+                        dataSrc: 'custom',
+                        valueProperty: 'value',
+                        dataType: 'string',
+                        data: {
+                            custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
+                        },
+                    }
+                    : {
+                        ...classComp,
+                        dataType: 'string',
+                        type: 'select',
+                    };
             }
         };
     }

package/lib/mjs/components/signature/editForm/Signature.edit.display.d.ts

@@ -7,7 +7,6 @@ declare const _default: ({
     placeholder: string;
     weight: number;
     conditional?: undefined;
-    customConditional?: undefined;
     ignore?: undefined;
 } | {
     type: string;
@@ -24,7 +23,6 @@ declare const _default: ({
         };
     };
     weight: number;
-    customConditional?: undefined;
     ignore?: undefined;
 } | {
     weight: number;
@@ -32,9 +30,6 @@ declare const _default: ({
     label: string;
     tooltip: string;
     key: string;
-    customConditional: ({ options }: {
-        options: any;
-    }) => boolean;
     input: boolean;
     placeholder?: undefined;
     conditional?: undefined;
@@ -49,6 +44,5 @@ declare const _default: ({
     placeholder?: undefined;
     weight?: undefined;
     conditional?: undefined;
-    customConditional?: undefined;
 })[];
 export default _default;

package/lib/mjs/components/signature/editForm/Signature.edit.display.js

@@ -37,7 +37,6 @@ export default [
         label: 'Keep Overlay Aspect Ratio',
         tooltip: 'If checked, the field will have the same aspect ratio as its preview.',
         key: 'keepOverlayRatio',
-        customConditional: ({ options }) => (options?.editForm?.display === 'pdf'),
         input: true
     },
     {

package/lib/mjs/components/tags/Tags.js

@@ -116,12 +116,12 @@ export default class TagsComponent extends Input {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/lib/mjs/components/time/Time.js

@@ -13,17 +13,6 @@ export default class TimeComponent extends TextFieldComponent {
             dataFormat: defaultDataFormat,
         }, ...extend);
     }
-    static get serverConditionSettings() {
-        return {
-            ...super.serverConditionSettings,
-            valueComponent(classComp) {
-                return {
-                    ...classComp,
-                    type: 'time',
-                };
-            },
-        };
-    }
     constructor(component, options, data) {
         super(component, options, data);
         const { edge: isEdgeBrowser, version: edgeVersion } = getBrowserInfo();

package/lib/mjs/utils/utils.d.ts

@@ -523,4 +523,4 @@ import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;
-export { jsonLogic, ConditionOperators, Evaluator, _ };
+export { jsonLogic, ConditionOperators, moment, Evaluator, _ };

package/lib/mjs/utils/utils.js

@@ -24,8 +24,7 @@ jsonLogic.add_operation('relativeMinDate', (relativeMinDate) => {
 jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
     return moment().add(relativeMaxDate, 'days').toISOString();
 });
-export { jsonLogic, ConditionOperators };
-export * as moment from 'moment-timezone/moment-timezone';
+export { jsonLogic, ConditionOperators, moment };
 /**
  * Sets the path to the component and parent schema.
  * @param {import('@formio/core').Component} component - The component to set the path for.

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.5754.c86e9f5",
+  "version": "5.0.0-dev.5755.a188b21",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -56,9 +56,10 @@
     "dopublish": "npm run build && npm run tag && npm publish",
     "lint": "eslint ./src --fix",
     "serve": "jekyll serve --config _config.yml,_config.dev.yml",
-    "test": "mocha 'src/**/*.unit.js'",
+    "test": "nyc --reporter=lcov --reporter=text --reporter=text-summary mocha test/unit/*.unit.js",
     "test:updateRenders": "npm run lib && TZ=UTC node --require jsdom-global/register test/updateRenders.js",
-    "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run"
+    "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run",
+    "show-coverage": "open coverage/lcov-report/index.html"
   },
   "repository": {
     "type": "git",
@@ -81,7 +82,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.1.0-dev.105.1bff2e6",
+    "@formio/core": "2.1.0-dev.145.4491833",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -155,6 +156,7 @@
     "mocha": "^10.3.0",
     "mock-local-storage": "^1.1.24",
     "natives": "^1.1.6",
+    "nyc": "^17.0.0",
     "power-assert": "^1.6.1",
     "pre-commit": "^1.2.2",
     "pretty": "^2.0.0",
@@ -174,5 +176,19 @@
     "webpack-cli": "^5.1.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-stream": "^7.0.0"
+  },
+  "nyc": {
+    "check-coverage": true,
+    "statements": 64,
+    "branches": 63,
+    "functions": 61,
+    "lines": 64,
+    "include": [
+      "src/**/*.js"
+    ],
+    "exclude": [
+      "src/**/fixtures"
+    ],
+    "all": true
   }
 }

package/lib/cjs/components/_classes/component/fixtures/comp1.d.ts

@@ -1,33 +0,0 @@
-declare namespace _default {
-    export let tags: never[];
-    export let type: string;
-    export namespace conditional {
-        let eq: string;
-        let when: null;
-        let show: string;
-    }
-    export namespace validate {
-        let customPrivate: boolean;
-        let custom: string;
-        let pattern: string;
-        let maxLength: number;
-        let minLength: number;
-        let required: boolean;
-    }
-    export let persistent: boolean;
-    export let unique: boolean;
-    let _protected: boolean;
-    export { _protected as protected };
-    export let defaultValue: string;
-    export let multiple: boolean;
-    export let suffix: string;
-    export let prefix: string;
-    export let placeholder: string;
-    export let key: string;
-    export let label: string;
-    export let inputMask: string;
-    export let inputType: string;
-    export let tableView: boolean;
-    export let input: boolean;
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp1.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    'tags': [],
-    'type': 'textfield',
-    'conditional': {
-        'eq': '',
-        'when': null,
-        'show': ''
-    },
-    'validate': {
-        'customPrivate': false,
-        'custom': '',
-        'pattern': '',
-        'maxLength': 0,
-        'minLength': 0,
-        'required': false
-    },
-    'persistent': true,
-    'unique': false,
-    'protected': false,
-    'defaultValue': '',
-    'multiple': false,
-    'suffix': '',
-    'prefix': '',
-    'placeholder': '',
-    'key': 'firstName',
-    'label': 'First Name',
-    'inputMask': '',
-    'inputType': 'text',
-    'tableView': true,
-    'input': true
-};

package/lib/cjs/components/_classes/component/fixtures/comp2.d.ts

@@ -1,33 +0,0 @@
-declare namespace _default {
-    export let tags: never[];
-    export let type: string;
-    export namespace conditional {
-        let eq: string;
-        let when: null;
-        let show: string;
-    }
-    export namespace validate {
-        let customPrivate: boolean;
-        let custom: string;
-        let pattern: string;
-        let maxLength: number;
-        let minLength: number;
-        let required: boolean;
-    }
-    export let persistent: boolean;
-    export let unique: boolean;
-    let _protected: boolean;
-    export { _protected as protected };
-    export let defaultValue: string;
-    export let multiple: boolean;
-    export let suffix: string;
-    export let prefix: string;
-    export let placeholder: string;
-    export let key: string;
-    export let label: string;
-    export let inputMask: string;
-    export let inputType: string;
-    export let tableView: boolean;
-    export let input: boolean;
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp2.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    'tags': [],
-    'type': 'textfield',
-    'conditional': {
-        'eq': '',
-        'when': null,
-        'show': ''
-    },
-    'validate': {
-        'customPrivate': false,
-        'custom': '',
-        'pattern': '',
-        'maxLength': 0,
-        'minLength': 0,
-        'required': false
-    },
-    'persistent': true,
-    'unique': false,
-    'protected': false,
-    'defaultValue': '',
-    'multiple': true,
-    'suffix': '',
-    'prefix': '',
-    'placeholder': '',
-    'key': 'names',
-    'label': 'Names',
-    'inputMask': '',
-    'inputType': 'text',
-    'tableView': true,
-    'input': true
-};

package/lib/cjs/components/_classes/component/fixtures/comp3.d.ts

@@ -1,14 +0,0 @@
-declare namespace _default {
-    let label: string;
-    let tableView: boolean;
-    let modalEdit: boolean;
-    let multiple: boolean;
-    namespace validate {
-        let multiple_1: boolean;
-        export { multiple_1 as multiple };
-    }
-    let key: string;
-    let type: string;
-    let input: boolean;
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp3.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    label: 'Text Field',
-    tableView: true,
-    modalEdit: true,
-    multiple: true,
-    validate: {
-        multiple: true
-    },
-    key: 'textField',
-    type: 'textfield',
-    input: true
-};

package/lib/cjs/components/_classes/component/fixtures/comp4.d.ts

@@ -1,17 +0,0 @@
-declare namespace _default {
-    let _id: string;
-    let label: string;
-    let tableView: boolean;
-    let modalEdit: boolean;
-    namespace validate {
-        let required: boolean;
-    }
-    let key: string;
-    let type: string;
-    let input: boolean;
-    let title: string;
-    let display: string;
-    let name: string;
-    let path: string;
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp4.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    _id: '611389eae1215a4dadc1099d',
-    label: 'Text Field',
-    tableView: true,
-    modalEdit: true,
-    validate: {
-        required: true
-    },
-    key: 'textField',
-    type: 'textfield',
-    input: true,
-    title: 'FIO-3631',
-    display: 'form',
-    name: 'fio3631',
-    path: 'fio3631',
-};

package/lib/cjs/components/_classes/component/fixtures/comp5.d.ts

@@ -1,26 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        description: string;
-        tooltip: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        disableOnInvalid?: undefined;
-    } | {
-        type: string;
-        label: string;
-        key: string;
-        disableOnInvalid: boolean;
-        input: boolean;
-        tableView: boolean;
-        description?: undefined;
-        tooltip?: undefined;
-        applyMaskOn?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp5.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Text Field',
-            description: "<img <img src='https://somesite' onerror='var _ee = 2' >",
-            tooltip: "<img src='https://somesite' onerror='var _ee = 1 >",
-            applyMaskOn: 'change',
-            tableView: true,
-            key: 'textField',
-            type: 'textfield',
-            input: true
-        },
-        {
-            type: 'button',
-            label: 'Submit',
-            key: 'submit',
-            disableOnInvalid: true,
-            input: true,
-            tableView: false
-        }
-    ],
-};

package/lib/cjs/components/_classes/component/fixtures/comp6.d.ts

@@ -1,77 +0,0 @@
-declare namespace _default {
-    let components: ({
-        label: string;
-        applyMaskOn: string;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        defaultValue: string;
-        mask?: undefined;
-        delimiter?: undefined;
-        requireDecimal?: undefined;
-        inputFormat?: undefined;
-        truncateMultipleSpaces?: undefined;
-        widget?: undefined;
-        data?: undefined;
-        action?: undefined;
-        showValidations?: undefined;
-    } | {
-        label: string;
-        applyMaskOn: string;
-        mask: boolean;
-        tableView: boolean;
-        delimiter: boolean;
-        requireDecimal: boolean;
-        inputFormat: string;
-        truncateMultipleSpaces: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        defaultValue: number;
-        widget?: undefined;
-        data?: undefined;
-        action?: undefined;
-        showValidations?: undefined;
-    } | {
-        label: string;
-        widget: string;
-        tableView: boolean;
-        data: {
-            values: {
-                label: string;
-                value: string;
-            }[];
-        };
-        key: string;
-        type: string;
-        input: boolean;
-        defaultValue: string;
-        applyMaskOn?: undefined;
-        mask?: undefined;
-        delimiter?: undefined;
-        requireDecimal?: undefined;
-        inputFormat?: undefined;
-        truncateMultipleSpaces?: undefined;
-        action?: undefined;
-        showValidations?: undefined;
-    } | {
-        label: string;
-        action: string;
-        showValidations: boolean;
-        tableView: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        applyMaskOn?: undefined;
-        defaultValue?: undefined;
-        mask?: undefined;
-        delimiter?: undefined;
-        requireDecimal?: undefined;
-        inputFormat?: undefined;
-        truncateMultipleSpaces?: undefined;
-        widget?: undefined;
-        data?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/_classes/component/fixtures/comp6.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    "components": [
-        {
-            "label": "Text Field",
-            "applyMaskOn": "change",
-            "tableView": true,
-            "key": "textField",
-            "type": "textfield",
-            "input": true,
-            "defaultValue": "test"
-        },
-        {
-            "label": "Number",
-            "applyMaskOn": "change",
-            "mask": false,
-            "tableView": false,
-            "delimiter": false,
-            "requireDecimal": false,
-            "inputFormat": "plain",
-            "truncateMultipleSpaces": false,
-            "key": "number",
-            "type": "number",
-            "input": true,
-            "defaultValue": 123
-        },
-        {
-            "label": "Select",
-            "widget": "choicesjs",
-            "tableView": true,
-            "data": {
-                "values": [
-                    {
-                        "label": "a",
-                        "value": "a"
-                    },
-                    {
-                        "label": "b",
-                        "value": "b"
-                    }
-                ]
-            },
-            "key": "select",
-            "type": "select",
-            "input": true,
-            "defaultValue": "a"
-        },
-        {
-            "label": "Reset",
-            "action": "reset",
-            "showValidations": false,
-            "tableView": false,
-            "key": "reset",
-            "type": "button",
-            "input": true
-        },
-    ]
-};