#7502 fix DataGrid resize handler flickers when multiple instances

twosigma · Jun 8, 2018 · 19631c7 · 19631c7
1 parent 5a9f391
commit 19631c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/js/notebook/src/tableDisplay/dataGrid/event/EventManager.ts b/js/notebook/src/tableDisplay/dataGrid/event/EventManager.ts
@@ -31,6 +31,7 @@ import retrieveUrl = DataGridHelpers.retrieveUrl;
 import {EventHelpers} from "./helpers";
 import isOutsideNode = EventHelpers.isOutsideNode;
 import isInsideGridNode = EventHelpers.isInsideGridNode;
+import isInsideGrid = EventHelpers.isInsideGrid;
 
 const COLUMN_RESIZE_AREA_WIDTH = 4;
 
@@ -189,7 +190,7 @@ export default class EventManager {
   }
 
   private isOutsideGrid(event) {
-    return isOutsideNode(event, this.dataGrid.node);
+    return !isInsideGrid(event);
   }
 
   private handleCellHover(event) {

diff --git a/js/notebook/src/tableDisplay/dataGrid/event/helpers.ts b/js/notebook/src/tableDisplay/dataGrid/event/helpers.ts
@@ -26,6 +26,15 @@ export namespace EventHelpers {
     )
   }
 
+  export function isInsideGrid(event) {
+    const relatedTarget = (event.relatedTarget || event.target) as HTMLElement;
+
+    return relatedTarget && (
+      relatedTarget.classList.contains('p-DataGrid')
+      || relatedTarget.closest('.p-DataGrid')
+    )
+  }
+
   export function isInsideGridNode(event: MouseEvent, gridNode: HTMLElement) {
     const relatedTarget = (event.relatedTarget || event.target) as HTMLElement;