@formio/js 5.1.0-dev.6040.debc859 → 5.1.0-dev.6042.603237d

package/lib/mjs/components/hidden/editForm/Hidden.edit.display.js

@@ -3,6 +3,14 @@ export default [
         key: 'labelPosition',
         ignore: true
     },
+    {
+        key: 'labelWidth',
+        ignore: true
+    },
+    {
+        key: 'labelMargin',
+        ignore: true
+    },
     {
         key: 'placeholder',
         ignore: true

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

@@ -53,8 +53,7 @@ export default class HTMLComponent extends Component {
         super.checkRefreshOn(changed);
         let visible;
         if (this.hasCondition()) {
-            this._conditionallyHidden = this.checkConditionallyHidden();
-            visible = !this.conditionallyHidden;
+            visible = !this.conditionallyHidden();
         }
         else {
             visible = !this.component.hidden;

package/lib/mjs/components/html/editForm/HTML.edit.display.js

@@ -3,6 +3,14 @@ export default [
         key: 'labelPosition',
         ignore: true
     },
+    {
+        key: 'labelWidth',
+        ignore: true
+    },
+    {
+        key: 'labelMargin',
+        ignore: true
+    },
     {
         key: 'placeholder',
         ignore: true

package/lib/mjs/components/number/Number.js

@@ -2,7 +2,7 @@ import { createNumberMask } from '@formio/text-mask-addons';
 import { conformToMask, maskInput } from '@formio/vanilla-text-mask';
 import _ from 'lodash';
 import Input from '../_classes/input/Input';
-import { getNumberSeparators, getNumberDecimalLimit, componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { getNumberSeparators, getNumberDecimalLimit, componentValueTypes, getComponentSavedTypes } from '../../utils/';
 export default class NumberComponent extends Input {
     static schema(...extend) {
         return Input.schema({

package/lib/mjs/components/number/editForm/Number.edit.display.js

@@ -11,6 +11,18 @@ export default [
         key: 'allowMultipleMasks',
         ignore: true
     },
+    {
+        key: 'inputMasks',
+        ignore: true
+    },
+    {
+        key: 'widget.type',
+        ignore: true
+    },
+    {
+        key: 'widget',
+        ignore: true
+    },
     {
         key: 'showWordCount',
         ignore: true,

package/lib/mjs/components/panel/Panel.js

@@ -1,5 +1,5 @@
 import NestedComponent from '../_classes/nested/NestedComponent';
-import { isChildOf } from '../../utils/utils';
+import { isChildOf } from '../../utils';
 export default class PanelComponent extends NestedComponent {
     static schema(...extend) {
         return NestedComponent.schema({

package/lib/mjs/components/password/editForm/Password.edit.display.js

@@ -10,5 +10,17 @@ export default [
     {
         key: 'allowMultipleMasks',
         ignore: true
-    }
+    },
+    {
+        key: 'inputMasks',
+        ignore: true
+    },
+    {
+        key: 'widget.type',
+        ignore: true
+    },
+    {
+        key: 'widget',
+        ignore: true
+    },
 ];

package/lib/mjs/components/phonenumber/PhoneNumber.form.js

@@ -17,7 +17,15 @@ export default function (...extend) {
                 {
                     key: 'showCharCount',
                     ignore: true
-                }
+                },
+                {
+                    key: 'widget.type',
+                    ignore: true
+                },
+                {
+                    key: 'widget',
+                    ignore: true
+                },
             ]
         },
         {

package/lib/mjs/components/radio/Radio.d.ts

@@ -28,6 +28,7 @@ export default class RadioComponent extends ListComponent {
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
     beforeSubmit(): Promise<any>;
+    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -41,5 +42,12 @@ export default class RadioComponent extends ListComponent {
     setSelectedClasses(): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
+    /**
+     * Normalize values coming into updateValue. For example, depending on the configuration, string value `"true"` will be normalized to boolean `true`.
+     * @param {*} value - The value to normalize
+     * @returns {*} - Returns the normalized value
+     */
+    convertByDataType(value: any): any;
+    normalizeValue(value: any): any;
 }
 import ListComponent from '../_classes/list/ListComponent';

package/lib/mjs/components/radio/Radio.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import ListComponent from '../_classes/list/ListComponent';
 import { Formio } from '../../Formio';
-import { boolValue, componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { boolValue, componentValueTypes, getComponentSavedTypes } from '../../utils';
 export default class RadioComponent extends ListComponent {
     static schema(...extend) {
         return ListComponent.schema({
@@ -153,6 +153,12 @@ export default class RadioComponent extends ListComponent {
             this.dataReady.then(() => res(true));
         });
     }
+    convertValues(values) {
+        if (this.options.renderMode === 'html' && this.type === 'radio') {
+            return values.map(x => ({ ...x, value: this.convertByDataType(x.value) }));
+        }
+        return values;
+    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -160,7 +166,7 @@ export default class RadioComponent extends ListComponent {
         return super.render(this.renderTemplate('radio', {
             input: this.inputInfo,
             inline: this.component.inline,
-            values: this.component.dataSrc === 'values' ? this.component.values : this.loadedOptions,
+            values: this.component.dataSrc === 'values' ? this.convertValues(this.component.values) : this.loadedOptions,
             value: this.dataValue,
             row: this.row,
         }));
@@ -365,7 +371,7 @@ export default class RadioComponent extends ListComponent {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
+                const checked = (value === undefined || value === null) ? false : (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);
@@ -406,7 +412,7 @@ export default class RadioComponent extends ListComponent {
      * @param {*} value - The value to normalize
      * @returns {*} - Returns the normalized value
      */
-    normalizeValue(value) {
+    convertByDataType(value) {
         const dataType = this.component.dataType || 'auto';
         if (value === this.emptyValue) {
             return value;
@@ -438,13 +444,17 @@ export default class RadioComponent extends ListComponent {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        if (this.isSelectURL && this.templateData && this.templateData[value]) {
+        return value;
+    }
+    normalizeValue(value) {
+        const valueConverted = this.convertByDataType(value);
+        if (this.isSelectURL && this.templateData && this.templateData[valueConverted]) {
             const submission = this.root.submission;
             if (!submission.metadata.selectData) {
                 submission.metadata.selectData = {};
             }
-            _.set(submission.metadata.selectData, this.path, this.templateData[value]);
+            _.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
         }
-        return super.normalizeValue(value);
+        return super.normalizeValue(valueConverted);
     }
 }

package/lib/mjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -1,4 +1,4 @@
-import { getContextButtons } from '../../../utils/utils';
+import { getContextButtons } from '../../../utils';
 export default [
     {
         key: 'recaptchaInfo',

package/lib/mjs/components/select/Select.d.ts

@@ -89,6 +89,7 @@ export default class SelectComponent extends ListComponent {
     disableInfiniteScroll(): void;
     set serverCount(value: any);
     get serverCount(): any;
+    shouldResetChoicesItems(items: any): boolean;
     setItems(items: any, fromSearch: any): void;
     selectItems: any;
     set downloadedResources(value: any);

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

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { Formio } from '../../Formio';
 import ListComponent from '../_classes/list/ListComponent';
 import Form from '../../Form';
-import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, isSelectResourceWithObjectValue, removeHTML } from '../../utils/utils';
+import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, isSelectResourceWithObjectValue, removeHTML } from '../../utils';
 import Choices from '../../utils/ChoicesWrapper';
 export default class SelectComponent extends ListComponent {
     static schema(...extend) {
@@ -359,6 +359,18 @@ export default class SelectComponent extends ListComponent {
         this.downloadedResources.serverCount = this.downloadedResources.length;
         this.serverCount = this.downloadedResources.length;
     }
+    shouldResetChoicesItems(items) {
+        if (this.choices._store.choices.length !== items.length) {
+            return true;
+        }
+        for (let item of items) {
+            const choicesItem = this.choices._store.choices.find((i) => i.label === item.label);
+            if (!choicesItem) {
+                return true;
+            }
+        }
+        return false;
+    }
     /* eslint-disable max-statements */
     setItems(items, fromSearch) {
         this.selectItems = items;
@@ -444,7 +456,7 @@ export default class SelectComponent extends ListComponent {
             this.addOption(itemValueAndLabel.value, itemValueAndLabel.label, {}, _.get(item, this.component.idPath, String(index)));
         });
         if (this.choices) {
-            this.choices.setChoices(this.selectOptions, 'value', 'label', true);
+            this.choices.setChoices(this.selectOptions, 'value', 'label', true, true, !fromSearch && this.shouldResetChoicesItems(this.selectOptions));
         }
         else if (this.loading) {
             // Re-attach select input.
@@ -935,8 +947,9 @@ export default class SelectComponent extends ListComponent {
             });
         }
         // Add value options.
+        const value = this.undoValueTyping(this.dataValue);
         this.addValueOptions();
-        this.setChoicesValue(this.dataValue);
+        this.setChoicesValue(value);
         if (this.isSelectResource && this.refs.addResource) {
             this.addEventListener(this.refs.addResource, 'click', (event) => {
                 event.preventDefault();
@@ -1248,7 +1261,7 @@ export default class SelectComponent extends ListComponent {
             }
             _.set(submission.metadata.selectData, this.path, templateData);
         }
-        if (flags.resetValue && this.root?.submission && !this.options.readOnly) {
+        if (flags.resetValue && !flags.fromSubmission && this.root?.submission && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};
@@ -1312,6 +1325,9 @@ export default class SelectComponent extends ListComponent {
             this.lazyLoadInit = true;
             const searchProperty = this.component.searchField || this.component.valueProperty;
             this.triggerUpdate(_.get(value.data || value, searchProperty, value), true);
+            this.itemsLoaded.then(() => {
+                this.setChoicesValue(value, hasPreviousValue, flags);
+            });
             return changed;
         }
         // Add the value options.
@@ -1487,7 +1503,7 @@ export default class SelectComponent extends ListComponent {
     }
     asString(value, options = {}) {
         value = value ?? this.getValue();
-        if (options.modalPreview || this.inDataTable) {
+        if (options.modalPreview || this.inDataTable || options.email) {
             if (this.inDataTable) {
                 value = this.undoValueTyping(value);
             }

package/lib/mjs/components/select/editForm/Select.edit.data.d.ts

@@ -9,99 +9,15 @@ declare const _default: ({
         custom?: undefined;
     };
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
-    conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
-    reorder?: undefined;
-    components?: undefined;
-    dataSrc?: undefined;
-    authenticate?: undefined;
-    template?: undefined;
-    valueProperty?: undefined;
-    clearOnHide?: undefined;
-    lazyLoad?: undefined;
-    skipMerge?: undefined;
-    refreshOn?: undefined;
-    onSetItems?: undefined;
-    onChange?: undefined;
-    placeholder?: undefined;
-    validate?: undefined;
-    delimiter?: undefined;
-    requireDecimal?: undefined;
-    encrypted?: undefined;
-    rows?: undefined;
-    mask?: undefined;
-    tableView?: undefined;
-    alwaysEnabled?: undefined;
-} | {
-    type: string;
-    weight: number;
-    input: boolean;
-    key: string;
-    label: string;
-    tooltip: string;
-    conditional: {
-        json: {
-            '===': (string | {
-                var: string;
-            })[];
-            and?: undefined;
-            in?: undefined;
-        };
-    };
-    data?: undefined;
-    as?: undefined;
-    editor?: undefined;
+    conditional?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
-    reorder?: undefined;
-    components?: undefined;
-    dataSrc?: undefined;
-    authenticate?: undefined;
-    template?: undefined;
-    valueProperty?: undefined;
-    clearOnHide?: undefined;
-    lazyLoad?: undefined;
-    skipMerge?: undefined;
-    refreshOn?: undefined;
-    onSetItems?: undefined;
-    onChange?: undefined;
-    placeholder?: undefined;
-    validate?: undefined;
-    delimiter?: undefined;
-    requireDecimal?: undefined;
-    encrypted?: undefined;
-    rows?: undefined;
-    mask?: undefined;
-    tableView?: undefined;
-    alwaysEnabled?: undefined;
-} | {
-    type: string;
-    as: string;
-    editor: string;
-    weight: number;
-    input: boolean;
-    key: string;
-    label: string;
-    tooltip: string;
-    defaultValue: {};
-    conditional: {
-        json: {
-            '===': (string | {
-                var: string;
-            })[];
-            and?: undefined;
-            in?: undefined;
-        };
-    };
-    data?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -172,6 +88,7 @@ declare const _default: ({
     key: string;
     tooltip: string;
     weight: number;
+    defaultValue: boolean;
     conditional: {
         json: {
             and: ({
@@ -192,7 +109,6 @@ declare const _default: ({
     data?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
     reorder?: undefined;
     components?: undefined;
@@ -303,8 +219,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     skipMerge?: undefined;
@@ -411,8 +327,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -443,11 +359,11 @@ declare const _default: ({
         url?: undefined;
         custom?: undefined;
     };
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -475,11 +391,52 @@ declare const _default: ({
     placeholder: string;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
+    description?: undefined;
+    conditional?: undefined;
     defaultValue?: undefined;
+    reorder?: undefined;
+    components?: undefined;
+    dataSrc?: undefined;
+    authenticate?: undefined;
+    template?: undefined;
+    valueProperty?: undefined;
+    clearOnHide?: undefined;
+    lazyLoad?: undefined;
+    skipMerge?: undefined;
+    refreshOn?: undefined;
+    onSetItems?: undefined;
+    onChange?: undefined;
+    validate?: undefined;
+    delimiter?: undefined;
+    requireDecimal?: undefined;
+    encrypted?: undefined;
+    rows?: undefined;
+    mask?: undefined;
+    tableView?: undefined;
+    alwaysEnabled?: undefined;
+} | {
+    type: string;
+    input: boolean;
+    key: string;
+    label: string;
+    tooltip: string;
+    weight: number;
+    conditional: {
+        json: {
+            '===': (string | {
+                var: string;
+            })[];
+            and?: undefined;
+            in?: undefined;
+        };
+    };
+    data?: undefined;
+    as?: undefined;
+    editor?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -492,6 +449,7 @@ declare const _default: ({
     refreshOn?: undefined;
     onSetItems?: undefined;
     onChange?: undefined;
+    placeholder?: undefined;
     validate?: undefined;
     delimiter?: undefined;
     requireDecimal?: undefined;
@@ -710,8 +668,8 @@ declare const _default: ({
     };
     data?: undefined;
     as?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -759,8 +717,8 @@ declare const _default: ({
     };
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     authenticate?: undefined;
@@ -831,10 +789,10 @@ declare const _default: ({
     defaultValue: boolean;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -927,10 +885,10 @@ declare const _default: ({
     weight: number;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -973,8 +931,8 @@ declare const _default: ({
     data?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1003,11 +961,11 @@ declare const _default: ({
     label: string;
     tooltip: string;
     data?: undefined;
-    conditional?: undefined;
     as?: undefined;
     editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    conditional?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1040,8 +998,8 @@ declare const _default: ({
     tooltip: string;
     defaultValue: {};
     data?: undefined;
-    conditional?: undefined;
     description?: undefined;
+    conditional?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1069,15 +1027,15 @@ declare const _default: ({
     onChange(context: any): void;
     data?: undefined;
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    description?: undefined;
     conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1150,14 +1108,14 @@ declare const _default: ({
         };
     };
     data?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
-    as?: undefined;
-    editor?: undefined;
-    defaultValue?: undefined;
     description?: undefined;
+    defaultValue?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;
@@ -1184,15 +1142,15 @@ declare const _default: ({
     onChange(context: any): void;
     data?: undefined;
     type?: undefined;
+    as?: undefined;
+    editor?: undefined;
     weight?: undefined;
     input?: undefined;
     label?: undefined;
     tooltip?: undefined;
+    description?: undefined;
     conditional?: undefined;
-    as?: undefined;
-    editor?: undefined;
     defaultValue?: undefined;
-    description?: undefined;
     reorder?: undefined;
     components?: undefined;
     dataSrc?: undefined;