@linzjs/step-ag-grid 29.3.0 → 29.3.2

package/dist/step-ag-grid.cjs

@@ -2778,7 +2778,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
     const hasSetContentSize = React.useRef(false);
     const hasSetContentSizeEmpty = React.useRef(false);
     const needsAutoSize = React.useRef(true);
-    const lastFullResize = React.useRef();
+    const requiresInitialSizeToFitRef = React.useRef(true);
     const autoSizeResultRef = React.useRef(null);
     const prevRowsVisibleRef = React.useRef(false);
     const setInitialContentSize = React.useCallback(() => {
@@ -2807,6 +2807,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                 autoSizeColumns({
                     skipHeader,
                     userSizedColIds: new Set(userSizedColIds.current.keys()),
+                    includeFlex: true,
                 });
             // Auto-size failed retry later
             if (!autoSizeResult) {
@@ -2821,22 +2822,16 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                 // We don't do this callback if we have previously had row data, or have already called back for empty
                 if (!hasSetContentSizeEmpty.current && !hasSetContentSize.current) {
                     hasSetContentSizeEmpty.current = true;
+                    requiresInitialSizeToFitRef.current = true;
                     params.onContentSize?.(autoSizeResult);
                 }
             }
             else if (gridRendered === 'rows-visible') {
                 // we have rows now so callback grid size
                 if (!hasSetContentSize.current) {
-                    // Only callback if grid size has settled
-                    if (lastFullResize.current === autoSizeResult.width) {
-                        hasSetContentSize.current = true;
-                        params.onContentSize?.(autoSizeResult);
-                    }
-                    else {
-                        // Need to retry callback when size has settelled
-                        lastFullResize.current = autoSizeResult.width;
-                        return;
-                    }
+                    hasSetContentSize.current = true;
+                    requiresInitialSizeToFitRef.current = true;
+                    params.onContentSize?.(autoSizeResult);
                 }
             }
             else {
@@ -2844,13 +2839,9 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                 console.error('Unknown value returned from hasGridRendered');
             }
         }
-        // 2. Now we size columns to fit the grid width
-        if (sizeColumns !== 'none') {
-            sizeColumnsToFit();
-        }
         setAutoSized(true);
         needsAutoSize.current = false;
-    }, [autoSizeColumns, gridRenderState, maxInitialWidth, params, rowData, sizeColumns, sizeColumnsToFit]);
+    }, [autoSizeColumns, gridRenderState, maxInitialWidth, params, rowData, sizeColumns]);
     const lastOwnerDocumentRef = React.useRef();
     const wasVisibleRef = React.useRef(false);
     /**
@@ -3147,6 +3138,9 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
      * Resize columns to fit if required on window/container resize
      */
     const onGridResize = React.useCallback((event) => {
+        if (!hasSetContentSizeEmpty.current && !hasSetContentSize.current) {
+            return;
+        }
         if (sizeColumns !== 'none') {
             // Flex columns can expand to fit after resize, but they cannot shrink less than use resized value
             // Double click column resize handle to reset this behaviour
@@ -3157,7 +3151,7 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                     maxWidth: w,
                 })),
             ];
