@elastic/eui 60.1.2 → 60.2.0

package/es/components/datagrid/utils/focus.js

@@ -56,11 +56,17 @@ export var useFocus = function useFocus(_ref) {
       focusedCell = _useState4[0],
       _setFocusedCell = _useState4[1];
 
-  var setFocusedCell = useCallback(function (focusedCell) {
-    _setFocusedCell(focusedCell);
+  var setFocusedCell = useCallback(function (nextFocusedCell) {
+    // If the x/y coordinates remained the same, don't update. This keeps the focusedCell
+    // reference stable, and allows it to be used in places that need reference equality.
+    if (nextFocusedCell[0] === (focusedCell === null || focusedCell === void 0 ? void 0 : focusedCell[0]) && nextFocusedCell[1] === (focusedCell === null || focusedCell === void 0 ? void 0 : focusedCell[1])) {
+      return;
+    }
+
+    _setFocusedCell(nextFocusedCell);
 
     setIsFocusedCellInView(true); // scrolling.ts ensures focused cells are fully in view
-  }, []);
+  }, [focusedCell]);
   var previousCell = useRef(undefined);
   useEffect(function () {
     if (previousCell.current) {
@@ -92,13 +98,16 @@ export var useFocus = function useFocus(_ref) {
       tabIndex: -1
     } : {
       tabIndex: 0,
-      onFocus: function onFocus(e) {
-        // if e.target (the source element of the `focus event`
-        // matches e.currentTarget (always the div with this onFocus listener)
-        // then the user has focused directly on the data grid wrapper (almost definitely by tabbing)
-        // so shift focus to the first visible and interactive cell within the grid
-        if (e.target === e.currentTarget) {
-          focusFirstVisibleInteractiveCell();
+      onKeyUp: function onKeyUp(e) {
+        // Ensure we only manually focus into the grid via keyboard tab -
+        // mouse users can accidentally trigger focus by clicking on scrollbars
+        if (e.key === keys.TAB) {
+          // if e.target (the source element of the `focus event`) matches
+          // e.currentTarget (always the div with this onKeyUp listener)
+          // then the user has focused directly on the data grid wrapper
+          if (e.target === e.currentTarget) {
+            focusFirstVisibleInteractiveCell();
+          }
         }
       }
     };