@formio/js 5.0.0-dev.5894.b7db66e → 5.0.0-dev.5898.ffba52a

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

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/cjs/utils/utils.js

@@ -295,12 +295,12 @@ exports.checkSimpleConditional = checkSimpleConditional;
  */
 function getComponentActualValue(compPath, data, row) {
     let value = null;
-    if (row) {
-        value = (0, formUtils_1.getValue)({ data: row }, compPath);
-    }
-    if (data && lodash_1.default.isNil(value)) {
+    if (data) {
         value = (0, formUtils_1.getValue)({ data }, compPath);
     }
+    if (row && lodash_1.default.isNil(value)) {
+        value = (0, formUtils_1.getValue)({ data: row }, compPath);
+    }
     // FOR-400 - Fix issue where falsey values were being evaluated as show=true
     if (lodash_1.default.isNil(value) || (lodash_1.default.isObject(value) && lodash_1.default.isEmpty(value))) {
         value = '';

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

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/lib/mjs/utils/utils.js

@@ -259,12 +259,12 @@ export function checkSimpleConditional(component, condition, row, data, instance
  */
 export function getComponentActualValue(compPath, data, row) {
     let value = null;
-    if (row) {
-        value = getValue({ data: row }, compPath);
-    }
-    if (data && _.isNil(value)) {
+    if (data) {
         value = getValue({ data }, compPath);
     }
+    if (row && _.isNil(value)) {
+        value = getValue({ data: row }, compPath);
+    }
     // FOR-400 - Fix issue where falsey values were being evaluated as show=true
     if (_.isNil(value) || (_.isObject(value) && _.isEmpty(value))) {
         value = '';

package/package.json

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