@formio/js 5.0.0-rc.27 → 5.0.0-rc.29

package/lib/cjs/Webform.js

@@ -115,7 +115,6 @@ class Webform extends NestedDataComponent_1.default {
         else {
             this.triggerSaveDraft = this.saveDraft.bind(this);
         }
-        this.customErrors = [];
         /**
          * Determines if this form should submit the API on submit.
          * @type {boolean}
@@ -779,9 +778,9 @@ class Webform extends NestedDataComponent_1.default {
         this.component.input = false;
         this.addComponents();
         this.on('submitButton', options => {
-            this.submit(false, options).catch(e => e !== false && console.log(e));
+            this.submit(false, options).catch(e => e !== false && e !== undefined && console.log(e));
         }, true);
-        this.on('checkValidity', (data) => this.checkValidity(data, true, data), true);
+        this.on('checkValidity', (data) => this.validate(data, { dirty: true, process: 'change' }), true);
         this.on('requestUrl', (args) => (this.submitUrl(args.url, args.headers)), true);
         this.on('resetForm', () => this.resetValue(), true);
         this.on('deleteSubmission', () => this.deleteSubmission(), true);
@@ -975,21 +974,14 @@ class Webform extends NestedDataComponent_1.default {
      * @returns {*}
      */
     /* eslint-disable no-unused-vars */
-    showErrors(error, triggerEvent, onChange) {
-        this.loading = false;
-        let errors = this.errors;
-        if (error) {
-            if (Array.isArray(error)) {
-                errors = errors.concat(error);
-            }
-            else {
-                errors.push(error);
-            }
+    showErrors(errors, triggerEvent, onChange) {
+        if (!errors) {
+            return;
         }
-        else {
-            errors = super.errors;
+        this.loading = false;
+        if (!Array.isArray(errors)) {
+            errors = [errors];
         }
-        errors = errors.concat(this.customErrors);
         errors = errors.concat(this.serverErrors || []);
         if (!errors.length) {
             this.setAlert(false);
@@ -1005,7 +997,7 @@ class Webform extends NestedDataComponent_1.default {
                 components.push(err.path);
             }
             components.forEach((path) => {
-                const originalPath = this._parentPath + (0, utils_1.getStringFromComponentPath)(path);
+                const originalPath = (0, utils_1.getStringFromComponentPath)(path);
                 const component = this.getComponent(path, lodash_1.default.identity, originalPath);
                 if (err.fromServer) {
                     if (component.serverErrors) {
@@ -1020,42 +1012,32 @@ class Webform extends NestedDataComponent_1.default {
             });
         });
         const displayedErrors = [];
-        errors.forEach(err => {
-            if (err) {
-                const createListItem = (message, index) => {
-                    const messageFromIndex = !lodash_1.default.isUndefined(index) && err.messages && err.messages[index];
-                    const keyOrPath = (messageFromIndex && messageFromIndex.formattedKeyOrPath || messageFromIndex.path) || (err.component && err.component.key) || err.fromServer && err.path;
-                    let formattedKeyOrPath = keyOrPath ? (0, utils_1.getStringFromComponentPath)(keyOrPath) : '';
-                    formattedKeyOrPath = this._parentPath + formattedKeyOrPath;
-                    if (typeof err !== 'string' && !err.formattedKeyOrPath) {
-                        err.formattedKeyOrPath = formattedKeyOrPath;
-                    }
-                    return {
-                        message: (0, utils_1.unescapeHTML)(message),
-                        keyOrPath: formattedKeyOrPath
-                    };
+        if (errors.length) {
+            errors = lodash_1.default.uniqBy(errors, error => error.message);
+            const createListItem = (message, index) => {
+                var _a, _b, _c;
+                const err = errors[index];
+                const messageFromIndex = !lodash_1.default.isUndefined(index) && errors && errors[index];
+                const keyOrPath = ((messageFromIndex === null || messageFromIndex === void 0 ? void 0 : messageFromIndex.formattedKeyOrPath) || (messageFromIndex === null || messageFromIndex === void 0 ? void 0 : messageFromIndex.path) || ((_a = messageFromIndex === null || messageFromIndex === void 0 ? void 0 : messageFromIndex.context) === null || _a === void 0 ? void 0 : _a.path)) || (((_b = err.context) === null || _b === void 0 ? void 0 : _b.component) && ((_c = err.context) === null || _c === void 0 ? void 0 : _c.component.key)) || (err.component && err.component.key) || err.fromServer && err.path;
+                const formattedKeyOrPath = keyOrPath ? (0, utils_1.getStringFromComponentPath)(keyOrPath) : '';
+                if (typeof err !== 'string' && !err.formattedKeyOrPath) {
+                    err.formattedKeyOrPath = formattedKeyOrPath;
+                }
+                return {
+                    message: (0, utils_1.unescapeHTML)(message),
+                    keyOrPath: formattedKeyOrPath
                 };
-                err.messages = lodash_1.default.uniqBy(err.messages, message => message.message);
-                if (err.messages && err.messages.length) {
-                    const { component } = err;
-                    err.messages.forEach(({ message, context, fromServer }, index) => {
-                        const text = (context === null || context === void 0 ? void 0 : context.hasLabel) || fromServer
-                            ? this.t('alertMessage', { message: this.t(message) })
-                            : this.t('alertMessageWithLabel', {
-                                label: this.t(component.label),
-                                message: this.t(message),
-                            });
-                        displayedErrors.push(createListItem(text, index));
+            };
+            errors.forEach(({ message, context, fromServer, component }, index) => {
+                const text = !(component === null || component === void 0 ? void 0 : component.label) || (context === null || context === void 0 ? void 0 : context.hasLabel) || fromServer
+                    ? this.t('alertMessage', { message: this.t(message) })
+                    : this.t('alertMessageWithLabel', {
+                        label: this.t(component === null || component === void 0 ? void 0 : component.label),
+                        message: this.t(message),
                     });
-                }
-                else if (err) {
-                    const message = lodash_1.default.isObject(err)
-                        ? this.t('alertMessage', { message: this.t(err.message || '') })
-                        : this.t('alertMessage', { message: this.t(err) });
-                    displayedErrors.push(createListItem(message));
-                }
-            }
-        });
+                displayedErrors.push(createListItem(text, index));
+            });
+        }
         const errorsList = this.renderTemplate('errorsList', { errors: displayedErrors });
         this.root.setAlert('danger', errorsList);
         if (triggerEvent) {
@@ -1118,17 +1100,10 @@ class Webform extends NestedDataComponent_1.default {
             this.emit('change', { isValid: true }, { silent: true });
             return false;
         }
-        let errors;
-        if (this.submitted) {
-            errors = this.showErrors();
-        }
-        else {
-            errors = this.showErrors(error, true);
-        }
+        this.showErrors(error, true);
         if (this.root && this.root.alert) {
             this.scrollIntoView(this.root.alert);
         }
-        return errors;
     }
     /**
      * Trigger the change event for this form.
@@ -1139,10 +1114,6 @@ class Webform extends NestedDataComponent_1.default {
     onChange(flags, changed, modified, changes) {
         flags = flags || {};
         let isChangeEventEmitted = false;
-        // For any change events, clear any custom errors for that component.
-        if (changed && changed.component) {
-            this.customErrors = this.customErrors.filter(err => err.component && err.component !== changed.component.key);
-        }
         super.onChange(flags, true);
         const value = lodash_1.default.clone(this.submission);
         flags.changed = value.changed = changed;
@@ -1150,10 +1121,13 @@ class Webform extends NestedDataComponent_1.default {
         if (modified && this.pristine) {
             this.pristine = false;
         }
-        value.isValid = this.checkData(value.data, flags);
+        this.checkData(value.data, flags);
+        const shouldValidate = !flags.noValidate || flags.fromIFrame || (flags.fromSubmission && this.rootPristine && this.pristine && flags.changed);
+        const errors = shouldValidate ? this.validate(value.data, Object.assign(Object.assign({}, flags), { process: 'change' })) : [];
+        value.isValid = errors.length === 0;
         this.loading = false;
         if (this.submitted) {
-            this.showErrors();
+            this.showErrors(errors);
         }
         // See if we need to save the draft of the form.
         if (modified && this.options.saveDraft) {
@@ -1169,13 +1143,6 @@ class Webform extends NestedDataComponent_1.default {
             this.initialized = true;
         }
     }
-    checkData(data, flags = {}) {
-        const valid = super.checkData(data, flags);
-        if ((lodash_1.default.isEmpty(flags) || flags.noValidate) && this.submitted) {
-            this.showErrors();
-        }
-        return valid;
-    }
     /**
      * Send a delete request to the server.
      */
@@ -1228,18 +1195,31 @@ class Webform extends NestedDataComponent_1.default {
             }
             const submission = (0, utils_1.fastCloneDeep)(this.submission || {});
             this.setMetadata(submission);
-            submission.state = options.state || 'submitted';
+            submission.state = options.state || submission.state || 'submitted';
             const isDraft = (submission.state === 'draft');
             this.hook('beforeSubmit', Object.assign(Object.assign({}, submission), { component: options.component }), (err, data) => {
+                var _a;
                 if (err) {
                     return reject(err);
                 }
                 submission._vnote = data && data._vnote ? data._vnote : '';
-                if (!isDraft && !submission.data) {
-                    return reject('Invalid Submission');
+                try {
+                    if (!isDraft && !options.noValidate) {
+                        if (!submission.data) {
+                            return reject('Invalid Submission');
+                        }
+                        const errors = this.validate(submission.data, {
+                            dirty: true,
+                            silentCheck: false,
+                            process: 'submit'
+                        });
+                        if (errors.length || ((_a = options.beforeSubmitResults) === null || _a === void 0 ? void 0 : _a.some((result) => result.status === 'rejected'))) {
+                            return reject(errors);
+                        }
+                    }
                 }
-                if (!isDraft && !this.checkValidity(submission.data, true)) {
-                    return reject();
+                catch (err) {
+                    console.error(err);
                 }
                 this.everyComponent((comp) => {
                     if (submission._vnote && comp.type === 'form' && comp.component.reference) {
@@ -1260,9 +1240,7 @@ class Webform extends NestedDataComponent_1.default {
                         }
                         // Ensure err is an array.
                         err = Array.isArray(err) ? err : [err];
-                        // Set as custom errors.
-                        this.customErrors = err;
-                        return reject();
+                        return reject(err);
                     }
                     this.loading = true;
                     // Use the form action to submit the form if available.
@@ -1358,7 +1336,7 @@ class Webform extends NestedDataComponent_1.default {
      *
      * @returns {Promise} - A promise when the form is done submitting.
      */
-    submit(before, options) {
+    submit(before, options = {}) {
         this.submissionInProcess = true;
         if (!before) {
             return this.beforeSubmit(options).then(() => this.executeSubmit(options));

package/lib/cjs/WebformBuilder.d.ts

@@ -73,7 +73,7 @@ export default class WebformBuilder extends Component {
     setForm(form: any): any;
     keyboardActionsEnabled: any;
     populateRecaptchaSettings(form: any): void;
-    removeComponent(component: any, parent: any, original: any): boolean | undefined;
+    removeComponent(component: any, parent: any, original: any, componentInstance: any): boolean | undefined;
     replaceDoubleQuotes(data: any, fieldsToRemoveDoubleQuotes?: any[]): any;
     updateComponent(component: any, changed: any): void;
     findRepeatablePaths(): any[];

package/lib/cjs/WebformBuilder.js

@@ -19,7 +19,7 @@ require("./components/builder");
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
 }
-const dragula_min_js_1 = __importDefault(require("dragula/dist/dragula.min.js"));
+const dragula_1 = __importDefault(require("dragula"));
 class WebformBuilder extends Component_1.default {
     // eslint-disable-next-line max-statements
     constructor() {
@@ -51,7 +51,7 @@ class WebformBuilder extends Component_1.default {
             }
         };
         this.setElement(element);
-        this.dragulaLib = dragula_min_js_1.default;
+        this.dragulaLib = dragula_1.default;
         this.builderHeight = 0;
         this.schemas = {};
         this.repeatablePaths = [];
@@ -361,7 +361,7 @@ class WebformBuilder extends Component_1.default {
         }
         if (component.refs.removeComponent) {
             this.attachTooltip(component.refs.removeComponent, this.t('Remove'));
-            component.addEventListener(component.refs.removeComponent, 'click', () => this.removeComponent(component.schema, parent, component.component));
+            component.addEventListener(component.refs.removeComponent, 'click', () => this.removeComponent(component.schema, parent, component.component, component));
         }
         return element;
     }
@@ -667,10 +667,10 @@ class WebformBuilder extends Component_1.default {
         const containersArray = Array.prototype.slice.call(this.refs['sidebar-container']).filter(item => {
             return item.id !== 'group-container-resource';
         });
-        if (!dragula_min_js_1.default) {
+        if (!dragula_1.default) {
             return;
         }
-        this.dragula = (0, dragula_min_js_1.default)(containersArray, {
+        this.dragula = (0, dragula_1.default)(containersArray, {
             moves(el) {
                 let moves = true;
                 const list = Array.from(el.classList).filter(item => item.indexOf('formio-component-') === 0);
@@ -735,6 +735,10 @@ class WebformBuilder extends Component_1.default {
             }
         }
         if (info) {
+            //if this is a custom component that was already assigned a key, don't stomp on it
+            if (!Components_1.default.components.hasOwnProperty(info.type) && info.key) {
+                return info;
+            }
             info.key = this.generateKey(info);
         }
         return info;
@@ -940,7 +944,7 @@ class WebformBuilder extends Component_1.default {
             }
         }
     }
-    removeComponent(component, parent, original) {
+    removeComponent(component, parent, original, componentInstance) {
         if (!parent) {
             return;
         }
@@ -966,6 +970,9 @@ class WebformBuilder extends Component_1.default {
             else if (parent.formioComponent && parent.formioComponent.removeChildComponent) {
                 parent.formioComponent.removeChildComponent(component);
             }
+            if (component.input && componentInstance && componentInstance.parent) {
+                lodash_1.default.unset(componentInstance._data, componentInstance.key);
+            }
             const rebuild = parent.formioComponent.rebuild() || Promise.resolve();
             rebuild.then(() => {
                 this.emit('removeComponent', component, parent.formioComponent.schema, path, index);
@@ -1094,13 +1101,14 @@ class WebformBuilder extends Component_1.default {
         const repeatablePaths = this.findRepeatablePaths();
         let hasInvalidComponents = false;
         this.webform.everyComponent((comp) => {
-            var _a, _b;
+            var _a;
             const path = comp.path;
+            const errors = comp.visibleErrors || [];
             if (repeatablePaths.includes(path)) {
                 comp.setCustomValidity(`API Key is not unique: ${comp.key}`);
                 hasInvalidComponents = true;
             }
-            else if ((_b = (_a = comp.error) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.startsWith('API Key is not unique')) {
+            else if (errors.length && ((_a = errors[0].message) === null || _a === void 0 ? void 0 : _a.startsWith('API Key is not unique'))) {
                 comp.setCustomValidity('');
             }
         });
@@ -1135,8 +1143,8 @@ class WebformBuilder extends Component_1.default {
                     comp = component;
                 }
             });
-            const originalComp = comp.component;
-            const originalComponentSchema = comp.schema;
+            const originalComp = comp === null || comp === void 0 ? void 0 : comp.component;
+            const originalComponentSchema = comp === null || comp === void 0 ? void 0 : comp.schema;
             const isParentSaveChildMethod = this.isParentSaveChildMethod(parent.formioComponent);
             if (parentContainer && !isParentSaveChildMethod) {
                 parentContainer[index] = submissionData;
@@ -1193,9 +1201,12 @@ class WebformBuilder extends Component_1.default {
         saveButtons.forEach((saveButton) => {
             this.editForm.addEventListener(saveButton, 'click', (event) => {
                 event.preventDefault();
-                if (!this.editForm.checkValidity(this.editForm.data, true, this.editForm.data)) {
+                const errors = this.editForm.validate(this.editForm.data, {
+                    dirty: true
+                });
+                if (errors.length) {
                     this.editForm.setPristine(false);
-                    this.editForm.showErrors();
+                    this.editForm.showErrors(errors);
                     return false;
                 }
                 this.saved = true;
@@ -1221,7 +1232,7 @@ class WebformBuilder extends Component_1.default {
         });
     }
     editComponent(component, parent, isNew, isJsonEdit, original, flags = {}) {
-        var _a;
+        var _a, _b;
         if (!component.key) {
             return;
         }
@@ -1248,7 +1259,7 @@ class WebformBuilder extends Component_1.default {
         editFormOptions.editComponent = component;
         editFormOptions.flags = flags;
         this.hook('editComponentParentInstance', editFormOptions, parent);
-        this.editForm = new Webform_1.default(Object.assign(Object.assign(Object.assign({}, lodash_1.default.omit(this.options, ['hooks', 'builder', 'events', 'attachMode', 'skipInit'])), { language: this.options.language }), editFormOptions));
+        this.editForm = new Webform_1.default(Object.assign(Object.assign(Object.assign(Object.assign({}, lodash_1.default.omit(this.options, ['hooks', 'builder', 'events', 'attachMode', 'skipInit'])), { language: this.options.language }), editFormOptions), { evalContext: Object.assign(Object.assign({}, ((editFormOptions === null || editFormOptions === void 0 ? void 0 : editFormOptions.evalContext) || ((_a = this.options) === null || _a === void 0 ? void 0 : _a.evalContext) || {})), { buildingForm: this.form }) }));
         this.hook('editFormProperties', parent);
         this.editForm.form = (isJsonEdit && !isCustom) ? {
             components: [
@@ -1296,7 +1307,7 @@ class WebformBuilder extends Component_1.default {
             ]));
             this.hook('previewFormSettitngs', schema, isJsonEdit);
         }
-        this.showPreview = (_a = ComponentClass.builderInfo.showPreview) !== null && _a !== void 0 ? _a : true;
+        this.showPreview = (_b = ComponentClass.builderInfo.showPreview) !== null && _b !== void 0 ? _b : true;
         this.componentEdit = this.ce('div', { 'class': 'component-edit-container' });
         this.setContent(this.componentEdit, this.renderTemplate('builderEditForm', {
             componentInfo: ComponentClass.builderInfo,
@@ -1353,8 +1364,14 @@ class WebformBuilder extends Component_1.default {
                         }
                     }
                 }
+                // If the edit form has any nested form inside, we get a partial data (nested form's data) in the
+                // event.data property
+                let editFormData;
+                if (event.changed.instance && event.changed.instance.root && event.changed.instance.root.id !== this.editForm.id) {
+                    editFormData = this.editForm.data;
+                }
                 // Update the component.
-                this.updateComponent(event.data.componentJson || event.data, event.changed);
+                this.updateComponent(event.data.componentJson || editFormData || event.data, event.changed);
             }
         });
         this.attachEditComponentControls(component, parent, isNew, original, ComponentClass);

package/lib/cjs/Wizard.d.ts

@@ -70,6 +70,7 @@ declare class Wizard extends Webform {
     beforePage(next: any): Promise<any>;
     emitNextPage(): void;
     nextPage(): Promise<void>;
+    validateCurrentPage(flags?: {}): any;
     emitPrevPage(): void;
     prevPage(): Promise<void>;
     cancel(noconfirm: any): Promise<void> | Promise<number>;
@@ -84,13 +85,13 @@ declare class Wizard extends Webform {
     hasButton(name: any, nextPage?: number | null): any;
     pageId(page: any): any;
     onChange(flags: any, changed: any, modified: any, changes: any): void;
+    checkValidity(data: any, dirty: any, row: any, currentPageOnly: any, childErrors?: any[]): any;
     focusOnComponent(key: any): any;
 }
 declare namespace Wizard {
-    const setBaseUrl: typeof Formio.setBaseUrl;
-    const setApiUrl: typeof Formio.setApiUrl;
-    const setAppUrl: typeof Formio.setAppUrl;
+    const setBaseUrl: any;
+    const setApiUrl: any;
+    const setAppUrl: any;
 }
 export default Wizard;
 import Webform from './Webform';
-import { Formio } from './Formio';

package/lib/cjs/Wizard.js

@@ -181,7 +181,10 @@ class Wizard extends Webform_1.default {
         return this.renderTemplate('wizardNav', ctx);
     }
     prepareHeaderSettings(ctx, headerType) {
-        if (this.currentPanel && this.currentPanel.breadcrumb === 'none' || ctx.isSubForm) {
+        var _a;
+        const shouldHideBreadcrumbs = ((_a = this.currentPanel) === null || _a === void 0 ? void 0 : _a.breadcrumb) === 'none' ||
+            lodash_1.default.get(this.form, 'settings.wizardBreadcrumbsType', '') === 'none';
+        if (shouldHideBreadcrumbs || ctx.isSubForm) {
             return null;
         }
         return this.renderTemplate(headerType, ctx);
@@ -577,6 +580,7 @@ class Wizard extends Webform_1.default {
             }
             this.redraw().then(() => {
                 this.checkData(this.submission.data);
+                this.validateCurrentPage();
             });
             return Promise.resolve();
         }
@@ -674,7 +678,8 @@ class Wizard extends Webform_1.default {
             });
         }
         // Validate the form, before go to the next page
-        if (this.checkValidity(this.localData, true, this.localData, true)) {
+        const errors = this.validateCurrentPage({ dirty: true });
+        if (errors.length === 0) {
             this.checkData(this.submission.data);
             return this.beforePage(true).then(() => {
                 return this.setPage(this.getNextPage()).then(() => {
@@ -689,9 +694,14 @@ class Wizard extends Webform_1.default {
         else {
             this.currentPage.components.forEach((comp) => comp.setPristine(false));
             this.scrollIntoView(this.element);
-            return Promise.reject(this.showErrors([], true));
+            return Promise.reject(this.showErrors(errors, true));
         }
     }
+    validateCurrentPage(flags = {}) {
+        var _a;
+        // Accessing the parent ensures the right instance (whether it's the parent Wizard or a nested Wizard) performs its validation
+        return (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.parent.validateComponents(this.currentPage.component.components, this.currentPage.parent.data, flags);
+    }
     emitPrevPage() {
         this.emit('prevPage', { page: this.page, submission: this.submission });
     }
@@ -768,7 +778,7 @@ class Wizard extends Webform_1.default {
         return super.setForm(form, flags);
     }
     onSetForm(clonedForm, initialForm) {
-        this.component.components = (this._parentPath ? initialForm.components : clonedForm.components) || [];
+        this.component.components = (this.parent ? initialForm.components : clonedForm.components) || [];
         this.setComponentSchema();
     }
     setEditMode(submission) {
@@ -781,7 +791,9 @@ class Wizard extends Webform_1.default {
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
-        if (!flags.sanitize) {
+        if (!flags.sanitize ||
+            (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
+            (this.options.server && (this.prefixComps.length || this.suffixComps.length))) {
             this.mergeData(this.data, submission.data);
         }
         if (changed) {
@@ -833,9 +845,9 @@ class Wizard extends Webform_1.default {
     onChange(flags, changed, modified, changes) {
         var _a, _b;
         super.onChange(flags, changed, modified, changes);
-        if (this.alert && !this.submitted) {
-            this.checkValidity(this.localData, false, this.localData, true);
-            this.showErrors([], true, true);
+        const errors = this.validate(this.localData, { dirty: false });
+        if (this.alert) {
+            this.showErrors(errors, true, true);
         }
         // If the pages change, need to redraw the header.
         let currentPanels;
@@ -872,7 +884,7 @@ class Wizard extends Webform_1.default {
         }
         return super.redraw();
     }
-    checkValidity(data, dirty, row, currentPageOnly) {
+    checkValidity(data, dirty, row, currentPageOnly, childErrors = []) {
         if (!this.checkCondition(row, data)) {
             this.setCustomValidity('');
             return true;
@@ -880,7 +892,7 @@ class Wizard extends Webform_1.default {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {
@@ -889,23 +901,22 @@ class Wizard extends Webform_1.default {
         return super.errors;
     }
     focusOnComponent(key) {
-        let pageIndex = 0;
-        const [page] = this.pages.filter((page, index) => {
-            let hasComponent = false;
-            page.getComponent(key, (comp) => {
-                if (comp.path === key) {
-                    pageIndex = index;
-                    hasComponent = true;
+        const component = this.getComponent(key);
+        if (component) {
+            let topPanel = component.parent;
+            while (!(topPanel.parent instanceof Wizard)) {
+                topPanel = topPanel.parent;
+            }
+            const pageIndex = this.pages.findIndex(page => page === topPanel);
+            if (pageIndex >= 0) {
+                const page = this.pages[pageIndex];
+                if (page && page !== this.currentPage) {
+                    return this.setPage(pageIndex).then(() => {
+                        this.showErrors(this.validate(this.localData, { dirty: true }));
+                        super.focusOnComponent(key);
+                    });
                 }
-            });
-            return hasComponent;
-        });
-        if (page && page !== this.currentPage) {
-            return this.setPage(pageIndex).then(() => {
-                this.checkValidity(this.submission.data, true, this.submission.data);
-                this.showErrors();
-                super.focusOnComponent(key);
-            });
+            }
         }
         return super.focusOnComponent(key);
     }

package/lib/cjs/WizardBuilder.d.ts

@@ -9,6 +9,7 @@ export default class WizardBuilder extends WebformBuilder {
         }[];
     };
     page: number;
+    removeComponent(component: any, parent: any, original: any): boolean | undefined;
     allowDrop(element: any): boolean;
     get pages(): any;
     get currentPage(): any;

package/lib/cjs/addons/PasswordStrength/PasswordStrengthAddon.d.ts

@@ -698,8 +698,7 @@ export default class PasswordStrengthAddon extends FormioAddon {
      * @param {string} value - Suggested password
      */
     checkValidity(value: string): boolean;
-    errors: any[] | undefined;
-    handleBlackListCheckResult(result: any): void;
+    handleBlackListCheckResult(result: any, errors: any): void;
     levels: any[];
     maxEntropy: any;
     attach(element: any): void;

package/lib/cjs/addons/PasswordStrength/PasswordStrengthAddon.js

@@ -268,30 +268,29 @@ class PasswordStrengthAddon extends FormioAddon_1.default {
         var _a;
         const passwordLength = value.length;
         const { charactersPoolSize, errors } = this.performChecks(value);
-        this.errors = errors;
         const entropy = this.calculatePasswordEntropy(passwordLength, charactersPoolSize);
         const blackListCheck = ((_a = this.settings.blackList) === null || _a === void 0 ? void 0 : _a.length) || this.settings.customBlacklistedWords ?
             this.checkBlackList(value)
             : null;
+        const isValid = this.isValid();
+        if (!isValid) {
+            errors.push({
+                message: 'Password is not strong enough',
+                level: this.settings.required ? 'error' : 'warning'
+            });
+        }
         // If there were found some words from the black list
         if (blackListCheck && blackListCheck !== true) {
-            this.handleBlackListCheckResult(blackListCheck);
+            this.handleBlackListCheckResult(blackListCheck, errors);
             // Select the mininal entropy based on the dictionary check or symbolic check
             this.entropy = Math.min(entropy, blackListCheck.entropy);
         }
         else {
             this.entropy = entropy;
         }
-        const isValid = this.isValid();
-        if (!isValid) {
-            this.errors.push({
-                message: 'Password is not strong enough',
-                level: this.settings.required ? 'error' : 'warning'
-            });
-        }
-        return !this.errors.length;
+        return !errors.length;
     }
-    handleBlackListCheckResult(result) {
+    handleBlackListCheckResult(result, errors) {
         const blacklistedWords = result.blacklistedWords;
         const isRequired = this.settings.disableBlacklistedWords;
         const message = `Password ${isRequired ? 'must' : 'should'} not include common words: ${blacklistedWords.join(', ')}`;
@@ -299,7 +298,7 @@ class PasswordStrengthAddon extends FormioAddon_1.default {
             name: 'blacklist',
             required: isRequired,
         };
-        this.handleRuleCheckResult(false, validation, message, this.errors);
+        this.handleRuleCheckResult(false, validation, message, errors);
     }
     constructor(settings, componentInstance) {
         super(settings, componentInstance);

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

@@ -592,6 +592,7 @@ export const editForms: {
         multiple?: undefined;
         hideLabel?: undefined;
     })[];
+    tableView: boolean;
     defaultValue: {
         data: {
             rulesSettings: {

package/lib/cjs/addons/index.js

@@ -12,7 +12,11 @@ exports.editForms = [
     key: 'settings',
     display: 'form',
     input: true,
-    components,
+    components: components.map((comp) => {
+        comp.tableView = false;
+        return comp;
+    }),
+    tableView: false,
     defaultValue: {
         data: defaultSettings
     },