@formio/js 5.0.0-rc.80 → 5.0.0-rc.81

package/lib/mjs/components/select/editForm/Select.edit.data.js

@@ -27,16 +27,20 @@ const setSelectData = (context) => {
     // Wait before downloadedResources will be set
     setTimeout(() => {
         const { instance, data } = context;
-        const selectDataComponent = instance?.root.getComponent('selectData');
+        const selectDataComponent = instance?.root?.getComponent('selectData');
+        // clear selectData if conditions are not met or clearing default value
+        if (selectDataComponent && (!selectDataComponent.visible || !data.defaultValue)) {
+            selectDataComponent.setValue(null, { resetValue: true });
+            return;
+        }
         // nothing can set if don't have downloaded resources
         if (!selectDataComponent || !instance.getValue() || !instance.downloadedResources?.length) {
             return;
         }
-        // if valueProperty is not provided, we have entire object
         const shouldCalculateUrlData = data.dataSrc === 'url' && data.data.url && data.valueProperty;
         const shouldCalculateResourceData = data.dataSrc === 'resource' && data.data.resource && data.valueProperty;
-        const newValue = shouldCalculateUrlData || shouldCalculateResourceData ? calculateSelectData(context) : undefined;
-        selectDataComponent.setValue(newValue);
+        const newValue = shouldCalculateUrlData || shouldCalculateResourceData ? calculateSelectData(context) : null;
+        selectDataComponent.setValue(newValue, { resetValue: newValue === null });
     }, 0);
 };
 export default [
@@ -678,10 +682,25 @@ export default [
     {
         key: 'selectData',
         conditional: {
-            json: { 'and': [
-                    { '!==': [{ var: 'data.valueProperty' }, null] },
-                    { '!==': [{ var: 'data.valueProperty' }, ''] },
-                ] },
+            json: {
+                and: [
+                    { var: 'data.valueProperty' },
+                    { '===': [{ var: 'data.lazyLoad' }, true] },
+                    { '!==': [{ var: 'data.widget' }, 'html5'] },
+                    {
+                        or: [
+                            { '===': [{ var: 'data.dataSrc' }, 'url'] },
+                            {
+                                and: [
+                                    { '===': [{ var: 'data.dataSrc' }, 'resource'] },
+                                    // 'data' means entire object from resource will be used
+                                    { '!==': [{ var: 'data.valueProperty' }, 'data'] },
+                                ],
+                            }
+                        ]
+                    }
+                ]
+            },
         },
     },
     {

package/lib/mjs/components/select/fixtures/comp4.d.ts

@@ -7,10 +7,13 @@ declare namespace _default {
     export let multiple: boolean;
     export let dataSrc: string;
     export namespace data {
-        let values: {
+        let values: ({
             label: string;
             value: string;
-        }[];
+        } | {
+            label: string;
+            value: number[];
+        })[];
         let resource: string;
         let json: string;
         let url: string;

package/lib/mjs/components/select/fixtures/comp4.js

@@ -19,6 +19,10 @@ export default {
             }, {
                 'label': 'test',
                 'value': 'test'
+            },
+            {
+                'label': '1',
+                'value': [1, 2, 3]
             }],
         'resource': '',
         'json': '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.80",
+  "version": "5.0.0-rc.81",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-rc.37",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.2.3-rc.2",
+    "@formio/core": "2.3.0-rc.3",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",