Skip to content

Commit e9a3dd7

Browse files
committed
deprecate MRT_Virtualizer type in favor of specific ones
1 parent 2b5d3de commit e9a3dd7

File tree

5 files changed

+22
-18
lines changed
  • apps/material-react-table-docs/examples
    • enable-column-virtualization/sandbox/src
    • enable-row-virtualization/sandbox/src
    • infinite-scrolling/sandbox/src
    • virtualized/sandbox/src
  • packages/material-react-table/src

5 files changed

+22
-18
lines changed

apps/material-react-table-docs/examples/enable-column-virtualization/sandbox/src/TS.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import { useRef } from 'react';
22
import {
33
MaterialReactTable,
44
useMaterialReactTable,
5-
type MRT_Virtualizer,
5+
type MRT_ColumnVirtualizer,
66
} from 'material-react-table';
77
import { fakeColumns, fakeData } from './makeData';
88

99
const Example = () => {
1010
//optionally access the underlying virtualizer instance
11-
const columnVirtualizerInstanceRef =
12-
useRef<MRT_Virtualizer<HTMLDivElement, HTMLTableCellElement>>(null);
11+
const columnVirtualizerInstanceRef = useRef<MRT_ColumnVirtualizer>(null);
1312

1413
const table = useMaterialReactTable({
1514
columnVirtualizerInstanceRef, //optional

apps/material-react-table-docs/examples/enable-row-virtualization/sandbox/src/TS.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
useMaterialReactTable,
55
type MRT_ColumnDef,
66
type MRT_SortingState,
7-
type MRT_Virtualizer,
7+
type MRT_RowVirtualizer,
88
} from 'material-react-table';
99
import { makeData, type Person } from './makeData';
1010

@@ -58,8 +58,7 @@ const Example = () => {
5858
);
5959

6060
//optionally access the underlying virtualizer instance
61-
const rowVirtualizerInstanceRef =
62-
useRef<MRT_Virtualizer<HTMLDivElement, HTMLTableRowElement>>(null);
61+
const rowVirtualizerInstanceRef = useRef<MRT_RowVirtualizer>(null);
6362

6463
const [data, setData] = useState<Person[]>([]);
6564
const [isLoading, setIsLoading] = useState(true);

apps/material-react-table-docs/examples/infinite-scrolling/sandbox/src/TS.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
type MRT_ColumnDef,
1313
type MRT_ColumnFiltersState,
1414
type MRT_SortingState,
15-
type MRT_Virtualizer,
15+
type MRT_RowVirtualizer,
1616
} from 'material-react-table';
1717
import { Typography } from '@mui/material';
1818
import {
@@ -64,8 +64,7 @@ const fetchSize = 25;
6464

6565
const Example = () => {
6666
const tableContainerRef = useRef<HTMLDivElement>(null); //we can get access to the underlying TableContainer element and react to its scroll events
67-
const rowVirtualizerInstanceRef =
68-
useRef<MRT_Virtualizer<HTMLDivElement, HTMLTableRowElement>>(null); //we can get access to the underlying Virtualizer instance and call its scrollToIndex method
67+
const rowVirtualizerInstanceRef = useRef<MRT_RowVirtualizer>(null); //we can get access to the underlying Virtualizer instance and call its scrollToIndex method
6968

7069
const [columnFilters, setColumnFilters] = useState<MRT_ColumnFiltersState>(
7170
[],

apps/material-react-table-docs/examples/virtualized/sandbox/src/TS.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
useMaterialReactTable,
55
type MRT_ColumnDef,
66
type MRT_SortingState,
7-
type MRT_Virtualizer,
7+
type MRT_RowVirtualizer,
88
} from 'material-react-table';
99
import { makeData, type Person } from './makeData';
1010

@@ -90,8 +90,7 @@ const Example = () => {
9090
);
9191

9292
//optionally access the underlying virtualizer instance
93-
const rowVirtualizerInstanceRef =
94-
useRef<MRT_Virtualizer<HTMLDivElement, HTMLTableRowElement>>(null);
93+
const rowVirtualizerInstanceRef = useRef<MRT_RowVirtualizer>(null);
9594

9695
const [data, setData] = useState<Person[]>([]);
9796
const [isLoading, setIsLoading] = useState(true);

packages/material-react-table/src/types.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ export type MRT_RowSelectionState = RowSelectionState;
105105
export type MRT_SortingState = SortingState;
106106
export type MRT_Updater<T> = Updater<T>;
107107
export type MRT_VirtualItem = VirtualItem;
108-
export type MRT_Virtualizer<
109-
TScrollElement extends Element | Window = Element | Window,
110-
TItemElement extends Element = Element,
111-
> = Virtualizer<TScrollElement, TItemElement>;
108+
112109
export type MRT_VirtualizerOptions<
113110
TScrollElement extends Element | Window = Element | Window,
114111
TItemElement extends Element = Element,
@@ -131,6 +128,13 @@ export type MRT_RowVirtualizer<
131128
virtualRows: MRT_VirtualItem[];
132129
};
133130

131+
/**
132+
* @deprecated use `MRT_ColumnVirtualizer` or `MRT_RowVirtualizer` instead
133+
*/
134+
export type MRT_Virtualizer<_TScrollElement = any, _TItemElement = any> =
135+
| MRT_ColumnVirtualizer
136+
| MRT_RowVirtualizer;
137+
134138
export type MRT_ColumnHelper<TData extends MRT_RowData> = {
135139
accessor: <
136140
TAccessor extends AccessorFn<TData> | DeepKeys<TData>,
@@ -750,7 +754,9 @@ export type MRT_TableOptions<TData extends MRT_RowData> = Omit<
750754
columnFilterModeOptions?: Array<
751755
LiteralUnion<string & MRT_FilterOption>
752756
> | null;
753-
columnVirtualizerInstanceRef?: MutableRefObject<MRT_ColumnVirtualizer | null>;
757+
columnVirtualizerInstanceRef?: MutableRefObject<
758+
MRT_ColumnVirtualizer | MRT_Virtualizer | null
759+
>;
754760
columnVirtualizerOptions?:
755761
| ((props: {
756762
table: MRT_TableInstance<TData>;
@@ -1184,7 +1190,9 @@ export type MRT_TableOptions<TData extends MRT_RowData> = Omit<
11841190
| 'sticky'
11851191
| 'top'
11861192
| 'top-and-bottom';
1187-
rowVirtualizerInstanceRef?: MutableRefObject<MRT_RowVirtualizer | null>;
1193+
rowVirtualizerInstanceRef?: MutableRefObject<
1194+
MRT_RowVirtualizer | MRT_Virtualizer | null
1195+
>;
11881196
rowVirtualizerOptions?:
11891197
| ((props: {
11901198
table: MRT_TableInstance<TData>;

0 commit comments

Comments
 (0)