@formio/js 5.1.0-dev.6101.0682abe → 5.1.0-dev.6102.9a0147c

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

@@ -1,3 +1,161 @@
-export { FormioUtils as Utils };
+export * from "./utils";
+export * from "./formUtils";
 export default FormioUtils;
-import * as FormioUtils from './utils';
+declare const FormioUtils: {
+    Evaluator: import("./Evaluator").DefaultEvaluator;
+    flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
+    guid: typeof import("@formio/core/lib/utils/formUtil").guid;
+    uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;
+    MODEL_TYPES_OF_KNOWN_COMPONENTS: {
+        nestedArray: string[];
+        nestedDataArray: string[];
+        dataObject: string[];
+        object: string[];
+        map: string[];
+        content: string[];
+        string: string[];
+        number: string[];
+        boolean: string[];
+        none: string[];
+        any: string[];
+    };
+    getModelType: typeof import("@formio/core/lib/utils/formUtil").getModelType;
+    getComponentPath: any;
+    setComponentScope: typeof import("@formio/core/lib/utils/formUtil").setComponentScope;
+    resetComponentScope: typeof import("@formio/core/lib/utils/formUtil").resetComponentScope;
+    isComponentNestedDataType: typeof import("@formio/core/lib/utils/formUtil").isComponentNestedDataType;
+    componentPath: typeof import("@formio/core/lib/utils/formUtil").componentPath;
+    getComponentPaths: typeof import("@formio/core/lib/utils/formUtil").getComponentPaths;
+    componentMatches: typeof import("@formio/core/lib/utils/formUtil").componentMatches;
+    getBestMatch: typeof import("@formio/core/lib/utils/formUtil").getBestMatch;
+    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) => 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) => void;
+    getComponentKey: typeof import("@formio/core/lib/utils/formUtil").getComponentKey;
+    getContextualRowPath: typeof import("@formio/core/lib/utils/formUtil").getContextualRowPath;
+    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;
+    eachComponentAsync: typeof import("@formio/core/lib/utils/formUtil").eachComponentAsync;
+    getComponentData: typeof import("@formio/core/lib/utils/formUtil").getComponentData;
+    getComponentActualValue: any;
+    isLayoutComponent: typeof import("@formio/core/lib/utils/formUtil").isLayoutComponent;
+    matchComponent: typeof import("@formio/core/lib/utils/formUtil").matchComponent;
+    getComponent: typeof import("@formio/core/lib/utils/formUtil").getComponent;
+    searchComponents: typeof import("@formio/core/lib/utils/formUtil").searchComponents;
+    removeComponent: typeof import("@formio/core/lib/utils/formUtil").removeComponent;
+    hasCondition: typeof import("@formio/core/lib/utils/formUtil").hasCondition;
+    parseFloatExt: typeof import("@formio/core/lib/utils/formUtil").parseFloatExt;
+    formatAsCurrency: typeof import("@formio/core/lib/utils/formUtil").formatAsCurrency;
+    escapeRegExCharacters: typeof import("@formio/core/lib/utils/formUtil").escapeRegExCharacters;
+    getValue: typeof import("@formio/core/lib/utils/formUtil").getValue;
+    getStrings: typeof import("@formio/core/lib/utils/formUtil").getStrings;
+    generateFormChange: typeof import("@formio/core/lib/utils/formUtil").generateFormChange;
+    applyFormChanges: typeof import("@formio/core/lib/utils/formUtil").applyFormChanges;
+    findComponent: typeof import("@formio/core/lib/utils/formUtil").findComponent;
+    getEmptyValue: typeof import("@formio/core/lib/utils/formUtil").getEmptyValue;
+    isComponentDataEmpty: typeof import("@formio/core/lib/utils/formUtil").isComponentDataEmpty;
+    isSelectResourceWithObjectValue: typeof import("@formio/core/lib/utils/formUtil").isSelectResourceWithObjectValue;
+    compareSelectResourceWithObjectTypeValues: typeof import("@formio/core/lib/utils/formUtil").compareSelectResourceWithObjectTypeValues;
+    getItemTemplateKeys: typeof import("@formio/core/lib/utils/formUtil").getItemTemplateKeys;
+    evaluate(func: string | object | Function, args: any, ret: string, interpolate: boolean, options?: import("@formio/core").EvaluatorOptions): any;
+    getRandomComponentId(): string;
+    getPropertyValue(style: CSSStyleDeclaration, prop: string): number;
+    getElementRect(element: HTMLElement): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    getScriptPlugin(property: string): any;
+    boolValue(value: string | boolean): boolean;
+    isMongoId(text: string): boolean;
+    checkCalculated(component: import("@formio/core").Component, submission: import("@formio/core").Submission, rowData: any): void;
+    checkSimpleConditional(component: any, condition: any, row: any, data: any, instance: any): boolean;
+    checkCustomConditional(component: import("@formio/core").Component, custom: string, row: any, data: any, form: import("@formio/core").Form, variable: string, onError: any, instance: any): any;
+    checkJsonConditional(component: import("@formio/core").Component, json: import("@formio/core").JSONConditional, row: any, data: any, form: import("@formio/core").Form, onError: any): boolean;
+    checkCondition(component: import("@formio/core").Component, row: any, data: any, form: import("@formio/core").Form, instance: any): boolean;
+    checkTrigger(component: import("@formio/core").Component, trigger: any, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, form: import("@formio/core").Form, instance: any): boolean;
+    setActionProperty(component: import("@formio/core").Component, action: any, result: string, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, instance: any): import("@formio/core").Component;
+    removeHTML(str: string): string;
+    unescapeHTML(str: string): string;
+    convertStringToHTMLElement(str: string, selector: string): HTMLElement;
+    getDateSetting(date: string | Date): Date | null;
+    isValidDate(date: string | Date): boolean;
+    currentTimezone(): string;
+    offsetDate(date: Date, timezone: string): Date;
+    zonesLoaded(): boolean;
+    shouldLoadZones(timezone: string): boolean;
+    loadZones(url: string, timezone: string): any;
+    momentDate(value: string | Date, format: string, timezone: string, options: object): Date;
+    formatDate(timezonesUrl: string, value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
+    formatOffset(timezonesUrl: string, formatFn: Function, date: string | Date, format: string, timezone: string): string;
+    getLocaleDateFormatInfo(locale: Intl.LocalesArgument): object;
+    convertFormatToFlatpickr(format: string): string;
+    convertFormatToMoment(format: string): string;
+    convertFormatToMask(format: string): string;
+    getInputMask(mask: string, placeholderChar: string): any[];
+    unmaskValue(value: string, mask: string, placeholderChar: string): string;
+    matchInputMask(value: string, inputMask: string): boolean;
+    getNumberSeparators(lang?: string): {
+        delimiter: string;
+        decimalSeparator: string;
+    };
+    getNumberDecimalLimit(component: import("@formio/core").Component, defaultLimit: number): number;
+    getCurrencyAffixes({ currency, decimalLimit, decimalSeparator, lang, }: {
+        currency: string;
+        decimalLimit: number;
+        decimalSeparator: string;
+        lang: string;
+    }): {
+        prefix: string;
+        suffix: string;
+    };
+    fieldData(data: import("@formio/core").DataObject, component: import("@formio/core").Component): any;
+    delay(fn: Function, delay?: number, ...args: any[]): any;
+    iterateKey(key: string): string;
+    uniqueKey(map: Record<string, string>, base: string): string;
+    bootstrapVersion(options: {
+        bootstrap: string;
+    }): number;
+    unfold(e: any): any;
+    withSwitch(a: any, b: any): Functions[];
+    observeOverload(callback: Function, options?: {
+        limit: number;
+        delay: number;
+    }): Function;
+    getContextComponents(context: any, excludeNested: boolean, excludedTypes?: string[]): any[];
+    getContextButtons(context: any): any[];
+    translateHTMLTemplate(template: string, translate: Function): string;
+    sanitize(string: string, options: any): string;
+    fastCloneDeep(obj: any): any;
+    isInputComponent(componentJson: import("@formio/core").Component): bool;
+    getArrayFromComponentPath(pathStr: string): Arryay<number>;
+    isChildOf(child: any, parent: any): boolean;
+    getStringFromComponentPath(path: number[]): string;
+    round(number: number, precision: number): string;
+    getIEBrowserVersion(): number | null;
+    getBrowserInfo(): object;
+    getComponentPathWithoutIndicies(path?: string): string;
+    getDataParentComponent(componentInstance: Component): any;
+    isPromise(value: any): boolean;
+    getFocusableElements(element: HTMLElement): NodeList<HTMLElement>;
+    getComponentSavedTypes(fullSchema: import("@formio/core").Component): string[] | null;
+    hasEncodedTimezone(value: string): boolean;
+    firstNonNil: any;
+    componentValueTypes: {
+        number: string;
+        string: string;
+        boolean: string;
+        array: string;
+        object: string;
+        date: string;
+        any: string;
+    };
+    interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
+};
+import { Evaluator } from './Evaluator';
+import { registerEvaluator } from './Evaluator';
+export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/cjs/utils/index.js

