@hillac/mantine-react-table 1.1.2 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +3 -3
- package/dist/index.js +269 -147
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1499,12 +1499,12 @@ declare const useMRT_RowVirtualizer: <TData extends MRT_RowData, TScrollElement
|
|
|
1499
1499
|
* state, refs, and helpers. State management is built on top of TanStack
|
|
1500
1500
|
* Store atoms (`useCreateAtom` from `@tanstack/react-store`):
|
|
1501
1501
|
*
|
|
1502
|
-
* - **TanStack-aware slices** (`columnOrder`, `columnResizing
|
|
1502
|
+
* - **TanStack-aware slices** (`columnOrder`, `columnResizing`)
|
|
1503
1503
|
* are passed via the `atoms` option on `useTable`. Library writes flow directly
|
|
1504
1504
|
* through these atoms, and they're automatically tracked in
|
|
1505
1505
|
* `table.state` by the v9 store.
|
|
1506
|
-
* - Pagination
|
|
1507
|
-
* as the fallback when the consumer does not control
|
|
1506
|
+
* - Pagination and grouping use `state` and their change callbacks, with local
|
|
1507
|
+
* React state as the fallback when the consumer does not control them.
|
|
1508
1508
|
* - **MRT-only slices** (`density`, `isFullScreen`, `creatingRow`,
|
|
1509
1509
|
* `editingCell`, `editingRow`, `draggingColumn`, `draggingRow`,
|
|
1510
1510
|
* `hoveredColumn`, `hoveredRow`, `globalFilterFn`, `columnFilterFns`,
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@ import clsx from 'clsx';
|
|
|
3
3
|
import { useMemo, useCallback, useState, memo, useEffect, useRef, Fragment as Fragment$1, useLayoutEffect, useReducer, createElement } from 'react';
|
|
4
4
|
import { Select, MultiSelect, TextInput, TableTr, TableTd, Collapse, CopyButton, Tooltip, UnstyledButton, Highlight, useDirection, Skeleton, Box, ActionIcon, Text, TableTbody, Flex, Button, useMantineTheme, Menu, Switch, TableTh, TableTfoot, Radio, Checkbox, Badge, Alert, Stack, Autocomplete, RangeSlider, Popover, Transition, Indicator, TableThead, Progress, Group, Pagination, Modal, useMantineColorScheme, Table, lighten, darken, LoadingOverlay, Paper } from '@mantine/core';
|
|
5
5
|
import { compareItems, rankItem, rankings } from '@tanstack/match-sorter-utils';
|
|
6
|
-
import { sortFns, constructRow, filterFns, Subscribe, flexRender as flexRender$1, aggregationFns,
|
|
6
|
+
import { sortFns, constructRow, filterFns, Subscribe, flexRender as flexRender$1, aggregationFns, createFacetedUniqueValues, createFacetedMinMaxValues, createFacetedRowModel, createGroupedRowModel, createExpandedRowModel, createPaginatedRowModel, createSortedRowModel, createFilteredRowModel, stockFeatures, useTable } from '@tanstack/react-table';
|
|
7
7
|
import { defaultRangeExtractor, useVirtualizer } from '@tanstack/react-virtual';
|
|
8
8
|
import { useDebouncedValue, useHover, useMediaQuery } from '@mantine/hooks';
|
|
9
9
|
import { DateInput } from '@mantine/dates';
|
|
@@ -190,6 +190,120 @@ const useMRT_Rows = (table) => {
|
|
|
190
190
|
return rows;
|
|
191
191
|
};
|
|
192
192
|
|
|
193
|
+
const getColumnId = (columnDef) => columnDef.id ?? columnDef.accessorKey?.toString?.() ?? columnDef.header;
|
|
194
|
+
const getAllLeafColumnDefs = (columns) => {
|
|
195
|
+
const allLeafColumnDefs = [];
|
|
196
|
+
const getLeafColumns = (cols) => {
|
|
197
|
+
cols.forEach((col) => {
|
|
198
|
+
if (col.columns) {
|
|
199
|
+
getLeafColumns(col.columns);
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
allLeafColumnDefs.push(col);
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
};
|
|
206
|
+
getLeafColumns(columns);
|
|
207
|
+
return allLeafColumnDefs;
|
|
208
|
+
};
|
|
209
|
+
const prepareColumns = ({ columnDefs, tableOptions, }) => {
|
|
210
|
+
const { defaultDisplayColumn, filterFns = {}, sortFns = {}, state: { columnFilterFns = {} } = {}, } = tableOptions;
|
|
211
|
+
return columnDefs.map((columnDef) => {
|
|
212
|
+
// assign columnId
|
|
213
|
+
if (!columnDef.id)
|
|
214
|
+
columnDef.id = getColumnId(columnDef);
|
|
215
|
+
// assign columnDefType
|
|
216
|
+
if (!columnDef.columnDefType)
|
|
217
|
+
columnDef.columnDefType = 'data';
|
|
218
|
+
if (columnDef.columns?.length) {
|
|
219
|
+
columnDef.columnDefType = 'group';
|
|
220
|
+
// recursively prepare columns if this is a group column
|
|
221
|
+
columnDef.columns = prepareColumns({
|
|
222
|
+
columnDefs: columnDef.columns,
|
|
223
|
+
tableOptions,
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
else if (columnDef.columnDefType === 'data') {
|
|
227
|
+
// assign filterFns
|
|
228
|
+
if (Object.keys(filterFns).includes(columnFilterFns[columnDef.id])) {
|
|
229
|
+
columnDef.filterFn =
|
|
230
|
+
filterFns[columnFilterFns[columnDef.id]] ?? filterFns.fuzzy;
|
|
231
|
+
columnDef._filterFn =
|
|
232
|
+
columnFilterFns[columnDef.id];
|
|
233
|
+
}
|
|
234
|
+
// assign sortFns
|
|
235
|
+
if (Object.keys(sortFns).includes(columnDef.sortFn)) {
|
|
236
|
+
columnDef.sortFn = sortFns[columnDef.sortFn];
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
else if (columnDef.columnDefType === 'display') {
|
|
240
|
+
columnDef = {
|
|
241
|
+
...defaultDisplayColumn,
|
|
242
|
+
...columnDef,
|
|
243
|
+
};
|
|
244
|
+
}
|
|
245
|
+
return columnDef;
|
|
246
|
+
});
|
|
247
|
+
};
|
|
248
|
+
const reorderColumn = (draggedColumn, targetColumn, columnOrder) => {
|
|
249
|
+
if (draggedColumn.getCanPin()) {
|
|
250
|
+
draggedColumn.pin(targetColumn.getIsPinned());
|
|
251
|
+
}
|
|
252
|
+
const newColumnOrder = [...columnOrder];
|
|
253
|
+
newColumnOrder.splice(newColumnOrder.indexOf(targetColumn.id), 0, newColumnOrder.splice(newColumnOrder.indexOf(draggedColumn.id), 1)[0]);
|
|
254
|
+
return newColumnOrder;
|
|
255
|
+
};
|
|
256
|
+
const getDefaultColumnFilterFn = (columnDef) => {
|
|
257
|
+
const { filterVariant } = columnDef;
|
|
258
|
+
if (filterVariant === 'multi-select')
|
|
259
|
+
return 'arrHas';
|
|
260
|
+
if (filterVariant?.includes('range'))
|
|
261
|
+
return 'betweenInclusive';
|
|
262
|
+
if (['checkbox', 'date', 'select'].includes(filterVariant || ''))
|
|
263
|
+
return 'equals';
|
|
264
|
+
return 'fuzzy';
|
|
265
|
+
};
|
|
266
|
+
|
|
267
|
+
const skeletonRowMarker = Symbol('mrt-skeleton-row');
|
|
268
|
+
const isSkeletonRow = (original) => typeof original === 'object' &&
|
|
269
|
+
original !== null &&
|
|
270
|
+
skeletonRowMarker in original;
|
|
271
|
+
const createSkeletonRows = (columns, pageSize) => {
|
|
272
|
+
const values = Object.fromEntries(getAllLeafColumnDefs(columns).map((column) => [getColumnId(column), null]));
|
|
273
|
+
return Array.from({ length: Math.min(pageSize, 20) }, () => ({ ...values, [skeletonRowMarker]: true }));
|
|
274
|
+
};
|
|
275
|
+
const withoutSkeletonAccessors = (columns, defaultColumn) => columns.map((column) => {
|
|
276
|
+
// TanStack merges defaults after MRT prepares columns. Include inherited
|
|
277
|
+
// callbacks, while preserving explicit overrides such as undefined.
|
|
278
|
+
const resolvedColumn = { ...defaultColumn, ...column };
|
|
279
|
+
return {
|
|
280
|
+
...column,
|
|
281
|
+
...((resolvedColumn.accessorFn ||
|
|
282
|
+
resolvedColumn.accessorKey !== undefined) && {
|
|
283
|
+
accessorFn: () => undefined,
|
|
284
|
+
}),
|
|
285
|
+
...(resolvedColumn.getUniqueValues && { getUniqueValues: () => [] }),
|
|
286
|
+
...(resolvedColumn.getGroupingValue && {
|
|
287
|
+
getGroupingValue: () => undefined,
|
|
288
|
+
}),
|
|
289
|
+
...(column.columns && {
|
|
290
|
+
columns: withoutSkeletonAccessors(column.columns, defaultColumn),
|
|
291
|
+
}),
|
|
292
|
+
};
|
|
293
|
+
});
|
|
294
|
+
const skipSkeletonFacets = (factory, makeEmptyValue) => (table, columnId) => {
|
|
295
|
+
let getValue;
|
|
296
|
+
// Stable per-column results avoid sharing mutable Maps between consumers.
|
|
297
|
+
const emptyValue = makeEmptyValue();
|
|
298
|
+
return () => {
|
|
299
|
+
if (isSkeletonRow(table.options.data[0]))
|
|
300
|
+
return emptyValue;
|
|
301
|
+
// Even a custom factory must not inspect the synthetic records.
|
|
302
|
+
getValue ??= factory(table, columnId);
|
|
303
|
+
return getValue();
|
|
304
|
+
};
|
|
305
|
+
};
|
|
306
|
+
|
|
193
307
|
const extraIndexRangeExtractor = (range, draggingIndex) => {
|
|
194
308
|
const newIndexes = defaultRangeExtractor(range);
|
|
195
309
|
if (draggingIndex === undefined)
|
|
@@ -212,7 +326,8 @@ const useMRT_RowVirtualizer = (table, rows) => {
|
|
|
212
326
|
const rowVirtualizerProps = parseFromValuesOrFunc(rowVirtualizerOptions, {
|
|
213
327
|
table,
|
|
214
328
|
});
|
|
215
|
-
const
|
|
329
|
+
const tableRows = rows ?? getRowModel().rows;
|
|
330
|
+
const rowCount = tableRows.length;
|
|
216
331
|
const defaultRowHeightByDensity = {
|
|
217
332
|
lg: 62.7,
|
|
218
333
|
md: 54.7,
|
|
@@ -224,7 +339,8 @@ const useMRT_RowVirtualizer = (table, rows) => {
|
|
|
224
339
|
const rowVirtualizer = useVirtualizer({
|
|
225
340
|
count: renderDetailPanel ? rowCount * 2 : rowCount,
|
|
226
341
|
estimateSize: (index) => renderDetailPanel && index % 2 === 1
|
|
227
|
-
?
|
|
342
|
+
? !isSkeletonRow(tableRows[Math.floor(index / 2)]?.original) &&
|
|
343
|
+
expanded === true
|
|
228
344
|
? 100
|
|
229
345
|
: 0
|
|
230
346
|
: normalRowHeight,
|
|
@@ -513,6 +629,7 @@ const MRT_TableBodyCell = ({ cell, numRows = 1, renderedColumnIndex = 0, rendere
|
|
|
513
629
|
const { state, options: { columnResizeDirection, columnResizeMode, createDisplayMode, editDisplayMode, enableClickToCopy, enableColumnOrdering, enableColumnPinning, enableEditing, enableGrouping, layoutMode, mantineSkeletonProps, mantineTableBodyCellProps, }, refs: { editInputRefs }, setEditingCell, setHoveredColumn, } = table;
|
|
514
630
|
const { columnResizing, creatingRow, density, draggingColumn, editingCell, editingRow, hoveredColumn, isLoading, showSkeletons, } = state;
|
|
515
631
|
const { column, row } = cell;
|
|
632
|
+
const isSkeleton = isSkeletonRow(row.original);
|
|
516
633
|
const { columnDef } = column;
|
|
517
634
|
const { columnDefType } = columnDef;
|
|
518
635
|
const args = {
|
|
@@ -524,10 +641,15 @@ const MRT_TableBodyCell = ({ cell, numRows = 1, renderedColumnIndex = 0, rendere
|
|
|
524
641
|
table,
|
|
525
642
|
};
|
|
526
643
|
const tableCellProps = {
|
|
527
|
-
...
|
|
528
|
-
|
|
644
|
+
...(isSkeleton && typeof mantineTableBodyCellProps === 'function'
|
|
645
|
+
? undefined
|
|
646
|
+
: parseFromValuesOrFunc(mantineTableBodyCellProps, args)),
|
|
647
|
+
...(isSkeleton && typeof columnDef.mantineTableBodyCellProps === 'function'
|
|
648
|
+
? undefined
|
|
649
|
+
: parseFromValuesOrFunc(columnDef.mantineTableBodyCellProps, args)),
|
|
529
650
|
...rest,
|
|
530
651
|
};
|
|
652
|
+
// Dedicated skeleton customization remains available while loading.
|
|
531
653
|
const skeletonProps = parseFromValuesOrFunc(mantineSkeletonProps, args);
|
|
532
654
|
const [skeletonWidth, setSkeletonWidth] = useState(100);
|
|
533
655
|
useEffect(() => {
|
|
@@ -555,7 +677,8 @@ const MRT_TableBodyCell = ({ cell, numRows = 1, renderedColumnIndex = 0, rendere
|
|
|
555
677
|
const isColumnPinned = enableColumnPinning &&
|
|
556
678
|
columnDef.columnDefType !== 'group' &&
|
|
557
679
|
column.getIsPinned();
|
|
558
|
-
const isEditable = !
|
|
680
|
+
const isEditable = !isSkeleton &&
|
|
681
|
+
!cell.getIsPlaceholder() &&
|
|
559
682
|
parseFromValuesOrFunc(enableEditing, row) &&
|
|
560
683
|
parseFromValuesOrFunc(columnDef.enableEditing, row) !== false;
|
|
561
684
|
const isEditing = isEditable &&
|
|
@@ -565,9 +688,10 @@ const MRT_TableBodyCell = ({ cell, numRows = 1, renderedColumnIndex = 0, rendere
|
|
|
565
688
|
editingCell?.id === cell.id) &&
|
|
566
689
|
!row.getIsGrouped();
|
|
567
690
|
const isCreating = isEditable && createDisplayMode === 'row' && creatingRow?.id === row.id;
|
|
568
|
-
const showClickToCopyButton =
|
|
569
|
-
(parseFromValuesOrFunc(
|
|
570
|
-
parseFromValuesOrFunc(columnDef.enableClickToCopy, cell)
|
|
691
|
+
const showClickToCopyButton = !isSkeleton &&
|
|
692
|
+
(parseFromValuesOrFunc(enableClickToCopy, cell) ||
|
|
693
|
+
(parseFromValuesOrFunc(columnDef.enableClickToCopy, cell) &&
|
|
694
|
+
parseFromValuesOrFunc(columnDef.enableClickToCopy, cell) !== false));
|
|
571
695
|
const handleDoubleClick = (event) => {
|
|
572
696
|
tableCellProps?.onDoubleClick?.(event);
|
|
573
697
|
if (isEditable && editDisplayMode === 'cell') {
|
|
@@ -613,6 +737,9 @@ const MRT_TableBodyCell = ({ cell, numRows = 1, renderedColumnIndex = 0, rendere
|
|
|
613
737
|
setIsCellContentOverflowing(false);
|
|
614
738
|
};
|
|
615
739
|
const renderCellContent = () => {
|
|
740
|
+
if (isSkeleton) {
|
|
741
|
+
return showSkeletons === false ? null : (jsx(Skeleton, { height: 20, width: skeletonWidth, ...skeletonProps }));
|
|
742
|
+
}
|
|
616
743
|
if (cell.getIsPlaceholder()) {
|
|
617
744
|
return columnDef.PlaceholderCell?.({ cell, column, row, table }) ?? null;
|
|
618
745
|
}
|
|
@@ -673,19 +800,22 @@ var classes$z = {"root":"MRT_TableBodyRow-module_root__2c3D4","root-grid":"MRT_T
|
|
|
673
800
|
const MRT_TableBodyRow = ({ children, columnVirtualizer, numRows, pinnedRowIds, renderedRowIndex = 0, row, rowVirtualizer, table, tableProps, virtualRow, ...rest }) => {
|
|
674
801
|
const { state, options: { enableRowOrdering, enableRowPinning, enableStickyFooter, enableStickyHeader, layoutMode, mantineTableBodyRowProps, memoMode, renderDetailPanel, rowPinningDisplayMode, }, refs: { tableFooterRef, tableHeadRef }, setHoveredRow, } = table;
|
|
675
802
|
const { density, draggingColumn, draggingRow, editingCell, editingRow, hoveredRow, isFullScreen, rowPinning, } = state;
|
|
803
|
+
const isSkeleton = isSkeletonRow(row.original);
|
|
676
804
|
const visibleCells = row.getVisibleCells();
|
|
677
805
|
const { virtualColumns, virtualPaddingLeft, virtualPaddingRight } = columnVirtualizer ?? {};
|
|
678
|
-
const isRowSelected = getIsRowSelected({ row, table });
|
|
806
|
+
const isRowSelected = !isSkeleton && getIsRowSelected({ row, table });
|
|
679
807
|
const isRowPinned = enableRowPinning && row.getIsPinned();
|
|
680
808
|
const isRowStickyPinned = isRowPinned && rowPinningDisplayMode?.includes('sticky') && 'sticky';
|
|
681
809
|
const isDraggingRow = draggingRow?.id === row.id;
|
|
682
810
|
const isHoveredRow = hoveredRow?.id === row.id;
|
|
683
811
|
const tableRowProps = {
|
|
684
|
-
...
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
812
|
+
...(isSkeleton && typeof mantineTableBodyRowProps === 'function'
|
|
813
|
+
? undefined
|
|
814
|
+
: parseFromValuesOrFunc(mantineTableBodyRowProps, {
|
|
815
|
+
renderedRowIndex,
|
|
816
|
+
row,
|
|
817
|
+
table,
|
|
818
|
+
})),
|
|
689
819
|
...rest,
|
|
690
820
|
};
|
|
691
821
|
const [bottomPinnedIndex, topPinnedIndex] = useMemo(() => {
|
|
@@ -778,7 +908,7 @@ const MRT_TableBodyRow = ({ children, columnVirtualizer, numRows, pinnedRowIds,
|
|
|
778
908
|
!draggingRow &&
|
|
779
909
|
editingCell?.id !== cell.id &&
|
|
780
910
|
editingRow?.id !== row.id ? (jsx(Memo_MRT_TableBodyCell, { ...cellProps }, cell.id)) : (jsx(MRT_TableBodyCell, { ...cellProps }, cell.id));
|
|
781
|
-
}), virtualPaddingRight ? (jsx(Box, { component: "td", display: "flex", w: virtualPaddingRight })) : null] }), renderDetailPanel && !row.getIsGrouped() && (jsx(MRT_TableDetailPanel, { parentRowRef: rowRef, renderedRowIndex: renderedRowIndex, row: row, rowVirtualizer: rowVirtualizer, striped: striped, table: table, virtualRow: virtualRow }))] }));
|
|
911
|
+
}), virtualPaddingRight ? (jsx(Box, { component: "td", display: "flex", w: virtualPaddingRight })) : null] }), renderDetailPanel && !isSkeleton && !row.getIsGrouped() && (jsx(MRT_TableDetailPanel, { parentRowRef: rowRef, renderedRowIndex: renderedRowIndex, row: row, rowVirtualizer: rowVirtualizer, striped: striped, table: table, virtualRow: virtualRow }))] }));
|
|
782
912
|
};
|
|
783
913
|
const Memo_MRT_TableBodyRow = memo(MRT_TableBodyRow, (prev, next) => prev.row === next.row);
|
|
784
914
|
|
|
@@ -1076,80 +1206,6 @@ const MRT_ExpandAllButton = ({ table, ...rest }) => {
|
|
|
1076
1206
|
: undefined) })) }) }));
|
|
1077
1207
|
};
|
|
1078
1208
|
|
|
1079
|
-
const getColumnId = (columnDef) => columnDef.id ?? columnDef.accessorKey?.toString?.() ?? columnDef.header;
|
|
1080
|
-
const getAllLeafColumnDefs = (columns) => {
|
|
1081
|
-
const allLeafColumnDefs = [];
|
|
1082
|
-
const getLeafColumns = (cols) => {
|
|
1083
|
-
cols.forEach((col) => {
|
|
1084
|
-
if (col.columns) {
|
|
1085
|
-
getLeafColumns(col.columns);
|
|
1086
|
-
}
|
|
1087
|
-
else {
|
|
1088
|
-
allLeafColumnDefs.push(col);
|
|
1089
|
-
}
|
|
1090
|
-
});
|
|
1091
|
-
};
|
|
1092
|
-
getLeafColumns(columns);
|
|
1093
|
-
return allLeafColumnDefs;
|
|
1094
|
-
};
|
|
1095
|
-
const prepareColumns = ({ columnDefs, tableOptions, }) => {
|
|
1096
|
-
const { defaultDisplayColumn, filterFns = {}, sortFns = {}, state: { columnFilterFns = {} } = {}, } = tableOptions;
|
|
1097
|
-
return columnDefs.map((columnDef) => {
|
|
1098
|
-
// assign columnId
|
|
1099
|
-
if (!columnDef.id)
|
|
1100
|
-
columnDef.id = getColumnId(columnDef);
|
|
1101
|
-
// assign columnDefType
|
|
1102
|
-
if (!columnDef.columnDefType)
|
|
1103
|
-
columnDef.columnDefType = 'data';
|
|
1104
|
-
if (columnDef.columns?.length) {
|
|
1105
|
-
columnDef.columnDefType = 'group';
|
|
1106
|
-
// recursively prepare columns if this is a group column
|
|
1107
|
-
columnDef.columns = prepareColumns({
|
|
1108
|
-
columnDefs: columnDef.columns,
|
|
1109
|
-
tableOptions,
|
|
1110
|
-
});
|
|
1111
|
-
}
|
|
1112
|
-
else if (columnDef.columnDefType === 'data') {
|
|
1113
|
-
// assign filterFns
|
|
1114
|
-
if (Object.keys(filterFns).includes(columnFilterFns[columnDef.id])) {
|
|
1115
|
-
columnDef.filterFn =
|
|
1116
|
-
filterFns[columnFilterFns[columnDef.id]] ?? filterFns.fuzzy;
|
|
1117
|
-
columnDef._filterFn =
|
|
1118
|
-
columnFilterFns[columnDef.id];
|
|
1119
|
-
}
|
|
1120
|
-
// assign sortFns
|
|
1121
|
-
if (Object.keys(sortFns).includes(columnDef.sortFn)) {
|
|
1122
|
-
columnDef.sortFn = sortFns[columnDef.sortFn];
|
|
1123
|
-
}
|
|
1124
|
-
}
|
|
1125
|
-
else if (columnDef.columnDefType === 'display') {
|
|
1126
|
-
columnDef = {
|
|
1127
|
-
...defaultDisplayColumn,
|
|
1128
|
-
...columnDef,
|
|
1129
|
-
};
|
|
1130
|
-
}
|
|
1131
|
-
return columnDef;
|
|
1132
|
-
});
|
|
1133
|
-
};
|
|
1134
|
-
const reorderColumn = (draggedColumn, targetColumn, columnOrder) => {
|
|
1135
|
-
if (draggedColumn.getCanPin()) {
|
|
1136
|
-
draggedColumn.pin(targetColumn.getIsPinned());
|
|
1137
|
-
}
|
|
1138
|
-
const newColumnOrder = [...columnOrder];
|
|
1139
|
-
newColumnOrder.splice(newColumnOrder.indexOf(targetColumn.id), 0, newColumnOrder.splice(newColumnOrder.indexOf(draggedColumn.id), 1)[0]);
|
|
1140
|
-
return newColumnOrder;
|
|
1141
|
-
};
|
|
1142
|
-
const getDefaultColumnFilterFn = (columnDef) => {
|
|
1143
|
-
const { filterVariant } = columnDef;
|
|
1144
|
-
if (filterVariant === 'multi-select')
|
|
1145
|
-
return 'arrHas';
|
|
1146
|
-
if (filterVariant?.includes('range'))
|
|
1147
|
-
return 'betweenInclusive';
|
|
1148
|
-
if (['checkbox', 'date', 'select'].includes(filterVariant || ''))
|
|
1149
|
-
return 'equals';
|
|
1150
|
-
return 'fuzzy';
|
|
1151
|
-
};
|
|
1152
|
-
|
|
1153
1209
|
function defaultDisplayColumnProps({ header, id, size, tableOptions, }) {
|
|
1154
1210
|
const { defaultDisplayColumn, displayColumnDefOptions, localization } = tableOptions;
|
|
1155
1211
|
return {
|
|
@@ -3052,7 +3108,7 @@ const MRT_DefaultDisplayColumn = {
|
|
|
3052
3108
|
enableResizing: false,
|
|
3053
3109
|
enableSorting: false,
|
|
3054
3110
|
};
|
|
3055
|
-
const useMRT_TableOptions = ({ aggregationFns, autoResetExpanded = false, columnFilterDisplayMode = 'subheader', columnResizeDirection, columnResizeMode = 'onChange', createDisplayMode = 'modal', defaultColumn, defaultDisplayColumn, editDisplayMode = 'modal', enableBatchRowSelection = true, enableBottomToolbar = true, enableColumnActions = true, enableColumnFilters = true, enableColumnOrdering = false, enableColumnPinning = false, enableColumnResizing = false, enableColumnVirtualization, enableDensityToggle = true, enableExpandAll = true, enableExpanding, enableFacetedValues = false, enableFilterMatchHighlighting = true, enableFilters = true, enableFullScreenToggle = true, enableGlobalFilter = true, enableGlobalFilterRankedResults = true, enableGrouping = false, enableHeaderActionsHoverReveal = false, enableHiding = true, enableMultiRowSelection = true, enableMultiSort = true, enablePagination = true, enableRowPinning = false, enableRowSelection = false, enableRowVirtualization, enableSelectAll = true, enableSorting = true, enableStickyHeader = false, enableTableFooter = true, enableTableHead = true, enableToolbarInternalActions = true, enableTopToolbar = true, filterFns, icons, layoutMode, localization, manualFiltering, manualGrouping, manualPagination, manualSorting, paginationDisplayMode = 'default', positionActionsColumn = 'first', positionCreatingRow = 'top', positionExpandColumn = 'first', positionGlobalFilter = 'right', positionPagination = 'bottom', positionToolbarAlertBanner = 'top', positionToolbarDropZone = 'top', rowNumberDisplayMode = 'static', rowPinningDisplayMode = 'sticky', selectAllMode = 'page', sortFns, ...rest }) => {
|
|
3111
|
+
const useMRT_TableOptions = ({ aggregationFns, autoResetExpanded = false, columnFilterDisplayMode = 'subheader', columnResizeDirection, columnResizeMode = 'onChange', createDisplayMode = 'modal', defaultColumn, defaultDisplayColumn, editDisplayMode = 'modal', enableBatchRowSelection = true, enableBottomToolbar = true, enableColumnActions = true, enableColumnFilters = true, enableColumnOrdering = false, enableColumnPinning = false, enableColumnResizing = false, enableColumnVirtualization, enableDensityToggle = true, enableExpandAll = true, enableExpanding, enableFacetedValues = false, enableFilterMatchHighlighting = true, enableFilters = true, enableFullScreenToggle = true, enableGlobalFilter = true, enableGlobalFilterRankedResults = true, enableGrouping = false, enableHeaderActionsHoverReveal = false, enableHiding = true, enableMultiRowSelection = true, enableMultiSort = true, enablePagination = true, enableRowPinning = false, enableRowSelection = false, enableRowVirtualization, enableSelectAll = true, enableSorting = true, enableStickyHeader = false, enableSubRowSelection, enableTableFooter = true, enableTableHead = true, enableToolbarInternalActions = true, enableTopToolbar = true, features, filterFns, getIsRowExpanded, getRowCanExpand, getRowId, icons, layoutMode, localization, manualExpanding, manualFiltering, manualGrouping, manualPagination, manualSorting, paginationDisplayMode = 'default', positionActionsColumn = 'first', positionCreatingRow = 'top', positionExpandColumn = 'first', positionGlobalFilter = 'right', positionPagination = 'bottom', positionToolbarAlertBanner = 'top', positionToolbarDropZone = 'top', rowNumberDisplayMode = 'static', rowPinningDisplayMode = 'sticky', selectAllMode = 'page', sortFns, ...rest }) => {
|
|
3056
3112
|
const direction = useDirection();
|
|
3057
3113
|
icons = useMemo(() => ({ ...MRT_Default_Icons, ...icons }), [icons]);
|
|
3058
3114
|
localization = useMemo(() => ({
|
|
@@ -3083,6 +3139,37 @@ const useMRT_TableOptions = ({ aggregationFns, autoResetExpanded = false, column
|
|
|
3083
3139
|
if (enablePagination === false && manualPagination === undefined) {
|
|
3084
3140
|
manualPagination = true;
|
|
3085
3141
|
}
|
|
3142
|
+
// v9 retains the feature registry from construction. Register the real
|
|
3143
|
+
// factories before useMRT_TableInstance enables temporary manual modes.
|
|
3144
|
+
const resolvedFeatures = features ?? {
|
|
3145
|
+
...stockFeatures,
|
|
3146
|
+
...((enableColumnFilters || enableGlobalFilter || enableFilters) &&
|
|
3147
|
+
!manualFiltering
|
|
3148
|
+
? { filteredRowModel: createFilteredRowModel(), filterFns }
|
|
3149
|
+
: {}),
|
|
3150
|
+
...(enableSorting && !manualSorting
|
|
3151
|
+
? { sortedRowModel: createSortedRowModel(), sortFns }
|
|
3152
|
+
: {}),
|
|
3153
|
+
...(enablePagination && !manualPagination
|
|
3154
|
+
? { paginatedRowModel: createPaginatedRowModel() }
|
|
3155
|
+
: {}),
|
|
3156
|
+
...(enableExpanding || enableGrouping
|
|
3157
|
+
? { expandedRowModel: createExpandedRowModel() }
|
|
3158
|
+
: {}),
|
|
3159
|
+
...(enableGrouping && !manualGrouping
|
|
3160
|
+
? {
|
|
3161
|
+
groupedRowModel: createGroupedRowModel(),
|
|
3162
|
+
aggregationFns,
|
|
3163
|
+
}
|
|
3164
|
+
: {}),
|
|
3165
|
+
...(enableFacetedValues
|
|
3166
|
+
? {
|
|
3167
|
+
facetedRowModel: createFacetedRowModel(),
|
|
3168
|
+
facetedMinMaxValues: createFacetedMinMaxValues(),
|
|
3169
|
+
facetedUniqueValues: createFacetedUniqueValues(),
|
|
3170
|
+
}
|
|
3171
|
+
: {}),
|
|
3172
|
+
};
|
|
3086
3173
|
return {
|
|
3087
3174
|
aggregationFns,
|
|
3088
3175
|
autoResetExpanded,
|
|
@@ -3122,44 +3209,32 @@ const useMRT_TableOptions = ({ aggregationFns, autoResetExpanded = false, column
|
|
|
3122
3209
|
enableSelectAll,
|
|
3123
3210
|
enableSorting,
|
|
3124
3211
|
enableStickyHeader,
|
|
3212
|
+
enableSubRowSelection,
|
|
3125
3213
|
enableTableFooter,
|
|
3126
3214
|
enableTableHead,
|
|
3127
3215
|
enableToolbarInternalActions,
|
|
3128
3216
|
enableTopToolbar,
|
|
3129
3217
|
filterFns,
|
|
3130
3218
|
features: {
|
|
3131
|
-
...
|
|
3132
|
-
...(
|
|
3133
|
-
|
|
3134
|
-
|
|
3135
|
-
|
|
3136
|
-
|
|
3137
|
-
|
|
3138
|
-
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
: {}),
|
|
3142
|
-
...(enableExpanding || enableGrouping
|
|
3143
|
-
? { expandedRowModel: createExpandedRowModel() }
|
|
3144
|
-
: {}),
|
|
3145
|
-
...(enableGrouping && !manualGrouping
|
|
3146
|
-
? {
|
|
3147
|
-
groupedRowModel: createGroupedRowModel(),
|
|
3148
|
-
aggregationFns,
|
|
3149
|
-
}
|
|
3150
|
-
: {}),
|
|
3151
|
-
...(enableFacetedValues
|
|
3152
|
-
? {
|
|
3153
|
-
facetedRowModel: createFacetedRowModel(),
|
|
3154
|
-
facetedMinMaxValues: createFacetedMinMaxValues(),
|
|
3155
|
-
facetedUniqueValues: createFacetedUniqueValues(),
|
|
3156
|
-
}
|
|
3157
|
-
: {}),
|
|
3219
|
+
...resolvedFeatures,
|
|
3220
|
+
...(resolvedFeatures.facetedRowModel && {
|
|
3221
|
+
facetedRowModel: skipSkeletonFacets(resolvedFeatures.facetedRowModel, () => ({ rows: [], flatRows: [], rowsById: {} })),
|
|
3222
|
+
}),
|
|
3223
|
+
...(resolvedFeatures.facetedMinMaxValues && {
|
|
3224
|
+
facetedMinMaxValues: skipSkeletonFacets(resolvedFeatures.facetedMinMaxValues, () => undefined),
|
|
3225
|
+
}),
|
|
3226
|
+
...(resolvedFeatures.facetedUniqueValues && {
|
|
3227
|
+
facetedUniqueValues: skipSkeletonFacets(resolvedFeatures.facetedUniqueValues, () => new Map()),
|
|
3228
|
+
}),
|
|
3158
3229
|
},
|
|
3230
|
+
getIsRowExpanded,
|
|
3231
|
+
getRowCanExpand,
|
|
3232
|
+
getRowId,
|
|
3159
3233
|
getSubRows: (row) => row?.subRows,
|
|
3160
3234
|
icons,
|
|
3161
3235
|
layoutMode,
|
|
3162
3236
|
localization,
|
|
3237
|
+
manualExpanding,
|
|
3163
3238
|
manualFiltering,
|
|
3164
3239
|
manualGrouping,
|
|
3165
3240
|
manualPagination,
|
|
@@ -3293,12 +3368,12 @@ const useMRT_Effects = (table) => {
|
|
|
3293
3368
|
* state, refs, and helpers. State management is built on top of TanStack
|
|
3294
3369
|
* Store atoms (`useCreateAtom` from `@tanstack/react-store`):
|
|
3295
3370
|
*
|
|
3296
|
-
* - **TanStack-aware slices** (`columnOrder`, `columnResizing
|
|
3371
|
+
* - **TanStack-aware slices** (`columnOrder`, `columnResizing`)
|
|
3297
3372
|
* are passed via the `atoms` option on `useTable`. Library writes flow directly
|
|
3298
3373
|
* through these atoms, and they're automatically tracked in
|
|
3299
3374
|
* `table.state` by the v9 store.
|
|
3300
|
-
* - Pagination
|
|
3301
|
-
* as the fallback when the consumer does not control
|
|
3375
|
+
* - Pagination and grouping use `state` and their change callbacks, with local
|
|
3376
|
+
* React state as the fallback when the consumer does not control them.
|
|
3302
3377
|
* - **MRT-only slices** (`density`, `isFullScreen`, `creatingRow`,
|
|
3303
3378
|
* `editingCell`, `editingRow`, `draggingColumn`, `draggingRow`,
|
|
3304
3379
|
* `hoveredColumn`, `hoveredRow`, `globalFilterFn`, `columnFilterFns`,
|
|
@@ -3344,15 +3419,14 @@ const useMRT_TableInstance = (definedTableOptions) => {
|
|
|
3344
3419
|
// ---------------------------------------------------------------------------
|
|
3345
3420
|
const columnOrderAtom = useCreateAtom(initialState.columnOrder ?? []);
|
|
3346
3421
|
const columnResizingAtom = useCreateAtom(initialState.columnResizing ?? {});
|
|
3347
|
-
const groupingAtom = useCreateAtom(initialState.grouping ?? []);
|
|
3348
|
-
// An external atom would take precedence over controlled state.pagination.
|
|
3349
|
-
const [pagination, setPagination] = useState(initialState?.pagination ?? { pageIndex: 0, pageSize: 10 });
|
|
3350
3422
|
// Subscribe so the consumer re-renders when these slices change. (The library
|
|
3351
3423
|
// also reads from these atoms internally; the subscriptions here are for the
|
|
3352
3424
|
// MRT component tree.)
|
|
3353
3425
|
const columnOrder = useSelector(columnOrderAtom);
|
|
3354
3426
|
const columnResizing = useSelector(columnResizingAtom);
|
|
3355
|
-
|
|
3427
|
+
// External atoms override controlled state, so keep these slices in React.
|
|
3428
|
+
const [grouping, setGrouping] = useState(initialState.grouping ?? []);
|
|
3429
|
+
const [pagination, setPagination] = useState(initialState?.pagination ?? { pageIndex: 0, pageSize: 10 });
|
|
3356
3430
|
// ---------------------------------------------------------------------------
|
|
3357
3431
|
// MRT-only atoms — these slices aren't part of v9's `TableState` so they
|
|
3358
3432
|
// can't be passed via the `atoms` option. They're maintained as standalone
|
|
@@ -3502,38 +3576,86 @@ const useMRT_TableInstance = (definedTableOptions) => {
|
|
|
3502
3576
|
});
|
|
3503
3577
|
columnPreparationDepsRef.current = columnPreparationDeps;
|
|
3504
3578
|
}
|
|
3505
|
-
|
|
3506
|
-
const
|
|
3507
|
-
statefulTableOptions.state.showSkeletons) &&
|
|
3508
|
-
|
|
3509
|
-
|
|
3510
|
-
|
|
3511
|
-
|
|
3512
|
-
|
|
3513
|
-
|
|
3514
|
-
|
|
3515
|
-
|
|
3516
|
-
|
|
3517
|
-
|
|
3518
|
-
|
|
3519
|
-
|
|
3579
|
+
const realData = statefulTableOptions.data;
|
|
3580
|
+
const showSkeletonRows = !!(statefulTableOptions.state.isLoading ||
|
|
3581
|
+
statefulTableOptions.state.showSkeletons) && !realData.length;
|
|
3582
|
+
const preparedColumns = columnDefsRef.current;
|
|
3583
|
+
const defaultColumn = statefulTableOptions.defaultColumn;
|
|
3584
|
+
const pageSize = statefulTableOptions.state.pagination.pageSize;
|
|
3585
|
+
// Sort/filter inference can read values even with manual row models.
|
|
3586
|
+
// Clone the prepared definitions, including inherited default callbacks.
|
|
3587
|
+
statefulTableOptions.columns = useMemo(() => showSkeletonRows
|
|
3588
|
+
? withoutSkeletonAccessors(preparedColumns, defaultColumn)
|
|
3589
|
+
: preparedColumns, [showSkeletonRows, preparedColumns, defaultColumn]);
|
|
3590
|
+
statefulTableOptions.data = useMemo(() => showSkeletonRows
|
|
3591
|
+
? // The public table API is typed for application records. Keep the
|
|
3592
|
+
// internal display-record assertion at this single boundary.
|
|
3593
|
+
createSkeletonRows(statefulTableOptions.columns, pageSize)
|
|
3594
|
+
: realData,
|
|
3595
|
+
// Memoized rows/cells need fresh display records when visibility changes.
|
|
3596
|
+
[
|
|
3597
|
+
realData,
|
|
3598
|
+
showSkeletonRows,
|
|
3599
|
+
statefulTableOptions.columns,
|
|
3600
|
+
pageSize,
|
|
3601
|
+
statefulTableOptions.state.isLoading,
|
|
3602
|
+
statefulTableOptions.state.showSkeletons,
|
|
3520
3603
|
]);
|
|
3604
|
+
// Keep factories registered, but bypass data processing and row predicates
|
|
3605
|
+
// for internal display rows. v9 shallow-merges options: explicitly assign
|
|
3606
|
+
// every temporary option on every render, including undefined defaults.
|
|
3607
|
+
statefulTableOptions.manualFiltering = showSkeletonRows
|
|
3608
|
+
? true
|
|
3609
|
+
: statefulTableOptions.manualFiltering;
|
|
3610
|
+
statefulTableOptions.manualGrouping = showSkeletonRows
|
|
3611
|
+
? true
|
|
3612
|
+
: statefulTableOptions.manualGrouping;
|
|
3613
|
+
statefulTableOptions.manualSorting = showSkeletonRows
|
|
3614
|
+
? true
|
|
3615
|
+
: statefulTableOptions.manualSorting;
|
|
3616
|
+
statefulTableOptions.manualPagination = showSkeletonRows
|
|
3617
|
+
? true
|
|
3618
|
+
: statefulTableOptions.manualPagination;
|
|
3619
|
+
statefulTableOptions.manualExpanding = showSkeletonRows
|
|
3620
|
+
? true
|
|
3621
|
+
: statefulTableOptions.manualExpanding;
|
|
3622
|
+
statefulTableOptions.getRowId = showSkeletonRows
|
|
3623
|
+
? (_row, index) => `mrt-skeleton-${index}`
|
|
3624
|
+
: statefulTableOptions.getRowId;
|
|
3625
|
+
statefulTableOptions.getSubRows = showSkeletonRows
|
|
3626
|
+
? () => undefined
|
|
3627
|
+
: statefulTableOptions.getSubRows;
|
|
3628
|
+
statefulTableOptions.getRowCanExpand = showSkeletonRows
|
|
3629
|
+
? () => false
|
|
3630
|
+
: statefulTableOptions.getRowCanExpand;
|
|
3631
|
+
statefulTableOptions.getIsRowExpanded = showSkeletonRows
|
|
3632
|
+
? () => false
|
|
3633
|
+
: statefulTableOptions.getIsRowExpanded;
|
|
3634
|
+
statefulTableOptions.enableFacetedValues = showSkeletonRows
|
|
3635
|
+
? false
|
|
3636
|
+
: statefulTableOptions.enableFacetedValues;
|
|
3637
|
+
statefulTableOptions.enableRowSelection = showSkeletonRows
|
|
3638
|
+
? false
|
|
3639
|
+
: statefulTableOptions.enableRowSelection;
|
|
3640
|
+
statefulTableOptions.enableMultiRowSelection = showSkeletonRows
|
|
3641
|
+
? false
|
|
3642
|
+
: statefulTableOptions.enableMultiRowSelection;
|
|
3643
|
+
statefulTableOptions.enableSubRowSelection = showSkeletonRows
|
|
3644
|
+
? false
|
|
3645
|
+
: statefulTableOptions.enableSubRowSelection;
|
|
3646
|
+
statefulTableOptions.enableRowPinning = showSkeletonRows
|
|
3647
|
+
? false
|
|
3648
|
+
: statefulTableOptions.enableRowPinning;
|
|
3521
3649
|
const table = useTable({
|
|
3522
3650
|
...statefulTableOptions,
|
|
3523
|
-
// Placeholder rows are not TData. Never pass their null fields to
|
|
3524
|
-
// consumer filters, comparators or aggregators, or page them away.
|
|
3525
|
-
manualFiltering: isPlaceholderData || statefulTableOptions.manualFiltering,
|
|
3526
|
-
manualSorting: isPlaceholderData || statefulTableOptions.manualSorting,
|
|
3527
|
-
manualGrouping: isPlaceholderData || statefulTableOptions.manualGrouping,
|
|
3528
|
-
manualPagination: isPlaceholderData || statefulTableOptions.manualPagination,
|
|
3529
3651
|
onPaginationChange: statefulTableOptions.onPaginationChange ?? setPagination,
|
|
3652
|
+
onGroupingChange: statefulTableOptions.onGroupingChange ?? setGrouping,
|
|
3530
3653
|
globalFilterFn: (globalFilterFn ?? 'fuzzy'),
|
|
3531
3654
|
// Hand TanStack-aware slices over to our external atoms — library writes
|
|
3532
3655
|
// (e.g. drag-resize) flow straight into them.
|
|
3533
3656
|
atoms: {
|
|
3534
3657
|
columnOrder: columnOrderAtom,
|
|
3535
3658
|
columnResizing: columnResizingAtom,
|
|
3536
|
-
grouping: groupingAtom,
|
|
3537
3659
|
},
|
|
3538
3660
|
}, (state) => state);
|
|
3539
3661
|
// v9 spells the resize setter `setcolumnResizing` (lowercase 'c') because
|