@formio/js 5.1.0-dev.5936.fa0f253 → 5.1.0-dev.5939.f5aa9d6

package/lib/cjs/components/datetime/DateTime.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const moment_1 = __importDefault(require("moment"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const utils_1 = __importDefault(require("../../utils"));
-const utils_2 = require("../../utils/utils");
+const utils_2 = require("../../utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 class DateTimeComponent extends Input_1.default {
     static schema(...extend) {
@@ -123,8 +123,8 @@ class DateTimeComponent extends Input_1.default {
     get emptyValue() {
         return '';
     }
-    get momentFormat() {
-        return utils_1.default.convertFormatToMoment(this.component.format);
+    get dayjsFormat() {
+        return utils_1.default.convertFormatToDayjs(this.component.format);
     }
     isEmpty(value = this.dataValue) {
         if (value && (value.toString() === 'Invalid Date')) {
@@ -133,12 +133,14 @@ class DateTimeComponent extends Input_1.default {
         return super.isEmpty(value);
     }
     formatValue(input) {
-        const result = moment_1.default.utc(input).toISOString();
-        return result === 'Invalid date' ? input : result;
+        if ((0, dayjs_1.default)(input).isValid()) {
+            return dayjs_1.default.utc(input).toISOString();
+        }
+        return input;
     }
     isEqual(valueA, valueB = this.dataValue) {
         return (this.isEmpty(valueA) && this.isEmpty(valueB))
-            || moment_1.default.utc(valueA).format(this.momentFormat) === moment_1.default.utc(valueB).format(this.momentFormat);
+            || dayjs_1.default.utc(valueA).format(this.dayjsFormat) === dayjs_1.default.utc(valueB).format(this.dayjsFormat);
     }
     createWrapper() {
         return false;
@@ -154,19 +156,19 @@ class DateTimeComponent extends Input_1.default {
         return super.checkValidity(data, dirty, rowData);
     }
     getValueAsString(value, options) {
-        let format = utils_1.default.convertFormatToMoment(this.component.format);
-        format += format.match(/z$/) ? '' : ' z';
+        let format = utils_1.default.convertFormatToDayjs(this.component.format);
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
+            format += format.match(/z$/) ? '' : ' z';
             if (Array.isArray(value) && this.component.multiple) {
-                return value.map(item => lodash_1.default.trim(utils_1.default.momentDate(item, format, timezone, options).format(format))).join(', ');
+                return value.map(item => lodash_1.default.trim(utils_1.default.dayjsDate(item, format, timezone, options).format(format))).join(', ');
             }
-            return lodash_1.default.trim(utils_1.default.momentDate(value, format, timezone, options).format(format));
+            return lodash_1.default.trim(utils_1.default.dayjsDate(value, format, timezone, options).format(format));
         }
         if (Array.isArray(value) && this.component.multiple) {
-            return value.map(item => lodash_1.default.trim((0, moment_1.default)(item).format(format))).join(', ');
+            return value.map(item => lodash_1.default.trim((0, dayjs_1.default)(item).format(format))).join(', ');
         }
-        return (value ? lodash_1.default.trim((0, moment_1.default)(value).format(format)) : value) || '';
+        return (value ? lodash_1.default.trim((0, dayjs_1.default)(value).format(format)) : value) || '';
     }
 }
 exports.default = DateTimeComponent;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const core_1 = require("@formio/core");
 class DayComponent extends Field_1.default {
     static schema(...extend) {
@@ -53,7 +53,7 @@ class DayComponent extends Field_1.default {
         return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.string];
     }
     constructor(component, options, data) {
-        if (!options.inFormBuilder && !options.building) {
+        if (options && !options.inFormBuilder && !options.building) {
             if (component.maxDate && component.maxDate.indexOf('moment(') === -1) {
                 component.maxDate = (0, moment_1.default)(component.maxDate, 'YYYY-MM-DD').toISOString();
             }

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -101,7 +101,6 @@ export default class EditGridComponent extends NestedArrayComponent {
     changeState(changed: any, flags: any): void;
     openWhenEmpty(): void;
     restoreRowContext(editRow: any, flags?: {}): void;
-    emptyRows(): void;
     hasChanged: (newValue: any, oldValue: any) => boolean;
 }
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';

package/lib/cjs/components/editgrid/EditGrid.js

@@ -9,7 +9,7 @@ const components_1 = require("@formio/bootstrap/components");
 const NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const Alert_1 = __importDefault(require("../alert/Alert"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const EditRowState = {
     New: 'new',
     Editing: 'editing',
@@ -1200,14 +1200,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             this.setNestedValue(component, editRow.data, flags);
         });
     }
-    emptyRows() {
-        this.editRows.forEach((editRow, index) => this.destroyComponents(false, index));
-        this.editRows = [];
-    }
-    resetValue() {
-        super.resetValue();
-        this.emptyRows();
-    }
 }
 exports.default = EditGridComponent;
 EditGridComponent.prototype.hasChanged = Component_1.default.prototype.hasChanged;

package/lib/cjs/components/editgrid/editForm/EditGrid.edit.display.js

@@ -35,7 +35,7 @@ exports.default = [
         weight: 1002,
         input: false,
         customConditional() {
-            return !Evaluator_1.Evaluator.noeval;
+            return !Evaluator_1.Evaluator.noeval || !Evaluator_1.Evaluator.protectedEval;
         },
     },
     {

package/lib/cjs/components/file/File.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const downloadjs_1 = __importDefault(require("downloadjs"));
 const lodash_1 = __importDefault(require("lodash"));
 const fileProcessor_1 = __importDefault(require("../../providers/processor/fileProcessor"));

package/lib/cjs/components/form/Form.js

@@ -8,7 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const ComponentModal_1 = __importDefault(require("../_classes/componentModal/ComponentModal"));
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Formio_1 = require("../../Formio");
 const Form_1 = __importDefault(require("../../Form"));
 class FormComponent extends Component_1.default {
@@ -278,6 +278,9 @@ class FormComponent extends Component_1.default {
             if (this.isSubFormLazyLoad() && !this.hasLoadedForm && !this.subFormLoading) {
                 this.createSubForm(true);
             }
+            if (!this.subFormReady) {
+                return Promise.resolve();
+            }
             return this.subFormReady.then(() => {
                 this.empty(element);
                 if (this.options.builder) {
@@ -408,13 +411,15 @@ class FormComponent extends Component_1.default {
             }
             // Render the form.
             return (new Form_1.default(form, this.getSubOptions())).ready.then((instance) => {
+                var _a, _b;
                 this.subForm = instance;
                 this.subForm.currentForm = this;
                 this.subForm.parentVisible = this.visible;
                 const componentsMap = this.componentsMap;
                 const formComponentsMap = this.subForm.componentsMap;
                 lodash_1.default.assign(componentsMap, formComponentsMap);
-                this.component.components = this.subForm.components.map((comp) => comp.component);
+                this.component.components = (_a = this.subForm._form) === null || _a === void 0 ? void 0 : _a.components;
+                this.component.display = (_b = this.subForm._form) === null || _b === void 0 ? void 0 : _b.display;
                 this.subForm.on('change', () => {
                     if (this.subForm && !this.shouldConditionallyClear()) {
                         this.dataValue = this.subForm.getValue();
@@ -699,6 +704,13 @@ class FormComponent extends Component_1.default {
         }
         return errors;
     }
+    conditionallyHidden() {
+        const conditionallyHidden = super.conditionallyHidden();
+        if (this.subForm) {
+            this.subForm._conditionallyHidden = conditionallyHidden;
+        }
+        return conditionallyHidden;
+    }
     updateSubFormVisibility() {
         if (this.subForm) {
             this.subForm.parentVisible = this.visible;

package/lib/cjs/components/form/editForm/Form.edit.form.js

@@ -32,10 +32,11 @@ exports.default = [
         tooltip: 'if it is checked, the subform is loaded after navigation to the page with this component within the wizard.',
         input: true,
         customConditional({ instance, data }) {
-            var _a, _b, _c, _d;
-            const formInfo = (_b = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form')) === null || _b === void 0 ? void 0 : _b.defaultDownloadedResources.find(res => res._id === data.form);
+            var _a, _b, _c;
+            const formComp = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form');
+            const formInfo = formComp === null || formComp === void 0 ? void 0 : formComp.defaultDownloadedResources.find(res => res._id === data.form);
             const displayMode = 'wizard';
-            return ((_d = (_c = instance.options) === null || _c === void 0 ? void 0 : _c.editForm) === null || _d === void 0 ? void 0 : _d.display) === displayMode && formInfo && formInfo.display !== displayMode;
+            return ((_c = (_b = instance.options) === null || _b === void 0 ? void 0 : _b.editForm) === null || _c === void 0 ? void 0 : _c.display) === displayMode && ((data.form && !formInfo) || (formInfo && formInfo.display !== displayMode));
         },
     },
     {

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

@@ -7,7 +7,7 @@ const text_mask_addons_1 = require("@formio/text-mask-addons");
 const vanilla_text_mask_1 = require("@formio/vanilla-text-mask");
 const lodash_1 = __importDefault(require("lodash"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils/");
 class NumberComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const NestedComponent_1 = __importDefault(require("../_classes/nested/NestedComponent"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class PanelComponent extends NestedComponent_1.default {
     static schema(...extend) {
         return NestedComponent_1.default.schema({

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

@@ -16,6 +16,7 @@ export default class RadioComponent extends ListComponent {
     static savedValueTypes(schema: any): any[];
     constructor(component: any, options: any, data: any);
     previousValue: any;
+    uncheckValue(flags?: {}): void;
     get inputInfo(): any;
     get emptyValue(): string;
     get isRadio(): boolean;
@@ -27,8 +28,8 @@ export default class RadioComponent extends ListComponent {
     itemsLoadedResolve: ((value: any) => void) | undefined;
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
-    valuesMap: Map<any, any> | undefined;
     beforeSubmit(): Promise<any>;
+    convertValues(values: any): any;
     render(): string;
     attach(element: any): Promise<void>;
     detach(element: any): void;
@@ -36,14 +37,18 @@ export default class RadioComponent extends ListComponent {
     validateValueAvailability(setting: any, value: any): boolean;
     getValueAsString(value: any, options?: {}): any;
     setValueAt(index: any, value: any): void;
-    prepareValue(item: any, options?: {}): any;
-    getValueByInput(input: any): any;
     loadItems(url: any, search: any, headers: any, options: any, method: any, body: any): void;
     loadItemsFromMetadata(): void;
     setItems(items: any): void;
     setSelectedClasses(): void;
-    setMetadata(value: any): 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/cjs/components/radio/Radio.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Formio_1 = require("../../Formio");
-const utils_1 = require("../../utils/utils");
-const uuid_1 = require("uuid");
+const utils_1 = require("../../utils");
 class RadioComponent extends ListComponent_1.default {
     static schema(...extend) {
         return ListComponent_1.default.schema({
@@ -80,13 +79,15 @@ class RadioComponent extends ListComponent_1.default {
         }
         return defaultValue;
     }
-    resetValue() {
+    uncheckValue(flags = {}) {
         this.unset();
         this.setValue(this.emptyValue, {
             noUpdateEvent: true,
             noValidate: true,
             resetValue: true
         });
+        this.triggerChange(flags);
+        this.setSelectedClasses();
     }
     get inputInfo() {
         var _a;
@@ -143,7 +144,6 @@ class RadioComponent extends ListComponent_1.default {
         });
         this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
         this.loadedOptions = [];
-        this.valuesMap = new Map();
         if (!this.visible) {
             this.itemsLoadedResolve();
         }
@@ -155,6 +155,12 @@ class RadioComponent extends ListComponent_1.default {
             this.dataReady.then(() => res(true));
         });
     }
+    convertValues(values) {
+        if (this.options.renderMode === 'html' && this.type === 'radio') {
+            return values.map(x => (Object.assign(Object.assign({}, x), { value: this.convertByDataType(x.value) })));
+        }
+        return values;
+    }
     render() {
         if (!this.optionsLoaded) {
             return super.render(this.renderTemplate('loader'));
@@ -162,7 +168,7 @@ class RadioComponent extends ListComponent_1.default {
         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,
         }));
@@ -183,12 +189,9 @@ class RadioComponent extends ListComponent_1.default {
                 if (!lodash_1.default.isString(this.dataValue)) {
                     dataValue = lodash_1.default.toString(this.dataValue);
                 }
-                if (this.isSelectURL) {
-                    const valueKey = this.loadedOptions[index].value;
-                    const optionValue = this.valuesMap.has(valueKey)
-                        ? this.valuesMap.get(valueKey)
-                        : valueKey;
-                    input.checked = lodash_1.default.isEqual(this.normalizeValue(optionValue), this.dataValue);
+                if (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) {
+                    const optionValue = this.component.dataType === 'string' ? JSON.stringify(this.loadedOptions[index].value) : this.loadedOptions[index].value;
+                    input.checked = lodash_1.default.isEqual(optionValue, this.dataValue);
                 }
                 else {
                     input.checked = (dataValue === input.value && (input.value || this.component.dataSrc !== 'url'));
@@ -225,14 +228,9 @@ class RadioComponent extends ListComponent_1.default {
         let value = this.component.inputType === 'checkbox' ? '' : this.dataValue;
         this.refs.input.forEach((input, index) => {
             if (input.checked) {
-                if (!this.isSelectURL) {
-                    value = input.value;
-                    return;
-                }
-                const optionValue = this.loadedOptions[index].value;
-                value = this.valuesMap.has(optionValue)
-                    ? this.valuesMap.get(optionValue)
-                    : optionValue;
+                value = (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) ?
+                    this.loadedOptions[index].value :
+                    input.value;
             }
         });
         return value;
@@ -276,8 +274,8 @@ class RadioComponent extends ListComponent_1.default {
     }
     setValueAt(index, value) {
         if (this.refs.input && this.refs.input[index] && value !== null && value !== undefined) {
-            const inputValue = this.getValueByInput(this.refs.input[index]);
-            this.refs.input[index].checked = lodash_1.default.isEqual(inputValue, value);
+            const inputValue = this.refs.input[index].value;
+            this.refs.input[index].checked = (inputValue === value.toString());
         }
     }
     get shouldLoad() {
@@ -287,23 +285,6 @@ class RadioComponent extends ListComponent_1.default {
         }
         return super.shouldLoad;
     }
-    prepareValue(item, options = {}) {
-        const value = this.component.valueProperty && !options.skipValueProperty
-            ? lodash_1.default.get(item, this.component.valueProperty)
-            : item;
-        if (this.component.type === 'radio' && typeof value !== 'string') {
-            const uuid = (0, uuid_1.v4)();
-            this.valuesMap.set(uuid, value);
-            return uuid;
-        }
-        return value;
-    }
-    getValueByInput(input) {
-        const inputValue = input.value;
-        return this.valuesMap.has(inputValue)
-            ? this.valuesMap.get(inputValue)
-            : inputValue;
-    }
     loadItems(url, search, headers, options, method, body) {
         if (this.optionsLoaded) {
             this.itemsLoadedResolve();
@@ -354,7 +335,7 @@ class RadioComponent extends ListComponent_1.default {
                 label: this.itemTemplate(item)
             };
             if (lodash_1.default.isEqual(item, this.selectData || lodash_1.default.pick(this.dataValue, lodash_1.default.keys(item)))) {
-                this.loadedOptions[i].value = this.prepareValue(this.dataValue, { skipValueProperty: true });
+                this.loadedOptions[i].value = this.dataValue;
             }
         });
         this.optionsLoaded = true;
@@ -364,15 +345,12 @@ class RadioComponent extends ListComponent_1.default {
         const listData = [];
         items === null || items === void 0 ? void 0 : items.forEach((item, i) => {
             const valueAtProperty = lodash_1.default.get(item, this.component.valueProperty);
-            const value = this.prepareValue(item);
-            const label = this.component.valueProperty
-                ? this.itemTemplate(item, valueAtProperty, i)
-                : this.itemTemplate(item, item, i);
-            this.loadedOptions[i] = { label, value };
-            listData.push(this.templateData[i]);
-            if (this.valuesMap.has(value)) {
-                this.templateData[value] = this.templateData[i];
-            }
+            this.loadedOptions[i] = {
+                value: this.component.valueProperty ? valueAtProperty : item,
+                label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
+            };
+            listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
+            const value = this.loadedOptions[i].value;
             if (!this.isRadio && (lodash_1.default.isObject(value) || lodash_1.default.isBoolean(value) || lodash_1.default.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
@@ -395,11 +373,7 @@ class RadioComponent extends ListComponent_1.default {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (value === undefined || value === null)
-                    ? false
-                    : (input.type === 'checkbox')
-                        ? value[input.value] || input.checked
-                        : lodash_1.default.isEqual(this.normalizeValue(this.getValueByInput(input)), value);
+                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);
@@ -413,26 +387,10 @@ class RadioComponent extends ListComponent_1.default {
             });
         }
     }
-    setMetadata(value) {
-        var _a;
-        let key = value;
-        if (typeof value !== 'string') {
-            const checkedInput = Array.prototype.find.call((_a = this.refs.input) !== null && _a !== void 0 ? _a : [], (input => input.type === 'radio' && input.getAttribute('checked')));
-            key = (checkedInput === null || checkedInput === void 0 ? void 0 : checkedInput.value) || key;
-        }
-        if (this.isSelectURL && this.templateData && this.templateData[key]) {
-            const submission = this.root.submission;
-            if (!submission.metadata.selectData) {
-                submission.metadata.selectData = {};
-            }
-            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[key]);
-        }
-    }
     updateValue(value, flags) {
         const changed = super.updateValue(value, flags);
         if (changed) {
             this.setSelectedClasses();
-            this.setMetadata(this.dataValue);
         }
         if (!flags || !flags.modified || !this.isRadio) {
             if (changed) {
@@ -444,9 +402,7 @@ class RadioComponent extends ListComponent_1.default {
         this.currentValue = this.dataValue;
         const shouldResetValue = flags && flags.modified && !flags.noUpdateEvent && this.previousValue === this.currentValue;
         if (shouldResetValue) {
-            this.resetValue();
-            this.triggerChange(flags);
-            this.setSelectedClasses();
+            this.uncheckValue(flags);
         }
         this.previousValue = this.dataValue;
         return changed;
@@ -456,7 +412,7 @@ class RadioComponent extends ListComponent_1.default {
      * @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;
@@ -488,10 +444,18 @@ class RadioComponent extends ListComponent_1.default {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        return super.normalizeValue(value);
+        return value;
     }
-    isSingleInputValue() {
-        return true;
+    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 = {};
+            }
+            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
+        }
+        return super.normalizeValue(valueConverted);
     }
 }
 exports.default = RadioComponent;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 exports.default = [
     {
         key: 'recaptchaInfo',

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

@@ -7,7 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Formio_1 = require("../../Formio");
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Form_1 = __importDefault(require("../../Form"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const ChoicesWrapper_1 = __importDefault(require("../../utils/ChoicesWrapper"));
 class SelectComponent extends ListComponent_1.default {
     static schema(...extend) {
@@ -355,6 +355,18 @@ class SelectComponent extends ListComponent_1.default {
         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) {
         var _a, _b;
@@ -441,7 +453,7 @@ class SelectComponent extends ListComponent_1.default {
             this.addOption(itemValueAndLabel.value, itemValueAndLabel.label, {}, lodash_1.default.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.
@@ -903,8 +915,9 @@ class SelectComponent extends ListComponent_1.default {
             });
         }
         // 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();
@@ -1219,7 +1232,7 @@ class SelectComponent extends ListComponent_1.default {
             }
             lodash_1.default.set(submission.metadata.selectData, this.path, templateData);
         }
-        if (flags.resetValue && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission) && !this.options.readOnly) {
+        if (flags.resetValue && !flags.fromSubmission && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission) && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};
@@ -1283,6 +1296,9 @@ class SelectComponent extends ListComponent_1.default {
             this.lazyLoadInit = true;
             const searchProperty = this.component.searchField || this.component.valueProperty;
             this.triggerUpdate(lodash_1.default.get(value.data || value, searchProperty, value), true);
+            this.itemsLoaded.then(() => {
+                this.setChoicesValue(value, hasPreviousValue, flags);
+            });
             return changed;
         }
         // Add the value options.

package/lib/cjs/components/select/editForm/Select.edit.data.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
     const rawDefaultValue = instance.downloadedResources.find(resource => lodash_1.default.get(resource, data.valueProperty) === defaultValue);

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

@@ -8,6 +8,12 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
+    /**
+     * Normalize values coming into updateValue.
+     * @param {any} value - The value to normalize.
+     * @returns {*} - The normalized value
+     */
+    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Radio_1 = __importDefault(require("../radio/Radio"));
 class SelectBoxesComponent extends Radio_1.default {
     static schema(...extend) {

package/lib/cjs/components/signature/Signature.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const signature_pad_1 = __importDefault(require("signature_pad"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SignatureComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

package/lib/cjs/components/survey/Survey.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SurveyComponent extends Field_1.default {
     static schema(...extend) {
         return Field_1.default.schema({