Skip to content

Commit eeb26bc

Browse files
committed
release v2.0.6
1 parent d69c69d commit eeb26bc

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

apps/material-react-table-docs/pages/changelog.mdx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,37 @@ import Head from 'next/head';
1212

1313
### Version 2
1414

15-
#### Version 2.0.5 - 12-05-2023
15+
#### Version 2.0.6 - 2023-12-15
16+
17+
- Fixed horizontal scrollbar showing up in layoutMode grid with column resizing enabled
18+
19+
#### Version 2.0.5 - 2023-12-05
1620

1721
- Upgraded to TanStack Virtual `v3.0.1` stable release
1822
- Added `MuiTablePagination-root` class to mrt pagination root element for easier styling
1923
- Fixed potential duplicate key warning while rendering skeleton rows when `getRowId` table option is provided and doesn't properly return `undefined`
2024
- Fixed `muiSearchTextFieldProps.InputProps` now able to partially overridden
2125

22-
#### Version 2.0.4 - 11-09-2023
26+
#### Version 2.0.4 - 2023-11-09
2327

2428
- Add support for `'all'` rows pagination option
2529
- Added `muiPaginationProps.SelectProps` support back to allow for native select
2630

27-
#### Version 2.0.3 - 11-06-2023
31+
#### Version 2.0.3 - 2023-11-06
2832

2933
- Locale updates
3034

31-
#### Version 2.0.2 - 11-01-2023
35+
#### Version 2.0.2 - 2023-11-01
3236

3337
- Fixed bug with popover filters null ref focus
3438

35-
#### Version 2.0.1 - 10-31-2023
39+
#### Version 2.0.1 - 2023-10-31
3640

3741
- Fixed bug where edit row action menu was created for all editDisplayModes
3842
- Fixed rest spread on table head row
3943
- Changed pagination text to a span instead of with hardcoded 0 margin and padding
4044

41-
#### Version 2.0.0 - 10-27-2023
45+
#### Version 2.0.0 - 2023-10-27
4246

4347
- Made `MaterialReactTable` a named export instead of a default export.
4448
- Made `@mui/x-date-pickers` a required peer dependency.

packages/material-react-table/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.5",
2+
"version": "2.0.6",
33
"license": "MIT",
44
"name": "material-react-table",
55
"description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",

packages/material-react-table/src/hooks/useMRT_DisplayColumns.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const useMRT_DisplayColumns = <TData extends MRT_RowData>(
3737
makeRowDragColumn,
3838
makeRowActionsColumn,
3939
makeRowExpandColumn,
40-
makeSelectColumn,
40+
makeRowSelectColumn,
4141
makeRowNumbersColumn,
4242
makeSpacerColumn,
4343
]
@@ -73,7 +73,7 @@ export const useMRT_DisplayColumns = <TData extends MRT_RowData>(
7373
);
7474
};
7575

76-
function defaultDisplayColumnProps<TData extends Record<string, any> = {}>(
76+
function defaultDisplayColumnProps<TData extends MRT_RowData>(
7777
{
7878
defaultDisplayColumn,
7979
displayColumnDefOptions,
@@ -84,15 +84,15 @@ function defaultDisplayColumnProps<TData extends Record<string, any> = {}>(
8484
size = 60,
8585
) {
8686
return {
87-
header: header ? localization[header]! : '',
8887
...defaultDisplayColumn,
88+
header: header ? localization[header]! : '',
89+
size,
8990
...displayColumnDefOptions?.[id],
9091
id,
91-
size,
9292
} as const;
9393
}
9494

95-
function makeRowPinColumn<TData extends Record<string, any> = {}>(
95+
function makeRowPinColumn<TData extends MRT_RowData>(
9696
{ tableOptions }: Params<TData>,
9797
order: MRT_ColumnOrderState,
9898
): MRT_ColumnDef<TData> | null {
@@ -108,7 +108,7 @@ function makeRowPinColumn<TData extends Record<string, any> = {}>(
108108
return null;
109109
}
110110

111-
function makeRowDragColumn<TData extends Record<string, any> = {}>(
111+
function makeRowDragColumn<TData extends MRT_RowData>(
112112
{ tableOptions }: Params<TData>,
113113
order: MRT_ColumnOrderState,
114114
): MRT_ColumnDef<TData> | null {
@@ -128,7 +128,7 @@ function makeRowDragColumn<TData extends Record<string, any> = {}>(
128128
return null;
129129
}
130130

131-
function makeRowActionsColumn<TData extends Record<string, any> = {}>(
131+
function makeRowActionsColumn<TData extends MRT_RowData>(
132132
{ creatingRow, tableOptions }: Params<TData>,
133133
order: MRT_ColumnOrderState,
134134
): MRT_ColumnDef<TData> | null {
@@ -147,7 +147,7 @@ function makeRowActionsColumn<TData extends Record<string, any> = {}>(
147147
return null;
148148
}
149149

150-
function makeRowExpandColumn<TData extends Record<string, any> = {}>(
150+
function makeRowExpandColumn<TData extends MRT_RowData>(
151151
{ grouping, tableOptions }: Params<TData>,
152152
order: MRT_ColumnOrderState,
153153
): MRT_ColumnDef<TData> | null {
@@ -167,7 +167,7 @@ function makeRowExpandColumn<TData extends Record<string, any> = {}>(
167167
return null;
168168
}
169169

170-
function makeSelectColumn<TData extends Record<string, any> = {}>(
170+
function makeRowSelectColumn<TData extends MRT_RowData>(
171171
{ tableOptions }: Params<TData>,
172172
order: MRT_ColumnOrderState,
173173
): MRT_ColumnDef<TData> | null {
@@ -185,7 +185,7 @@ function makeSelectColumn<TData extends Record<string, any> = {}>(
185185
return null;
186186
}
187187

188-
function makeRowNumbersColumn<TData extends Record<string, any> = {}>(
188+
function makeRowNumbersColumn<TData extends MRT_RowData>(
189189
{ tableOptions }: Params<TData>,
190190
order: MRT_ColumnOrderState,
191191
): MRT_ColumnDef<TData> | null {
@@ -209,7 +209,7 @@ const blankColProps = {
209209
},
210210
};
211211

212-
function makeSpacerColumn<TData extends Record<string, any> = {}>(
212+
function makeSpacerColumn<TData extends MRT_RowData>(
213213
{ tableOptions }: Params<TData>,
214214
order: MRT_ColumnOrderState,
215215
): MRT_ColumnDef<TData> | null {

0 commit comments

Comments
 (0)