ag-grid-community 33.2.3 → 33.2.4

package/dist/ag-grid-community.js

@@ -23675,7 +23675,8 @@ class FocusService extends beanStub_1.BeanStub {
     // grid cell will still be focused as far as the grid is concerned,
     // however the browser focus will have moved somewhere else.
     getFocusCellToUseAfterRefresh() {
-        if (this.gos.get('suppressFocusAfterRefresh') || !this.focusedCell) {
+        const { gos, focusedCell } = this;
+        if (gos.get('suppressFocusAfterRefresh') || gos.get('suppressCellFocus') || !focusedCell) {
             return null;
         }
         // we check that the browser is actually focusing on the grid, if it is not, then
@@ -23684,7 +23685,7 @@ class FocusService extends beanStub_1.BeanStub {
         if (!this.doesRowOrCellHaveBrowserFocus()) {
             return null;
         }
-        return this.focusedCell;
+        return focusedCell;
     }
     getFocusHeaderToUseAfterRefresh() {
         if (this.gos.get('suppressFocusAfterRefresh') || !this.focusedHeader) {
@@ -43950,6 +43951,9 @@ class RowCtrl extends beanStub_1.BeanStub {
             this.allRowGuis.forEach(callback);
         }
     }
+    isRowRendered() {
+        return this.allRowGuis.length > 0;
+    }
     onRowHeightChanged(gui) {
         // check for exists first - if the user is resetting the row height, then
         // it will be null (or undefined) momentarily until the next time the flatten
@@ -44449,37 +44453,50 @@ class RowRenderer extends beanStub_1.BeanStub {
             this.allRowCtrls = liveList;
         }
     }
-    isCellRendered(rowIndex, column) {
+    /**
+     * Checks if the cell is rendered or not. Also returns true if row ctrl is present but has not rendered
+     * cells yet.
+     * @returns true if cellCtrl is present, or if the row is present but has not rendered rows yet
+     */
+    isCellBeingRendered(rowIndex, column) {
         const rowCtrl = this.rowCtrlsByRowIndex[rowIndex];
-        // if no column, simply check for row ctrl
-        if (!column) {
+        // if no column, simply check for row ctrl, if no rowCtrl then return false
+        if (!column || !rowCtrl) {
             return !!rowCtrl;
         }
-        if (rowCtrl && rowCtrl.isFullWidth()) {
+        if (rowCtrl.isFullWidth()) {
             return true;
         }
-        // check if this is spanned, if it has been rendered by the span renderer
+        // return true if:
+        // - spannedRowRenderer has a cell for this position,
+        // - or if the rowCtrl has a cell for this column
+        // - or if the row is not rendered yet, as it might try to render it
         const spannedCell = this.beans.spannedRowRenderer?.getCellByPosition({ rowIndex, column, rowPinned: null });
-        if (spannedCell) {
-            return true;
-        }
-        // otherwise, check if the cell is rendered
-        return !!rowCtrl?.getCellCtrl(column);
+        return !!spannedCell || !!rowCtrl.getCellCtrl(column) || !rowCtrl.isRowRendered();
     }
     /**
      * Notifies all row and cell controls of any change in focused cell.
      * @param event cell focused event
      */
+    updateCellFocus(event) {
+        this.getAllCellCtrls().forEach((cellCtrl) => cellCtrl.onCellFocused(event));
+        this.getFullWidthRowCtrls().forEach((rowCtrl) => rowCtrl.onFullWidthRowFocused(event));
+    }
+    /**
+     * Called when a new cell is focused in the grid
+     * - if the focused cell isn't rendered; re-draw rows to dry to render it
+     * - subsequently updates all cell and row controls with the new focused cell
+     * @param event cell focused event
+     */
     onCellFocusChanged(event) {
         // if the focused cell has not been rendered, need to render cell so focus can be captured.
         if (event && event.rowIndex != null && !event.rowPinned) {
             const col = this.beans.colModel.getCol(event.column) ?? undefined;
-            if (!this.isCellRendered(event.rowIndex, col)) {
+            if (!this.isCellBeingRendered(event.rowIndex, col)) {
                 this.redraw();
             }
         }
-        this.getAllCellCtrls().forEach((cellCtrl) => cellCtrl.onCellFocused(event));
-        this.getFullWidthRowCtrls().forEach((rowCtrl) => rowCtrl.onFullWidthRowFocused(event));
+        this.updateCellFocus(event);
     }
     onSuppressCellFocusChanged(suppressCellFocus) {
         this.getAllCellCtrls().forEach((cellCtrl) => cellCtrl.onSuppressCellFocusChanged(suppressCellFocus));
@@ -44490,10 +44507,8 @@ class RowRenderer extends beanStub_1.BeanStub {
     // all active cells.
     registerCellEventListeners() {
         this.addManagedEventListeners({
-            cellFocused: (event) => {
-                this.onCellFocusChanged(event);
-            },
-            cellFocusCleared: () => this.onCellFocusChanged(),
+            cellFocused: (event) => this.onCellFocusChanged(event),
+            cellFocusCleared: () => this.updateCellFocus(),
             flashCells: (event) => {
                 const { cellFlashSvc } = this.beans;
                 if (cellFlashSvc) {
@@ -44840,7 +44855,7 @@ class RowRenderer extends beanStub_1.BeanStub {
         }
         // if the grid lost focus, we need to try to bring it back
         if (!focusSvc.doesRowOrCellHaveBrowserFocus()) {
-            this.onCellFocusChanged((0, gridOptionsUtils_1._addGridCommonParams)(this.gos, {
+            this.updateCellFocus((0, gridOptionsUtils_1._addGridCommonParams)(this.gos, {
                 ...cellToFocus,
                 forceBrowserFocus: true,
                 preventScrollOnBrowserFocus: true,
@@ -57353,7 +57368,7 @@ exports.VanillaFrameworkOverrides = VanillaFrameworkOverrides;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.VERSION = void 0;
 // DO NOT UPDATE MANUALLY: Generated from script during build time
-exports.VERSION = '33.2.3';
+exports.VERSION = '33.2.4';
 
 
 /***/ }),