@formio/js 5.1.0-dev.6162.d0510e0 → 5.1.0-dev.6180.de668a0

package/lib/cjs/Webform.js

@@ -1119,7 +1119,7 @@ class Webform extends NestedDataComponent_1.default {
         const componentErrors = {};
         errors.forEach((err) => {
             var _a, _b;
-            const path = err.path || ((_a = err.context) === null || _a === void 0 ? void 0 : _a.path) || ((_b = err.component) === null || _b === void 0 ? void 0 : _b.key);
+            const path = (0, utils_1.getStringFromComponentPath)(err.path) || ((_a = err.context) === null || _a === void 0 ? void 0 : _a.path) || ((_b = err.component) === null || _b === void 0 ? void 0 : _b.key);
             if (!componentErrors[path]) {
                 componentErrors[path] = [];
             }

package/lib/cjs/components/Components.js

@@ -75,6 +75,12 @@ class Components {
         if (comp.path) {
             comp.componentsMap[comp.path] = comp;
         }
+        // Reset the componentMatches on the root element if any new component is created.
+        let parent = comp.parent;
+        while (parent) {
+            parent.componentMatches = {};
+            parent = parent.parent;
+        }
         return comp;
     }
 }

package/lib/cjs/components/_classes/component/Component.js

@@ -1170,15 +1170,21 @@ class Component extends Element_1.default {
      * @returns {string} - The modal preview template.
      */
     getModalPreviewTemplate() {
-        var _a;
+        var _a, _b;
         const dataValue = this.component.type === 'password' ? this.dataValue.replace(/./g, '•') : this.dataValue;
         let modalLabel;
         if (this.hasInput && ((_a = this.component.validate) === null || _a === void 0 ? void 0 : _a.required) && !this.isPDFReadOnlyMode) {
             modalLabel = { className: 'field-required' };
         }
+        let messages = '';
+        if ((_b = this.errors) === null || _b === void 0 ? void 0 : _b.length) {
+            messages = this.errors.map((err) => {
+                return err.level === 'error' ? this.renderTemplate('message', Object.assign({}, err)) : '';
+            }).join('');
+        }
         return this.renderModalPreview({
             previewText: this.getValueAsString(dataValue, { modalPreview: true }) || this.t('clickToSetValue'),
-            messages: '',
+            messages,
             labelInfo: modalLabel,
         });
     }
@@ -2715,6 +2721,11 @@ class Component extends Element_1.default {
                 this.setValueAt(i, isArray && !this.isSingleInputValue() ? value[i] : value, flags);
             }
         }
+        // Also reset value of the modal component, otherwise it will keep the old value locally and the preview
+        // element won't refresh
+        if (this.componentModal && flags && flags.resetValue) {
+            this.componentModal.setValue(value);
+        }
         return changed;
     }
     /**

package/lib/cjs/components/_classes/component/editForm/Component.edit.data.d.ts

@@ -82,6 +82,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -101,6 +102,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -126,6 +128,7 @@ declare const _default: ({
         value: string;
     })[];
     placeholder?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -141,6 +144,7 @@ declare const _default: ({
     tooltip: string;
     key: string;
     input: boolean;
+    customConditional: string;
     logic: ({
         name: string;
         trigger: {
@@ -211,6 +215,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     as?: undefined;
     editor?: undefined;
@@ -226,6 +231,7 @@ declare const _default: ({
     placeholder?: undefined;
     inline?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -248,6 +254,7 @@ declare const _default: ({
     placeholder?: undefined;
     inline?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;

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

@@ -61,6 +61,7 @@ exports.default = [
         tooltip: 'Encrypt this field on the server. This is two way encryption which is not suitable for passwords.',
         key: 'encrypted',
         input: true,
+        customConditional: 'show = data.encrypted;',
         logic: [
             {
                 name: 'disabled',

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

@@ -108,6 +108,7 @@ export default class NestedComponent extends Field {
      * @returns {any} - The component that is located.
      */
     getComponent(path: string): any;
+    componentMatches: {} | undefined;
     /**
      * Return a component provided the Id of the component.
      * @param {string} id - The Id of the component.

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

@@ -311,6 +311,13 @@ class NestedComponent extends Field_1.default {
      */
     getComponent(path) {
         var _a;
+        // If the component is found
+        if (!this.componentMatches) {
+            this.componentMatches = {};
+        }
+        if (this.componentMatches && this.componentMatches[path]) {
+            return this.componentMatches[path];
+        }
         path = utils_1.default.getStringFromComponentPath(path);
         const matches = {
             path: undefined,
@@ -336,7 +343,8 @@ class NestedComponent extends Field_1.default {
                 return match;
             });
         });
