@formio/js 5.0.0-dev.5894.b7db66e → 5.0.0-dev.5896.56bf2bd

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

@@ -312,12 +312,13 @@ class RadioComponent extends ListComponent_1.default {
             .then((response) => {
             this.loading = false;
             this.setItems(response);
-            this.optionsLoaded = true;
-            this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
+        })
+            .finally(() => {
+            this.optionsLoaded = true;
+            this.redraw();
         });
     }
     loadItemsFromMetadata() {
@@ -341,9 +342,8 @@ class RadioComponent extends ListComponent_1.default {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(valueAtProperty) ||
-                (!this.isRadio && lodash_1.default.isObject(valueAtProperty)) ||
-                (!this.isRadio && lodash_1.default.isBoolean(valueAtProperty)))) {
+            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;
             }
         });

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

@@ -1239,7 +1239,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)) {
+        if (flags.resetValue && ((_b = this.root) === null || _b === void 0 ? void 0 : _b.submission) && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};

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

@@ -312,12 +312,13 @@ export default class RadioComponent extends ListComponent {
             .then((response) => {
             this.loading = false;
             this.setItems(response);
-            this.optionsLoaded = true;
-            this.redraw();
         })
             .catch((err) => {
-            this.optionsLoaded = true;
             this.handleLoadingError(err);
+        })
+            .finally(() => {
+            this.optionsLoaded = true;
+            this.redraw();
         });
     }
     loadItemsFromMetadata() {
@@ -341,9 +342,8 @@ export default class RadioComponent extends ListComponent {
                 label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
             listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (_.isUndefined(valueAtProperty) ||
-                (!this.isRadio && _.isObject(valueAtProperty)) ||
-                (!this.isRadio && _.isBoolean(valueAtProperty)))) {
+            const value = this.loadedOptions[i].value;
+            if (!this.isRadio && (_.isObject(value) || _.isBoolean(value) || _.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

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

@@ -1267,7 +1267,7 @@ export default class SelectComponent extends ListComponent {
             }
             _.set(submission.metadata.selectData, this.path, templateData);
         }
-        if (flags.resetValue && this.root?.submission) {
+        if (flags.resetValue && this.root?.submission && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5894.b7db66e",
+  "version": "5.0.0-dev.5896.56bf2bd",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {