feat(ui): polish core component surfaces
This commit is contained in:
@@ -44,6 +44,7 @@ import {
|
||||
EmptyStateTitle
|
||||
} from "./empty-state";
|
||||
import { Input, type InputProps } from "./input";
|
||||
import { InputGroup, InputGroupPrefix } from "./input-group";
|
||||
import {
|
||||
Sheet,
|
||||
SheetContent,
|
||||
@@ -585,7 +586,7 @@ function DataTableInner<TData>(
|
||||
<DataTableToolbar>
|
||||
<div className="flex flex-1 flex-wrap items-center gap-3">
|
||||
{shouldRenderSearch ? (
|
||||
<div className={dataTableSearchContainerVariants()}>
|
||||
<div className={cn(dataTableSearchContainerVariants())}>
|
||||
<DataTableSearch
|
||||
aria-label={searchLabel}
|
||||
onChange={(event) => {
|
||||
@@ -650,12 +651,20 @@ function DataTableInner<TData>(
|
||||
|
||||
{selectionEnabled && selectedRows.length > 0 ? (
|
||||
<DataTableSelectionBar>
|
||||
<div className="text-sm font-medium text-[var(--color-foreground)]">
|
||||
{typeof selectionLabel === "function"
|
||||
? selectionLabel(selectedRows)
|
||||
: selectionLabel ?? `${selectedRows.length} selected`}
|
||||
<div className="grid gap-1">
|
||||
<p className="text-[0.72rem] font-medium uppercase tracking-[var(--tracking-caps)] text-[color-mix(in_oklch,var(--color-primary)_68%,var(--color-foreground))]">
|
||||
Selection ready
|
||||
</p>
|
||||
<div className="text-sm font-medium text-[var(--color-foreground)]">
|
||||
{typeof selectionLabel === "function"
|
||||
? selectionLabel(selectedRows)
|
||||
: selectionLabel ?? `${selectedRows.length} selected`}
|
||||
</div>
|
||||
</div>
|
||||
<div {...createSlot("actions")} className="flex flex-wrap items-center gap-2">
|
||||
<div
|
||||
{...createSlot("actions")}
|
||||
className="flex flex-wrap items-center gap-2"
|
||||
>
|
||||
{selectionActions?.(selectedRows)}
|
||||
<Button
|
||||
size="sm"
|
||||
@@ -701,19 +710,32 @@ function DataTableInner<TData>(
|
||||
>
|
||||
{header.isPlaceholder ? null : header.column.getCanSort() ? (
|
||||
<button
|
||||
className={[
|
||||
"inline-flex w-full items-center gap-2 rounded-[var(--radius-sm)] px-2 py-1.5",
|
||||
"outline-none transition-colors duration-200 hover:bg-[var(--color-surface)]",
|
||||
"focus-visible:ring-2 focus-visible:ring-[var(--color-ring)]",
|
||||
align === "end" ? "justify-end" : align === "center" ? "justify-center" : "justify-start"
|
||||
].join(" ")}
|
||||
className={cn(
|
||||
"group inline-flex w-full items-center gap-2 rounded-[calc(var(--ui-control-radius)-0.15rem)] px-2.5 py-2",
|
||||
"outline-none transition-[background-color,box-shadow,color,transform] duration-[var(--dur-fast)] ease-[var(--ease-standard)]",
|
||||
"focus-visible:ring-2 focus-visible:ring-[var(--color-ring)] focus-visible:ring-offset-2",
|
||||
"focus-visible:ring-offset-[color-mix(in_oklch,var(--ui-card-default-bg)_82%,white_18%)]",
|
||||
sortState
|
||||
? "-translate-y-px bg-[color-mix(in_oklch,var(--color-surface-bright)_52%,var(--color-primary-container))] text-[var(--color-foreground)] shadow-[inset_0_1px_0_color-mix(in_oklch,white_42%,transparent)]"
|
||||
: "hover:-translate-y-px hover:bg-[color-mix(in_oklch,var(--ui-card-subtle-bg)_74%,white_26%)] hover:text-[var(--color-foreground)]",
|
||||
align === "end"
|
||||
? "justify-end"
|
||||
: align === "center"
|
||||
? "justify-center"
|
||||
: "justify-start"
|
||||
)}
|
||||
onClick={header.column.getToggleSortingHandler()}
|
||||
type="button"
|
||||
>
|
||||
<span>{flexRender(header.column.columnDef.header, header.getContext())}</span>
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="inline-flex items-center justify-center text-[var(--color-muted-foreground)]"
|
||||
className={cn(
|
||||
"inline-flex items-center justify-center transition-[color,transform] duration-[var(--dur-fast)] ease-[var(--ease-standard)]",
|
||||
sortState
|
||||
? "translate-x-px text-[var(--color-primary)]"
|
||||
: "text-[var(--color-muted-foreground)] group-hover:translate-x-px group-hover:text-[var(--color-foreground)]"
|
||||
)}
|
||||
>
|
||||
{sortState === "asc" ? (
|
||||
<SortAscendingIcon className="size-3.5" />
|
||||
@@ -795,13 +817,18 @@ function DataTableInner<TData>(
|
||||
</div>
|
||||
|
||||
<DataTablePagination>
|
||||
<div className="text-sm text-[var(--color-muted-foreground)]">
|
||||
{pageStart}-{pageEnd} of {filteredRowCount}
|
||||
<div className="grid gap-0.5">
|
||||
<span className="text-[0.72rem] font-medium uppercase tracking-[var(--tracking-caps)] text-[var(--color-muted-foreground)]">
|
||||
Visible rows
|
||||
</span>
|
||||
<span className="text-sm font-medium text-[var(--color-foreground)]">
|
||||
{pageStart}-{pageEnd} of {filteredRowCount}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-wrap items-center gap-3">
|
||||
{resolvedPageSizeOptions.length > 1 ? (
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex items-center gap-2 rounded-[var(--radius-full)] bg-[color-mix(in_oklch,var(--ui-card-subtle-bg)_76%,white_24%)] px-2.5 py-1.5 shadow-[var(--ui-control-shadow)]">
|
||||
<span className="text-sm text-[var(--color-muted-foreground)]">Rows</span>
|
||||
<Select
|
||||
value={String(currentPageSize)}
|
||||
@@ -810,7 +837,7 @@ function DataTableInner<TData>(
|
||||
setCurrentPageIndex(0);
|
||||
}}
|
||||
>
|
||||
<SelectTrigger aria-label="Rows per page" className="w-[5.5rem]">
|
||||
<SelectTrigger aria-label="Rows per page" className="h-9 w-[5.5rem] border-0 bg-transparent px-2 shadow-none">
|
||||
<SelectValue placeholder={String(currentPageSize)} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
@@ -824,11 +851,11 @@ function DataTableInner<TData>(
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<div className="text-sm text-[var(--color-muted-foreground)]">
|
||||
<div className="rounded-[var(--radius-full)] bg-[color-mix(in_oklch,var(--ui-card-subtle-bg)_72%,white_28%)] px-3 py-1.5 text-sm font-medium text-[var(--color-foreground)] shadow-[var(--ui-control-shadow)]">
|
||||
Page {Math.min(currentPageIndex + 1, Math.max(pageCount, 1))} of {Math.max(pageCount, 1)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex items-center gap-2 rounded-[var(--radius-full)] bg-[color-mix(in_oklch,var(--ui-card-subtle-bg)_76%,white_24%)] p-1 shadow-[var(--ui-control-shadow)]">
|
||||
<Button
|
||||
disabled={!table.getCanPreviousPage()}
|
||||
size="sm"
|
||||
@@ -884,6 +911,21 @@ type DataTableComponent = <TData>(
|
||||
|
||||
export const DataTable = forwardRef(DataTableInner) as DataTableComponent;
|
||||
|
||||
function DataTableSearchIcon() {
|
||||
return (
|
||||
<svg aria-hidden="true" className="size-4" viewBox="0 0 16 16">
|
||||
<path
|
||||
d="M7.25 12.5a5.25 5.25 0 1 1 0-10.5a5.25 5.25 0 0 1 0 10.5Zm3.75-1.5 3 3"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
strokeWidth="1.5"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
export type DataTableToolbarProps = ComponentPropsWithoutRef<"div">;
|
||||
|
||||
export const DataTableToolbar = forwardRef<HTMLDivElement, DataTableToolbarProps>(
|
||||
@@ -907,18 +949,27 @@ export const DataTableFilters = forwardRef<HTMLDivElement, DataTableFiltersProps
|
||||
<div
|
||||
{...props}
|
||||
{...createSlot("actions")}
|
||||
className={cn("flex flex-wrap items-center gap-2", className)}
|
||||
className={cn("flex flex-wrap items-center justify-end gap-2", className)}
|
||||
ref={ref}
|
||||
/>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
export type DataTableSearchProps = Omit<InputProps, "size">;
|
||||
export type DataTableSearchProps = Omit<InputProps, "size"> & {
|
||||
wrapperClassName?: string;
|
||||
};
|
||||
|
||||
export const DataTableSearch = forwardRef<HTMLInputElement, DataTableSearchProps>(
|
||||
function DataTableSearch({ className, type = "search", ...props }, ref) {
|
||||
return <Input {...props} className={className} ref={ref} type={type} />;
|
||||
function DataTableSearch({ className, type = "search", wrapperClassName, ...props }, ref) {
|
||||
return (
|
||||
<InputGroup className={cn(wrapperClassName)}>
|
||||
<InputGroupPrefix>
|
||||
<DataTableSearchIcon />
|
||||
</InputGroupPrefix>
|
||||
<Input {...props} className={className} ref={ref} type={type} />
|
||||
</InputGroup>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user