@formio/js 5.0.0-dev.5712.d53f35e → 5.0.0-dev.5714.6318ec3

package/dist/formio.utils.min.js.LICENSE.txt

@@ -20,6 +20,8 @@
 
 /*! @license DOMPurify 3.1.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.5/LICENSE */
 
+/*! @license DOMPurify 3.1.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.6/LICENSE */
+
 /*! formiojs v5.0.0-rc.59 | https://unpkg.com/formiojs@5.0.0-rc.59/LICENSE.txt */
 
 /**

package/lib/cjs/Form.d.ts

@@ -398,10 +398,10 @@ export default class Form extends Element {
     getFormInitOptions(url: string, form: import('@formio/core').Form): object;
     /**
      * Sets the form to the JSON schema of a form.
-     * @param {import('@formio/core').Form} formParam - The form JSON to set this form to.
+     * @param {import('@formio/core').Form | string} formParam - The form JSON to set this form to.
      * @returns {Promise<Webform|Wizard|PDF>} - The webform instance that was created.
      */
-    setForm(formParam: import('@formio/core').Form): Promise<Webform | Wizard | PDF>;
+    setForm(formParam: import('@formio/core').Form | string): Promise<Webform | Wizard | PDF>;
     _form: any;
     getSubmission(formio: any, opts: any): any;
     /**

package/lib/cjs/Form.js

@@ -195,7 +195,7 @@ class Form extends Element_1.default {
     }
     /**
      * Sets the form to the JSON schema of a form.
-     * @param {import('@formio/core').Form} formParam - The form JSON to set this form to.
+     * @param {import('@formio/core').Form | string} formParam - The form JSON to set this form to.
      * @returns {Promise<Webform|Wizard|PDF>} - The webform instance that was created.
      */
     setForm(formParam) {
@@ -222,8 +222,14 @@ class Form extends Element_1.default {
                     }
                     this.loading = false;
                     this.instance = this.instance || this.create(form.display);
-                    const options = this.getFormInitOptions(formParam, form);
-                    this.instance.setUrl(formParam, options);
+                    // If we're in builder mode, instance.setUrl is not a function, so just manually set the URL.
+                    if (this.instance.setUrl) {
+                        const options = this.getFormInitOptions(formParam, form);
+                        this.instance.setUrl(formParam, options);
+                    }
+                    else {
+                        this.instance.url = formParam;
+                    }
                     this.instance.nosubmit = false;
                     this._form = this.instance.form = form;
                     if (submission) {

package/lib/cjs/PDF.js

@@ -70,7 +70,7 @@ class PDF extends Webform_1.default {
         super.destroy(all);
     }
     rebuild() {
-        if (this.attached && this.builderMode && this.component.components) {
+        if (this.builderMode && this.component.components) {
             this.destroyComponents();
             this.addComponents();
             return Promise.resolve();

package/lib/cjs/Webform.js

@@ -826,7 +826,6 @@ class Webform extends NestedDataComponent_1.default {
         if (!submission || !submission.data) {
             submission = {
                 data: {},
-                metadata: submission.metadata,
             };
         }
         // Metadata needs to be available before setValue
@@ -1130,7 +1129,7 @@ class Webform extends NestedDataComponent_1.default {
         });
         const displayedErrors = [];
         if (errors.length) {
-            errors = lodash_1.default.uniqBy(errors, (error) => error.message);
+            errors = lodash_1.default.uniqBy(errors, (error) => { var _a, _b; return [error.message, (_a = error.component) === null || _a === void 0 ? void 0 : _a.id, (_b = error.context) === null || _b === void 0 ? void 0 : _b.path].join(); });
             const createListItem = (message, index) => {
                 var _a, _b, _c;
                 const err = errors[index];

package/lib/cjs/WebformBuilder.js

@@ -208,7 +208,8 @@ class WebformBuilder extends Component_1.default {
             params: {
                 type: 'resource',
                 limit: 1000000,
-                select: '_id,title,name,components'
+                select: '_id,title,name,components',
+                'tags__ne': 'noBuilderResource'
             }
         };
         if (this.options && this.options.resourceTag) {
@@ -908,7 +909,11 @@ class WebformBuilder extends Component_1.default {
         if (form && form.properties) {
             this.options.properties = form.properties;
         }
-        this.keyboardActionsEnabled = lodash_1.default.get(this.options, 'keyboardBuilder', false) || ((_a = this.options.properties) === null || _a === void 0 ? void 0 : _a.keyboardBuilder);
+        let keyboardActionsEnabled = lodash_1.default.get(this.options, 'keyboardBuilder', false) || ((_a = this.options.properties) === null || _a === void 0 ? void 0 : _a.keyboardBuilder);
+        if (typeof keyboardActionsEnabled === 'string') {
+            keyboardActionsEnabled = keyboardActionsEnabled === 'true';
+        }
+        this.keyboardActionsEnabled = keyboardActionsEnabled;
         const isShowSubmitButton = !this.options.noDefaultSubmitButton
             && (!form.components.length || !form.components.find(comp => comp.key === 'submit'));
         // Ensure there is at least a submit button.
@@ -1060,7 +1065,10 @@ class WebformBuilder extends Component_1.default {
                     'calculateValue',
                     'conditional',
                     'customConditional',
-                    'id'
+                    'id',
+                    'fields.day.required',
+                    'fields.month.required',
+                    'fields.year.required',
                 ]));
                 const parentComponent = defaultValueComponent.parent;
                 let tabIndex = -1;
@@ -1236,6 +1244,7 @@ class WebformBuilder extends Component_1.default {
         const previewButtons = this.componentEdit.querySelectorAll(`[${this._referenceAttributeName}="previewButton"]`);
         previewButtons.forEach((previewButton) => {
             this.editForm.addEventListener(previewButton, 'click', (event) => {
+                var _a;
                 event.preventDefault();
                 this.showPreview = !this.showPreview;
                 this.editForm.detach();
@@ -1247,6 +1256,7 @@ class WebformBuilder extends Component_1.default {
                     helplinks: this.helplinks,
                 }));
                 this.editForm.attach(this.componentEdit.querySelector(`[${this._referenceAttributeName}="editForm"]`));
+                this.updateComponent((_a = this.editForm.submission.data) !== null && _a !== void 0 ? _a : component);
                 this.attachEditComponentControls(component, parent, isNew, original, ComponentClass);
             });
         });

package/lib/cjs/components/_classes/nested/NestedComponent.d.ts

@@ -211,11 +211,12 @@ export default class NestedComponent extends Field {
     calculateValue(data: any, flags: any, row: any): any;
     isLastPage(): boolean;
     isValid(data: any, dirty: any): any;
-    validationProcessor({ scope, data, row, instance }: {
+    validationProcessor({ scope, data, row, instance, component }: {
         scope: any;
         data: any;
         row: any;
         instance: any;
+        component: any;
     }, flags: any): void;
     /**
      * Perform a validation on all child components of this nested component.

package/lib/cjs/components/_classes/nested/NestedComponent.js

@@ -497,6 +497,7 @@ class NestedComponent extends Field_1.default {
             header: 'single',
             collapsed: this.collapsed,
             [this.nestedKey]: 'single',
+            messageContainer: 'single-scope',
         });
         let childPromise = Promise.resolve();
         if (this.refs[this.nestedKey]) {
@@ -681,8 +682,11 @@ class NestedComponent extends Field_1.default {
     isValid(data, dirty) {
         return this.getComponents().reduce((valid, comp) => comp.isValid(data, dirty) && valid, super.isValid(data, dirty));
     }
-    validationProcessor({ scope, data, row, instance }, flags) {
+    validationProcessor({ scope, data, row, instance, component }, flags) {
         const { dirty } = flags;
+        if (this.root.hasExtraPages && this.page !== this.root.page) {
+            instance = this.getComponent(component.path);
+        }
         if (!instance) {
             return;
         }

package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.d.ts

@@ -12,6 +12,8 @@ export default class NestedArrayComponent extends NestedDataComponent {
     hasAddButton(): any;
     getComponent(path: any, fn: any, originalPath: any): any;
     everyComponent(fn: any, rowIndex: any, options?: {}): void;
+    _getEmailTableHeader(options: any): string;
+    _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -149,39 +149,60 @@ class NestedArrayComponent extends NestedDataComponent_1.default {
             }
         });
     }
+    _getEmailTableHeader(options) {
+        let row = '';
+        const getHeaderCell = (component) => {
+            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
+                return '';
+            }
+            const label = component.label || component.key;
+            return `<th style="padding: 5px 10px;">${label}</th>`;
+        };
+        const components = this.getComponents(0);
+        for (const component of components) {
+            if (component.isInputComponent) {
+                row += getHeaderCell(component);
+            }
+            else if ((0, utils_1.isLayoutComponent)(component) && typeof component.everyComponent === 'function') {
+                component.everyComponent((comp) => {
+                    row += getHeaderCell(comp);
+                }, options);
+            }
+        }
+        return `<thead><tr>${row}</tr></thead>`;
+    }
+    _getEmailTableBody(options) {
+        const getBodyCell = (component) => {
+            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
+                return '';
+            }
+            return `<td style="padding: 5px 10px;">${component.getView(component.dataValue, options)}</td>`;
+        };
+        const rows = [];
+        for (const { components } of this.iteratableRows) {
+            let row = '';
+            for (const component of components) {
+                if (component.isInputComponent) {
+                    row += getBodyCell(component);
+                }
+                else if ((0, utils_1.isLayoutComponent)(component) && typeof component.everyComponent === 'function') {
+                    component.everyComponent((comp) => {
+                        row += getBodyCell(comp);
+                    }, options);
+                }
+            }
+            rows.push(`<tr>${row}</tr>`);
+        }
+        return `<tbody>${rows.join('')}</tbody>`;
+    }
     getValueAsString(value, options) {
-        var _a;
         if (options === null || options === void 0 ? void 0 : options.email) {
-            let result = (`
+            return `
         <table border="1" style="width:100%">
-          <thead>
-            <tr>
-      `);
-            (_a = this.component.components) === null || _a === void 0 ? void 0 : _a.forEach((component) => {
-                const label = component.label || component.key;
-                result += `<th style="padding: 5px 10px;">${label}</th>`;
-            });
-            result += (`
-          </tr>
-        </thead>
-        <tbody>
-      `);
-            this.iteratableRows.forEach(({ components }) => {
-                result += '<tr>';
-                lodash_1.default.each(components, (component) => {
-                    result += '<td style="padding:5px 10px;">';
-                    if (component.isInputComponent && component.visible && !component.skipInEmail) {
-                        result += component.getView(component.dataValue, options);
-                    }
-                    result += '</td>';
-                });
-                result += '</tr>';
-            });
-            result += (`
-          </tbody>
+          ${this._getEmailTableHeader(options)}
+          ${this._getEmailTableBody(options)}
         </table>
-      `);
-            return result;
+      `;
         }
         if (!value || !value.length) {
             return '';

package/lib/cjs/components/datagrid/DataGrid.d.ts

@@ -59,7 +59,6 @@ export default class DataGridComponent extends NestedArrayComponent {
     getRows(): {}[];
     getColumns(): any[];
     hasHeader(): any;
-    loadRefs(element: any, refs: any): void;
     dragula: any;
     getComponentsContainer(): any;
     /**

package/lib/cjs/components/datagrid/DataGrid.js

@@ -263,13 +263,6 @@ class DataGridComponent extends NestedArrayComponent_1.default {
             return hasHeader || ((col.label || col.title) && !col.hideLabel);
         }, false);
     }
-    loadRefs(element, refs) {
-        super.loadRefs(element, refs);
-        if (refs['messageContainer'] === 'single') {
-            const container = lodash_1.default.last(element.querySelectorAll(`[${this._referenceAttributeName}=messageContainer]`));
-            this.refs['messageContainer'] = container || this.refs['messageContainer'];
-        }
-    }
     attach(element) {
         this.loadRefs(element, {
             [`${this.datagridKey}-row`]: 'multiple',
@@ -278,7 +271,6 @@ class DataGridComponent extends NestedArrayComponent_1.default {
             [`${this.datagridKey}-removeRow`]: 'multiple',
             [`${this.datagridKey}-group-header`]: 'multiple',
             [this.datagridKey]: 'multiple',
-            'messageContainer': 'single'
         });
         if (this.allowReorder) {
             this.refs[`${this.datagridKey}-row`].forEach((row, index) => {

package/lib/cjs/components/datamap/DataMap.js

@@ -241,7 +241,7 @@ class DataMapComponent extends DataGrid_1.default {
             delete dataValue[key];
             const comp = components[this.valueKey];
             comp.component.key = newKey;
-            comp.path = Components_1.default.calculateComponentPath(comp);
+            comp.path = Components_1.default.getComponentPath(comp);
             key = newKey;
         });
         const valueComponent = lodash_1.default.clone(this.component.valueComponent);

package/lib/cjs/components/day/Day.d.ts

@@ -17,9 +17,9 @@ export default class DayComponent extends Field {
     constructor(component: any, options: any, data: any);
     /**
      * The empty value for day component.
-     * @returns {'00/00/0000'} - The empty value of the day component.
+     * @returns {''} - The empty value of the day component.
      */
-    get emptyValue(): "00/00/0000";
+    get emptyValue(): "";
     get valueMask(): RegExp;
     get dayRequired(): any;
     get showDay(): boolean;

package/lib/cjs/components/day/Day.js

@@ -64,10 +64,10 @@ class DayComponent extends Field_1.default {
     }
     /**
      * The empty value for day component.
-     * @returns {'00/00/0000'} - The empty value of the day component.
+     * @returns {''} - The empty value of the day component.
      */
     get emptyValue() {
-        return '00/00/0000';
+        return '';
     }
     get valueMask() {
         return /^\d{2}\/\d{2}\/\d{4}$/;
@@ -363,7 +363,7 @@ class DayComponent extends Field_1.default {
     setValueAt(index, value) {
         // temporary solution to avoid input reset
         // on invalid date.
-        if (!value || value === 'Invalid date') {
+        if (value === 'Invalid date') {
             return null;
         }
         const parts = value.split('/');

package/lib/cjs/components/editgrid/EditGrid.js

@@ -490,11 +490,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         else {
             this.removeClass(this.refs.component, `formio-component-${this.component.type}-row-open`);
         }
-        const superAttach = super.attach(element);
-        this.loadRefs(element, {
-            messageContainer: 'single-scope',
-        });
-        return superAttach;
+        return super.attach(element);
     }
     flattenRowDataValue(dataValue) {
         const flattened = {};

package/lib/cjs/components/editgrid/fixtures/comp17.d.ts

@@ -0,0 +1,80 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        rowDrafts: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            collapsible: boolean;
+            key: string;
+            type: string;
+            label: string;
+            input: boolean;
+            tableView: boolean;
+            components: {
+                label: string;
+                columns: ({
+                    components: {
+                        label: string;
+                        optionsLabelPosition: string;
+                        inline: boolean;
+                        tableView: boolean;
+                        values: {
+                            label: string;
+                            value: string;
+                            shortcut: string;
+                        }[];
+                        key: string;
+                        type: string;
+                        input: boolean;
+                    }[];
+                    width: number;
+                    offset: number;
+                    push: number;
+                    pull: number;
+                    size: string;
+                    currentWidth: number;
+                } | {
+                    components: {
+                        label: string;
+                        applyMaskOn: string;
+                        autoExpand: boolean;
+                        tableView: boolean;
+                        key: string;
+                        conditional: {
+                            show: boolean;
+                            conjunction: string;
+                        };
+                        type: string;
+                        input: boolean;
+                    }[];
+                    width: number;
+                    offset: number;
+                    push: number;
+                    pull: number;
+                    size: string;
+                    currentWidth: number;
+                })[];
+                key: string;
+                type: string;
+                input: boolean;
+                tableView: boolean;
+            }[];
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        rowDrafts?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/editgrid/fixtures/comp17.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Edit Grid',
+            tableView: false,
+            rowDrafts: false,
+            key: 'editGrid',
+            type: 'editgrid',
+            input: true,
+            components: [
+                {
+                    collapsible: false,
+                    key: 'panel',
+                    type: 'panel',
+                    label: 'Panel',
+                    input: false,
+                    tableView: false,
+                    components: [
+                        {
+                            label: 'Columns',
+                            columns: [
+                                {
+                                    components: [
+                                        {
+                                            label: 'Radio',
+                                            optionsLabelPosition: 'right',
+                                            inline: false,
+                                            tableView: true,
+                                            values: [
+                                                {
+                                                    label: 'yes',
+                                                    value: 'yes',
+                                                    shortcut: ''
+                                                },
+                                                {
+                                                    label: 'no',
+                                                    value: 'no',
+                                                    shortcut: ''
+                                                }
+                                            ],
+                                            key: 'radio',
+                                            type: 'radio',
+                                            input: true
+                                        }
+                                    ],
+                                    width: 6,
+                                    offset: 0,
+                                    push: 0,
+                                    pull: 0,
+                                    size: 'md',
+                                    currentWidth: 6
+                                },
+                                {
+                                    components: [
+                                        {
+                                            label: 'Text Area',
+                                            applyMaskOn: 'change',
+                                            autoExpand: false,
+                                            tableView: true,
+                                            key: 'textArea',
+                                            conditional: {
+                                                show: true,
+                                                conjunction: 'all'
+                                            },
+                                            type: 'textarea',
+                                            input: true
+                                        }
+                                    ],
+                                    width: 6,
+                                    offset: 0,
+                                    push: 0,
+                                    pull: 0,
+                                    size: 'md',
+                                    currentWidth: 6
+                                }
+                            ],
+                            key: 'columns',
+                            type: 'columns',
+                            input: false,
+                            tableView: false
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

package/lib/cjs/components/editgrid/fixtures/index.d.ts

@@ -14,8 +14,9 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp16 from './comp16';
+import comp17 from './comp17';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

package/lib/cjs/components/editgrid/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compTestEvents = exports.compWithCustomDefaultValue = exports.withOpenWhenEmptyAndConditions = exports.compOpenWhenEmpty = exports.comp16 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.compTestEvents = exports.compWithCustomDefaultValue = exports.withOpenWhenEmptyAndConditions = exports.compOpenWhenEmpty = exports.comp17 = exports.comp16 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -36,6 +36,8 @@ const comp15_1 = __importDefault(require("./comp15"));
 exports.comp15 = comp15_1.default;
 const comp16_1 = __importDefault(require("./comp16"));
 exports.comp16 = comp16_1.default;
+const comp17_1 = __importDefault(require("./comp17"));
+exports.comp17 = comp17_1.default;
 const comp_with_conditions_and_openWhenEmpty_1 = __importDefault(require("./comp-with-conditions-and-openWhenEmpty"));
 exports.withOpenWhenEmptyAndConditions = comp_with_conditions_and_openWhenEmpty_1.default;
 const comp_openWhenEmpty_1 = __importDefault(require("./comp-openWhenEmpty"));

package/lib/cjs/components/file/File.js

@@ -935,6 +935,10 @@ class FileComponent extends Field_1.default {
                         : response.type === 'abort'
                             ? this.t('Request was aborted')
                             : response.toString();
+                    this.emit('fileUploadError', {
+                        fileToSync,
+                        response,
+                    });
                 }
                 finally {
                     delete fileToSync.progress;

package/lib/cjs/components/form/editForm/Form.edit.form.js

@@ -47,7 +47,7 @@ exports.default = [
         },
         searchField: 'title__regex',
         template: '<span>{{ item._vid }}</span>',
-        valueProperty: '_id',
+        valueProperty: 'revisionId',
         authenticate: true,
         label: 'Form Revision',
         key: 'revision',

package/lib/cjs/components/panel/Panel.d.ts

@@ -4,6 +4,7 @@ export default class PanelComponent extends NestedComponent {
         icon: string;
         group: string;
         documentation: string;
+        showPreview: boolean;
         weight: number;
         schema: any;
     };

package/lib/cjs/components/panel/Panel.js

@@ -27,6 +27,7 @@ class PanelComponent extends NestedComponent_1.default {
             icon: 'list-alt',
             group: 'layout',
             documentation: '/userguide/form-building/layout-components#panel',
+            showPreview: false,
             weight: 30,
             schema: PanelComponent.schema()
         };

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

@@ -295,14 +295,15 @@ class RadioComponent extends ListComponent_1.default {
     setItems(items) {
         const listData = [];
         items === null || items === void 0 ? void 0 : items.forEach((item, i) => {
+            const valueAtProperty = lodash_1.default.get(item, this.component.valueProperty);
             this.loadedOptions[i] = {
-                value: this.component.valueProperty ? item[this.component.valueProperty] : item,
-                label: this.component.valueProperty ? this.itemTemplate(item, item[this.component.valueProperty]) : this.itemTemplate(item, item, i)
+                value: this.component.valueProperty ? valueAtProperty : item,
+                label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
-            listData.push(this.templateData[this.component.valueProperty ? item[this.component.valueProperty] : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(item[this.component.valueProperty]) ||
-                (!this.isRadio && lodash_1.default.isObject(item[this.component.valueProperty])) ||
-                (!this.isRadio && lodash_1.default.isBoolean(item[this.component.valueProperty])))) {
+            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)))) {
                 this.loadedOptions[i].invalid = true;
             }
         });