fix(common): make sure destroy is a function before calling it (#1148)

* fix(common): make sure destroy is a function before calling it * fix(common): make sure destroy is a function before calling it --------- Co-authored-by: ghiscoding <Ghislain.Beaulac@se.com>
ghiscoding · Oct 24, 2023 · dba9606 · dba9606
1 parent 1fd2739
commit dba9606
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/packages/common/src/editors/autocompleterEditor.ts b/packages/common/src/editors/autocompleterEditor.ts
@@ -196,7 +196,9 @@ export class AutocompleterEditor<T extends AutocompleteItem = any> implements Ed
 
   destroy() {
     this._bindEventService.unbindAll();
-    this._instance?.destroy();
+    if (typeof this._instance?.destroy === 'function') {
+      this._instance.destroy();
+    }
     this._inputElm?.remove?.();
     this._elementCollection = null;
   }

diff --git a/packages/common/src/editors/dateEditor.ts b/packages/common/src/editors/dateEditor.ts
@@ -191,7 +191,7 @@ export class DateEditor implements Editor {
     this.hide();
     this._bindEventService.unbindAll();
 
-    if (this.flatInstance?.destroy) {
+    if (typeof this.flatInstance?.destroy === 'function') {
       this.flatInstance.destroy();
       if (this.flatInstance?.element) {
         setTimeout(() => destroyObjectDomElementProps(this.flatInstance));

diff --git a/packages/common/src/editors/selectEditor.ts b/packages/common/src/editors/selectEditor.ts
@@ -421,7 +421,9 @@ export class SelectEditor implements Editor {
     }
 
     this._isDisposingOrCallingSave = true;
-    this._msInstance?.destroy();
+    if (typeof this._msInstance?.destroy === 'function') {
+      this._msInstance.destroy();
+    }
     this.editorElm?.remove();
     this._msInstance = undefined;
   }

diff --git a/packages/common/src/filters/autocompleterFilter.ts b/packages/common/src/filters/autocompleterFilter.ts
@@ -237,7 +237,9 @@ export class AutocompleterFilter<T extends AutocompleteItem = any> implements Fi
    * destroy the filter
    */
   destroy() {
-    this._instance?.destroy();
+    if (typeof this._instance?.destroy === 'function') {
+      this._instance.destroy();
+    }
     if (this._filterElm) {
       // this._filterElm.autocomplete('destroy');
       // this._filterElm.off('input').remove();

diff --git a/packages/common/src/filters/selectFilter.ts b/packages/common/src/filters/selectFilter.ts
@@ -208,7 +208,9 @@ export class SelectFilter implements Filter {
 
   /** destroy the filter */
   destroy() {
-    this._msInstance?.destroy();
+    if (typeof this._msInstance?.destroy === 'function') {
+      this._msInstance.destroy();
+    }
     this.filterElm?.remove();
 
     // unsubscribe all the possible Observables if RxJS was used

diff --git a/packages/common/src/services/filter.service.ts b/packages/common/src/services/filter.service.ts
@@ -142,7 +142,9 @@ export class FilterService {
     if (Array.isArray(this._filtersMetadata)) {
       let filter = this._filtersMetadata.pop();
       while (filter) {
-        filter?.destroy();
+        if (typeof filter?.destroy === 'function') {
+          filter.destroy();
+        }
         filter = this._filtersMetadata.pop();
       }
     }

diff --git a/packages/vanilla-bundle/src/components/slick-vanilla-grid-bundle.ts b/packages/vanilla-bundle/src/components/slick-vanilla-grid-bundle.ts
@@ -438,7 +438,7 @@ export class SlickVanillaGridBundle {
     unsubscribeAll(this.subscriptions);
     this._eventPubSubService?.unsubscribeAll();
     this.dataView?.setItems([]);
-    if (this.dataView?.destroy) {
+    if (typeof this.dataView?.destroy === 'function') {
       this.dataView?.destroy();
     }
     this.slickGrid?.destroy(true);
@@ -1478,7 +1478,9 @@ export class SlickVanillaGridBundle {
       // get current Editor, remove it from the DOm then re-enable it and re-render it with the new collection.
       const currentEditor = this.slickGrid.getCellEditor() as AutocompleterEditor | SelectEditor;
       if (currentEditor?.disable && currentEditor?.renderDomElement) {
-        currentEditor.destroy();
+        if (typeof currentEditor.destroy === 'function') {
+          currentEditor.destroy();
+        }
         currentEditor.disable(false);
         currentEditor.renderDomElement(newCollection);
       }