@formio/js 5.0.0-dev.5614.ea3660d → 5.0.0-dev.5615.4672b8c

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

@@ -374,4 +374,4 @@ import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import Evaluator from './Evaluator';
 export const interpolate: (rawTemplate: any, data: any, _options: any) => any;
-export { jsonLogic, moment, ConditionOperators, Evaluator, _ };
+export { jsonLogic, ConditionOperators, Evaluator, _ };

package/lib/cjs/utils/utils.js

@@ -11,14 +11,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.ConditionOperators = exports.moment = exports.jsonLogic = void 0;
+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.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
 exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = 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 = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
@@ -26,7 +38,6 @@ const fetch_ponyfill_1 = __importDefault(require("fetch-ponyfill"));
 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"));
@@ -55,6 +66,7 @@ json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
 json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
     return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
 });
+exports.moment = __importStar(require("moment-timezone/moment-timezone"));
 function setPathToComponentAndPerentSchema(component) {
     component.path = getComponentPath(component);
     const dataParent = getDataParentComponent(component);

package/lib/cjs/widgets/CalendarWidget.js

@@ -467,11 +467,11 @@ class CalendarWidget extends InputWidget_1.default {
             return Flatpickr.formatDate(date, format);
         };
     }
-    destroy() {
-        super.destroy();
+    destroy(all = false) {
         if (this.calendar) {
             this.calendar.destroy();
         }
+        super.destroy(all);
     }
 }
 exports.default = CalendarWidget;

package/lib/mjs/Element.d.ts

