@formio/js 5.1.0-dev.6112.86987a5 → 5.1.0-dev.6112.b627acb

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.
@@ -154,7 +155,7 @@ export default class NestedComponent extends Field {
      * @param {import('@formio/core').Component[]} components - The components to attach logic to.
      */
     attachComponentsLogic(components: import('@formio/core').Component[]): void;
-    attachComponents(element: any, components: any, container: any): Promise<any>;
+    attachComponents(element: any, components: any, container: any): Promise<void> | Promise<any[]>;
     /**
      * Remove a component from the components array and from the children object
      * @param {import('@formio/core').Component} component - The component to remove from the components.

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.
@@ -526,8 +534,7 @@ export default class NestedComponent extends Field {
         container = container || this.component.components;
         element = this.hook('attachComponents', element, components, container, this);
         if (!element) {
-            // Return a non-resolving promise.
-            return (new Promise(() => { }));
+            return Promise.resolve();
         }
         let index = 0;
         const promises = [];
@@ -552,6 +559,9 @@ export default class NestedComponent extends Field {
         if (this.componentsMap[component.path]) {
             delete this.componentsMap[component.path];
         }
+        if (this.root?.componentsMap[component.path]) {
+            delete this.root?.componentsMap[component.path];
+        }
     }
     /**
      * Removes a component provided the API key of that component.
@@ -795,8 +805,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() {
@@ -808,7 +820,7 @@ export default class NestedComponent extends Field {
             return false;
         }
         if (component.type === 'components') {
-            if (component.tree && component.hasValue(value)) {
+            if ((component.tree || component.hasInput) && component.hasValue(value)) {
                 return component.setValue(_.get(value, component.key), flags);
             }
             return component.setValue(value, flags);

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;
@@ -564,11 +564,11 @@ export default class AddressComponent extends ContainerComponent {
         }
         if (valueInManualMode) {
             if (this.component.manualModeViewString) {
-                return this.interpolate(this.component.manualModeViewString, {
+                return this.evaluate(this.component.manualModeViewString, {
                     address,
-                    data: this.data,
+                    data: value,
                     component: this.component,
-                });
+                }, 'value');
             }
             return this.getComponents()
                 .filter((component) => component.hasValue(address))

package/lib/mjs/components/address/editForm/Address.edit.provider.js

@@ -142,7 +142,7 @@ export default [
         key: 'manualModeViewString',
         label: 'Manual Mode View String',
         placeholder: 'Enter Manual Mode View String',
-        description: '"address" variable references component value, "data" - submission data and "component" - address component schema.',
+        description: '"data.address" references component value and "component" - address component schema.',
         weight: 60,
         rows: 5,
         editor: 'ace',

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) {
@@ -492,7 +496,13 @@ export default class DataGridComponent extends NestedArrayComponent {
                     const formComp = getComponent(this.component.components, changed.component.key);
                     _.set(formComp, 'components', changed.component.components);
                 }
-                this.triggerChange({ modified });
+                // If we're in a nested form we need to ensure our changes are triggered upstream
+                if (changed.instance.root?.id && (this.root?.id !== changed.instance.root.id)) {
+                    changed.instance.root.triggerChange(flags, changed, modified);
+                }
+                else {
+                    this.triggerChange({ modified });
+                }
             };
             let columnComponent;
             if (this.builderMode) {

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

@@ -73,10 +73,10 @@ export default class EditGridComponent extends NestedArrayComponent {
         rowIndex: any;
     } | undefined;
     emptyRow: any;
-    addRowModal(rowIndex: any): Promise<any>;
+    addRowModal(rowIndex: any): Promise<void> | Promise<any[]>;
     alert: Alert | null | undefined;
     showDialog(rowIndex: any): Promise<any>;
-    editRow(rowIndex: any): Promise<any>;
+    editRow(rowIndex: any): Promise<void> | Promise<any[]>;
     clearErrors(rowIndex: any): void;
     cancelRow(rowIndex: any): void;
     saveRow(rowIndex: any, modified: any): boolean | undefined;
@@ -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/form/Form.d.ts

@@ -29,7 +29,7 @@ export default class FormComponent extends Component {
      * Prints out the value of form components as a datagrid value.
      */
     getValueAsString(value: any, options: any): any;
-    attach(element: any): Promise<void>;
+    attach(element: any): Promise<any>;
     get hasLoadedForm(): any;
     get isRevisionChanged(): any;
     get subFormData(): any;
@@ -42,6 +42,7 @@ export default class FormComponent extends Component {
     everyComponent(...args: any[]): any;
     setSubFormDisabled(subForm: any): void;
     updateSubWizards(subForm: any): void;
+    setComponentsMap(): void;
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.

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

@@ -286,29 +286,35 @@ export default class FormComponent extends Component {
                     return;
                 }
                 this.setContent(element, this.render());
+                const postAttach = () => {
+                    if (!this.builderMode && this.component.modalEdit) {
+                        const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
+                        const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
+                        this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+                        this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
+                        this.setOpenModalElement();
+                    }
+                    this.calculateValue();
+                };
                 if (this.subForm) {
                     if (this.isNestedWizard) {
                         element = this.root.element;
                     }
-                    this.subForm.attach(element);
-                    this.valueChanged = this.hasSetValue;
-                    if (!this.shouldConditionallyClear()) {
-                        if (!this.valueChanged && this.dataValue.state !== 'submitted') {
-                            this.setDefaultValue();
-                        }
-                        else {
-                            this.restoreValue();
+                    return this.subForm.attach(element).then(() => {
+                        this.valueChanged = this.hasSetValue;
+                        if (!this.shouldConditionallyClear()) {
+                            if (!this.valueChanged && this.dataValue.state !== 'submitted') {
+                                this.setDefaultValue();
+                            }
+                            else {
+                                this.restoreValue();
+                            }
                         }
-                    }
-                }
-                if (!this.builderMode && this.component.modalEdit) {
-                    const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
-                    const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
-                    this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
-                    this.subForm.element = this.componentModal.refs.componentContent || this.subForm.element;
-                    this.setOpenModalElement();
+                        postAttach();
+                        this.setComponentsMap();
+                    });
                 }
-                this.calculateValue();
+                postAttach();
             });
         });
     }
