@linzjs/step-ag-grid 29.2.4 → 29.3.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "29.2.4",
+  "version": "29.3.1",
   "keywords": [
     "aggrid",
     "ag-grid",
@@ -83,7 +83,7 @@
     "@chromatic-com/storybook": "^4.1.1",
     "@linzjs/lui": "^23.11.1",
     "@linzjs/style": "^5.4.0",
-    "@linzjs/windows": "^5.6.0",
+    "@linzjs/windows": "^5.7.0",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",

package/src/components/Grid.tsx

@@ -14,7 +14,6 @@ import {
   GetRowIdParams,
   GridOptions,
   GridReadyEvent,
-  GridSizeChangedEvent,
   IColumnLimit,
   ModelUpdatedEvent,
   ModuleRegistry,
@@ -27,15 +26,14 @@ import {
 } from 'ag-grid-community';
 import { AgGridReact } from 'ag-grid-react';
 import clsx from 'clsx';
-import { defer, difference, isEmpty, last, omit, sum, xorBy } from 'lodash-es';
+import { defer, delay, difference, isEmpty, last, omit, xorBy } from 'lodash-es';
 import { ReactElement, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useInterval } from 'usehooks-ts';
 
-import { useGridContext } from '../contexts/GridContext';
+import { AutoSizeColumnsResult, useGridContext } from '../contexts/GridContext';
 import { GridUpdatingContext } from '../contexts/GridUpdatingContext';
 import { fnOrVar, isNotEmpty } from '../utils/util';
 import { clickInputWhenContainingCellClicked } from './clickInputWhenContainingCellClicked';
-import { ColDefT } from './GridCell';
 import { GridHeaderSelect } from './gridHeader';
 import { GridContextMenuComponent, useGridContextMenu } from './gridHook';
 import { GridNoRowsOverlay } from './GridNoRowsOverlay';
@@ -194,8 +192,9 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
   const hasSetContentSizeEmpty = useRef(false);
   const needsAutoSize = useRef(true);
 
-  const lastFullResize = useRef<number>();
-
+  const requiresInitialSizeToFitRef = useRef(true);
+  const autoSizeResultRef = useRef<AutoSizeColumnsResult | null>(null);
+  const prevRowsVisibleRef = useRef(false);
   const setInitialContentSize = useCallback(() => {
     if (!gridDivRef.current?.clientWidth || rowData == null) {
       // Don't resize grids if they are offscreen as it doesn't work.
@@ -210,46 +209,63 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
       return;
     }
 
-    const skipHeader = sizeColumns === 'auto-skip-headers' && gridRendered === 'rows-visible';
-    if (sizeColumns === 'auto' || skipHeader) {
-      const result = autoSizeColumns({
-        skipHeader,
-        userSizedColIds: new Set(userSizedColIds.current.keys()),
-        includeFlex: true,
-      });
-      if (!result) {
+    // 1. First we autosize to get the size of the columns on an infinite grid.
+    if (sizeColumns === 'auto' || sizeColumns === 'auto-skip-headers') {
+      // You can't skip headers until the grid has content
+      const rowsVisible = gridRendered === 'rows-visible';
+      const skipHeader = sizeColumns === 'auto-skip-headers' && rowsVisible;
+      // If grid was empty and now has content we need to autosize
+      if (rowsVisible !== prevRowsVisibleRef.current && rowsVisible) {
+        prevRowsVisibleRef.current = rowsVisible;
+        autoSizeResultRef.current = null;
+      }
+      const autoSizeResult =
+        autoSizeResultRef.current ??
+        autoSizeColumns({
+          skipHeader,
+          userSizedColIds: new Set(userSizedColIds.current.keys()),
+          includeFlex: true,
+        });
+      // Auto-size failed retry later
+      if (!autoSizeResult) {
         needsAutoSize.current = true;
         return;
       }
-      // Default max intial width is 256x initial visible column count, max of 80% window width
-      const maxWidth =
-        maxInitialWidth ||
-        sum(params.columnDefs.map((c: ColDefT<TData>) => (!(c as any).hide ? c.maxInitialWidth || 128 : 0)));
-      result.width = Math.min(result.width, maxWidth);
+
+      autoSizeResultRef.current = autoSizeResult;
+      // Calculate the auto-sized width, limit it to maxInitialWidth
+      autoSizeResult.width = maxInitialWidth ? Math.min(autoSizeResult.width, maxInitialWidth) : autoSizeResult.width;
       if (gridRendered === 'empty') {
+        // If the grid is empty we still do an onContentSize callback, we will do another callback when grid has data
+        // 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;
-          params.onContentSize?.(result);
+          requiresInitialSizeToFitRef.current = true;
+          params.onContentSize?.(autoSizeResult);
         }
       } else if (gridRendered === 'rows-visible') {
+        // we have rows now so callback grid size
         if (!hasSetContentSize.current) {
-          if (lastFullResize.current === result.width) {
-            hasSetContentSize.current = true;
-            params.onContentSize?.(result);
-          } else {
-            needsAutoSize.current = true;
-          }
-          lastFullResize.current = result.width;
+          hasSetContentSize.current = true;
+          requiresInitialSizeToFitRef.current = true;
+          params.onContentSize?.(autoSizeResult);
         }
       } else {
         // It should be impossible to get here
         console.error('Unknown value returned from hasGridRendered');
       }
-    }
 
-    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.
+      delay(() => {
+        if (requiresInitialSizeToFitRef.current) {
+          requiresInitialSizeToFitRef.current = false;
+          sizeColumnsToFit();
+        }
+      }, 50);
     }
+
     setAutoSized(true);
     needsAutoSize.current = false;
   }, [autoSizeColumns, gridRenderState, maxInitialWidth, params, rowData, sizeColumns, sizeColumnsToFit]);
@@ -430,6 +446,8 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
   const onRowDataChanged = useCallback(() => {
     const length = rowData?.length ?? 0;
     if (previousRowDataLength.current !== length) {
+      // We need to autosize all cells again
+      autoSizeResultRef.current = null;
       setInitialContentSize();
       previousRowDataLength.current = length;
     }
@@ -594,18 +612,22 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
   /**
    * Resize columns to fit if required on window/container resize
    */
-  const onGridSizeChanged = useCallback(
-    (event: GridSizeChangedEvent<TData>) => {
+  const onGridResize = useCallback(
+    (event: AgGridEvent<TData>) => {
       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
         const columnLimits = [
           ...userSizedColIds.current.entries().map(
             ([c, w]): IColumnLimit => ({
               key: c,
               minWidth: w,
+              maxWidth: w,
             }),
           ),
         ];
-        event.api.sizeColumnsToFit({ columnLimits });
+        requiresInitialSizeToFitRef.current = false;
+        defer(() => event.api.sizeColumnsToFit({ columnLimits }));
       }
     },
     [sizeColumns],
@@ -619,24 +641,32 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
   /**
    * Lock/unlock column width on user edit/reset.
    */
-  const onColumnResized = useCallback((e: ColumnResizedEvent) => {
-    const colId = e.column?.getColId();
-    if (colId == null) {
-      return;
-    }
-    const width = e.column?.getActualWidth();
-    if (width == null) {
-      return;
-    }
-    switch (e.source) {
-      case 'uiColumnResized':
-        userSizedColIds.current.set(colId, width);
-        break;
-      case 'autosizeColumns':
-        userSizedColIds.current.delete(colId);
-        break;
-    }
-  }, []);
+  const onColumnResized = useCallback(
+    (e: ColumnResizedEvent) => {
+      const colId = e.column?.getColId();
+      if (colId == null) {
+        return;
+      }
+      const width = e.column?.getActualWidth();
+      if (width == null) {
+        return;
+      }
+      switch (e.source) {
+        case 'uiColumnResized':
+          userSizedColIds.current.set(colId, width);
+          const colDef = e.column?.getColDef();
+          if (!colDef?.flex) {
+            onGridResize(e);
+          }
+          break;
+        case 'autosizeColumns':
+          userSizedColIds.current.delete(colId);
+          onGridResize(e);
+          break;
+      }
+    },
+    [onGridResize],
+  );
 
   const gridContextMenu = useGridContextMenu({ contextMenu: params.contextMenu, contextMenuSelectRow });
 
@@ -773,6 +803,7 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
   );
 
   const selectionColumnDef = useMemo((): SelectionColumnDef => {
+    // Note this has to be 1 for hidden otherwise ag-grid does crazy things whilst resizing
     const selectWidth = params.hideSelectColumn ? 0 : selectable && params.onRowDragEnd ? 76 : 48;
     return {
       suppressNavigable: params.hideSelectColumn,
@@ -840,7 +871,7 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
           animateRows={params.animateRows ?? false}
           rowClassRules={params.rowClassRules}
           getRowId={getRowId}
-          onGridSizeChanged={onGridSizeChanged}
+          onGridSizeChanged={onGridResize}
           suppressColumnVirtualisation={suppressColumnVirtualization}
           suppressClickEdit={true}
           onColumnVisible={setInitialContentSize}

package/src/components/GridCell.tsx

@@ -71,7 +71,6 @@ export interface ColDefT<TData extends GridBaseRow, ValueType = any> extends Col
   editable?: boolean | EditableCallback<TData, ValueType>;
   valueGetter?: string | ValueGetterFunc<TData, ValueType>;
   valueFormatter?: string | ValueFormatterFunc<TData, ValueType>;
-  maxInitialWidth?: number;
   cellRenderer?:
     | ((props: ICellRendererParams<TData, ValueType>) => ReactElement | string | false | null | undefined)
     | string;

package/src/components/GridWrapper.tsx

@@ -1,11 +1,18 @@
-import { PropsWithChildren } from 'react';
+import clsx from 'clsx';
+import { forwardRef, PropsWithChildren } from 'react';
 
 export interface GridWrapperProps {
+  className?: string | undefined;
   maxHeight?: number | string;
 }
 
-export const GridWrapper = ({ children, maxHeight }: PropsWithChildren<GridWrapperProps>) => (
-  <div className={'Grid-wrapper'} style={{ maxHeight }}>
-    {children}
-  </div>
-);
+export const GridWrapper = forwardRef<HTMLDivElement, PropsWithChildren<GridWrapperProps>>(function GridWrapperFr(
+  { children, maxHeight, className },
+  ref,
+) {
+  return (
+    <div className={clsx('Grid-wrapper', className)} style={{ maxHeight }} ref={ref}>
+      {children}
+    </div>
+  );
+});

package/src/stories/grid/gridAutosize/ShowPanelResizingAgGrid/ShowPanelResizingAgGrid.stories.tsx

@@ -12,7 +12,7 @@ const meta: Meta<typeof TestShowPanelResizingAgGrid> = {
   decorators: [
     (Story) => (
       <div>
-        <PanelsContextProvider baseZIndex={500}>
+        <PanelsContextProvider baseZIndex={500} panelStateOptions={null}>
           <Story />
         </PanelsContextProvider>
       </div>