@@ -117,10 +117,11 @@ export default class Element {
     removeEventListener(obj: any, type: any, func?: null): this | undefined;
     removeEventListeners(): void;
     removeAllEvents(includeExternal: any): void;
+    teardown(): void;
     /**
      * Removes all event listeners attached to this component.
      */
-    destroy(): void;
+    destroy(all?: boolean): void;
     /**
      * Append an HTML DOM element to a container.
      *

package/lib/mjs/Element.js

@@ -230,20 +230,29 @@ export default class Element {
         this.eventHandlers = [];
     }
     removeAllEvents(includeExternal) {
-        _.each(this.events._events, (events, type) => {
-            _.each(events, (listener) => {
-                if (listener && (this.id === listener.id) && (includeExternal || listener.internal)) {
-                    this.events.off(type, listener);
-                }
+        if (this.events) {
+            _.each(this.events._events, (events, type) => {
+                _.each(events, (listener) => {
+                    if (listener && (this.id === listener.id) && (includeExternal || listener.internal)) {
+                        this.events.off(type, listener);
+                    }
+                });
             });
-        });
+        }
+    }
+    teardown() {
+        delete this.i18next;
+        delete this.events;
     }
     /**
      * Removes all event listeners attached to this component.
      */
-    destroy() {
+    destroy(all = false) {
         this.removeEventListeners();
         this.removeAllEvents();
+        if (all) {
+            this.teardown();
+        }
     }
     /**
      * Append an HTML DOM element to a container.
@@ -387,7 +396,7 @@ export default class Element {
      * @param {Object} params - The i18n parameters to use for translation.
      */
     t(text, ...args) {
-        return this.i18next.t(text, ...args);
+        return this.i18next ? this.i18next.t(text, ...args) : text;
     }
     /**
      * Alias to create a text node.

package/lib/mjs/Form.js

@@ -35,6 +35,9 @@ export default class Form extends Element {
         });
         this.instance = null;
         if (args[0] instanceof HTMLElement) {
+            if (this.element) {
+                delete this.element.component;
+            }
             this.element = args[0];
             this.options = args[2] || {};
             this.options.events = this.events;
@@ -126,7 +129,7 @@ export default class Form extends Element {
      * @return {*}
      */
     set form(formParam) {
-        return this.setForm(formParam);
+        this.setForm(formParam);
     }
     errorForm(err) {
         return {
@@ -224,6 +227,9 @@ export default class Form extends Element {
         }
         // A redraw has occurred so save off the new element in case of a setDisplay causing a rebuild.
         return result.then(() => {
+            if (this.element) {
+                delete this.element.component;
+            }
             this.element = this.instance.element;
             return this.instance;
         });
@@ -344,6 +350,9 @@ export default class Form extends Element {
         if (!this.instance) {
             return Promise.reject('Form not ready. Use form.ready promise');
         }
+        if (this.element) {
+            delete this.element.component;
+        }
         this.element = element;
         return this.instance.attach(this.element)
             .then((param) => {
@@ -351,6 +360,11 @@ export default class Form extends Element {
             return param;
         });
     }
+    teardown() {
+        super.teardown();
+        delete this.instance;
+        delete this.ready;
+    }
 }
 // Allow simple embedding.
 Formio.embedForm = (embed) => Form.embed(embed);

package/lib/mjs/PDF.js

@@ -57,8 +57,15 @@ export default class PDF extends Webform {
         this.postMessage({ name: 'redraw' });
         return this.builderMode ? Promise.resolve() : super.redraw();
     }
+    destroy(all = false) {
+        if (this.iframeElement) {
+            delete this.iframeElement.formioComponent;
+            this.iframeElement.formioComponent = null;
+        }
+        super.destroy(all);
+    }
     rebuild() {
-        if (this.builderMode && this.component.components) {
+        if (this.attached && this.builderMode && this.component.components) {
             this.destroyComponents();
             this.addComponents();
             return Promise.resolve();

package/lib/mjs/PDFBuilder.js

@@ -251,9 +251,9 @@ export default class PDFBuilder extends WebformBuilder {
         });
         return this.webform;
     }
-    destroy(deleteFromGlobal) {
-        super.destroy(deleteFromGlobal);
-        this.webform.destroy(deleteFromGlobal);
+    destroy(all = false) {
+        super.destroy(all);
+        this.webform.destroy(all);
     }
     // d8b 8888888888                                                                              888
     // Y8P 888                                                                                     888

package/lib/mjs/Webform.d.ts

@@ -382,7 +382,6 @@ declare class Webform extends NestedDataComponent {
      */
     init(): Promise<any>;
     executeFormController(): false | undefined;
-    destroy(deleteFromGlobal?: boolean): void;
     build(element: any): Promise<any>;
     getClassName(): string;
     render(): any;

package/lib/mjs/Webform.js

@@ -142,7 +142,7 @@ export default class Webform extends NestedDataComponent {
             formOptions = elementOrOptions;
         }
         super(null, getOptions(formOptions));
-        this.element = element;
+        this.setElement(element);
         // Keep track of all available forms globally.
         Formio.forms[this.id] = this;
         // Set the base url.
@@ -331,10 +331,12 @@ export default class Webform extends NestedDataComponent {
      * @return {*}
      */
     addLanguage(code, lang, active = false) {
-        var translations = _.assign(fastCloneDeep(i18nDefaults.resources.en.translation), lang);
-        this.i18next.addResourceBundle(code, 'translation', translations, true, true);
-        if (active) {
-            this.language = code;
+        if (this.i18next) {
+            var translations = _.assign(fastCloneDeep(i18nDefaults.resources.en.translation), lang);
+            this.i18next.addResourceBundle(code, 'translation', translations, true, true);
+            if (active) {
+                this.language = code;
+            }
         }
     }
     keyboardCatchableElement(element) {
@@ -913,18 +915,21 @@ export default class Webform extends NestedDataComponent {
             });
         });
     }
-    destroy(deleteFromGlobal = false) {
+    teardown() {
+        this.emit('formDelete', this.id);
+        delete Formio.forms[this.id];
+        delete this.executeShortcuts;
+        delete this.triggerSaveDraft;
+        super.teardown();
+    }
+    destroy(all = false) {
         this.off('submitButton');
         this.off('checkValidity');
         this.off('requestUrl');
         this.off('resetForm');
         this.off('deleteSubmission');
         this.off('refreshData');
-        if (deleteFromGlobal) {
-            this.emit('formDelete', this.id);
-            delete Formio.forms[this.id];
-        }
-        return super.destroy();
+        return super.destroy(all);
     }
     build(element) {
         if (element || this.element) {
@@ -958,7 +963,7 @@ export default class Webform extends NestedDataComponent {
         return this.attach(this.element);
     }
     attach(element) {
-        this.element = element;
+        this.setElement(element);
         this.loadRefs(element, { webform: 'single' });
         const childPromise = this.attachComponents(this.refs.webform);
         this.addEventListener(document, 'keydown', this.executeShortcuts);

package/lib/mjs/WebformBuilder.d.ts

@@ -118,7 +118,6 @@ export default class WebformBuilder extends Component {
     isParentSaveChildMethod(parentComp: any): boolean;
     getParentElement(element: any): any;
     addBuilderComponentInfo(component: any): any;
-    destroy(deleteFromGlobal: any): void;
     addBuilderGroup(name: any, group: any): void;
     updateBuilderGroup(name: any, group: any): void;
     generateKey(info: any): any;

package/lib/mjs/WebformBuilder.js

@@ -30,7 +30,7 @@ export default class WebformBuilder extends Component {
         options.skipInit = false;
         options.display = options.display || 'form';
         super(null, options);
-        this.element = element;
+        this.setElement(element);
         this.dragulaLib = dragula;
         this.builderHeight = 0;
         this.schemas = {};
@@ -1584,11 +1584,11 @@ export default class WebformBuilder extends Component {
             this.webform.clear();
         }
     }
-    destroy(deleteFromGlobal) {
+    destroy(all = false) {
         if (this.webform.initialized) {
-            this.webform.destroy(deleteFromGlobal);
+            this.webform.destroy(all);
         }
-        super.destroy(deleteFromGlobal);
+        super.destroy(all);
     }
     addBuilderGroup(name, group) {
         if (!this.groups[name]) {

package/lib/mjs/Wizard.js

@@ -240,7 +240,7 @@ export default class Wizard extends Webform {
         }
     }
     attach(element) {
-        this.element = element;
+        this.setElement(element);
         this.loadRefs(element, {
             [this.wizardKey]: 'single',
             [`${this.wizardKey}-header`]: 'single',

package/lib/mjs/addons/FormioAddon.d.ts

@@ -14,5 +14,6 @@ export default class FormioAddon extends Element {
     settings: any;
     attach(element: any): Promise<void>;
     _element: any;
+    destroy(): void;
 }
 import Element from '../Element';

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

@@ -335,7 +335,6 @@ declare class Component extends Element {
     createComponentModal(element: any, modalShouldBeOpened: any, currentValue: any): ComponentModal;
     attach(element: any): Promise<void>;
     componentModal: any;
-    element: any;
     restoreFocus(): void;
     addShortcut(element: any, shortcut: any): void;
     removeShortcut(element: any, shortcut: any): void;
@@ -364,6 +363,8 @@ declare class Component extends Element {
      */
     inContext(component: any): boolean;
     get viewOnly(): any;
+    setElement(element: any): void;
+    element: any;
     createViewOnlyElement(): any;
     get defaultViewOnlyValue(): string;
     /**

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

@@ -498,10 +498,30 @@ export default class Component extends Element {
         }
         return addon;
     }
-    destroy() {
-        super.destroy();
+    teardown() {
+        if (this.element) {
+            delete this.element.component;
+            delete this.element;
+        }
+        delete this._currentForm;
+        delete this.parent;
+        delete this.root;
+        delete this.triggerChange;
+        delete this.triggerRedraw;
+        if (this.options) {
+            delete this.options.root;
+            delete this.options.parent;
+            delete this.options.i18next;
+        }
+        super.teardown();
+    }
+    destroy(all = false) {
+        super.destroy(all);
         this.detach();
         this.addons.forEach((addon) => addon.destroy());
+        if (all) {
+            this.teardown();
+        }
     }
     get shouldDisabled() {
         return this.options.readOnly || this.component.disabled || (this.options.hasOwnProperty('disabled') && this.options.disabled[this.key]);
@@ -1052,7 +1072,7 @@ export default class Component extends Element {
             this.setOpenModalElement(openModalTemplate);
         }
         this.attached = true;
-        this.element = element;
+        this.setElement(element);
         element.component = this;
         // If this already has an id, get it from the dom. If SSR, it could be different from the initiated id.
         if (this.element.id) {
@@ -1110,6 +1130,17 @@ export default class Component extends Element {
      * Remove all event handlers.
      */
     detach() {
+        // First iterate through each ref and delete the component so there are no dangling component references.
+        _.each(this.refs, (ref) => {
+            if (typeof ref === NodeList) {
+                ref.forEach((elem) => {
+                    delete elem.component;
+                });
+            }
+            else if (ref) {
+                delete ref.component;
+            }
+        });
         this.refs = {};
         this.removeEventListeners();
         this.detachLogic();
@@ -1197,10 +1228,17 @@ export default class Component extends Element {
     get viewOnly() {
         return this.options.readOnly && this.options.viewAsHtml;
     }
+    setElement(element) {
+        if (this.element) {
+            delete this.element.component;
+            delete this.element;
+        }
+        this.element = element;
+    }
     createViewOnlyElement() {
-        this.element = this.ce('dl', {
+        this.setElement(this.ce('dl', {
             id: this.id
-        });
+        }));
         if (this.element) {
             // Ensure you can get the component info from the element.
             this.element.component = this;
@@ -1518,7 +1556,7 @@ export default class Component extends Element {
         const parent = this.element.parentNode;
         const index = Array.prototype.indexOf.call(parent.children, this.element);
         this.element.outerHTML = this.sanitize(this.render());
-        this.element = parent.children[index];
+        this.setElement(parent.children[index]);
         return this.attach(this.element);
     }
     rebuild() {

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

@@ -266,8 +266,22 @@ export default class Input extends Multivalue {
         widget.on('redraw', () => this.redraw(), true);
         return widget;
     }
+    teardown() {
+        if (this.element && this.element.widget) {
+            this.element.widget.destroy();
+            delete this.element.widget;
+        }
+        if (this.refs && this.refs.input) {
+            for (let i = 0; i <= this.refs.input.length; i++) {
+                const widget = this.getWidget(i);
+                if (widget) {
+                    widget.destroy();
+                }
+            }
+        }
+        super.teardown();
+    }
     detach() {
-        super.detach();
         if (this.refs && this.refs.input) {
             for (let i = 0; i <= this.refs.input.length; i++) {
                 const widget = this.getWidget(i);
@@ -277,5 +291,6 @@ export default class Input extends Multivalue {
             }
         }
         this.refs.input = [];
+        super.detach();
     }
 }

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

@@ -82,7 +82,7 @@ export default class NestedComponent extends Field {
      * @param {Component} component - The component to remove from the components.
      * @param {Array<Component>} components - An array of components to remove this component from.
      */
-    removeComponent(component: Component, components: Array<Component>): void;
+    removeComponent(component: Component, components: Array<Component>, all?: boolean): void;
     /**
      * Removes a component provided the API key of that component.
      *
@@ -140,7 +140,7 @@ export default class NestedComponent extends Field {
     checkAsyncValidity(data: any, dirty: any, row: any, silentCheck: any): Promise<any>;
     setPristine(pristine: any): void;
     get isPristine(): any;
-    destroyComponents(): void;
+    destroyComponents(all?: boolean): void;
     get visibleErrors(): any;
     get errors(): any;
     get dataReady(): Promise<any[]>;

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

@@ -325,6 +325,7 @@ export default class NestedComponent extends Field {
      */
     addComponents(data, options) {
         data = data || this.data;
+        this.components = this.components || [];
         options = options || this.options;
         if (options.components) {
             this.components = options.components;
@@ -436,9 +437,9 @@ export default class NestedComponent extends Field {
      * @param {Component} component - The component to remove from the components.
      * @param {Array<Component>} components - An array of components to remove this component from.
      */
-    removeComponent(component, components) {
+    removeComponent(component, components, all = false) {
         components = components || this.components;
-        component.destroy();
+        component.destroy(all);
         _.remove(components, { id: component.id });
         if (this.componentsMap[component.path]) {
             delete this.componentsMap[component.path];
@@ -663,13 +664,13 @@ export default class NestedComponent extends Field {
         });
         super.clear();
     }
-    destroy() {
-        this.destroyComponents();
-        super.destroy();
+    destroy(all = false) {
+        this.destroyComponents(all);
+        super.destroy(all);
     }
-    destroyComponents() {
+    destroyComponents(all = false) {
         const components = this.getComponents().slice();
-        components.forEach((comp) => this.removeComponent(comp, this.components));
+        components.forEach((comp) => this.removeComponent(comp, this.components, all));
         this.components = [];
     }
     get visibleErrors() {

package/lib/mjs/components/columns/Columns.js

@@ -145,8 +145,8 @@ export default class ColumnsComponent extends NestedComponent {
     detach(all) {
         super.detach(all);
     }
-    destroy() {
-        super.destroy();
+    destroy(all = false) {
+        super.destroy(all);
         this.columns = [];
     }
 }

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

@@ -52,7 +52,7 @@ export default class EditGridComponent extends NestedArrayComponent {
     renderRow(row: any, rowIndex: any): any;
     eachComponent(fn: any, rowIndex: any): void;
     flattenComponents(rowIndex: any): {};
-    destroyComponents(rowIndex: any): void;
+    destroyComponents(all?: boolean, rowIndex?: number): void;
     createRow(dataObj: any, rowIndex: any): {
         components: any;
         data: any;

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

@@ -567,15 +567,19 @@ export default class EditGridComponent extends NestedArrayComponent {
         return this.builderMode
             ? super.getComponents()
             : _.isNumber(rowIndex)
-                ? (this.editRows[rowIndex].components || [])
+                ? (this.editRows[rowIndex]?.components || [])
                 : this.editRows.reduce((result, row) => result.concat(row.components || []), []);
     }
-    destroyComponents(rowIndex) {
+    destroy(all = false) {
+        this.calculatedValue = undefined;
+        super.destroy(all);
+    }
+    destroyComponents(all = false, rowIndex = 0) {
         if (this.builderMode) {
-            return super.destroyComponents();
+            return super.destroyComponents(all);
         }
         const components = this.getComponents(rowIndex).slice();
-        components.forEach((comp) => this.removeComponent(comp, this.components));
+        components.forEach((comp) => this.removeComponent(comp, this.components, all));
     }
     createRow(dataObj, rowIndex) {
         const editRow = {
@@ -748,7 +752,7 @@ export default class EditGridComponent extends NestedArrayComponent {
             case EditRowState.New: {
                 editRow.state = EditRowState.Removed;
                 this.clearErrors(rowIndex);
-                this.destroyComponents(rowIndex);
+                this.destroyComponents(false, rowIndex);
                 if (this.inlineEditMode) {
                     this.splice(rowIndex);
                 }
@@ -866,7 +870,7 @@ export default class EditGridComponent extends NestedArrayComponent {
     baseRemoveRow(rowIndex) {
         const editRow = this.editRows[rowIndex];
         editRow.state = EditRowState.Removed;
-        this.destroyComponents(rowIndex);
+        this.destroyComponents(false, rowIndex);
         return editRow;
     }
     removeRow(rowIndex, modified) {
@@ -889,6 +893,15 @@ export default class EditGridComponent extends NestedArrayComponent {
         this.redraw();
     }
     createRowComponents(row, rowIndex, recreatePartially) {
+        // Iterate through existing components and destroy the ones with the same rowIndex.
+        if (this.components) {
+            for (let i = 0; i < this.components.length; i++) {
+                if (this.components[i].rowIndex === rowIndex) {
+                    this.components[i].destroy();
+                    this.components.splice(i, 1);
+                }
+            }
+        }
         const currentRowComponents = _.get(this.editRows, `[${rowIndex}].components`, null);
         return this.component.components.map((col, colIndex) => {
             if (recreatePartially && currentRowComponents && this.variableTypeComponentsIndexes.length) {
@@ -1168,7 +1181,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         });
     }
     emptyRows() {
-        this.editRows.forEach((editRow, index) => this.destroyComponents(index));
+        this.editRows.forEach((editRow, index) => this.destroyComponents(false, index));
         this.editRows = [];
     }
     resetValue() {

package/lib/mjs/components/file/File.d.ts

@@ -167,5 +167,6 @@ export default class FileComponent extends Field {
     getFile(fileInfo: any): any;
     focus(): void;
     beforeSubmit(): Promise<void>;
+    destroy(all: any): void;
 }
 import Field from '../_classes/field/Field';

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

@@ -1022,8 +1022,8 @@ export default class FileComponent extends Field {
             return Promise.reject(error.message);
         }
     }
-    destroy() {
+    destroy(all) {
         this.stopVideo();
-        super.destroy();
+        super.destroy(all);
     }
 }

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

@@ -329,13 +329,13 @@ export default class FormComponent extends Component {
             && _.isNumber(this.formObj._vid)
             && this.formObj._vid !== this.subFormRevision;
     }
-    destroy() {
+    destroy(all = false) {
         if (this.subForm) {
-            this.subForm.destroy();
+            this.subForm.destroy(all);
             this.subForm = null;
             this.subFormReady = null;
         }
-        super.destroy();
+        super.destroy(all);
     }
     redraw() {
         if (this.subForm) {