main branch integraiton

This commit is contained in:
Nick A 2025-04-27 15:47:59 -04:00
parent be164d1a05
commit 15ad267225
2 changed files with 4 additions and 2 deletions

View File

@ -14,6 +14,7 @@ import DataPoint from "@/utils/models/DataPoint";
interface ColumnHeaderProps<T extends DataPoint> { interface ColumnHeaderProps<T extends DataPoint> {
header: Header<T, any>; header: Header<T, any>;
details: Details | undefined; details: Details | undefined;
hasHorizontalBorders: boolean;
setFilterFn?: (field: string, filterFn: FilterFn) => void; setFilterFn?: (field: string, filterFn: FilterFn) => void;
} }
@ -30,6 +31,7 @@ function DropdownCheckIcon({ className }: { className?: string }) {
export function ColumnHeader<T extends DataPoint>({ export function ColumnHeader<T extends DataPoint>({
header, header,
details, details,
hasHorizontalBorders,
setFilterFn, setFilterFn,
}: ColumnHeaderProps<T>) { }: ColumnHeaderProps<T>) {
const { column } = header; const { column } = header;
@ -90,7 +92,7 @@ export function ColumnHeader<T extends DataPoint>({
scope="col" scope="col"
className={`border-gray-200 border-y font-medium ${ className={`border-gray-200 border-y font-medium ${
isFiltered ? "bg-purple-50" : "" isFiltered ? "bg-purple-50" : ""
}`} } ${hasHorizontalBorders ? "border-x" : ""}`}
ref={headerRef} ref={headerRef}
> >
<div> <div>

View File

@ -251,7 +251,7 @@ export default function Table<T extends DataPoint>({
key={cell.id} key={cell.id}
className={`[&:nth-child(n+${ className={`[&:nth-child(n+${
2 + offset 2 + offset
})]:border-x pl-2 relative first:text-left first:px-0 last:border-none ${ })]:border-x px-2 relative first:text-left first:px-0 last:border-none ${
cell.column.getIsFiltered() cell.column.getIsFiltered()
? "bg-purple-50" ? "bg-purple-50"
: "" : ""