@formio/js 5.0.0-dev.5770.0748fdc → 5.0.0-dev.5777.4ccabb1

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

@@ -30,35 +30,26 @@ export default class RadioComponent extends ListComponent {
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: classComp.dataType || '',
-                    data: {
-                        custom() {
-                            return classComp.values;
+                const isValuesSrc = !classComp.dataSrc || classComp.dataSrc === 'values';
+                return isValuesSrc
+                    ? {
+                        type: 'select',
+                        dataSrc: 'custom',
+                        valueProperty: 'value',
+                        dataType: classComp.dataType || '',
+                        data: {
+                            custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`,
                         }
-                    },
-                };
+                    }
+                    : {
+                        ...classComp,
+                        type: 'select',
+                    };
             }
         };
     }
     static get serverConditionSettings() {
-        return {
-            ...super.serverConditionSettings,
-            valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: classComp.dataType || '',
-                    data: {
-                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`,
-                    },
-                };
-            },
-        };
+        return RadioComponent.conditionOperatorsSettings;
     }
     static savedValueTypes(schema) {
         const { boolean, string, number, object, array } = componentValueTypes;
@@ -264,6 +255,16 @@ export default class RadioComponent extends ListComponent {
         if (method.toUpperCase() === 'GET') {
             body = null;
         }
+        const limit = this.component.limit || 100;
+        const skip = this.isScrollLoading ? this.selectOptions.length : 0;
+        // Allow for url interpolation.
+        url = this.sanitize(this.interpolate(url, {
+            formioBase: Formio.getBaseUrl(),
+            search,
+            limit,
+            skip,
+            page: Math.abs(Math.floor(skip / limit))
+        }), this.shouldSanitizeValue);
         // Set ignoreCache if it is
         options.ignoreCache = this.component.ignoreCache;
         // Make the request.

package/lib/mjs/components/recaptcha/ReCaptcha.d.ts

@@ -1,6 +1,12 @@
 export default class ReCaptchaComponent extends Component {
     static get builderInfo(): {};
     static savedValueTypes(): never[];
+    static get conditionOperatorsSettings(): {
+        operators: string[];
+    };
+    static get serverConditionSettings(): {
+        operators: string[];
+    };
     render(): string;
     recaptchaResult: any;
     createInput(): void;

package/lib/mjs/components/recaptcha/ReCaptcha.js

@@ -17,6 +17,15 @@ export default class ReCaptchaComponent extends Component {
     static savedValueTypes() {
         return [];
     }
+    static get conditionOperatorsSettings() {
+        return {
+            ...super.conditionOperatorsSettings,
+            operators: ['isEmpty', 'isNotEmpty'],
+        };
+    }
+    static get serverConditionSettings() {
+        return ReCaptchaComponent.conditionOperatorsSettings;
+    }
     render() {
         this.recaptchaResult = null;
         if (this.builderMode) {

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

@@ -538,13 +538,13 @@ export default class SelectComponent extends ListComponent {
             skip,
         };
         // Allow for url interpolation.
-        url = this.interpolate(url, {
+        url = this.sanitize(this.interpolate(url, {
             formioBase: Formio.getBaseUrl(),
             search,
             limit,
             skip,
             page: Math.abs(Math.floor(skip / limit))
-        });
+        }), this.shouldSanitizeValue);
         // Add search capability.
         if (this.component.searchField && search) {
             const searchValue = Array.isArray(search)

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

@@ -1,26 +1,4 @@
 export default class SelectBoxesComponent extends RadioComponent {
-    static get serverConditionSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
-    static get conditionOperatorsSettings(): {
-        valueComponent(classComp: any): {
-            type: string;
-            dataSrc: string;
-            valueProperty: string;
-            dataType: string;
-            data: {
-                custom: string;
-            };
-        };
-    };
     static savedValueTypes(schema: any): string[];
     constructor(...args: any[]);
     get emptyValue(): any;

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

@@ -27,15 +27,22 @@ export default class SelectBoxesComponent extends RadioComponent {
         return {
             ...super.conditionOperatorsSettings,
             valueComponent(classComp) {
-                return {
-                    type: 'select',
-                    dataSrc: 'custom',
-                    valueProperty: 'value',
-                    dataType: 'string',
-                    data: {
-                        custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
-                    },
-                };
+                const isValuesSrc = !classComp.dataSrc || classComp.dataSrc === 'values';
+                return isValuesSrc
+                    ? {
+                        type: 'select',
+                        dataSrc: 'custom',
+                        valueProperty: 'value',
+                        dataType: 'string',
+                        data: {
+                            custom: `values = ${classComp && classComp.values ? JSON.stringify(classComp.values) : []}`
+                        },
+                    }
+                    : {
+                        ...classComp,
+                        dataType: 'string',
+                        type: 'select',
+                    };
             }
         };
     }

package/lib/mjs/components/tags/Tags.js

@@ -116,12 +116,12 @@ export default class TagsComponent extends Input {
     }
     normalizeValue(value) {
         if (this.component.storeas === 'string' && Array.isArray(value)) {
-            return value.join(this.delimiter);
+            return super.normalizeValue(value.join(this.delimiter));
         }
         else if (this.component.storeas === 'array' && typeof value === 'string') {
-            return value.split(this.delimiter).filter(result => result);
+            return super.normalizeValue(value.split(this.delimiter).filter(result => result));
         }
-        return value;
+        return super.normalizeValue(value);
     }
     setValue(value, flags = {}) {
         const changed = super.setValue(value, flags);

package/lib/mjs/components/time/Time.js

@@ -13,17 +13,6 @@ export default class TimeComponent extends TextFieldComponent {
             dataFormat: defaultDataFormat,
         }, ...extend);
     }
-    static get serverConditionSettings() {
-        return {
-            ...super.serverConditionSettings,
-            valueComponent(classComp) {
-                return {
-                    ...classComp,
-                    type: 'time',
-                };
-            },
-        };
-    }
     constructor(component, options, data) {
         super(component, options, data);
         const { edge: isEdgeBrowser, version: edgeVersion } = getBrowserInfo();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5770.0748fdc",
+  "version": "5.0.0-dev.5777.4ccabb1",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {