@formio/js 5.0.0-dev.5893.c6cb848 → 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/selectboxes/SelectBoxes.js

@@ -257,6 +257,18 @@ class SelectBoxesComponent extends Radio_1.default {
         }
         return super.checkComponentValidity(data, dirty, rowData, options, errors);
     }
+    setCustomValidity(messages, dirty, external) {
+        if (this.options.building && lodash_1.default.find(messages, { ruleName: 'invalidValueProperty' })) {
+            setTimeout(() => {
+                this.root && (0, utils_1.getComponent)(this.root.components, 'valueProperty').setCustomValidity(messages, dirty);
+            }, 0);
+            return super.setCustomValidity(lodash_1.default.filter(messages, (message) => message.ruleName !== 'invalidValueProperty'), dirty, external);
+        }
+        else {
+            return super.setCustomValidity(messages, dirty, external);
+        }
+        ;
+    }
     validateValueAvailability(setting, value) {
         if (!(0, utils_1.boolValue)(setting) || !value) {
             return true;

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/selectboxes/SelectBoxes.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { componentValueTypes, getComponentSavedTypes, boolValue } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes, boolValue, getComponent } from '../../utils/utils';
 import RadioComponent from '../radio/Radio';
 export default class SelectBoxesComponent extends RadioComponent {
     static schema(...extend) {
@@ -258,6 +258,18 @@ export default class SelectBoxesComponent extends RadioComponent {
         }
         return super.checkComponentValidity(data, dirty, rowData, options, errors);
     }
+    setCustomValidity(messages, dirty, external) {
+        if (this.options.building && _.find(messages, { ruleName: 'invalidValueProperty' })) {
+            setTimeout(() => {
+                this.root && getComponent(this.root.components, 'valueProperty').setCustomValidity(messages, dirty);
+            }, 0);
+            return super.setCustomValidity(_.filter(messages, (message) => message.ruleName !== 'invalidValueProperty'), dirty, external);
+        }
+        else {
+            return super.setCustomValidity(messages, dirty, external);
+        }
+        ;
+    }
     validateValueAvailability(setting, value) {
         if (!boolValue(setting) || !value) {
             return true;

package/package.json

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