Skip to content

Scheduling infrastructure for absolutely everyone.

fix: preserve columnVisibility from initialState (#19412)

Eunjae Lee0b3aa4fd34fc
diff --git a/packages/features/data-table/components/DataTableWrapper.tsx b/packages/features/data-table/components/DataTableWrapper.tsx
index 8a1218d1dd9..d301fb7367a 100644
--- a/packages/features/data-table/components/DataTableWrapper.tsx
+++ b/packages/features/data-table/components/DataTableWrapper.tsx
@@ -1,6 +1,6 @@
"use client";
-import type { Table as ReactTableType } from "@tanstack/react-table";
+import type { Table as ReactTableType, VisibilityState } from "@tanstack/react-table";
import { useEffect, useRef } from "react";
import {
@@ -61,11 +61,16 @@ export function DataTableWrapper<TData, TValue>({
const columnFilters = useColumnFilters();
useEffect(() => {
+ const mergedColumnVisibility = {
+ ...(table.initialState?.columnVisibility || {}),
+ ...columnVisibility,
+ } satisfies VisibilityState;
+
table.setState((prev) => ({
...prev,
sorting,
columnFilters,
- columnVisibility,
+ columnVisibility: mergedColumnVisibility,
}));
table.setOptions((prev) => ({
...prev,