@linzjs/step-ag-grid 29.1.6 → 29.2.0

package/dist/step-ag-grid.esm.js

@@ -2826,10 +2826,27 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
         needsAutoSize.current = false;
     }, [autoSizeColumns, gridRenderState, params, rowData, sizeColumns, sizeColumnsToFit]);
     const lastOwnerDocumentRef = useRef();
+    const wasVisibleRef = useRef(false);
     /**
      * Auto-size windows that had deferred auto-size
+     * Reset focus if panel went from invisible to visible.
      */
     useInterval(() => {
+        // If grid has become visible after previously being hidden, then refocus the last focused cell.
+        const visible = !!gridDivRef.current?.checkVisibility();
+        if (visible && !wasVisibleRef.current) {
+            wasVisibleRef.current = true;
+            const el = window.__stepaggrid_lastfocuseventtarget;
+            if (el) {
+                // Setting this to null will cause a new refocus event
+                window.__stepaggrid_lastfocuseventtarget = null;
+                // Check element is still part of document
+                if (el.checkVisibility()) {
+                    el.focus();
+                }
+            }
+        }
+        wasVisibleRef.current = visible;
         // Check if window has been popped out and needs resize
         const currentDocument = gridDivRef.current?.ownerDocument;
         if (currentDocument !== lastOwnerDocumentRef.current) {
@@ -3156,7 +3173,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
         }
     }, [clearHighlightRowClasses]);
     const onCellFocused = useCallback((event) => {
-        if (!paramsOnCellFocused || event.rowIndex == null) {
+        if (event.rowIndex == null) {
             return;
         }
         const api = event.api;
@@ -3170,15 +3187,16 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
         if (!colDef || typeof colDef === 'string') {
             return;
         }
-        // Prevent repeated callbacks to cell focus when it focus didn't change
+        // Prevent repeated callbacks to cell focus when focus didn't change
         const { sourceEvent } = event;
         if (sourceEvent) {
-            if (window.__stepaggrid_lastfocuseventtarget === sourceEvent.target) {
+            const cell = sourceEvent.target.closest('.ag-cell');
+            if (window.__stepaggrid_lastfocuseventtarget === cell) {
                 return;
             }
-            window.__stepaggrid_lastfocuseventtarget = sourceEvent.target;
+            window.__stepaggrid_lastfocuseventtarget = cell;
         }
-        paramsOnCellFocused({ colDef, data });
+        paramsOnCellFocused?.({ colDef, data });
     }, [paramsOnCellFocused]);
     const onRowDragEnd = useCallback((event) => {
         clearHighlightRowClasses();