@linzjs/step-ag-grid 17.0.5 → 17.0.7

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "17.0.5",
+  "version": "17.0.7",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/components/Grid.tsx

@@ -97,6 +97,7 @@ export const Grid = ({
   sizeColumns = "auto",
   selectColumnPinned = null,
   contextMenuSelectRow = false,
+  rowHeight = theme === "ag-theme-step-default" ? 40 : theme === "ag-theme-step-compact" ? 36 : undefined,
   ...params
 }: GridProps): ReactElement => {
   const {
@@ -153,7 +154,7 @@ export const Grid = ({
 
     const skipHeader = sizeColumns === "auto-skip-headers" && !isEmpty(params.rowData);
     if (sizeColumns === "auto" || skipHeader) {
-      const result = autoSizeColumns({ skipHeader, userSizedColIds: userSizedColIds.current });
+      const result = autoSizeColumns({ skipHeader, userSizedColIds: userSizedColIds.current, includeFlex: true });
       if (isEmpty(params.rowData)) {
         if (!hasSetContentSizeEmpty.current && result && !hasSetContentSize.current) {
           hasSetContentSizeEmpty.current = true;
@@ -598,7 +599,7 @@ export const Grid = ({
       {gridContextMenu.component}
       <div style={{ flex: 1 }} ref={gridDivRef}>
         <AgGridReact
-          rowHeight={params.rowHeight}
+          rowHeight={rowHeight}
           animateRows={params.animateRows}
           rowClassRules={params.rowClassRules}
           getRowId={(params) => `${params.data.id}`}

package/src/contexts/GridContext.tsx

@@ -10,6 +10,7 @@ export interface AutoSizeColumnsProps {
   skipHeader?: boolean;
   colIds?: Set<string> | string[];
   userSizedColIds?: Set<string>;
+  includeFlex?: boolean;
 }
 
 export type AutoSizeColumnsResult = { width: number } | null;

package/src/contexts/GridContextProvider.tsx

@@ -394,12 +394,16 @@ export const GridContextProvider = <RowType extends GridBaseRow>(props: PropsWit
    * Resize columns to fit container
    */
   const autoSizeColumns = useCallback(
-    ({ skipHeader, colIds, userSizedColIds }: AutoSizeColumnsProps = {}): AutoSizeColumnsResult => {
+    ({ skipHeader, colIds, userSizedColIds, includeFlex }: AutoSizeColumnsProps = {}): AutoSizeColumnsResult => {
       if (!columnApi) return null;
       const colIdsSet = colIds instanceof Set ? colIds : new Set(colIds);
       const colsToResize = columnApi.getColumnState().filter((colState) => {
         const colId = colState.colId;
-        return (isEmpty(colIdsSet) || colIdsSet.has(colId)) && !userSizedColIds?.has(colId) && !colState.flex;
+        return (
+          (isEmpty(colIdsSet) || colIdsSet.has(colId)) &&
+          !userSizedColIds?.has(colId) &&
+          (includeFlex || !colState.flex)
+        );
       });
       if (!isEmpty(colsToResize)) {
         columnApi.autoSizeColumns(