From 74a9f4a3d71dceea64c42955d026e3e2a8d4586d Mon Sep 17 00:00:00 2001 From: Kenny Lin Date: Thu, 25 Jun 2026 16:49:52 -0400 Subject: [PATCH 1/3] added md as default for column size --- .../gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx | 5 +++-- packages/gamut/src/DataList/Tables/Rows/TableRow.tsx | 8 ++++++-- packages/gamut/src/DataList/types.ts | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx b/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx index 705c0705c49..c1b7df8f0d7 100644 --- a/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx +++ b/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx @@ -11,7 +11,7 @@ import { } from '../../Controls'; import { useControlContext } from '../../hooks/useListControls'; import { useListState } from '../../hooks/useListState'; -import { ColumnConfig, Query } from '../../types'; +import { ColumnConfig, DEFAULT_COLUMN_SIZE, Query } from '../../types'; import { StyledHeaderRow } from './elements'; interface HeaderComponent { @@ -56,7 +56,7 @@ export const TableHeaderRow: HeaderComponent = ({ )} )} - {columns.map(({ key, header, sortable, filters, ...colProps }) => { + {columns.map(({ key, header, sortable, filters, size, ...colProps }) => { const rowProperty = key as string; const renderKey = prefixId(`header-col-${rowProperty}`); const columnText = String(header || key); @@ -73,6 +73,7 @@ export const TableHeaderRow: HeaderComponent = ({ {...colProps} aria-sort={sortable ? ariaSortDirection : undefined} columnHeader + size={size ?? DEFAULT_COLUMN_SIZE} > >; @@ -108,7 +112,7 @@ export const TableRow: DataRow = ({ const newKey = prefixId(`${id}-col-${String(key)}`); const colProps = { ...listColProps, - size, + size: size ?? DEFAULT_COLUMN_SIZE, justify, fill, type, diff --git a/packages/gamut/src/DataList/types.ts b/packages/gamut/src/DataList/types.ts index ccfa239a321..8d04a21d9e1 100644 --- a/packages/gamut/src/DataList/types.ts +++ b/packages/gamut/src/DataList/types.ts @@ -65,6 +65,10 @@ export type IdentifiableKeys = Extract< export type FilterOption = string | { text: string; value: string }; +export type DataGridColumnSize = Exclude; + +export const DEFAULT_COLUMN_SIZE: DataGridColumnSize = 'md'; + export interface ColumnConfig { key: keyof T; /** @@ -73,7 +77,7 @@ export interface ColumnConfig { */ header?: string; type?: ListColProps['type']; - size?: Exclude; + size?: DataGridColumnSize; render?: (row: T) => ReactElement | null; sortable?: boolean; filters?: string[]; From b3e51abc185abba49ec05c547a0db22d5fad3b7b Mon Sep 17 00:00:00 2001 From: Kenny Lin Date: Fri, 26 Jun 2026 09:54:36 -0400 Subject: [PATCH 2/3] moved default column size to its own file to avoid export from public api --- packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx | 3 ++- packages/gamut/src/DataList/Tables/Rows/TableRow.tsx | 7 ++----- packages/gamut/src/DataList/types.ts | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx b/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx index c1b7df8f0d7..5cacd4a87c6 100644 --- a/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx +++ b/packages/gamut/src/DataList/Tables/Rows/TableHeaderRow.tsx @@ -3,6 +3,7 @@ import { memo, ReactElement } from 'react'; import { FlexBox } from '../../..'; import { ListCol } from '../../../List'; import { useListContext } from '../../../List/ListProvider'; +import { DEFAULT_COLUMN_SIZE } from '../../constants'; import { ExpandControl, FilterControl, @@ -11,7 +12,7 @@ import { } from '../../Controls'; import { useControlContext } from '../../hooks/useListControls'; import { useListState } from '../../hooks/useListState'; -import { ColumnConfig, DEFAULT_COLUMN_SIZE, Query } from '../../types'; +import { ColumnConfig, Query } from '../../types'; import { StyledHeaderRow } from './elements'; interface HeaderComponent { diff --git a/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx b/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx index 14e9df09dab..834840b3216 100644 --- a/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx +++ b/packages/gamut/src/DataList/Tables/Rows/TableRow.tsx @@ -11,13 +11,10 @@ import { ListCol, ListRow } from '../../../List'; import { ColProps } from '../../../List/elements'; import { useListContext } from '../../../List/ListProvider'; import { Shimmer } from '../../../Loading/Shimmer'; +import { DEFAULT_COLUMN_SIZE } from '../../constants'; import { ExpandControl, SelectControl } from '../../Controls'; import { useControlContext } from '../../hooks/useListControls'; -import { - ColumnConfig, - DEFAULT_COLUMN_SIZE, - IdentifiableKeys, -} from '../../types'; +import { ColumnConfig, IdentifiableKeys } from '../../types'; export type MarshaledColProps = Partial>; diff --git a/packages/gamut/src/DataList/types.ts b/packages/gamut/src/DataList/types.ts index 8d04a21d9e1..7e99dc3cbd2 100644 --- a/packages/gamut/src/DataList/types.ts +++ b/packages/gamut/src/DataList/types.ts @@ -67,8 +67,6 @@ export type FilterOption = string | { text: string; value: string }; export type DataGridColumnSize = Exclude; -export const DEFAULT_COLUMN_SIZE: DataGridColumnSize = 'md'; - export interface ColumnConfig { key: keyof T; /** From d8b35bcae8d551bf91fbecbd2e354c5e58e0e09a Mon Sep 17 00:00:00 2001 From: Kenny Lin Date: Fri, 26 Jun 2026 10:09:21 -0400 Subject: [PATCH 3/3] added constants file --- packages/gamut/src/DataList/constants.ts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 packages/gamut/src/DataList/constants.ts diff --git a/packages/gamut/src/DataList/constants.ts b/packages/gamut/src/DataList/constants.ts new file mode 100644 index 00000000000..89d24efa00b --- /dev/null +++ b/packages/gamut/src/DataList/constants.ts @@ -0,0 +1,3 @@ +import { DataGridColumnSize } from './types'; + +export const DEFAULT_COLUMN_SIZE: DataGridColumnSize = 'md';