@aurora-ds/components 0.17.9 → 0.17.10

package/dist/esm/components/layout/grid/Grid.props.d.ts

@@ -3,9 +3,9 @@ import { CSSProperties, ReactNode } from 'react';
 export type GridProps = {
     /** Grid children elements */
     children: ReactNode;
-    /** Number of columns (number or CSS grid-template-columns value) */
+    /** Number of columns (number or CSS grid-template-columns value). Acts as max columns when minChildWidth is set. */
     columns?: number | string;
-    /** Number of rows (number or CSS grid-template-rows value) */
+    /** Number of rows (number or CSS grid-template-rows value). */
     rows?: number | string;
     /** Gap between items (theme spacing key) */
     gap?: keyof Theme['spacing'];

package/dist/esm/index.js

@@ -1890,12 +1890,23 @@ Card.displayName = 'Card';
 
 /**
  * Generates the grid-template-columns value based on columns and minChildWidth props
+ * - If only columns is defined: creates a fixed number of columns
+ * - If only minChildWidth is defined: creates responsive auto-fill columns
+ * - If both are defined: creates responsive columns with a maximum limit
  */
 const getGridTemplateColumns = (columns, minChildWidth) => {
+    const minWidthValue = typeof minChildWidth === 'number' ? `${minChildWidth}px` : minChildWidth;
+    if (minChildWidth && typeof columns === 'number') {
+        // Responsive grid with max columns limit
+        // Uses auto-fit with max() to ensure we don't exceed the column limit
+        return `repeat(auto-fit, minmax(max(${minWidthValue}, calc((100% - ${(columns - 1)} * var(--grid-gap, 0px)) / ${columns})), 1fr))`;
+    }
     if (minChildWidth) {
-        return `repeat(auto-fill, minmax(${typeof minChildWidth === 'number' ? `${minChildWidth}px` : minChildWidth}, 1fr))`;
+        // Responsive grid without column limit
+        return `repeat(auto-fill, minmax(${minWidthValue}, 1fr))`;
     }
     if (typeof columns === 'number') {
+        // Fixed columns
         return `repeat(${columns}, 1fr)`;
     }
     return columns;
@@ -1914,24 +1925,25 @@ const getGridTemplateRows = (rows) => {
  */
 const GRID_STYLES = createStyles((theme) => ({
     root: ({ columns, rows, gap, columnGap, rowGap, width, height, minHeight, alignItems, justifyItems, alignContent, justifyContent, padding, minChildWidth, }) => {
-        const gapValue = gap ? parseInt(theme.spacing[gap]) : 0;
-        const maxWidth = typeof columns === 'number' && typeof minChildWidth === 'number' ? `${columns * minChildWidth + (columns - 1) * gapValue}px` : undefined;
+        const gapValue = gap ? theme.spacing[gap] : undefined;
+        const columnGapValue = columnGap ? theme.spacing[columnGap] : gapValue;
         return {
             display: 'grid',
             gridTemplateColumns: getGridTemplateColumns(columns, minChildWidth),
             gridTemplateRows: getGridTemplateRows(rows),
-            gap: gap ? theme.spacing[gap] : undefined,
+            gap: gapValue,
             columnGap: columnGap ? theme.spacing[columnGap] : undefined,
             rowGap: rowGap ? theme.spacing[rowGap] : undefined,
             width,
             height,
             minHeight,
-            maxWidth,
             alignItems,
             justifyItems,
             alignContent,
             justifyContent,
             padding: padding ? theme.spacing[padding] : undefined,
+            // CSS variable for gap calculation in grid-template-columns
+            '--grid-gap': columnGapValue || gapValue || '0px',
         };
     },
 }));