-        return (_a = utils_1.default.getBestMatch(matches)) === null || _a === void 0 ? void 0 : _a.instance;
+        this.componentMatches[path] = (_a = utils_1.default.getBestMatch(matches)) === null || _a === void 0 ? void 0 : _a.instance;
+        return this.componentMatches[path];
     }
     /**
      * Return a component provided the Id of the component.
@@ -800,8 +808,10 @@ class NestedComponent extends Field_1.default {
         return this.data;
     }
     resetValue() {
-        super.resetValue();
+        // Reset values of child components first, then reset the parent one, otherwise it will restore the default
+        // value of parent component and clear it one by one while resetting child components
         this.getComponents().forEach((comp) => comp.resetValue());
+        super.resetValue();
         this.setPristine(true);
     }
     get dataReady() {

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

@@ -249,7 +249,7 @@ class AddressComponent extends Container_1.default {
         if (this.manualMode) {
             this.restoreComponentsContext();
         }
-        if (changed || !lodash_1.default.isEmpty(value) && flags.fromSubmission) {
+        if (changed || !lodash_1.default.isEmpty(value) && flags.fromSubmission || flags.resetValue) {
             this.redraw();
         }
         return changed;

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

@@ -419,12 +419,16 @@ class DataGridComponent extends NestedArrayComponent_1.default {
     updateComponentsRowIndex(components, rowIndex) {
         components.forEach((component, colIndex) => {
             var _a;
+            if (this.componentsMap[component.paths.dataPath]) {
+                delete this.componentsMap[component.paths.dataPath];
+            }
             if ((_a = component.options) === null || _a === void 0 ? void 0 : _a.name) {
                 const newName = `[${this.key}][${rowIndex}]`;
                 component.options.name = component.options.name.replace(`[${this.key}][${component.rowIndex}]`, newName);
             }
             component.rowIndex = rowIndex;
             component.row = `${rowIndex}-${colIndex}`;
+            this.componentsMap[component.paths.dataPath] = component;
         });
     }
     updateRowsComponents(rowIndex) {

package/lib/cjs/components/editgrid/EditGrid.d.ts

@@ -101,7 +101,6 @@ export default class EditGridComponent extends NestedArrayComponent {
     changeState(changed: any, flags: any): void;
     openWhenEmpty(): void;
     restoreRowContext(editRow: any, flags?: {}): void;
-    emptyRows(): void;
     hasChanged: (newValue: any, oldValue: any) => boolean;
 }
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';

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

@@ -1200,14 +1200,6 @@ class EditGridComponent extends NestedArrayComponent_1.default {
             this.setNestedValue(component, editRow.data, flags);
         });
     }
-    emptyRows() {
-        this.editRows.forEach((editRow, index) => this.destroyComponents(false, index));
-        this.editRows = [];
-    }
-    resetValue() {
-        super.resetValue();
-        this.emptyRows();
-    }
 }
 exports.default = EditGridComponent;
 EditGridComponent.prototype.hasChanged = Component_1.default.prototype.hasChanged;

package/lib/cjs/components/radio/Radio.d.ts

@@ -16,6 +16,7 @@ export default class RadioComponent extends ListComponent {
     static savedValueTypes(schema: any): any[];
     constructor(component: any, options: any, data: any);
     previousValue: any;
+    uncheckValue(flags?: {}): void;
     get inputInfo(): any;
     get emptyValue(): string;
     get isRadio(): boolean;

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

@@ -79,13 +79,15 @@ class RadioComponent extends ListComponent_1.default {
         }
         return defaultValue;
     }
-    resetValue() {
+    uncheckValue(flags = {}) {
         this.unset();
         this.setValue(this.emptyValue, {
             noUpdateEvent: true,
             noValidate: true,
             resetValue: true
         });
+        this.triggerChange(flags);
+        this.setSelectedClasses();
     }
     get inputInfo() {
         var _a;
@@ -400,9 +402,7 @@ class RadioComponent extends ListComponent_1.default {
         this.currentValue = this.dataValue;
         const shouldResetValue = flags && flags.modified && !flags.noUpdateEvent && this.previousValue === this.currentValue;
         if (shouldResetValue) {
-            this.resetValue();
-            this.triggerChange(flags);
-            this.setSelectedClasses();
+            this.uncheckValue(flags);
         }
         this.previousValue = this.dataValue;
         return changed;

package/lib/cjs/utils/utils.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToDayjs = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.dayjsDate = exports.shouldHandleTimezone = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = void 0;
 exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.fastCloneDeep = exports.sanitize = void 0;
-/* global jQuery */
 const lodash_1 = __importDefault(require("lodash"));
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
@@ -1064,9 +1063,6 @@ function bootstrapVersion(options) {
     if (options.bootstrap) {
         return options.bootstrap;
     }
-    if ((typeof jQuery === 'function') && (typeof jQuery().collapse === 'function')) {
-        return parseInt(jQuery.fn.collapse.Constructor.VERSION.split('.')[0], 10);
-    }
     if (window.bootstrap && window.bootstrap.Collapse) {
         return parseInt(window.bootstrap.Collapse.VERSION.split('.')[0], 10);
     }

package/lib/mjs/Webform.js

@@ -1121,7 +1121,7 @@ export default class Webform extends NestedDataComponent {
         // Mark any components as invalid if in a custom message.
         const componentErrors = {};
         errors.forEach((err) => {
-            const path = err.path || err.context?.path || err.component?.key;
+            const path = getStringFromComponentPath(err.path) || err.context?.path || err.component?.key;
             if (!componentErrors[path]) {
                 componentErrors[path] = [];
             }

package/lib/mjs/components/Components.js

@@ -72,6 +72,12 @@ export default class Components {
         if (comp.path) {
             comp.componentsMap[comp.path] = comp;
         }
+        // Reset the componentMatches on the root element if any new component is created.
+        let parent = comp.parent;
+        while (parent) {
+            parent.componentMatches = {};
+            parent = parent.parent;
+        }
         return comp;
     }
 }

package/lib/mjs/components/_classes/component/Component.js

@@ -1160,9 +1160,15 @@ export default class Component extends Element {
         if (this.hasInput && this.component.validate?.required && !this.isPDFReadOnlyMode) {
             modalLabel = { className: 'field-required' };
         }
+        let messages = '';
+        if (this.errors?.length) {
+            messages = this.errors.map((err) => {
+                return err.level === 'error' ? this.renderTemplate('message', { ...err }) : '';
+            }).join('');
+        }
         return this.renderModalPreview({
             previewText: this.getValueAsString(dataValue, { modalPreview: true }) || this.t('clickToSetValue'),
-            messages: '',
+            messages,
             labelInfo: modalLabel,
         });
     }
@@ -2707,6 +2713,11 @@ export default class Component extends Element {
                 this.setValueAt(i, isArray && !this.isSingleInputValue() ? value[i] : value, flags);
             }
         }
+        // Also reset value of the modal component, otherwise it will keep the old value locally and the preview
+        // element won't refresh
+        if (this.componentModal && flags && flags.resetValue) {
+            this.componentModal.setValue(value);
+        }
         return changed;
     }
     /**

package/lib/mjs/components/_classes/component/editForm/Component.edit.data.d.ts

@@ -82,6 +82,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -101,6 +102,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -126,6 +128,7 @@ declare const _default: ({
         value: string;
     })[];
     placeholder?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -141,6 +144,7 @@ declare const _default: ({
     tooltip: string;
     key: string;
     input: boolean;
+    customConditional: string;
     logic: ({
         name: string;
         trigger: {
@@ -211,6 +215,7 @@ declare const _default: ({
     inline?: undefined;
     defaultValue?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     as?: undefined;
     editor?: undefined;
@@ -226,6 +231,7 @@ declare const _default: ({
     placeholder?: undefined;
     inline?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;
@@ -248,6 +254,7 @@ declare const _default: ({
     placeholder?: undefined;
     inline?: undefined;
     values?: undefined;
+    customConditional?: undefined;
     logic?: undefined;
     dataSrc?: undefined;
     valueProperty?: undefined;

package/lib/mjs/components/_classes/component/editForm/Component.edit.data.js

@@ -56,6 +56,7 @@ export default [
         tooltip: 'Encrypt this field on the server. This is two way encryption which is not suitable for passwords.',
         key: 'encrypted',
         input: true,
+        customConditional: 'show = data.encrypted;',
         logic: [
             {
                 name: 'disabled',

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

@@ -108,6 +108,7 @@ export default class NestedComponent extends Field {
      * @returns {any} - The component that is located.
      */
     getComponent(path: string): any;
+    componentMatches: {} | undefined;
     /**
      * Return a component provided the Id of the component.
      * @param {string} id - The Id of the component.

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

@@ -308,6 +308,13 @@ export default class NestedComponent extends Field {
      * @returns {any} - The component that is located.
      */
     getComponent(path) {
+        // If the component is found
+        if (!this.componentMatches) {
+            this.componentMatches = {};
+        }
+        if (this.componentMatches && this.componentMatches[path]) {
+            return this.componentMatches[path];
+        }
         path = FormioUtils.getStringFromComponentPath(path);
         const matches = {
             path: undefined,
@@ -332,7 +339,8 @@ export default class NestedComponent extends Field {
                 return match;
             });
         });