@@ -22,11 +22,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = void 0;
-const FormioUtils = __importStar(require("./utils"));
+exports.registerEvaluator = exports.Evaluator = exports.Utils = void 0;
+const utils = __importStar(require("./utils"));
+const formUtils = __importStar(require("./formUtils"));
+const Evaluator_1 = require("./Evaluator");
+Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
+Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
+const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator });
 exports.Utils = FormioUtils;
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
+__exportStar(require("./utils"), exports);
+__exportStar(require("./formUtils"), exports);
 exports.default = FormioUtils;

package/lib/cjs/utils/utils.d.ts

@@ -499,7 +499,6 @@ export function getComponentSavedTypes(fullSchema: import('@formio/core').Compon
  * @returns {boolean} if value has encoded timezone
  */
 export function hasEncodedTimezone(value: string): boolean;
-export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
  * @param {Array<T>} collection - The collection to map through unfold.;
@@ -516,7 +515,3 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import ConditionOperators from './conditionOperators';
-import { Evaluator } from './Evaluator';
-export const interpolate: typeof Evaluator.interpolate;
-export { jsonLogic, ConditionOperators, moment, Evaluator, _ };

package/lib/cjs/utils/utils.js

@@ -1,57 +1,19 @@
 "use strict";
-/* global jQuery */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = 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 = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = 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.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
+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.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = 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 = exports.translateHTMLTemplate = exports.getContextButtons = void 0;
+/* global jQuery */
 const lodash_1 = __importDefault(require("lodash"));
-exports._ = lodash_1.default;
-const json_logic_js_1 = __importDefault(require("json-logic-js"));
-exports.jsonLogic = json_logic_js_1.default;
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
-exports.moment = moment_timezone_1.default;
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
-const operators_1 = require("./jsonlogic/operators");
 const dompurify_1 = __importDefault(require("dompurify"));
 const formUtils_1 = require("./formUtils");
 const Evaluator_1 = require("./Evaluator");
-Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
-exports.ConditionOperators = conditionOperators_1.default;
 const core_1 = require("@formio/core");
-const interpolate = Evaluator_1.Evaluator.interpolate;
-exports.interpolate = interpolate;
-__exportStar(require("./formUtils"), exports);
-// Configure JsonLogic
-operators_1.lodashOperators.forEach((name) => json_logic_js_1.default.add_operation(`_${name}`, lodash_1.default[name]));
-// Retrieve Any Date
-json_logic_js_1.default.add_operation('getDate', (date) => {
-    return (0, moment_timezone_1.default)(date).toISOString();
-});
-// Set Relative Minimum Date
-json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
-    return (0, moment_timezone_1.default)().subtract(relativeMinDate, 'days').toISOString();
-});
-// Set Relative Maximum Date
-json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
-    return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
-});
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -335,7 +297,7 @@ exports.checkCustomConditional = checkCustomConditional;
  */
 function checkJsonConditional(component, json, row, data, form, onError) {
     try {
-        return json_logic_js_1.default.apply(json, {
+        return core_1.jsonLogic.apply(json, {
             data,
             row,
             form,

package/lib/cjs/widgets/CalendarWidget.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Formio_1 = require("../Formio");
 const InputWidget_1 = __importDefault(require("./InputWidget"));
-const utils_1 = require("../utils/utils");
+const utils_1 = require("../utils");
 const moment_1 = __importDefault(require("moment"));
 const lodash_1 = __importDefault(require("lodash"));
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';

package/lib/mjs/Element.js

@@ -1,10 +1,10 @@
-import EventEmitter from './EventEmitter';
-import { Formio } from './Formio';
-import * as FormioUtils from './utils/utils';
-import { I18n } from './utils/i18n';
 import _ from 'lodash';
 import moment from 'moment';
 import maskInput from '@formio/vanilla-text-mask';
+import EventEmitter from './EventEmitter';
+import { Formio } from './Formio';
+import { I18n } from './utils/i18n';
+import FormioUtils from './utils';
 /**
  * The root component for all elements within the Form.io renderer.
  */
@@ -523,9 +523,9 @@ export default class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = _.mapValues(evalContext.data, (val) => _.isString(val) ? encodeURIComponent(val) : val);
-            return FormioUtils.interpolate(string, evalContext, options);
+            return FormioUtils.Evaluator.interpolate(string, evalContext, options);
         }
-        return FormioUtils.interpolate(string, this.evalContext(data), options);
+        return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/mjs/EventEmitter.js

@@ -1,5 +1,5 @@
 import { EventEmitter as EventEmitter3 } from 'eventemitter3';
-import * as utils from './utils/utils';
+import { observeOverload } from './utils';
 export default class EventEmitter extends EventEmitter3 {
     constructor(conf = {}) {
         const { loadLimit = 1000, eventsSafeInterval = 300 } = conf;
@@ -7,7 +7,7 @@ export default class EventEmitter extends EventEmitter3 {
         const overloadHandler = () => {
             console.warn(`There were more than ${loadLimit} events emitted in ${eventsSafeInterval} ms. It might be caused by events' infinite loop`, this.id);
         };
-        const dispatch = utils.observeOverload(overloadHandler, {
+        const dispatch = observeOverload(overloadHandler, {
             limit: loadLimit,
             delay: eventsSafeInterval
         });

package/lib/mjs/Form.js

@@ -2,7 +2,7 @@ import Element from './Element';
 import { Formio } from './Formio';
 import Displays from './displays';
 import templates from './templates';
-import * as FormioUtils from './utils/utils';
+import FormioUtils from './utils';
 export default class Form extends Element {
     /**
      * Represents a JSON value.

package/lib/mjs/PDF.js

@@ -1,6 +1,6 @@
 import { Formio } from './Formio';
 import Webform from './Webform';
-import { fastCloneDeep, eachComponent } from './utils/utils';
+import { fastCloneDeep, eachComponent } from './utils';
 export default class PDF extends Webform {
     constructor(element, options) {
         options.display = 'pdf';

package/lib/mjs/PDFBuilder.js

@@ -1,8 +1,7 @@
 import _ from 'lodash';
 import { Formio } from './Formio';
 import WebformBuilder from './WebformBuilder';
-import { fastCloneDeep, getElementRect, getBrowserInfo } from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+import { fastCloneDeep, getElementRect, getBrowserInfo, eachComponent } from './utils';
 import BuilderUtils from './utils/builder';
 import PDF from './PDF';
 export default class PDFBuilder extends WebformBuilder {

package/lib/mjs/Webform.js

@@ -6,8 +6,7 @@ import i18nDefaults from './i18n';
 import { Formio } from './Formio';
 import Components from './components/Components';
 import NestedDataComponent from './components/_classes/nesteddata/NestedDataComponent';
-import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, } from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, eachComponent } from './utils';
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;

package/lib/mjs/WebformBuilder.d.ts

@@ -77,6 +77,7 @@ export default class WebformBuilder extends Component {
     removeComponent(component: any, parent: any, original: any, componentInstance: any): boolean | undefined;
     replaceDoubleQuotes(data: any, fieldsToRemoveDoubleQuotes?: any[]): any;
     updateComponent(component: any, changed: any): void;
+    originalDefaultValue: any;
     findRepeatablePaths(): any[];
     highlightInvalidComponents(): void;
     /**

package/lib/mjs/WebformBuilder.js

@@ -3,8 +3,7 @@ import Component from './components/_classes/component/Component';
 import tippy from 'tippy.js';
 import Components from './components/Components';
 import { Formio } from './Formio';
-import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath } from './utils/utils';
-import { eachComponent, getComponent } from './utils/formUtils';
+import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, } from './utils';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
 import autoScroll from 'dom-autoscroller';
@@ -1054,6 +1053,16 @@ export default class WebformBuilder extends Component {
                     'fields.month.required',
                     'fields.year.required',
                 ]));
+                if (defaultValueComponent.component.components) {
+                    if (!this.originalDefaultValue) {
+                        this.originalDefaultValue = fastCloneDeep(defaultValueComponent.component);
+                    }
+                    eachComponent(defaultValueComponent.component.components, (comp => {
+                        if (comp.validate?.required) {
+                            comp.validate.required = false;
+                        }
+                    }));
+                }
                 const parentComponent = defaultValueComponent.parent;
                 let tabIndex = -1;
                 let index = -1;
@@ -1145,6 +1154,9 @@ export default class WebformBuilder extends Component {
         if (index !== -1) {
             let submissionData = this.editForm.submission.data;
             submissionData = submissionData.componentJson || submissionData;
+            if (submissionData.components && this.originalDefaultValue) {
+                submissionData.components = this.originalDefaultValue.components;
+            }
             const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];
             this.replaceDoubleQuotes(submissionData, fieldsToRemoveDoubleQuotes);
             this.hook('beforeSaveComponentSettings', submissionData);

package/lib/mjs/Wizard.d.ts

@@ -6,7 +6,6 @@ declare class Wizard extends Webform {
     originalComponents: any[];
     page: number;
     currentPanel: any;
-    currentPanels: any[] | null;
     currentNextPage: number;
     _seenPages: number[];
     subWizards: any[];
@@ -17,7 +16,7 @@ declare class Wizard extends Webform {
     originalOptions: any;
     isLastPage(): any;
     getPages(args?: {}): any[];
-    get hasExtraPages(): boolean;
+    get hasSubWizards(): boolean;
     get localData(): any;
     get wizardKey(): string;
     set wizard(form: object);

package/lib/mjs/Wizard.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Webform from './Webform';
 import { Formio } from './Formio';
-import { fastCloneDeep, checkCondition, firstNonNil, uniqueKey, eachComponent, } from './utils/utils';
+import { fastCloneDeep, checkCondition, firstNonNil, uniqueKey, eachComponent, } from './utils';
 export default class Wizard extends Webform {
     /**
      * Constructor for wizard-based forms.
@@ -29,7 +29,6 @@ export default class Wizard extends Webform {
         this.originalComponents = [];
         this.page = 0;
         this.currentPanel = null;
-        this.currentPanels = null;
         this.currentNextPage = 0;
         this._seenPages = [0];
         this.subWizards = [];
@@ -48,12 +47,12 @@ export default class Wizard extends Webform {
     }
     getPages(args = {}) {
         const { all = false } = args;
-        const pages = this.hasExtraPages ? this.components : this.pages;
+        const pages = this.hasSubWizards ? this.components : this.pages;
         const filteredPages = pages
             .filter(all ? _.identity : (p, index) => this._seenPages.includes(index));
         return filteredPages;
     }
-    get hasExtraPages() {
+    get hasSubWizards() {
         return !_.isEmpty(this.subWizards);
     }
     get data() {
@@ -177,9 +176,9 @@ export default class Wizard extends Webform {
     }
     render() {
         const ctx = this.renderContext;
-        if (this.component.key) {
-            ctx.panels.map(panel => {
-                if (panel.key === this.component.key) {
+        if (this.component.id) {
+            ctx.panels.forEach(panel => {
+                if (panel.id === this.component.id) {
                     this.currentPanel = panel;
                     ctx.wizardPageTooltip = this.getFormattedTooltip(panel.tooltip);
                 }
@@ -580,7 +579,7 @@ export default class Wizard extends Webform {
             this.pageFieldLogic(num);
             this.getNextPage();
             let parentNum = num;
-            if (this.hasExtraPages) {
+            if (this.hasSubWizards) {
                 const pageFromPages = this.pages[num];
                 const pageFromComponents = this.components[num];
                 if (!pageFromComponents || pageFromPages?.id !== pageFromComponents.id) {
@@ -869,23 +868,18 @@ export default class Wizard extends Webform {
             this.showErrors(errors, true, true);
         }
         // If the pages change, need to redraw the header.
-        let currentPanels;
-        let panels;
+        const currentPanels = this.pages;
+        // calling this.establishPages() updates/mutates this.pages to be the current pages
+        this.establishPages();
+        const newPanels = this.pages;
         const currentNextPage = this.currentNextPage;
-        if (this.hasExtraPages) {
-            currentPanels = this.pages.map(page => page.component.key);
-            this.establishPages();
-            panels = this.pages.map(page => page.component.key);
-        }
-        else {
-            currentPanels = this.currentPanels || this.pages.map(page => page.component.key);
-            panels = this.establishPages().map(panel => panel.key);
-            this.currentPanels = panels;
-            if (this.currentPanel?.key && this.currentPanels?.length) {
-                this.setPage(this.currentPanels.findIndex(panel => panel === this.currentPanel.key));
-            }
+        const panelsUpdated = !_.isEqual(newPanels, currentPanels);
+        if (this.currentPanel?.id && this.pages.length && (!this.hasSubWizards || (this.hasSubWizards && panelsUpdated))) {
+            const newIndex = this.pages.findIndex(page => page.id === this.currentPanel.id);
+            if (newIndex !== -1)
+                this.setPage(newIndex);
         }
-        if (!_.isEqual(panels, currentPanels) || (flags && flags.fromSubmission)) {
+        if (panelsUpdated || (flags && flags.fromSubmission)) {
             this.redrawHeader();
         }
         // If the next page changes, then make sure to redraw navigation.

package/lib/mjs/WizardBuilder.js

@@ -2,7 +2,7 @@ import WebformBuilder from './WebformBuilder';
 import Webform from './Webform';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
-import { fastCloneDeep } from './utils/utils';
+import { fastCloneDeep } from './utils';
 export default class WizardBuilder extends WebformBuilder {
     constructor() {
         let element, options;

package/lib/mjs/components/_classes/component/Component.d.ts

@@ -165,7 +165,6 @@ declare class Component extends Element {
     get componentsMap(): object;
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear(): boolean;

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

@@ -5,8 +5,8 @@ import _ from 'lodash';
 import isMobile from 'ismobilejs';
 import { processOne, processOneSync, validateProcessInfo } from '@formio/core/process';
 import { Formio } from '../../../Formio';
-import * as FormioUtils from '../../../utils/utils';
-import { fastCloneDeep, boolValue, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils/utils';
+import FormioUtils from '../../../utils';
+import { fastCloneDeep, boolValue, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils';
 import Element from '../../../Element';
 import ComponentModal from '../componentModal/ComponentModal';
 import Widgets from '../../../widgets';
@@ -424,7 +424,6 @@ export default class Component extends Element {
     }
     /**
      * Returns if the parent should conditionally clear.
-     *
      * @returns {boolean} - If the parent should conditionally clear.
      */
     parentShouldConditionallyClear() {

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

@@ -1,5 +1,5 @@
 import EditFormUtils from './utils';
-import { getContextComponents } from '../../../../utils/utils';
+import { getContextComponents } from '../../../../utils';
 /* eslint-disable quotes, max-len */
 export default [
     {

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

@@ -1,5 +1,5 @@
 import EditFormUtils from './utils';
-import { getContextComponents } from '../../../../utils/utils';
+import { getContextComponents } from '../../../../utils';
 /* eslint-disable quotes, max-len */
 export default [
     {

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

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { fastCloneDeep } from '../../../utils/utils';
+import { fastCloneDeep } from '../../../utils';
 export default class ComponentModal {
     static render(component, data, topLevel) {
         const children = component.renderTemplate('component', data, topLevel);

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

@@ -1,5 +1,5 @@
 import Multivalue from '../multivalue/Multivalue';
-import { convertStringToHTMLElement } from '../../../utils/utils';
+import { convertStringToHTMLElement } from '../../../utils';
 import Widgets from '../../../widgets';
 import _ from 'lodash';
 export default class Input extends Multivalue {

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

@@ -1,7 +1,7 @@
 import Field from '../field/Field';
 import { Formio } from '../../../Formio';
 import _ from 'lodash';
-import { getItemTemplateKeys } from '../../../utils/utils';
+import { getItemTemplateKeys } from '../../../utils';
 export default class ListComponent extends Field {
     static schema(...extend) {
         return Field.schema({