@@ -384,6 +390,14 @@ export default class FormComponent extends Component {
             this.emit('subWizardsUpdated', subForm);
         }
     }
+    setComponentsMap() {
+        if (!this.subForm) {
+            return;
+        }
+        const componentsMap = this.componentsMap;
+        const formComponentsMap = this.subForm.componentsMap;
+        _.assign(componentsMap, formComponentsMap);
+    }
     /**
      * Create a subform instance.
      * @param {boolean} [fromAttach] - This function is being called from an `attach` method.
@@ -408,9 +422,7 @@ export default class FormComponent extends Component {
                 this.subForm = instance;
                 this.subForm.currentForm = this;
                 this.subForm.parentVisible = this.visible;
-                const componentsMap = this.componentsMap;
-                const formComponentsMap = this.subForm.componentsMap;
-                _.assign(componentsMap, formComponentsMap);
+                this.setComponentsMap();
                 this.component.components = this.subForm._form?.components;
                 this.component.display = this.subForm._form?.display;
                 this.subForm.on('change', () => {

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

@@ -89,10 +89,13 @@ export default class NumberComponent extends Input {
     }
     get defaultValue() {
         let defaultValue = super.defaultValue;
-        if (typeof defaultValue === 'string') {
+        if (typeof defaultValue === 'string' && defaultValue) {
             // Default value may be a string or have custom thousands separators or decimal symbols, so we need to call
             // parseNumber on it
             defaultValue = this.parseNumber(defaultValue);
+            if (_.isNaN(defaultValue)) {
+                defaultValue = null;
+            }
         }
         if (!defaultValue && this.component.defaultValue === 0) {
             defaultValue = this.component.defaultValue;

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();
@@ -142,7 +144,7 @@ export default class RadioComponent extends ListComponent {
         });
         this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
         this.loadedOptions = [];
-        if (!this.visible) {
+        if (!this.visible || this.optionsLoaded) {
             this.itemsLoadedResolve();
         }
         // Get the template keys for this radio component.
@@ -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/components/select/Select.js

@@ -1154,7 +1154,7 @@ export default class SelectComponent extends ListComponent {
         }
         // Choices will return undefined if nothing is selected. We really want '' to be empty.
         if (value === undefined || value === null) {
-            value = '';
+            value = this.emptyValue;
         }
         return value;
     }

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

@@ -158,6 +158,13 @@ export default class TagsComponent extends Input {
             this.refs.input[0].parentNode.lastChild.focus();
         }
     }
+    getValue() {
+        if (this.choices) {
+            const value = this.choices.getValue(true);
+            return value.join(`${this.delimiter}`);
+        }
+        return super.getValue();
+    }
     getValueAsString(value) {
         if (!value) {
             return '';

package/lib/mjs/formio.form.d.ts

@@ -23,4 +23,5 @@ import { Formio } from './Formio';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+import { DefaultEvaluator } from './utils';
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/mjs/formio.form.js

@@ -12,7 +12,7 @@ import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
 import { I18n } from '@formio/core';
-import { Evaluator, registerEvaluator } from './utils';
+import { Evaluator, registerEvaluator, DefaultEvaluator } from './utils';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -130,4 +130,4 @@ export function useModule(defaultFn = null) {
 Formio.use = useModule();
 export { Formio as FormioCore } from './Formio';
 // Export the components.
-export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform };
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses, EventEmitter, Webform, DefaultEvaluator };

package/lib/mjs/providers/storage/url.js

@@ -125,13 +125,17 @@ function url(formio) {
         deleteFile(fileInfo, options) {
             return new Promise((resolve, reject) => {
                 const xhr = new XMLHttpRequest();
-                xhr.open('DELETE', fileInfo.url, true);
+                xhr.open("DELETE", fileInfo.url, true);
+                const token = formio.getToken();
+                if (token) {
+                    xhr.setRequestHeader("x-jwt-token", token);
+                }
                 xhr.onload = () => {
                     if (xhr.status >= 200 && xhr.status < 300) {
-                        resolve('File deleted');
+                        resolve("File deleted");
                     }
                     else {
-                        reject(xhr.response || 'Unable to delete file');
+                        reject(xhr.response || "Unable to delete file");
                     }
                 };
                 if (options) {

package/lib/mjs/utils/formUtils.d.ts

@@ -26,10 +26,10 @@ export const getBestMatch: typeof Utils.getBestMatch;
 export const getComponentFromPath: typeof Utils.getComponentFromPath;
 export const getComponentValue: typeof Utils.getComponentValue;
 export const findComponents: typeof Utils.findComponents;
-export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => Promise<void>;
-export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => void;
+export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined, afterFn?: import("@formio/core").EachComponentDataAsyncCallback | undefined) => Promise<void>;
+export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined, afterFn?: import("@formio/core").EachComponentDataCallback | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
-export const getContextualRowPath: typeof Utils.getContextualRowPath;
+export const getContextualRowPath: any;
 export const getContextualRowData: typeof Utils.getContextualRowData;
 export const componentInfo: typeof Utils.componentInfo;
 export const eachComponent: typeof Utils.eachComponent;

package/lib/mjs/utils/index.d.ts

@@ -2,7 +2,7 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -37,10 +37,10 @@ declare const FormioUtils: {
     getComponentFromPath: typeof import("@formio/core/lib/utils/formUtil").getComponentFromPath;
     getComponentValue: typeof import("@formio/core/lib/utils/formUtil").getComponentValue;
     findComponents: typeof import("@formio/core/lib/utils/formUtil").findComponents;
-    eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => Promise<void>;
-    eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => void;
+    eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined, afterFn?: import("@formio/core").EachComponentDataAsyncCallback | undefined) => Promise<void>;
+    eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined, afterFn?: import("@formio/core").EachComponentDataCallback | undefined) => void;
     getComponentKey: typeof import("@formio/core/lib/utils/formUtil").getComponentKey;
-    getContextualRowPath: typeof import("@formio/core/lib/utils/formUtil").getContextualRowPath;
+    getContextualRowPath: any;
     getContextualRowData: typeof import("@formio/core/lib/utils/formUtil").getContextualRowData;
     componentInfo: typeof import("@formio/core/lib/utils/formUtil").componentInfo;
     eachComponent: typeof import("@formio/core/lib/utils/formUtil").eachComponent;
@@ -164,7 +164,8 @@ declare const FormioUtils: {
     interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
 };
 import { Evaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
-export { FormioUtils as Utils, Evaluator, registerEvaluator };
+export { FormioUtils as Utils, Evaluator, DefaultEvaluator, registerEvaluator };

package/lib/mjs/utils/index.js

@@ -1,6 +1,6 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 import _ from 'lodash';
 import moment from 'moment';
@@ -17,7 +17,7 @@ if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
 export { FormioUtils as Utils };
-export { Evaluator, registerEvaluator };
+export { Evaluator, DefaultEvaluator, registerEvaluator };
 export * from './utils';
 export * from './formUtils';
 export default FormioUtils;

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/lib/mjs/widgets/CalendarWidget.js

@@ -115,7 +115,14 @@ export default class CalendarWidget extends InputWidget {
                 if (this._input) {
                     const { locale } = this.settings;
                     if (locale && locale.length >= 2 && locale !== 'en') {
-                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio.cdn['flatpickr']}/l10n/${locale}.js`, true).then(() => this.initFlatpickr(Flatpickr));
+                        return Formio.requireLibrary(`flatpickr-${locale}`, `flatpickr.l10ns.${locale}`, `${Formio.cdn['flatpickr']}/l10n/${locale}.js`, true)
+                            .catch(() => {
+                            // fallback to en if locale fails to load
+                            this.settings.locale = 'en';
+                        })
+                            .finally(() => {
+                            this.initFlatpickr(Flatpickr);
+                        });
                     }
                     else {
                         this.initFlatpickr(Flatpickr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6112.86987a5",
+  "version": "5.1.0-dev.6112.b627acb",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
     "@formio/bootstrap": "v3.0.0-dev.121.085d187",
-    "@formio/core": "2.4.0-dev.267.2866472",
+    "@formio/core": "2.5.1-rc.6",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",