Skip to content

refactor(data-table): remove redundant toolbar effects #440

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

Open
IzumiSy wants to merge 1 commit into
base: stack/data-table-filter-placement-and-column-ui-followups
Choose a base branch
from
+34 −18
Open

refactor(data-table): remove redundant toolbar effects #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions packages/core/src/components/data-table/toolbar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,21 @@ describe("AddFilterPanel", () => {
// ---------------------------------------------------------------------------

describe("FilterChip", () => {
it("focuses the operator search input when the operator popover opens", async () => {
const user = userEvent.setup();
const control = makeControl({
filters: [{ field: "name", operator: "contains", value: "Alice" }],
});
render(<TestFilters control={control} columns={[stringColumn]} />, {
wrapper,
});

await user.click(screen.getByRole("button", { name: "contains" }));

const input = await screen.findByPlaceholderText("Search...");
expect(document.activeElement).toBe(input);
});

it("calls removeFilter when the remove button is clicked", async () => {
const user = userEvent.setup();
const control = makeControl({
Expand Down
37 changes: 19 additions & 18 deletions packages/core/src/components/data-table/toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
import { useCallback, useMemo, useState, type ReactNode } from "react";
import { Popover } from "@base-ui/react/popover";
import { ChevronDown, Filter as FilterIcon, X, Check, Search } from "lucide-react";
import { cn } from "@/lib/utils";
Expand Down Expand Up @@ -287,17 +287,22 @@ function AddFilterPanel({
if (col) setOperator(seedPanelOperator(control, col));
};

// Keep the selection in sync with the search: if the query filters out the
// currently-selected field, advance to the first still-visible field so the
// field list and the value editor don't desync (empty highlight on the left
// while the right still shows the old field's editor).
useEffect(() => {
if (!fq || visibleFieldColumns.length === 0) return;
if (visibleFieldColumns.some((c) => c.filter.field === fieldName)) return;
const first = visibleFieldColumns[0];
const handleFieldQueryChange = (value: string) => {
setFieldQuery(value);

const nextQuery = value.trim().toLowerCase();
if (!nextQuery) return;

const nextVisible = columns.filter((c) =>
(c.label ?? c.filter.field).toLowerCase().includes(nextQuery),
);
if (nextVisible.length === 0) return;
if (nextVisible.some((c) => c.filter.field === fieldName)) return;

const first = nextVisible[0];
setFieldName(first.filter.field);
setOperator(seedPanelOperator(control, first));
}, [fq, visibleFieldColumns, fieldName, control]);
};

// Always reopen on the first field rather than wherever the user last was.
const handleOpenChange = (next: boolean) => {
Expand Down Expand Up @@ -358,7 +363,7 @@ function AddFilterPanel({
<Input
type="search"
value={fieldQuery}
onChange={(e) => setFieldQuery(e.target.value)}
onChange={(e) => handleFieldQueryChange(e.target.value)}
placeholder={t("searchFields")}
aria-label={t("searchFields")}
className="astw:h-8 astw:pl-8 astw:text-sm"
Expand Down Expand Up @@ -1255,12 +1260,6 @@ function OperatorList({
}) {
const t = useDataTableT();
const [query, setQuery] = useState("");
const ref = useRef<HTMLInputElement>(null);

useEffect(() => {
const id = requestAnimationFrame(() => ref.current?.focus());
return () => cancelAnimationFrame(id);
}, []);

const q = query.trim().toLowerCase();
const items = operators
Expand All @@ -1271,8 +1270,10 @@ function OperatorList({
<div className="astw:flex astw:flex-col">
<div className="astw:flex astw:items-center astw:gap-2 astw:border-b astw:border-border astw:px-2.5">
<Search className="astw:size-3.5 astw:text-muted-foreground" />
{/* Base UI's Popover.Popup moves initial focus to the first tabbable
element by default, which is this input. On touch it focuses the
popup instead so the virtual keyboard doesn't jump open. */}
<input
ref={ref}
value={query}
onChange={(e) => setQuery(e.target.value)}
placeholder={t("filterOperatorSearchPlaceholder")}
Expand Down
Loading