add scroll area to data table

This commit is contained in:
2024-07-11 12:59:13 +02:00
parent d387b1cda2
commit 058c061754
5 changed files with 53 additions and 3 deletions

Binary file not shown.

View File

@@ -17,6 +17,7 @@
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",

View File

@@ -5,6 +5,7 @@ import {
DropdownMenuCheckboxItem,
DropdownMenuContent,
DropdownMenuTrigger,
ScrollArea,
Table,
TableBody,
TableCell,
@@ -159,7 +160,7 @@ export const DataTable = ({
});
return (
<div className={"flex flex-col gap-4 flex-1 max-h-full pb-3"}>
<div className={"flex flex-col gap-4 flex-1 max-h-full h-full pb-3"}>
<div className={"flex gap-4 items-center justify-between"}>
<h1 className="text-2xl font-bold flex items-center gap-2">
<Rows3 /> {tableName}
@@ -193,7 +194,7 @@ export const DataTable = ({
</p>
</div>
<div className="rounded-md border min-h-0 h-full overflow-auto w-full min-w-0">
<ScrollArea className="rounded-md border min-h-0 h-full w-full min-w-0">
<Table
className={"table-fixed min-w-full"}
{...{
@@ -289,7 +290,7 @@ export const DataTable = ({
)}
</TableBody>
</Table>
</div>
</ScrollArea>
<DataTablePagination table={table} />
</div>
);

View File

@@ -8,6 +8,7 @@ export * from "./label";
export * from "./mode-toggle";
export * from "./select";
export * from "./sonner";
export * from "./scroll-area";
export * from "./sql-data-table";
export * from "./sql-data-table-cell";
export * from "./switch";

View File

@@ -0,0 +1,47 @@
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
import * as React from "react";
import { cn } from "@/lib/utils";
const ScrollArea = React.forwardRef<
React.ElementRef<typeof ScrollAreaPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
>(({ className, children, ...props }, ref) => (
<ScrollAreaPrimitive.Root
ref={ref}
className={cn("relative overflow-hidden", className)}
{...props}
>
<ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
{children}
</ScrollAreaPrimitive.Viewport>
<ScrollBar />
<ScrollBar orientation="horizontal" />
<ScrollAreaPrimitive.Corner />
</ScrollAreaPrimitive.Root>
));
ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
const ScrollBar = React.forwardRef<
React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
>(({ className, orientation = "vertical", ...props }, ref) => (
<ScrollAreaPrimitive.ScrollAreaScrollbar
ref={ref}
orientation={orientation}
className={cn(
"flex touch-none select-none transition-colors",
orientation === "vertical" &&
"h-full w-2.5 border-l border-l-transparent p-[1px]",
orientation === "horizontal" &&
"h-2.5 flex-col border-t border-t-transparent p-[1px]",
className,
)}
{...props}
>
<ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
</ScrollAreaPrimitive.ScrollAreaScrollbar>
));
ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
export { ScrollArea, ScrollBar };