@linzjs/step-ag-grid 29.3.0 → 29.3.1

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,32 +2822,31 @@ 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 {
                 // It should be impossible to get here
                 console.error('Unknown value returned from hasGridRendered');
             }
-        }
-        // 2. Now we size columns to fit the grid width
-        if (sizeColumns !== 'none') {
-            sizeColumnsToFit();
+            // If there's no contentSize callback there'll be on onGridResize callback
+            // which is required to run sizeColumnsToFit.
+            // There's also the possibility that the panel was already the right size so didn't trigger onGridResize.
+            lodashEs.delay(() => {
+                if (requiresInitialSizeToFitRef.current) {
+                    requiresInitialSizeToFitRef.current = false;
+                    sizeColumnsToFit();
+                }
+            }, 50);
         }
         setAutoSized(true);
         needsAutoSize.current = false;
@@ -3157,7 +3157,8 @@ const Grid = ({ 'data-testid': dataTestId, defaultPostSort = true, rowSelection
                     maxWidth: w,
                 })),
             ];
-            event.api.sizeColumnsToFit({ columnLimits });
+            requiresInitialSizeToFitRef.current = false;
+            lodashEs.defer(() => event.api.sizeColumnsToFit({ columnLimits }));
         }
     }, [sizeColumns]);
     /**