Merge pull request #80 from mbektasbbg/unsubscribe_grid_wheel

unsubscribe from grid wheel events on editor dispose
jupyterlab · Jun 12, 2020 · 87ddf3c · 87ddf3c
2 parents 9d7764b + 685659f
commit 87ddf3c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/packages/datagrid/src/celleditor.ts b/packages/datagrid/src/celleditor.ts
@@ -372,6 +372,11 @@ abstract class CellEditor implements ICellEditor, IDisposable {
       return;
     }
 
+    if (this._gridWheelEventHandler) {
+      this.cell.grid.node.removeEventListener('wheel', this._gridWheelEventHandler);
+      this._gridWheelEventHandler = null;
+    }
+
     this._closeValidityNotification();
 
     this._disposed = true;
@@ -392,10 +397,12 @@ abstract class CellEditor implements ICellEditor, IDisposable {
 
     this.validator = (options && options.validator) ? options.validator : this.createValidatorBasedOnType();
 
-    cell.grid.node.addEventListener('wheel', () => {
+    this._gridWheelEventHandler = () => {
       this._closeValidityNotification();
       this.updatePosition();
-    });
+    };
+
+    cell.grid.node.addEventListener('wheel', this._gridWheelEventHandler);
 
     this._addContainer();
 
@@ -722,6 +729,10 @@ abstract class CellEditor implements ICellEditor, IDisposable {
    * Whether the value input is valid.
    */
   private _validInput: boolean = true;
+  /**
+   * Grid wheel event handler.
+   */
+  private _gridWheelEventHandler: ((this: HTMLElement, ev: WheelEvent) => any) | null = null;
 }
 
 /**