Skip to content

feat: migrate TanStack Table to v9 #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pasqualevitiello merged 3 commits into from
Sep 8, 2026
Merged

feat: migrate TanStack Table to v9 #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd8b392
feat: migrate TanStack Table to v9
pasqualevitiello Sep 6, 2026
f5f0e39
perf: optimize TanStack Table state updates
pasqualevitiello Sep 6, 2026
15472fb
fix: restore team members table selection updates
pasqualevitiello Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
463 changes: 254 additions & 209 deletions apps/examples/calcom/app/(dashboard)/members/members-page-client.tsx
View file
Open in desktop

Large diffs are not rendered by default.

271 changes: 160 additions & 111 deletions apps/examples/calcom/app/(settings)/settings/teams/[id]/members/team-members-page-client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,17 @@ import {
} from "@coss/ui/components/table";
import {
type ColumnDef,
columnSizingFeature,
columnVisibilityFeature,
createSortedRowModel,
flexRender,
getCoreRowModel,
getSortedRowModel,
rowSelectionFeature,
rowSortingFeature,
type SortingState,
useReactTable,
sortFn_alphanumeric,
sortFn_text,
tableFeatures,
useTable,
} from "@tanstack/react-table";
import {
ArrowUpRightIcon,
Expand Down Expand Up @@ -98,6 +104,18 @@ type TeamMember = {
hasOptions?: boolean;
};

const features = tableFeatures({
columnSizingFeature,
columnVisibilityFeature,
rowSelectionFeature,
rowSortingFeature,
sortedRowModel: createSortedRowModel(),
sortFns: {
alphanumeric: sortFn_alphanumeric,
text: sortFn_text,
},
});

const members: TeamMember[] = [
{
avatarUrl:
Expand Down Expand Up @@ -147,6 +165,15 @@ const members: TeamMember[] = [
},
];

function shouldIgnoreRowSelectionClick(target: EventTarget | null): boolean {
return (
target instanceof Element &&
target.closest(
'a, button, input, select, textarea, [role="button"], [role="checkbox"], [data-slot="checkbox"], [data-slot="label"]',
) !== null
);
}

function getInitials(name: string): string {
const parts = name.trim().split(/\s+/);
if (parts.length === 0) return "";
Expand Down Expand Up @@ -230,17 +257,16 @@ function getColumns({
}: {
showRoleColumn: boolean;
showLastActiveColumn: boolean;
}): ColumnDef<TeamMember>[] {
const cols: ColumnDef<TeamMember>[] = [
}): ColumnDef<typeof features, TeamMember>[] {
const cols: ColumnDef<typeof features, TeamMember>[] = [
{
cell: ({ row }) => (
<Label className="before:absolute before:inset-0">
<Label>
<Checkbox
aria-label={`Select ${row.original.name}`}
checked={row.getIsSelected()}
onCheckedChange={(value) => row.toggleSelected(!!value)}
/>
<span className="sr-only">{`Select ${row.original.name}`}</span>
</Label>
),
enableSorting: false,
Expand Down Expand Up @@ -330,7 +356,6 @@ export function TeamMembersPageClient() {
const [searchValue, setSearchValue] = useState("");
const [showRoleColumn, setShowRoleColumn] = useState(true);
const [showLastActiveColumn, setShowLastActiveColumn] = useState(true);
const [rowSelection, setRowSelection] = useState({});
const [sorting, setSorting] = useState<SortingState>([
{ desc: false, id: "name" },
]);
Expand Down Expand Up @@ -389,21 +414,21 @@ export function TeamMembersPageClient() {
});
}, [showLastActiveColumn, showRoleColumn]);

const table = useReactTable({
columns,
data: filteredMembers,
enableRowSelection: true,
enableSortingRemoval: false,
getCoreRowModel: getCoreRowModel(),
getRowId: (row) => row.id,
getSortedRowModel: getSortedRowModel(),
onRowSelectionChange: setRowSelection,
onSortingChange: setSorting,
state: {
rowSelection,
sorting,
const table = useTable(
{
columns,
data: filteredMembers,
enableRowSelection: true,
enableSortingRemoval: false,
features,
getRowId: (row) => row.id,
onSortingChange: setSorting,
state: {
sorting,
},
},
});
() => null,
);

return (
<>
Expand Down Expand Up @@ -521,100 +546,124 @@ export function TeamMembersPageClient() {
</Button>
</div>

<CardFrame className="w-full">
<Table variant="card" className="table-fixed">
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
const columnSize = header.column.getSize();

return (
<TableHead
className={
header.column.id === "name" ? "sm:w-auto!" : undefined
}
key={header.id}
style={
columnSize ? { width: `${columnSize}px` } : undefined
<table.Subscribe
selector={(state) => ({
rowSelection: state.rowSelection,
sorting: state.sorting,
})}
>
{() => (
<CardFrame className="w-full">
<Table variant="card" className="table-fixed">
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
const columnSize = header.column.getSize();

return (
<TableHead
className={
header.column.id === "name"
? "sm:w-auto!"
: undefined
}
key={header.id}
style={
columnSize
? { width: `${columnSize}px` }
: undefined
}
>
{header.isPlaceholder ? null : header.column.getCanSort() ? (
<div
className="flex h-full cursor-pointer select-none items-center justify-between gap-2"
onClick={header.column.getToggleSortingHandler()}
onKeyDown={(event) => {
if (
event.key === "Enter" ||
event.key === " "
) {
event.preventDefault();
header.column.getToggleSortingHandler()?.(
event,
);
}
}}
role="button"
tabIndex={0}
>
{flexRender(
header.column.columnDef.header,
header.getContext(),
)}
{{
asc: (
<ChevronUpIcon
aria-hidden="true"
className="size-4 shrink-0 opacity-80"
/>
),
desc: (
<ChevronDownIcon
aria-hidden="true"
className="size-4 shrink-0 opacity-80"
/>
),
}[header.column.getIsSorted() as string] ??
null}
</div>
) : (
flexRender(
header.column.columnDef.header,
header.getContext(),
)
)}
</TableHead>
);
})}
</TableRow>
))}
</TableHeader>
<TableBody>
{table.getRowModel().rows.length ? (
table.getRowModel().rows.map((row) => (
<TableRow
data-state={
row.getIsSelected() ? "selected" : undefined
}
key={row.id}
onClick={(event) => {
if (shouldIgnoreRowSelectionClick(event.target))
return;
row.toggleSelected();
}}
>
{header.isPlaceholder ? null : header.column.getCanSort() ? (
<div
className="flex h-full cursor-pointer select-none items-center justify-between gap-2"
onClick={header.column.getToggleSortingHandler()}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault();
header.column.getToggleSortingHandler()?.(
event,
);
}
}}
role="button"
tabIndex={0}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(
header.column.columnDef.header,
header.getContext(),
cell.column.columnDef.cell,
cell.getContext(),
)}
{{
asc: (
<ChevronUpIcon
aria-hidden="true"
className="size-4 shrink-0 opacity-80"
/>
),
desc: (
<ChevronDownIcon
aria-hidden="true"
className="size-4 shrink-0 opacity-80"
/>
),
}[header.column.getIsSorted() as string] ?? null}
</div>
) : (
flexRender(
header.column.columnDef.header,
header.getContext(),
)
)}
</TableHead>
);
})}
</TableRow>
))}
</TableHeader>
<TableBody>
{table.getRowModel().rows.length ? (
table.getRowModel().rows.map((row) => (
<TableRow
data-state={row.getIsSelected() ? "selected" : undefined}
key={row.id}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
cell.getContext(),
)}
</TableCell>
))}
</TableRow>
))
) : (
<TableRow>
<TableCell
className="h-24 text-center"
colSpan={columns.length}
>
No members found.
</TableCell>
))}
</TableRow>
))
) : (
<TableRow>
<TableCell
className="h-24 text-center"
colSpan={columns.length}
>
No members found.
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</CardFrame>
</TableRow>
)}
</TableBody>
</Table>
</CardFrame>
)}
</table.Subscribe>
</div>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/calcom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@dnd-kit/utilities": "^3.2.2",
"@hugeicons/core-free-icons": "^2.0.0",
"@hugeicons/react": "^1.1.1",
"@tanstack/react-table": "^8.21.3",
"@tanstack/react-table": "^9.2.4",
"dompurify": "^3.3.1",
"lucide-react": "^0.555.0",
"marked": "^17.0.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/origin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@origin-space/image-cropper": "^0.1.9",
"@radix-ui/react-icons": "^1.3.2",
"@remixicon/react": "^4.7.0",
"@tanstack/react-table": "^8.21.3",
"@tanstack/react-table": "^9.2.4",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "1.1.1",
Expand Down
Loading
Loading