From ac5e0587b9333c31dc59a0c678d39399ef3bae7c Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Tue, 21 Sep 2021 15:51:02 -0700
Subject: [PATCH] [Fix] DRY out enableInteractives call

Setting isCellEntered to true already makes that same call, so *should* have that same effect as long as we're consistent about changing logic via isCellEntered

This also fixes #4384, which was a focus-lock issue caused focusin/focusout events firing multiple times. Now with the setIsCellEntered change, focus does not fire repeatedly
---
 .../datagrid/body/header/data_grid_header_cell_wrapper.tsx  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/datagrid/body/header/data_grid_header_cell_wrapper.tsx b/src/components/datagrid/body/header/data_grid_header_cell_wrapper.tsx
index 92ab59cf53e..76c9b61d5a7 100644
--- a/src/components/datagrid/body/header/data_grid_header_cell_wrapper.tsx
+++ b/src/components/datagrid/body/header/data_grid_header_cell_wrapper.tsx
@@ -122,10 +122,8 @@ export const EuiDataGridHeaderCellWrapper: FunctionComponent<EuiDataGridHeaderCe
         if (isFocused === false) {
           setFocusedCell([index, -1]);
         } else {
-          // this cell already had the grid's focus, so re-enable interactives
-          enableInteractives(headerNode);
-          // shift focus to the interactive element
-          focusInteractives(headerNode);
+          // this cell already had the grid's focus, so re-enable and focus interactives
+          setIsCellEntered(true);
         }
       }
     }