fix lint for real

Author: snowystinger

packages/@react-aria/grid/src/useGridCell.ts

@@ -109,12 +109,13 @@ export function useGridCell<T, C extends GridCollection<T>>(props: GridCellProps
   });
 
   let onKeyDownCapture = (e: ReactKeyboardEvent) => {
-    if (!nodeContains(e.currentTarget, e.target as Element) || state.isKeyboardNavigationDisabled || !ref.current || !getActiveElement()) {
+    let activeElement = getActiveElement();
+    if (!nodeContains(e.currentTarget, e.target as Element) || state.isKeyboardNavigationDisabled || !ref.current || !activeElement) {
       return;
     }
 
     let walker = getFocusableTreeWalker(ref.current);
-    walker.currentNode = getActiveElement();
+    walker.currentNode = activeElement;
 
     switch (e.key) {
       case 'ArrowLeft': {

packages/@react-aria/gridlist/src/useGridListItem.ts

@@ -131,14 +131,15 @@ export function useGridListItem<T>(props: AriaGridListItemOptions, state: ListSt
   });
 
   let onKeyDownCapture = (e: ReactKeyboardEvent) => {
-    if (!nodeContains(e.currentTarget, e.target as Element) || !ref.current || !getActiveElement()) {
+    let activeElement = getActiveElement();
+    if (!nodeContains(e.currentTarget, e.target as Element) || !ref.current || !activeElement) {
       return;
     }
 
     let walker = getFocusableTreeWalker(ref.current);
-    walker.currentNode = getActiveElement();
+    walker.currentNode = activeElement;
 
-    if ('expandedKeys' in state && getActiveElement() === ref.current) {
+    if ('expandedKeys' in state && activeElement === ref.current) {
       if ((e.key === EXPANSION_KEYS['expand'][direction]) && state.selectionManager.focusedKey === node.key && hasChildRows && !state.expandedKeys.has(node.key)) {
         state.toggleKey(node.key);
         e.stopPropagation();
@@ -244,7 +245,8 @@ export function useGridListItem<T>(props: AriaGridListItemOptions, state: ListSt
   };
 
   let onKeyDown = (e) => {
-    if (!nodeContains(e.currentTarget, e.target as Element) || !ref.current || !getActiveElement()) {
+    let activeElement = getActiveElement();
+    if (!nodeContains(e.currentTarget, e.target as Element) || !ref.current || !activeElement) {
       return;
     }
 
@@ -254,7 +256,7 @@ export function useGridListItem<T>(props: AriaGridListItemOptions, state: ListSt
           // If there is another focusable element within this item, stop propagation so the tab key
           // is handled by the browser and not by useSelectableCollection (which would take us out of the list).
           let walker = getFocusableTreeWalker(ref.current, {tabbable: true});
-          walker.currentNode = getActiveElement();
+          walker.currentNode = activeElement;
           let next = e.shiftKey ? walker.previousNode() : walker.nextNode();
 
           if (next) {

packages/@react-aria/selection/src/useSelectableCollection.ts

@@ -314,7 +314,8 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
             // If the active element is NOT tabbable but is contained by an element that IS tabbable (aka the cell), the browser will actually move focus to
             // the containing element. We need to special case this so that tab will move focus out of the grid instead of looping between
             // focusing the containing cell and back to the non-tabbable child element
-            if (next && (!nodeContains(next, getActiveElement()) || (getActiveElement() && !isTabbable(getActiveElement())))) {
+            let activeElement = getActiveElement();
+            if (next && (!nodeContains(next, activeElement) || (activeElement && !isTabbable(activeElement)))) {
               focusWithoutScrolling(next);
             }
           }

packages/@react-aria/table/src/useTableColumnResize.ts

@@ -16,8 +16,8 @@ import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shar
 import {focusSafely, useInteractionModality, useKeyboard, useMove, usePress} from '@react-aria/interactions';
 import {getActiveElement, mergeProps, useDescription, useEffectEvent, useId} from '@react-aria/utils';
 import {getColumnHeaderId} from './utils';
-// @ts-ignore
 import {GridNode} from '@react-types/grid';
+// @ts-ignore
 import intlMessages from '../intl/*.json';
 import {TableColumnResizeState} from '@react-stately/table';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';