-            event.api.sizeColumnsToFit({ columnLimits });
+            lodashEs.defer(() => event.api.sizeColumnsToFit({ columnLimits }));
         }
     }, [sizeColumns]);
     /**
@@ -3330,9 +3324,15 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                         ? {
                             enableSelectionWithoutKeys: params.enableSelectionWithoutKeys ?? false,
                             enableClickSelection: params.enableClickSelection ?? false,
-                            mode: rowSelection == 'single' ? 'singleRow' : 'multiRow',
+                            mode: rowSelection === 'single' ? 'singleRow' : 'multiRow',
+                        }
+                        : undefined, onDisplayedColumnsChanged: () => {
+                        // This happens after an autosize event, if we don't wait for it size columns to fit doesn't work
+                        if (requiresInitialSizeToFitRef.current) {
+                            requiresInitialSizeToFitRef.current = false;
+                            sizeColumnsToFit();
                         }
-                        : undefined, rowHeight: rowHeight, animateRows: params.animateRows ?? false, rowClassRules: params.rowClassRules, getRowId: getRowId, onGridSizeChanged: onGridResize, suppressColumnVirtualisation: suppressColumnVirtualization, suppressClickEdit: true, onColumnVisible: setInitialContentSize, onRowDataUpdated: onRowDataChanged, onCellFocused: onCellFocused, onCellKeyDown: onCellKeyPress, onCellClicked: onCellClicked, onCellDoubleClicked: onCellDoubleClick, domLayout: params.domLayout, onColumnResized: onColumnResized, defaultColDef: defaultColDef, columnDefs: columnDefsAdjusted, selectionColumnDef: selectionColumnDef, rowData: rowData, postSortRows: params.onRowDragEnd || !defaultPostSort ? undefined : postSortRows, onModelUpdated: onModelUpdated, onGridReady: onGridReady, onSortChanged: ensureSelectedRowIsVisible, quickFilterParser: quickFilterParser, onSelectionChanged: synchroniseExternalStateToGridSelection, onColumnMoved: params.onColumnMoved, noRowsOverlayComponent: noRowsOverlayComponent, alwaysShowVerticalScroll: params.alwaysShowVerticalScroll, isExternalFilterPresent: isExternalFilterPresent, doesExternalFilterPass: doesExternalFilterPass, maintainColumnOrder: true, preventDefaultOnContextMenu: true, onCellContextMenu: gridContextMenu.cellContextMenu, rowDragText: params.rowDragText, onRowDragCancel: clearHighlightRowClasses, onRowDragMove: onRowDragMove, onRowDragEnd: onRowDragEnd, suppressCellFocus: params.suppressCellFocus, pinnedTopRowData: params.pinnedTopRowData, pinnedBottomRowData: params.pinnedBottomRowData, onRowClicked: params.onRowClicked, onRowDoubleClicked: params.onRowDoubleClicked, suppressStartEditOnTab: true }) })] }));
+                    }, rowHeight: rowHeight, animateRows: params.animateRows ?? false, rowClassRules: params.rowClassRules, getRowId: getRowId, onGridSizeChanged: onGridResize, suppressColumnVirtualisation: suppressColumnVirtualization, suppressClickEdit: true, onColumnVisible: setInitialContentSize, onRowDataUpdated: onRowDataChanged, onCellFocused: onCellFocused, onCellKeyDown: onCellKeyPress, onCellClicked: onCellClicked, onCellDoubleClicked: onCellDoubleClick, domLayout: params.domLayout, onColumnResized: onColumnResized, defaultColDef: defaultColDef, columnDefs: columnDefsAdjusted, selectionColumnDef: selectionColumnDef, rowData: rowData, postSortRows: params.onRowDragEnd || !defaultPostSort ? undefined : postSortRows, onModelUpdated: onModelUpdated, onGridReady: onGridReady, onSortChanged: ensureSelectedRowIsVisible, quickFilterParser: quickFilterParser, onSelectionChanged: synchroniseExternalStateToGridSelection, onColumnMoved: params.onColumnMoved, noRowsOverlayComponent: noRowsOverlayComponent, alwaysShowVerticalScroll: params.alwaysShowVerticalScroll, isExternalFilterPresent: isExternalFilterPresent, doesExternalFilterPass: doesExternalFilterPass, maintainColumnOrder: true, preventDefaultOnContextMenu: true, onCellContextMenu: gridContextMenu.cellContextMenu, rowDragText: params.rowDragText, onRowDragCancel: clearHighlightRowClasses, onRowDragMove: onRowDragMove, onRowDragEnd: onRowDragEnd, suppressCellFocus: params.suppressCellFocus, pinnedTopRowData: params.pinnedTopRowData, pinnedBottomRowData: params.pinnedBottomRowData, onRowClicked: params.onRowClicked, onRowDoubleClicked: params.onRowDoubleClicked, suppressStartEditOnTab: true }) })] }));
 };
 const quickFilterParser = (filterStr) => {
     // filter is exact matches exactly groups separated by commas