From 755ce550ec1a46142f8d572dbf47ce0f659ad643 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Thu, 20 Jan 2022 15:25:07 +0300
Subject: [PATCH] fix(plugin-data-spreadsheet-new): CB-1521 return focus to the
 grid

---
 .../src/DataGrid/TableColumnHeader/TableColumnHeader.tsx   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
index 39d4ae005e..3eb6745a93 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableColumnHeader.tsx
@@ -94,17 +94,14 @@ export const TableColumnHeader = observer<HeaderRendererProps<any>>(function Tab
     }
   }
 
-  function preventFocus(event: React.MouseEvent<HTMLDivElement, MouseEvent>) {
-    event.preventDefault();
-  }
-
   function handleClick(event: React.MouseEvent<HTMLDivElement, MouseEvent>) {
     gridSelectionContext.selectColumn(calculatedColumn.idx, event.ctrlKey || event.metaKey);
+    dataGridContext.focus();
   }
 
   return styled(useStyles(headerStyles))(
     <table-header>
-      <shrink-container as='div' title={columnTooltip} onMouseDown={preventFocus} onClick={handleClick}>
+      <shrink-container as='div' title={columnTooltip} onClick={handleClick}>
         <icon>
           {icon && <StaticImage icon={icon} />}
           {!dataReadonly && columnReadOnly && <readonly-status className='rdg-table-header__readonly-status' />}