@formio/js 5.1.0-dev.6042.18ef5d3 → 5.1.0-dev.6042.603237d

package/lib/cjs/components/checkbox/Checkbox.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 Field_1 = __importDefault(require("../_classes/field/Field"));
 class CheckBoxComponent extends Field_1.default {
     static schema(...extend) {

package/lib/cjs/components/container/Container.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 Component_1 = __importDefault(require("../_classes/component/Component"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const NestedDataComponent_1 = __importDefault(require("../_classes/nesteddata/NestedDataComponent"));

package/lib/cjs/components/currency/Currency.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Number_1 = __importDefault(require("../number/Number"));
 class CurrencyComponent extends Number_1.default {
     static schema(...extend) {

package/lib/cjs/components/datagrid/DataGrid.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 NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class DataGridComponent extends NestedArrayComponent_1.default {
     static schema(...extend) {
         return NestedArrayComponent_1.default.schema({
@@ -492,6 +492,10 @@ class DataGridComponent extends NestedArrayComponent_1.default {
             options.row = `${rowIndex}-${colIndex}`;
             options.rowIndex = rowIndex;
             options.onChange = (flags, changed, modified) => {
+                if (changed.component.type === 'form') {
+                    const formComp = (0, utils_1.getComponent)(this.component.components, changed.component.key);
+                    lodash_1.default.set(formComp, 'components', changed.component.components);
+                }
                 this.triggerChange({ modified });
             };
             let columnComponent;

package/lib/cjs/components/datetime/DateTime.d.ts

@@ -17,7 +17,7 @@ export default class DateTimeComponent extends Input {
     };
     static savedValueTypes(schema: any): string[];
     get emptyValue(): string;
-    get momentFormat(): string;
+    get dayjsFormat(): string;
     createWrapper(): boolean;
     checkValidity(data: any, dirty: any, rowData: any): boolean;
     getValueAsString(value: any, options: any): any;

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.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',

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"));
@@ -905,17 +905,16 @@ class FileComponent extends Field_1.default {
     }
     uploadFile(fileToSync) {
         return __awaiter(this, void 0, void 0, function* () {
-            const filePromise = this.fileService.uploadFile(fileToSync.storage, fileToSync.file, fileToSync.name, fileToSync.dir, 
+            return yield this.fileService.uploadFile(fileToSync.storage, fileToSync.file, fileToSync.name, fileToSync.dir, 
             // Progress callback
             this.updateProgress.bind(this, fileToSync), fileToSync.url, fileToSync.options, fileToSync.fileKey, fileToSync.groupPermissions, fileToSync.groupResourceId, () => {
-                this.emit('fileUploadingStart', filePromise);
+                this.emit('fileUploadingStart');
             }, 
             // Abort upload callback
             (abort) => this.abortUploads.push({
                 id: fileToSync.id,
                 abort,
             }), this.getMultipartOptions(fileToSync));
-            return yield filePromise;
         });
     }
     upload() {
@@ -937,7 +936,7 @@ class FileComponent extends Field_1.default {
                     fileToSync.message = this.t('succefullyUploaded');
                     fileInfo.originalName = fileToSync.originalName;
                     fileInfo.hash = fileToSync.hash;
-                    this.emit('fileUploadingEnd', Promise.resolve(fileInfo));
+                    this.emit('fileUploadingEnd');
                 }
                 catch (response) {
                     fileToSync.status = 'error';
@@ -947,7 +946,7 @@ class FileComponent extends Field_1.default {
                         : response.type === 'abort'
                             ? this.t('Request was aborted')
                             : response.toString();
-                    this.emit('fileUploadingEnd', Promise.reject(response));
+                    this.emit('fileUploadingEnd');
                     this.emit('fileUploadError', {
                         fileToSync,
                         response,

package/lib/cjs/components/form/Form.d.ts

@@ -98,7 +98,6 @@ export default class FormComponent extends Component {
      * @returns {void}
      */
     onSetSubFormValue(submission: object | null | undefined, flags: object | null | undefined): void;
-    areAllComponentsEmpty(data: any): boolean;
     updateSubFormVisibility(): void;
     /**
      * Determines if this form is a Nested Wizard

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 {
@@ -101,6 +101,9 @@ class FormComponent extends Component_1.default {
         }
         return this.createSubForm();
     }
+    shouldConditionallyClearOnPristine() {
+        return !this.hasSetValue && super.shouldConditionallyClearOnPristine();
+    }
     get dataReady() {
         var _a;
         return ((_a = this.subForm) === null || _a === void 0 ? void 0 : _a.dataReady) || this.subFormReady || Promise.resolve();
@@ -275,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) {
@@ -290,11 +296,13 @@ class FormComponent extends Component_1.default {
                     }
                     this.subForm.attach(element);
                     this.valueChanged = this.hasSetValue;
-                    if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                        this.setDefaultValue();
-                    }
-                    else {
-                        this.restoreValue();
+                    if (!this.shouldConditionallyClear()) {
+                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                            this.setDefaultValue();
+                        }
+                        else {
+                            this.restoreValue();
+                        }
                     }
                 }
                 if (!this.builderMode && this.component.modalEdit) {
@@ -403,15 +411,17 @@ 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) {
+                    if (this.subForm && !this.shouldConditionallyClear()) {
                         this.dataValue = this.subForm.getValue();
                         this.triggerChange({
                             noEmit: true
@@ -679,20 +689,7 @@ class FormComponent extends Component_1.default {
         }
     }
     isEmpty(value = this.dataValue) {
-        return value === null || lodash_1.default.isEqual(value, this.emptyValue) || (this.areAllComponentsEmpty(value === null || value === void 0 ? void 0 : value.data) && !(value === null || value === void 0 ? void 0 : value._id));
-    }
-    areAllComponentsEmpty(data) {
-        let res = true;
-        if (this.subForm) {
-            this.subForm.everyComponent((comp) => {
-                const componentValue = lodash_1.default.get(data, comp.key);
-                res &= comp.isEmpty(componentValue);
-            });
-        }
-        else {
-            res = false;
-        }
-        return res;
+        return value === null || lodash_1.default.isEqual(value, this.emptyValue);
     }
     getValue() {
         if (this.subForm) {
@@ -707,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

@@ -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/cjs/components/radio/Radio.js

@@ -6,7 +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 utils_1 = require("../../utils");
 class RadioComponent extends ListComponent_1.default {
     static schema(...extend) {
         return ListComponent_1.default.schema({
@@ -153,6 +153,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'));
@@ -160,7 +166,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,
         }));
@@ -406,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;
@@ -438,14 +444,18 @@ class RadioComponent extends ListComponent_1.default {
                 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 = {};
             }
-            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[value]);
+            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[valueConverted]);
         }
-        return super.normalizeValue(value);
+        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) {
@@ -150,6 +150,9 @@ class SelectBoxesComponent extends Radio_1.default {
                 }
             }
         }
+        else if (lodash_1.default.isEmpty(this.loadedOptions) && !checkedValues.length) {
+            value = {};
+        }
         return value;
     }
     /**

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({

package/lib/cjs/components/tags/Tags.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 utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const choices_js_1 = __importDefault(require("choices.js"));
 class TagsComponent extends Input_1.default {

package/lib/cjs/components/textarea/TextArea.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* global Quill */
 const TextField_1 = __importDefault(require("../textfield/TextField"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class TextAreaComponent extends TextField_1.default {
     static schema(...extend) {
         return TextField_1.default.schema({
@@ -63,8 +63,8 @@ class TextAreaComponent extends TextField_1.default {
         if ((this.options.readOnly || this.disabled) && !this.isHtmlRenderMode()) {
             const elementStyle = this.info.attr.style || '';
             const children = `
-        <div ${this._referenceAttributeName}="input" 
-          class="formio-editor-read-only-content" 
+        <div ${this._referenceAttributeName}="input"
+          class="formio-editor-read-only-content"
           ${elementStyle ? `style='${elementStyle}'` : ''}
           role="textbox"
           aria-multiline="true"