@formio/js 5.0.0-dev.5673.3d062b9 → 5.0.0-dev.5673.ae99c16

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Formio_1 = require("../../Formio");
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
-const Input_1 = __importDefault(require("../_classes/input/Input"));
 const Form_1 = __importDefault(require("../../Form"));
 const utils_1 = require("../../utils/utils");
 const ChoicesWrapper_1 = __importDefault(require("../../utils/ChoicesWrapper"));
@@ -63,6 +62,7 @@ class SelectComponent extends ListComponent_1.default {
         return SelectComponent.conditionOperatorsSettings;
     }
     static get conditionOperatorsSettings() {
+        const numberType = () => ({ type: 'number' });
         return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { valueComponent(classComp) {
                 const valueComp = Object.assign(Object.assign({}, classComp), { type: 'select' });
                 if ((0, utils_1.isSelectResourceWithObjectValue)(classComp)) {
@@ -77,6 +77,15 @@ class SelectComponent extends ListComponent_1.default {
           `;
                 }
                 return valueComp;
+            }, dataTypeOperators: {
+                number: ['lessThan', 'greaterThan', 'lessThanOrEqual', 'greaterThanOrEqual'],
+            }, dataTypeValueComponents: {
+                number: {
+                    lessThan: numberType,
+                    greaterThan: numberType,
+                    lessThanOrEqual: numberType,
+                    greaterThanOrEqual: numberType,
+                },
             } });
     }
     static savedValueTypes(schema) {
@@ -527,13 +536,13 @@ class SelectComponent extends ListComponent_1.default {
             skip,
         };
         // Allow for url interpolation.
-        url = this.interpolate(url, {
+        url = this.sanitize(this.interpolate(url, {
             formioBase: Formio_1.Formio.getBaseUrl(),
             search,
             limit,
             skip,
             page: Math.abs(Math.floor(skip / limit))
-        });
+        }), this.shouldSanitizeValue);
         // Add search capability.
         if (this.component.searchField && search) {
             const searchValue = Array.isArray(search)
@@ -834,7 +843,7 @@ class SelectComponent extends ListComponent_1.default {
                 this.choices.containerOuter.element.setAttribute('tabIndex', '-1');
                 this.addEventListener(this.choices.containerOuter.element, 'focus', () => this.focusableElement.focus());
             }
-            Input_1.default.prototype.addFocusBlurEvents.call(this, this.focusableElement);
+            this.addFocusBlurEvents(this.choices.input.element);
             if (this.itemsFromUrl && !this.component.noRefreshOnScroll) {
                 this.scrollList = this.choices.choiceList.element;
                 this.addEventListener(this.scrollList, 'scroll', () => this.onScroll());
@@ -1558,8 +1567,8 @@ class SelectComponent extends ListComponent_1.default {
         super.detach();
     }
     focus() {
+        super.focus.call(this);
         if (this.focusableElement) {
-            super.focus.call(this);
             this.focusableElement.focus();
         }
     }

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

@@ -0,0 +1,59 @@
+declare namespace _default {
+    let components: ({
+        label: string;
+        tableView: boolean;
+        modal: boolean;
+        rowDrafts: boolean;
+        key: string;
+        type: string;
+        displayAsTable: boolean;
+        input: boolean;
+        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;
+        showValidations: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        saveOnEnter: boolean;
+        modal?: undefined;
+        rowDrafts?: undefined;
+        displayAsTable?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    "components": [
+        {
+            "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"
+                            }
+                        ]
+                    },
+                    "validate": {
+                        "required": true
+                    },
+                    "key": "select",
+                    "type": "select",
+                    "input": true
+                },
+                {
+                    "label": "Text Field",
+                    "applyMaskOn": "change",
+                    "tableView": true,
+                    "validate": {
+                        "required": true
+                    },
+                    "validateWhenHidden": false,
+                    "key": "textField",
+                    "type": "textfield",
+                    "input": true
+                }
+            ]
+        },
+        {
+            "label": "Submit",
+            "showValidations": false,
+            "tableView": false,
+            "key": "submit",
+            "type": "button",
+            "input": true,
+            "saveOnEnter": false
+        }
+    ]
+};

package/lib/cjs/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/cjs/components/select/fixtures/comp26.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.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/cjs/components/select/fixtures/index.d.ts

@@ -21,5 +21,7 @@ import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
 import comp24 from './comp24';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, 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 };
 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.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.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"));
@@ -53,3 +53,7 @@ const comp23_1 = __importDefault(require("./comp23"));
 exports.comp23 = comp23_1.default;
 const comp24_1 = __importDefault(require("./comp24"));
 exports.comp24 = comp24_1.default;
+const comp25_1 = __importDefault(require("./comp25"));
+exports.comp25 = comp25_1.default;
+const comp26_1 = __importDefault(require("./comp26"));
+exports.comp26 = comp26_1.default;

package/lib/cjs/components/selectboxes/SelectBoxes.d.ts

@@ -1,26 +1,4 @@
 export default class SelectBoxesComponent extends RadioComponent {
-    static get serverConditionSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
-    static get conditionOperatorsSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
     static savedValueTypes(schema: any): string[];
     constructor(...args: any[]);
     get emptyValue(): any;

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

@@ -30,15 +30,18 @@ class SelectBoxesComponent extends Radio_1.default {
     }
     static get conditionOperatorsSettings() {
         return Object.assign(Object.assign({}, 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) : []}`
+                        },
+                    }
+                    : Object.assign(Object.assign({}, classComp), { dataType: 'string', type: 'select' });
             } });
     }
     static savedValueTypes(schema) {

package/lib/cjs/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/cjs/components/signature/editForm/Signature.edit.display.js

@@ -39,7 +39,6 @@ exports.default = [
         label: 'Keep Overlay Aspect Ratio',
         tooltip: 'If checked, the field will have the same aspect ratio as its preview.',
         key: 'keepOverlayRatio',
-        customConditional: ({ options }) => { var _a; return (((_a = options === null || options === void 0 ? void 0 : options.editForm) === null || _a === void 0 ? void 0 : _a.display) === 'pdf'); },
         input: true
     },
     {

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

@@ -118,12 +118,12 @@ class TagsComponent extends Input_1.default {
     }
     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/cjs/components/time/Time.d.ts

@@ -1,12 +1,12 @@
 export default class TimeComponent extends TextFieldComponent {
-    rawData: string | never[];
+    rawData: any;
     get dataFormat(): any;
     get skipMaskValidation(): boolean;
     isNotCompleteInput(value: any): any;
     removeValue(index: any): void;
     resetRawData(index: any): void;
     setRawValue(value: any, index: any): void;
-    getRawValue(index: any): string | never[];
+    getRawValue(index: any): any;
     getValueAt(index: any): any;
     setValueAt(index: any, value: any): void;
     getStringAsValue(view: any): any;

package/lib/cjs/components/time/Time.form.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 });
-const Component_form_1 = __importDefault(require("../_classes/component/Component.form"));
+const Components_1 = __importDefault(require("../Components"));
 const Time_edit_data_1 = __importDefault(require("./editForm/Time.edit.data"));
 const Time_edit_display_1 = __importDefault(require("./editForm/Time.edit.display"));
 /**
@@ -12,7 +12,7 @@ const Time_edit_display_1 = __importDefault(require("./editForm/Time.edit.displa
  * @returns {import('@formio/core').Component[]} - The edit form components.
  */
 function default_1(...extend) {
-    return (0, Component_form_1.default)([
+    return Components_1.default.baseEditForm([
         {
             key: 'data',
             components: Time_edit_data_1.default,

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

@@ -18,11 +18,6 @@ class TimeComponent extends TextField_1.default {
             dataFormat: defaultDataFormat,
         }, ...extend);
     }
-    static get serverConditionSettings() {
-        return Object.assign(Object.assign({}, super.serverConditionSettings), { valueComponent(classComp) {
-                return Object.assign(Object.assign({}, classComp), { type: 'time' });
-            } });
-    }
     constructor(component, options, data) {
         super(component, options, data);
         const { edge: isEdgeBrowser, version: edgeVersion } = (0, utils_1.getBrowserInfo)();
@@ -30,7 +25,8 @@ class TimeComponent extends TextField_1.default {
         this.component.inputType = isEdgeBrowser && edgeVersion <= 18
             ? 'text'
             : (this.component.inputType || 'time');
-        this.rawData = this.component.multiple ? [] : this.emptyValue;
+        // If default value is given then the raw data needs to be set
+        this.rawData = this.component.multiple ? [] : this.getValueAsString(this.defaultValue) || this.emptyValue;
     }
     static get builderInfo() {
         return {
@@ -61,7 +57,7 @@ class TimeComponent extends TextField_1.default {
         return value;
     }
     get validationValue() {
-        if (Array.isArray(this.rawData) && !this.rawData.length || !this.rawData) {
+        if ((Array.isArray(this.rawData) && !this.rawData.length) || !this.rawData) {
             return this.dataValue;
         }
         return this.rawData;

package/lib/cjs/components/time/fixtures/comp4.d.ts

@@ -0,0 +1,166 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let components: {
+        title: string;
+        breadcrumbClickable: boolean;
+        buttonSettings: {
+            previous: boolean;
+            cancel: boolean;
+            next: boolean;
+        };
+        navigateOnEnter: boolean;
+        saveOnEnter: boolean;
+        scrollToTop: boolean;
+        collapsible: boolean;
+        key: string;
+        type: string;
+        label: string;
+        components: {
+            label: string;
+            disabled: boolean;
+            alwaysEnabled: boolean;
+            tableView: boolean;
+            defaultValue: string;
+            key: string;
+            type: string;
+            input: boolean;
+            inputMask: string;
+            hideOnChildrenHidden: boolean;
+            id: string;
+            placeholder: string;
+            prefix: string;
+            customClass: string;
+            suffix: string;
+            multiple: boolean;
+            protected: boolean;
+            unique: boolean;
+            persistent: boolean;
+            hidden: boolean;
+            clearOnHide: boolean;
+            refreshOn: string;
+            redrawOn: string;
+            modalEdit: boolean;
+            dataGridLabel: boolean;
+            labelPosition: string;
+            description: string;
+            errorLabel: string;
+            tooltip: string;
+            hideLabel: boolean;
+            tabindex: string;
+            autofocus: boolean;
+            dbIndex: boolean;
+            customDefaultValue: string;
+            calculateValue: string;
+            calculateServer: boolean;
+            widget: {
+                type: string;
+            };
+            attributes: {};
+            validateOn: string;
+            validate: {
+                required: boolean;
+                custom: string;
+                customPrivate: boolean;
+                strictDateValidation: boolean;
+                multiple: boolean;
+                unique: boolean;
+                minLength: string;
+                maxLength: string;
+                pattern: string;
+            };
+            conditional: {
+                show: null;
+                when: null;
+                eq: string;
+            };
+            overlay: {
+                style: string;
+                left: string;
+                top: string;
+                width: string;
+                height: string;
+            };
+            allowCalculateOverride: boolean;
+            encrypted: boolean;
+            showCharCount: boolean;
+            showWordCount: boolean;
+            properties: {};
+            allowMultipleMasks: boolean;
+            addons: never[];
+            mask: boolean;
+            inputType: string;
+            inputFormat: string;
+            displayMask: string;
+            spellcheck: boolean;
+            truncateMultipleSpaces: boolean;
+            format: string;
+            dataFormat: string;
+        }[];
+        input: boolean;
+        tableView: boolean;
+        id: string;
+        placeholder: string;
+        prefix: string;
+        customClass: string;
+        suffix: string;
+        multiple: boolean;
+        defaultValue: null;
+        protected: boolean;
+        unique: boolean;
+        persistent: boolean;
+        hidden: boolean;
+        clearOnHide: boolean;
+        refreshOn: string;
+        redrawOn: string;
+        modalEdit: boolean;
+        dataGridLabel: boolean;
+        labelPosition: string;
+        description: string;
+        errorLabel: string;
+        tooltip: string;
+        hideLabel: boolean;
+        tabindex: string;
+        disabled: boolean;
+        autofocus: boolean;
+        dbIndex: boolean;
+        customDefaultValue: string;
+        calculateValue: string;
+        calculateServer: boolean;
+        widget: null;
+        attributes: {};
+        validateOn: string;
+        validate: {
+            required: boolean;
+            custom: string;
+            customPrivate: boolean;
+            strictDateValidation: boolean;
+            multiple: boolean;
+            unique: boolean;
+        };
+        conditional: {
+            show: null;
+            when: null;
+            eq: string;
+        };
+        overlay: {
+            style: string;
+            left: string;
+            top: string;
+            width: string;
+            height: string;
+        };
+        allowCalculateOverride: boolean;
+        encrypted: boolean;
+        showCharCount: boolean;
+        showWordCount: boolean;
+        properties: {};
+        allowMultipleMasks: boolean;
+        addons: never[];
+        tree: boolean;
+        lazyLoad: boolean;
+        theme: string;
+        breadcrumb: string;
+    }[];
+}
+export default _default;