@formio/js 5.1.0-dev.6114.02b6d9c → 5.1.0-dev.6123.055aa35

package/lib/cjs/components/_classes/component/editForm/Component.edit.conditional.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = __importDefault(require("./utils"));
-const utils_2 = require("../../../../utils/utils");
+const utils_2 = require("../../../../utils");
 /* eslint-disable quotes, max-len */
 exports.default = [
     {

package/lib/cjs/components/_classes/component/editForm/Component.edit.logic.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = __importDefault(require("./utils"));
-const utils_2 = require("../../../../utils/utils");
+const utils_2 = require("../../../../utils");
 /* eslint-disable quotes, max-len */
 exports.default = [
     {

package/lib/cjs/components/_classes/componentModal/ComponentModal.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 class ComponentModal {
     static render(component, data, topLevel) {
         const children = component.renderTemplate('component', data, topLevel);

package/lib/cjs/components/_classes/input/Input.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Multivalue_1 = __importDefault(require("../multivalue/Multivalue"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 const widgets_1 = __importDefault(require("../../../widgets"));
 const lodash_1 = __importDefault(require("lodash"));
 class Input extends Multivalue_1.default {

package/lib/cjs/components/_classes/list/ListComponent.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../field/Field"));
 const Formio_1 = require("../../../Formio");
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 class ListComponent extends Field_1.default {
     static schema(...extend) {
         return Field_1.default.schema({

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

@@ -7,7 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../field/Field"));
 const Components_1 = __importDefault(require("../../Components"));
 '';
-const utils_1 = require("../../../utils/utils");
+const utils_1 = __importDefault(require("../../../utils"));
 const process_1 = require("@formio/core/process");
 /**
  * NestedComponent class.
@@ -209,7 +209,7 @@ class NestedComponent extends Field_1.default {
     set rowIndex(value) {
         var _a, _b;
         this._rowIndex = value;
-        this.paths = (0, utils_1.getComponentPaths)(this.component, (_a = this.parent) === null || _a === void 0 ? void 0 : _a.component, Object.assign(Object.assign({}, (((_b = this.parent) === null || _b === void 0 ? void 0 : _b.paths) || {})), { dataIndex: value }));
+        this.paths = utils_1.default.getComponentPaths(this.component, (_a = this.parent) === null || _a === void 0 ? void 0 : _a.component, Object.assign(Object.assign({}, (((_b = this.parent) === null || _b === void 0 ? void 0 : _b.paths) || {})), { dataIndex: value }));
         this.eachComponent((component) => {
             component.rowIndex = value;
         });
@@ -311,7 +311,7 @@ class NestedComponent extends Field_1.default {
      */
     getComponent(path) {
         var _a;
-        path = (0, utils_1.getStringFromComponentPath)(path);
+        path = utils_1.default.getStringFromComponentPath(path);
         const matches = {
             path: undefined,
             fullPath: undefined,
@@ -324,7 +324,7 @@ class NestedComponent extends Field_1.default {
         this.everyComponent((component) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
             // All searches are relative to this component so replace this path from the child paths.
-            (0, utils_1.componentMatches)(component.component, {
+            utils_1.default.componentMatches(component.component, {
                 path: (_b = (_a = component.paths) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.replace(new RegExp(`^${(_c = this.paths) === null || _c === void 0 ? void 0 : _c.path}\\.?`), ''),
                 fullPath: (_e = (_d = component.paths) === null || _d === void 0 ? void 0 : _d.fullPath) === null || _e === void 0 ? void 0 : _e.replace(new RegExp(`^${(_f = this.paths) === null || _f === void 0 ? void 0 : _f.fullPath}\\.?`), ''),
                 localPath: (_h = (_g = component.paths) === null || _g === void 0 ? void 0 : _g.localPath) === null || _h === void 0 ? void 0 : _h.replace(new RegExp(`^${(_j = this.paths) === null || _j === void 0 ? void 0 : _j.localPath}\\.?`), ''),
@@ -336,7 +336,7 @@ class NestedComponent extends Field_1.default {
                 return match;
             });
         });
-        return (_a = (0, utils_1.getBestMatch)(matches)) === null || _a === void 0 ? void 0 : _a.instance;
+        return (_a = utils_1.default.getBestMatch(matches)) === null || _a === void 0 ? void 0 : _a.instance;
     }
     /**
      * Return a component provided the Id of the component.
@@ -378,7 +378,7 @@ class NestedComponent extends Field_1.default {
         options.localRoot = this.localRoot;
         options.skipInit = true;
         if (!(options.display === 'pdf' && this.builderMode)) {
-            component.id = (0, utils_1.getRandomComponentId)();
+            component.id = utils_1.default.getRandomComponentId();
         }
         const comp = Components_1.default.create(component, options, data, true);
         comp.init();

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("@formio/core/utils");
 const { getComponentPaths } = utils_1.Utils;
-const utils_2 = require("../../../utils/utils");
+const utils_2 = require("../../../utils");
 const Component_1 = __importDefault(require("../component/Component"));
 const NestedDataComponent_1 = __importDefault(require("../nesteddata/NestedDataComponent"));
 class NestedArrayComponent extends NestedDataComponent_1.default {

package/lib/cjs/components/_classes/nesteddata/NestedDataComponent.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Component_1 = __importDefault(require("../component/Component"));
 const NestedComponent_1 = __importDefault(require("../nested/NestedComponent"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 class NestedDataComponent extends NestedComponent_1.default {
     hasChanged(newValue, oldValue) {
         // If we do not have a value and are getting set to anything other than undefined or null, then we changed.

package/lib/cjs/components/address/Address.js

@@ -11,7 +11,7 @@ const GoogleAddressProvider_1 = require("../../providers/address/GoogleAddressPr
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const NestedComponent_1 = __importDefault(require("../_classes/nested/NestedComponent"));
 const Container_1 = __importDefault(require("../container/Container"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 exports.AddressComponentMode = {
     Autocomplete: 'autocomplete',
     Manual: 'manual',

package/lib/cjs/components/alert/Alert.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class Alert {
     constructor(container, component) {
         this.container = container;

package/lib/cjs/components/button/Button.d.ts

@@ -7,7 +7,7 @@ export default class ButtonComponent extends Field {
         weight: number;
         schema: any;
     };
-    static savedValueTypes(schema: any): string[];
+    static savedValueTypes(schema: any): any;
     constructor(component: any, options: any, data: any);
     filesUploading: number;
     get inputInfo(): any;

package/lib/cjs/components/button/Button.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const utils_1 = require("../../utils/utils");
+const formUtils_1 = require("../../utils/formUtils");
 class ButtonComponent extends Field_1.default {
     static schema(...extend) {
         return Input_1.default.schema({
@@ -35,7 +35,7 @@ class ButtonComponent extends Field_1.default {
         };
     }
     static savedValueTypes(schema) {
-        return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.boolean];
+        return (0, formUtils_1.getComponentSavedTypes)(schema) || [formUtils_1.componentValueTypes.boolean];
     }
     constructor(component, options, data) {
         super(component, options, data);
@@ -306,7 +306,7 @@ class ButtonComponent extends Field_1.default {
                 const form = this.getRoot();
                 const flattened = {};
                 const components = {};
-                (0, utils_1.eachComponent)(form.components, (componentWrapper, path) => {
+                (0, formUtils_1.eachComponent)(form.components, (componentWrapper, path) => {
                     const component = componentWrapper.component || componentWrapper;
                     flattened[path] = component;
                     components[component.key] = component;
@@ -447,7 +447,7 @@ class ButtonComponent extends Field_1.default {
         }, 100);
     }
     get oauthComponentPath() {
-        const pathArray = (0, utils_1.getArrayFromComponentPath)(this.path);
+        const pathArray = (0, formUtils_1.getArrayFromComponentPath)(this.path);
         return lodash_1.default.chain(pathArray).filter(pathPart => !lodash_1.default.isNumber(pathPart)).join('.').value();
     }
     focus() {

package/lib/cjs/components/checkbox/Checkbox.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 class CheckBoxComponent extends Field_1.default {
     static schema(...extend) {

package/lib/cjs/components/container/Container.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
 const NestedDataComponent_1 = __importDefault(require("../_classes/nesteddata/NestedDataComponent"));

package/lib/cjs/components/currency/Currency.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const text_mask_addons_1 = require("@formio/text-mask-addons");
 const vanilla_text_mask_1 = require("@formio/vanilla-text-mask");
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Number_1 = __importDefault(require("../number/Number"));
 class CurrencyComponent extends Number_1.default {
     static schema(...extend) {

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class DataGridComponent extends NestedArrayComponent_1.default {
     static schema(...extend) {
         return NestedArrayComponent_1.default.schema({

package/lib/cjs/components/datamap/DataMap.d.ts

@@ -1,5 +1,5 @@
 export default class DataMapComponent extends DataGridComponent {
-    static savedValueTypes(schema: any): string[];
+    static savedValueTypes(schema: any): any;
     constructor(component: any, options: any, data: any);
     get schema(): any;
     get emptyValue(): {};

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

@@ -7,7 +7,7 @@ const Component_1 = __importDefault(require("../_classes/component/Component"));
 const DataGrid_1 = __importDefault(require("../datagrid/DataGrid"));
 const lodash_1 = __importDefault(require("lodash"));
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const utils_1 = require("../../utils/utils");
+const formUtils_1 = require("../../utils/formUtils");
 class DataMapComponent extends DataGrid_1.default {
     static schema(...extend) {
         return Component_1.default.schema({
@@ -50,7 +50,7 @@ class DataMapComponent extends DataGrid_1.default {
         return lodash_1.default.omit(schema, 'components');
     }
     static savedValueTypes(schema) {
-        return (0, utils_1.getComponentSavedTypes)(schema) || [utils_1.componentValueTypes.object];
+        return (0, formUtils_1.getComponentSavedTypes)(schema) || [formUtils_1.componentValueTypes.object];
     }
     constructor(component, options, data) {
         super(component, options, data);
@@ -149,7 +149,7 @@ class DataMapComponent extends DataGrid_1.default {
     getRowKey(rowIndex) {
         const keys = Object.keys(this.dataValue);
         if (!keys[rowIndex]) {
-            keys[rowIndex] = (0, utils_1.uniqueKey)(this.dataValue, this.defaultRowKey);
+            keys[rowIndex] = (0, formUtils_1.uniqueKey)(this.dataValue, this.defaultRowKey);
         }
         return keys[rowIndex];
     }
@@ -232,7 +232,7 @@ class DataMapComponent extends DataGrid_1.default {
         components['__key'] = this.createComponent(this.keySchema, options, { __key: this.builderMode ? this.defaultRowKey : key });
         components['__key'].on('componentChange', (event) => {
             const dataValue = this.dataValue;
-            const newKey = (0, utils_1.uniqueKey)(dataValue, event.value);
+            const newKey = (0, formUtils_1.uniqueKey)(dataValue, event.value);
             dataValue[newKey] = dataValue[key];
             delete dataValue[key];
             const comp = components[this.valueKey];

package/lib/cjs/components/datetime/DateTime.d.ts

@@ -17,7 +17,7 @@ export default class DateTimeComponent extends Input {
     };
     static savedValueTypes(schema: any): string[];
     get emptyValue(): string;
-    get momentFormat(): string;
+    get dayjsFormat(): string;
     createWrapper(): boolean;
     checkValidity(data: any, dirty: any, rowData: any): boolean;
     getValueAsString(value: any, options: any): any;

package/lib/cjs/components/datetime/DateTime.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const moment_1 = __importDefault(require("moment"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const utils_1 = __importDefault(require("../../utils"));
-const utils_2 = require("../../utils/utils");
+const utils_2 = require("../../utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 class DateTimeComponent extends Input_1.default {
     static schema(...extend) {
@@ -123,8 +123,8 @@ class DateTimeComponent extends Input_1.default {
     get emptyValue() {
         return '';
     }
-    get momentFormat() {
-        return utils_1.default.convertFormatToMoment(this.component.format);
+    get dayjsFormat() {
+        return utils_1.default.convertFormatToDayjs(this.component.format);
     }
     isEmpty(value = this.dataValue) {
         if (value && (value.toString() === 'Invalid Date')) {
@@ -133,12 +133,14 @@ class DateTimeComponent extends Input_1.default {
         return super.isEmpty(value);
     }
     formatValue(input) {
-        const result = moment_1.default.utc(input).toISOString();
-        return result === 'Invalid date' ? input : result;
+        if ((0, dayjs_1.default)(input).isValid()) {
+            return dayjs_1.default.utc(input).toISOString();
+        }
+        return input;
     }
     isEqual(valueA, valueB = this.dataValue) {
         return (this.isEmpty(valueA) && this.isEmpty(valueB))
-            || moment_1.default.utc(valueA).format(this.momentFormat) === moment_1.default.utc(valueB).format(this.momentFormat);
+            || dayjs_1.default.utc(valueA).format(this.dayjsFormat) === dayjs_1.default.utc(valueB).format(this.dayjsFormat);
     }
     createWrapper() {
         return false;
@@ -154,19 +156,19 @@ class DateTimeComponent extends Input_1.default {
         return super.checkValidity(data, dirty, rowData);
     }
     getValueAsString(value, options) {
-        let format = utils_1.default.convertFormatToMoment(this.component.format);
-        format += format.match(/z$/) ? '' : ' z';
+        let format = utils_1.default.convertFormatToDayjs(this.component.format);
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
+            format += format.match(/z$/) ? '' : ' z';
             if (Array.isArray(value) && this.component.multiple) {
-                return value.map(item => lodash_1.default.trim(utils_1.default.momentDate(item, format, timezone, options).format(format))).join(', ');
+                return value.map(item => lodash_1.default.trim(utils_1.default.dayjsDate(item, format, timezone, options).format(format))).join(', ');
             }
-            return lodash_1.default.trim(utils_1.default.momentDate(value, format, timezone, options).format(format));
+            return lodash_1.default.trim(utils_1.default.dayjsDate(value, format, timezone, options).format(format));
         }
         if (Array.isArray(value) && this.component.multiple) {
-            return value.map(item => lodash_1.default.trim((0, moment_1.default)(item).format(format))).join(', ');
+            return value.map(item => lodash_1.default.trim((0, dayjs_1.default)(item).format(format))).join(', ');
         }
-        return (value ? lodash_1.default.trim((0, moment_1.default)(value).format(format)) : value) || '';
+        return (value ? lodash_1.default.trim((0, dayjs_1.default)(value).format(format)) : value) || '';
     }
 }
 exports.default = DateTimeComponent;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const core_1 = require("@formio/core");
 class DayComponent extends Field_1.default {
     static schema(...extend) {

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

@@ -9,7 +9,7 @@ const components_1 = require("@formio/bootstrap/components");
 const NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const Alert_1 = __importDefault(require("../alert/Alert"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const EditRowState = {
     New: 'new',
     Editing: 'editing',

package/lib/cjs/components/editgrid/editForm/EditGrid.edit.display.js

@@ -35,7 +35,7 @@ exports.default = [
         weight: 1002,
         input: false,
         customConditional() {
-            return !Evaluator_1.Evaluator.noeval;
+            return !Evaluator_1.Evaluator.noeval || !Evaluator_1.Evaluator.protectedEval;
         },
     },
     {

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

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const downloadjs_1 = __importDefault(require("downloadjs"));
 const lodash_1 = __importDefault(require("lodash"));
 const fileProcessor_1 = __importDefault(require("../../providers/processor/fileProcessor"));

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

@@ -8,7 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const ComponentModal_1 = __importDefault(require("../_classes/componentModal/ComponentModal"));
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Formio_1 = require("../../Formio");
 const Form_1 = __importDefault(require("../../Form"));
 class FormComponent extends Component_1.default {
@@ -278,6 +278,9 @@ class FormComponent extends Component_1.default {
             if (this.isSubFormLazyLoad() && !this.hasLoadedForm && !this.subFormLoading) {
                 this.createSubForm(true);
             }
+            if (!this.subFormReady) {
+                return Promise.resolve();
+            }
             return this.subFormReady.then(() => {
                 this.empty(element);
                 if (this.options.builder) {
@@ -408,13 +411,15 @@ class FormComponent extends Component_1.default {
             }
             // Render the form.
             return (new Form_1.default(form, this.getSubOptions())).ready.then((instance) => {
+                var _a, _b;
                 this.subForm = instance;
                 this.subForm.currentForm = this;
                 this.subForm.parentVisible = this.visible;
                 const componentsMap = this.componentsMap;
                 const formComponentsMap = this.subForm.componentsMap;
                 lodash_1.default.assign(componentsMap, formComponentsMap);
-                this.component.components = this.subForm.components.map((comp) => comp.component);
+                this.component.components = (_a = this.subForm._form) === null || _a === void 0 ? void 0 : _a.components;
+                this.component.display = (_b = this.subForm._form) === null || _b === void 0 ? void 0 : _b.display;
                 this.subForm.on('change', () => {
                     if (this.subForm && !this.shouldConditionallyClear()) {
                         this.dataValue = this.subForm.getValue();
@@ -699,6 +704,13 @@ class FormComponent extends Component_1.default {
         }
         return errors;
     }
+    conditionallyHidden() {
+        const conditionallyHidden = super.conditionallyHidden();
+        if (this.subForm) {
+            this.subForm._conditionallyHidden = conditionallyHidden;
+        }
+        return conditionallyHidden;
+    }
     updateSubFormVisibility() {
         if (this.subForm) {
             this.subForm.parentVisible = this.visible;

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

@@ -32,10 +32,11 @@ exports.default = [
         tooltip: 'if it is checked, the subform is loaded after navigation to the page with this component within the wizard.',
         input: true,
         customConditional({ instance, data }) {
-            var _a, _b, _c, _d;
-            const formInfo = (_b = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form')) === null || _b === void 0 ? void 0 : _b.defaultDownloadedResources.find(res => res._id === data.form);
+            var _a, _b, _c;
+            const formComp = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form');
+            const formInfo = formComp === null || formComp === void 0 ? void 0 : formComp.defaultDownloadedResources.find(res => res._id === data.form);
             const displayMode = 'wizard';
-            return ((_d = (_c = instance.options) === null || _c === void 0 ? void 0 : _c.editForm) === null || _d === void 0 ? void 0 : _d.display) === displayMode && formInfo && formInfo.display !== displayMode;
+            return ((_c = (_b = instance.options) === null || _b === void 0 ? void 0 : _b.editForm) === null || _c === void 0 ? void 0 : _c.display) === displayMode && ((data.form && !formInfo) || (formInfo && formInfo.display !== displayMode));
         },
     },
     {

package/lib/cjs/components/number/Number.js

@@ -7,7 +7,7 @@ const text_mask_addons_1 = require("@formio/text-mask-addons");
 const vanilla_text_mask_1 = require("@formio/vanilla-text-mask");
 const lodash_1 = __importDefault(require("lodash"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils/");
 class NumberComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const NestedComponent_1 = __importDefault(require("../_classes/nested/NestedComponent"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class PanelComponent extends NestedComponent_1.default {
     static schema(...extend) {
         return NestedComponent_1.default.schema({

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Formio_1 = require("../../Formio");
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class RadioComponent extends ListComponent_1.default {
     static schema(...extend) {
         return ListComponent_1.default.schema({

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 exports.default = [
     {
         key: 'recaptchaInfo',

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

@@ -7,7 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Formio_1 = require("../../Formio");
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Form_1 = __importDefault(require("../../Form"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const ChoicesWrapper_1 = __importDefault(require("../../utils/ChoicesWrapper"));
 class SelectComponent extends ListComponent_1.default {
     static schema(...extend) {

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
     const rawDefaultValue = instance.downloadedResources.find(resource => lodash_1.default.get(resource, data.valueProperty) === defaultValue);

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Radio_1 = __importDefault(require("../radio/Radio"));
 class SelectBoxesComponent extends Radio_1.default {
     static schema(...extend) {

package/lib/cjs/components/signature/Signature.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const signature_pad_1 = __importDefault(require("signature_pad"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SignatureComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

package/lib/cjs/components/survey/Survey.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SurveyComponent extends Field_1.default {
     static schema(...extend) {
         return Field_1.default.schema({

package/lib/cjs/components/tags/Tags.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 });
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const choices_js_1 = __importDefault(require("choices.js"));
 class TagsComponent extends Input_1.default {

package/lib/cjs/components/textarea/TextArea.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* global Quill */
 const TextField_1 = __importDefault(require("../textfield/TextField"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class TextAreaComponent extends TextField_1.default {
     static schema(...extend) {
         return TextField_1.default.schema({
@@ -63,8 +63,8 @@ class TextAreaComponent extends TextField_1.default {
         if ((this.options.readOnly || this.disabled) && !this.isHtmlRenderMode()) {
             const elementStyle = this.info.attr.style || '';
             const children = `
-        <div ${this._referenceAttributeName}="input" 
-          class="formio-editor-read-only-content" 
+        <div ${this._referenceAttributeName}="input"
+          class="formio-editor-read-only-content"
           ${elementStyle ? `style='${elementStyle}'` : ''}
           role="textbox"
           aria-multiline="true"