260917_01_fix: 컨택 목록 복귀 시 필터·정렬·페이지 상태 복원 #37
@@ -25,6 +25,7 @@ export function DataTable<TData, TValue = unknown>({
|
||||
totalCount: serverTotalCount,
|
||||
pagination: externalPagination,
|
||||
onPaginationChange: onServerPaginationChange,
|
||||
sorting: externalSorting,
|
||||
onSortingChange: onServerSortingChange,
|
||||
selectMode = 'none',
|
||||
onRowClick,
|
||||
@@ -41,7 +42,7 @@ export function DataTable<TData, TValue = unknown>({
|
||||
bottomPinnedRows = EMPTY_PINNED_ROWS,
|
||||
}: Readonly<DataTableProps<TData, TValue>>) {
|
||||
const [internalPagination, setInternalPagination] = useState<PaginationState>({ pageIndex: 0, pageSize: defaultPageSize })
|
||||
const [sorting, setSorting] = useState<SortingState>([])
|
||||
const [internalSorting, setInternalSorting] = useState<SortingState>([])
|
||||
const [rowSelection, setRowSelection] = useState<RowSelectionState>({})
|
||||
const scrollContainerRef = useRef<HTMLDivElement>(null)
|
||||
const drag = usePreventClickOnDrag()
|
||||
@@ -78,6 +79,7 @@ export function DataTable<TData, TValue = unknown>({
|
||||
}, [columns, selectMode, selectionEnabled])
|
||||
|
||||
const pagination = isClient ? internalPagination : (externalPagination ?? internalPagination)
|
||||
const sorting = !isClient && externalSorting ? externalSorting : internalSorting
|
||||
|
||||
useEffect(() => {
|
||||
setRowSelection({})
|
||||
@@ -100,6 +102,20 @@ export function DataTable<TData, TValue = unknown>({
|
||||
[isClient, onServerPaginationChange],
|
||||
)
|
||||
|
||||
const handleSortingChange = useCallback<OnChangeFn<SortingState>>(
|
||||
(updater) => {
|
||||
const nextSorting = typeof updater === 'function' ? updater(sorting) : updater
|
||||
|
||||
if (!isClient && onServerSortingChange) {
|
||||
onServerSortingChange(nextSorting)
|
||||
return
|
||||
}
|
||||
|
||||
setInternalSorting(nextSorting)
|
||||
},
|
||||
[isClient, onServerSortingChange, sorting],
|
||||
)
|
||||
|
||||
const combinedData = useMemo(
|
||||
() => [...topPinnedRows, ...data, ...bottomPinnedRows],
|
||||
[topPinnedRows, data, bottomPinnedRows],
|
||||
@@ -128,7 +144,7 @@ export function DataTable<TData, TValue = unknown>({
|
||||
enableRowPinning: true,
|
||||
keepPinnedRows: true,
|
||||
onRowSelectionChange: setRowSelection,
|
||||
onSortingChange: setSorting,
|
||||
onSortingChange: handleSortingChange,
|
||||
onPaginationChange: handlePaginationChange,
|
||||
getCoreRowModel: getCoreRowModel(),
|
||||
getSortedRowModel: isClient ? getSortedRowModel() : undefined,
|
||||
@@ -139,10 +155,6 @@ export function DataTable<TData, TValue = unknown>({
|
||||
getRowId: internalGetRowId,
|
||||
})
|
||||
|
||||
useEffect(() => {
|
||||
if (!isClient) onServerSortingChange?.(sorting)
|
||||
}, [isClient, onServerSortingChange, sorting])
|
||||
|
||||
useEffect(() => {
|
||||
if (!selectionEnabled) return
|
||||
onRowSelectionChange?.(table.getSelectedRowModel().rows.map((row) => row.original))
|
||||
|
||||
@@ -33,6 +33,7 @@ export interface DataTableProps<TData, TValue = unknown> {
|
||||
totalCount?: number
|
||||
pagination?: PaginationState
|
||||
onPaginationChange?: (updater: Updater<PaginationState>) => void
|
||||
sorting?: SortingState
|
||||
onSortingChange?: (sorting: SortingState) => void
|
||||
selectMode?: SelectMode
|
||||
onRowClick?: (row: TData) => void
|
||||
|
||||
@@ -667,6 +667,8 @@ export function ListSearchTable({
|
||||
}, [pagination, onPaginationChange])
|
||||
|
||||
useEffect(() => {
|
||||
if (listHeaders.length === 0) return
|
||||
|
||||
setFilterRows((prev) => {
|
||||
const next = prev.filter((row) => {
|
||||
const header = accessibleFilterHeaderById.get(row.headerId)
|
||||
@@ -674,7 +676,7 @@ export function ListSearchTable({
|
||||
})
|
||||
return next.length === prev.length ? prev : next
|
||||
})
|
||||
}, [accessibleFilterHeaderById, lockedListFilterHeaderTypes])
|
||||
}, [accessibleFilterHeaderById, listHeaders.length, lockedListFilterHeaderTypes])
|
||||
|
||||
useEffect(() => {
|
||||
if (!refreshKey || handledRefreshKeyRef.current === refreshKey) return
|
||||
@@ -805,6 +807,7 @@ export function ListSearchTable({
|
||||
totalCount={totalCount}
|
||||
pagination={pagination}
|
||||
onPaginationChange={setPagination}
|
||||
sorting={sorting}
|
||||
onSortingChange={handleSortingChange}
|
||||
selectMode={selectMode}
|
||||
onRowSelectionChange={handleRowSelectionChange}
|
||||
|
||||
Reference in New Issue
Block a user