-        return FormioUtils.getBestMatch(matches)?.instance;
+        this.componentMatches[path] = FormioUtils.getBestMatch(matches)?.instance;
+        return this.componentMatches[path];
     }
     /**
      * Return a component provided the Id of the component.
@@ -795,8 +803,10 @@ export default class NestedComponent extends Field {
         return this.data;
     }
     resetValue() {
-        super.resetValue();
+        // Reset values of child components first, then reset the parent one, otherwise it will restore the default
+        // value of parent component and clear it one by one while resetting child components
         this.getComponents().forEach((comp) => comp.resetValue());
+        super.resetValue();
         this.setPristine(true);
     }
     get dataReady() {

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

@@ -245,7 +245,7 @@ export default class AddressComponent extends ContainerComponent {
         if (this.manualMode) {
             this.restoreComponentsContext();
         }
-        if (changed || !_.isEmpty(value) && flags.fromSubmission) {
+        if (changed || !_.isEmpty(value) && flags.fromSubmission || flags.resetValue) {
             this.redraw();
         }
         return changed;

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

@@ -415,12 +415,16 @@ export default class DataGridComponent extends NestedArrayComponent {
     }
     updateComponentsRowIndex(components, rowIndex) {
         components.forEach((component, colIndex) => {
+            if (this.componentsMap[component.paths.dataPath]) {
+                delete this.componentsMap[component.paths.dataPath];
+            }
             if (component.options?.name) {
                 const newName = `[${this.key}][${rowIndex}]`;
                 component.options.name = component.options.name.replace(`[${this.key}][${component.rowIndex}]`, newName);
             }
             component.rowIndex = rowIndex;
             component.row = `${rowIndex}-${colIndex}`;
+            this.componentsMap[component.paths.dataPath] = component;
         });
     }
     updateRowsComponents(rowIndex) {

package/lib/mjs/components/editgrid/EditGrid.d.ts

@@ -101,7 +101,6 @@ export default class EditGridComponent extends NestedArrayComponent {
     changeState(changed: any, flags: any): void;
     openWhenEmpty(): void;
     restoreRowContext(editRow: any, flags?: {}): void;
-    emptyRows(): void;
     hasChanged: (newValue: any, oldValue: any) => boolean;
 }
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';

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

@@ -1192,13 +1192,5 @@ export default class EditGridComponent extends NestedArrayComponent {
             this.setNestedValue(component, editRow.data, flags);
         });
     }
-    emptyRows() {
-        this.editRows.forEach((editRow, index) => this.destroyComponents(false, index));
-        this.editRows = [];
-    }
-    resetValue() {
-        super.resetValue();
-        this.emptyRows();
-    }
 }
 EditGridComponent.prototype.hasChanged = Component.prototype.hasChanged;

package/lib/mjs/components/radio/Radio.d.ts

@@ -16,6 +16,7 @@ export default class RadioComponent extends ListComponent {
     static savedValueTypes(schema: any): any[];
     constructor(component: any, options: any, data: any);
     previousValue: any;
+    uncheckValue(flags?: {}): void;
     get inputInfo(): any;
     get emptyValue(): string;
     get isRadio(): boolean;

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

@@ -80,13 +80,15 @@ export default class RadioComponent extends ListComponent {
         }
         return defaultValue;
     }
-    resetValue() {
+    uncheckValue(flags = {}) {
         this.unset();
         this.setValue(this.emptyValue, {
             noUpdateEvent: true,
             noValidate: true,
             resetValue: true
         });
+        this.triggerChange(flags);
+        this.setSelectedClasses();
     }
     get inputInfo() {
         const info = super.elementInfo();
@@ -400,9 +402,7 @@ export default class RadioComponent extends ListComponent {
         this.currentValue = this.dataValue;
         const shouldResetValue = flags && flags.modified && !flags.noUpdateEvent && this.previousValue === this.currentValue;
         if (shouldResetValue) {
-            this.resetValue();
-            this.triggerChange(flags);
-            this.setSelectedClasses();
+            this.uncheckValue(flags);
         }
         this.previousValue = this.dataValue;
         return changed;

package/lib/mjs/utils/utils.js

@@ -1,4 +1,3 @@
-/* global jQuery */
 import _ from 'lodash';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
@@ -1014,9 +1013,6 @@ export function bootstrapVersion(options) {
     if (options.bootstrap) {
         return options.bootstrap;
     }
-    if ((typeof jQuery === 'function') && (typeof jQuery().collapse === 'function')) {
-        return parseInt(jQuery.fn.collapse.Constructor.VERSION.split('.')[0], 10);
-    }
     if (window.bootstrap && window.bootstrap.Collapse) {
         return parseInt(window.bootstrap.Collapse.VERSION.split('.')[0], 10);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6162.d0510e0",
+  "version": "5.1.0-dev.6180.de668a0",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {