@marimo-team/frontend 0.23.4-dev0 → 0.23.4-dev10

package/src/components/data-table/column-header.tsx

@@ -9,7 +9,7 @@ import {
   TextIcon,
   XIcon,
 } from "lucide-react";
-import { useMemo, useRef, useState } from "react";
+import { useRef, useState } from "react";
 import { useLocale } from "react-aria";
 import {
   DropdownMenu,
@@ -22,24 +22,12 @@ import {
   DropdownMenuSubTrigger,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { useAsyncData } from "@/hooks/useAsyncData";
-import { ErrorBanner } from "@/plugins/impl/common/error-banner";
 import type { CalculateTopKRows } from "@/plugins/impl/DataTablePlugin";
 import type { OperatorType } from "@/plugins/impl/data-frames/utils/operators";
 import { logNever } from "@/utils/assertNever";
 import { cn } from "@/utils/cn";
-import { Logger } from "@/utils/Logger";
 import { capitalize } from "@/utils/strings";
-import { Spinner } from "../icons/spinner";
 import { Button } from "../ui/button";
-import { Checkbox } from "../ui/checkbox";
-import {
-  Command,
-  CommandEmpty,
-  CommandInput,
-  CommandItem,
-  CommandList,
-} from "../ui/command";
 import { DraggablePopover } from "../ui/draggable-popover";
 import { Input } from "../ui/input";
 import { NumberField } from "../ui/number-field";
@@ -52,8 +40,12 @@ import {
   SelectTrigger,
   SelectValue,
 } from "../ui/select";
-import { type ColumnFilterForType, Filter } from "./filters";
-import { SentinelCell } from "./sentinel-cell";
+import { FilterByValuesList } from "./filter-by-values-picker";
+import {
+  type ColumnFilterForType,
+  type ColumnFilterValue,
+  Filter,
+} from "./filters";
 import {
   ClearFilterMenuItem,
   FilterButtons,
@@ -66,9 +58,6 @@ import {
   renderSortFilterIcon,
   renderSorts,
 } from "./header-items";
-import { detectSentinel, stringifyUnknownValue } from "./utils";
-
-const TOP_K_ROWS = 30;
 
 interface DataTableColumnHeaderProps<
   TData,
@@ -534,6 +523,26 @@ const TextFilter = <TData, TValue>({
   );
 };
 
+/**
+ * Seed the filter-by-values picker from a column's existing filter value.
+ *
+ * Reopening the picker should reflect what's already applied. Only `select`
+ * filters carry checkbox-style values; other filter shapes (number, text,
+ * etc.) seed an empty list.
+ */
+export function seedFromFilter(value: ColumnFilterValue | undefined): {
+  values: unknown[];
+  operator: Extract<OperatorType, "in" | "not_in">;
+} {
+  if (value && "type" in value && value.type === "select") {
+    return {
+      values: [...value.options],
+      operator: value.operator === "not_in" ? "not_in" : "in",
+    };
+  }
+  return { values: [], operator: "in" };
+}
+
 const PopoverFilterByValues = <TData, TValue>({
   setIsFilterValueOpen,
   calculateTopKRows,
@@ -543,69 +552,13 @@ const PopoverFilterByValues = <TData, TValue>({
   calculateTopKRows?: CalculateTopKRows;
   column: Column<TData, TValue>;
 }) => {
-  const [chosenValues, setChosenValues] = useState<Set<unknown>>(new Set());
-  const [query, setQuery] = useState<string>("");
-
-  const { data, isPending, error } = useAsyncData(async () => {
-    if (!calculateTopKRows) {
-      return null;
-    }
-    const res = await calculateTopKRows({ column: column.id, k: TOP_K_ROWS });
-    return res.data;
-  }, []);
-
-  const filteredData = useMemo(() => {
-    if (!data) {
-      return [];
-    }
-
-    try {
-      return data.filter(([value, _count]) => {
-        // Check if value exists and can be converted to string
-        // Keep null values for filtering
-        return value === undefined
-          ? false
-          : String(value).toLowerCase().includes(query.toLowerCase());
-      });
-    } catch (error_) {
-      Logger.error("Error filtering data", error_);
-      return [];
-    }
-  }, [data, query]);
-
-  let dataTable: React.ReactNode;
-
-  if (isPending) {
-    dataTable = <Spinner size="medium" className="mx-auto mt-12 mb-10" />;
-  }
-
-  if (error) {
-    dataTable = <ErrorBanner error={error} className="my-10 mx-4" />;
-  }
-
-  const handleToggle = (value: unknown) => {
-    setChosenValues((prev) => {
-      const checked = prev.has(value);
-      const newSet = new Set(prev);
-      if (checked) {
-        newSet.delete(value);
-      } else {
-        newSet.add(value);
-      }
-      return newSet;
-    });
-  };
+  const seed = seedFromFilter(
+    column.getFilterValue() as ColumnFilterValue | undefined,
+  );
 
-  const handleToggleAll = (checked: boolean) => {
-    if (!data) {
-      return;
-    }
-    if (checked) {
-      setChosenValues(new Set(filteredData.map(([value]) => value)));
-    } else {
-      setChosenValues(new Set());
-    }
-  };
+  const [chosenValues, setChosenValues] = useState<Set<unknown>>(
+    () => new Set(seed.values),
+  );
 
   const handleApply = () => {
     if (chosenValues.size === 0) {
@@ -613,87 +566,13 @@ const PopoverFilterByValues = <TData, TValue>({
       return;
     }
     column.setFilterValue(
-      Filter.select({ options: [...chosenValues], operator: "in" }),
+      Filter.select({
+        options: [...chosenValues],
+        operator: seed.operator,
+      }),
     );
   };
 
-  if (data) {
-    const allChecked = chosenValues.size === filteredData.length;
-
-    dataTable = (
-      <>
-        <Command className="text-sm outline-hidden" shouldFilter={false}>
-          <CommandInput
-            placeholder={`Search among the top ${data.length} values`}
-            autoFocus={true}
-            onValueChange={(value) => setQuery(value.trim())}
-          />
-          <CommandEmpty>No results found.</CommandEmpty>
-          <CommandList className="border-b">
-            {filteredData.length > 0 && (
-              <CommandItem
-                value="__select-all__"
-                className="border-b rounded-none px-3"
-                onSelect={() => handleToggleAll(!allChecked)}
-              >
-                <Checkbox
-                  checked={chosenValues.size === filteredData.length}
-                  aria-label="Select all"
-                  className="mr-3 h-3.5 w-3.5"
-                />
-                <span className="font-bold flex-1">{column.id}</span>
-                <span className="font-bold">Count</span>
-              </CommandItem>
-            )}
-            {filteredData.map(([value, count], rowIndex) => {
-              const isSelected = chosenValues.has(value);
-              const valueString = stringifyUnknownValue({ value });
-              const sentinel = detectSentinel(
-                value,
-                column.columnDef.meta?.dataType,
-              );
-
-              return (
-                <CommandItem
-                  key={rowIndex}
-                  value={valueString}
-                  className="not-last:border-b rounded-none px-3"
-                  onSelect={() => handleToggle(value)}
-                >
-                  <Checkbox
-                    checked={isSelected}
-                    aria-label="Select row"
-                    className="mr-3 h-3.5 w-3.5"
-                  />
-                  <span className="flex-1 overflow-hidden max-h-20 line-clamp-3">
-                    {sentinel ? (
-                      <SentinelCell sentinel={sentinel} />
-                    ) : (
-                      valueString
-                    )}
-                  </span>
-                  <span className="ml-3">{count}</span>
-                </CommandItem>
-              );
-            })}
-          </CommandList>
-          {filteredData.length === TOP_K_ROWS && (
-            <span className="text-xs text-muted-foreground mt-1.5 text-center">
-              Only showing the top {TOP_K_ROWS} values
-            </span>
-          )}
-        </Command>
-        <FilterButtons
-          onApply={handleApply}
-          onClear={() => {
-            setChosenValues(new Set());
-          }}
-          clearButtonDisabled={chosenValues.size === 0}
-        />
-      </>
-    );
-  }
-
   return (
     <DraggablePopover
       open={true}
@@ -709,7 +588,19 @@ const PopoverFilterByValues = <TData, TValue>({
           <XIcon className="h-4 w-4" />
         </Button>
       </PopoverClose>
-      <div className="flex flex-col gap-1.5 py-2">{dataTable}</div>
+      <div className="flex flex-col gap-1.5 py-2">
+        <FilterByValuesList
+          column={column}
+          calculateTopKRows={calculateTopKRows}
+          chosenValues={chosenValues}
+          onChange={(values) => setChosenValues(new Set(values))}
+        />
+        <FilterButtons
+          onApply={handleApply}
+          onClear={() => setChosenValues(new Set())}
+          clearButtonDisabled={chosenValues.size === 0}
+        />
+      </div>
     </DraggablePopover>
   );
 };

package/src/components/data-table/data-table.tsx

@@ -22,7 +22,10 @@ import React, { memo } from "react";
 import { useLocale } from "react-aria";
 
 import { Table } from "@/components/ui/table";
-import type { GetRowIds } from "@/plugins/impl/DataTablePlugin";
+import type {
+  CalculateTopKRows,
+  GetRowIds,
+} from "@/plugins/impl/DataTablePlugin";
 import { cn } from "@/utils/cn";
 import {
   PANEL_TYPES,
@@ -89,6 +92,7 @@ interface DataTableProps<TData> extends Partial<ExportActionProps> {
   showFilters?: boolean;
   filters?: ColumnFiltersState;
   onFiltersChange?: OnChangeFn<ColumnFiltersState>;
+  calculateTopKRows?: CalculateTopKRows;
   reloading?: boolean;
   // Columns
   freezeColumnsLeft?: string[];
@@ -139,6 +143,7 @@ const DataTableInternal = <TData,>({
   showFilters = false,
   filters,
   onFiltersChange,
+  calculateTopKRows,
   reloading,
   freezeColumnsLeft,
   freezeColumnsRight,
@@ -282,7 +287,11 @@ const DataTableInternal = <TData,>({
 
   return (
     <div className={cn(wrapperClassName, "flex flex-col space-y-1")}>
-      <FilterPills filters={filters} table={table} />
+      <FilterPills
+        filters={filters}
+        table={table}
+        calculateTopKRows={calculateTopKRows}
+      />
       <CellSelectionProvider>
         <div
           part="table-wrapper"

package/src/components/data-table/filter-by-values-picker.tsx

@@ -0,0 +1,241 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+"use no memo";
+
+import type { Column } from "@tanstack/react-table";
+import { ChevronDownIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+import { useAsyncData } from "@/hooks/useAsyncData";
+import { ErrorBanner } from "@/plugins/impl/common/error-banner";
+import type { CalculateTopKRows } from "@/plugins/impl/DataTablePlugin";
+import { cn } from "@/utils/cn";
+import { Logger } from "@/utils/Logger";
+import { Sets } from "@/utils/sets";
+import { smartMatch } from "@/utils/smartMatch";
+import { Spinner } from "../icons/spinner";
+import { Button } from "../ui/button";
+import { Checkbox } from "../ui/checkbox";
+import {
+  Command,
+  CommandEmpty,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "../ui/command";
+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
+import { SentinelCell } from "./sentinel-cell";
+import { detectSentinel, stringifyUnknownValue } from "./utils";
+
+const TOP_K_ROWS = 30;
+
+interface Props<TData, TValue> {
+  column: Column<TData, TValue>;
+  calculateTopKRows?: CalculateTopKRows;
+  chosenValues: unknown[];
+  onChange: (values: unknown[]) => void;
+}
+
+export const FilterByValuesPicker = <TData, TValue>({
+  column,
+  calculateTopKRows,
+  chosenValues,
+  onChange,
+}: Props<TData, TValue>) => {
+  const [open, setOpen] = useState(false);
+
+  const chosenValuesSet = useMemo(() => new Set(chosenValues), [chosenValues]);
+
+  const selectedValuesStr = useMemo(() => {
+    if (chosenValuesSet.size === 0) {
+      return "Select values…";
+    }
+    const items = [...chosenValuesSet].map((v) =>
+      stringifyUnknownValue({ value: v }),
+    );
+    return `[${items.join(", ")}]`;
+  }, [chosenValuesSet]);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild={true}>
+        <Button
+          variant="outline"
+          size="xs"
+          className="h-6 mb-1 w-full justify-between font-normal"
+        >
+          <span
+            className={cn(
+              "truncate",
+              chosenValuesSet.size === 0 && "text-muted-foreground",
+            )}
+          >
+            {selectedValuesStr}
+          </span>
+          <ChevronDownIcon className="h-4 w-4 opacity-50 shrink-0" />
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-80 p-0">
+        <FilterByValuesList
+          column={column}
+          calculateTopKRows={calculateTopKRows}
+          chosenValues={chosenValuesSet}
+          onChange={onChange}
+        />
+      </PopoverContent>
+    </Popover>
+  );
+};
+
+interface FilterByValuesListProps<TData, TValue> {
+  column: Column<TData, TValue>;
+  calculateTopKRows?: CalculateTopKRows;
+  chosenValues: Set<unknown>;
+  onChange: (values: unknown[]) => void;
+}
+
+/**
+ * Search + checkbox list that powers the "filter by values" picker.
+ */
+export const FilterByValuesList = <TData, TValue>({
+  column,
+  calculateTopKRows,
+  chosenValues,
+  onChange,
+}: FilterByValuesListProps<TData, TValue>) => {
+  const [query, setQuery] = useState<string>("");
+
+  const { data, isPending, error } = useAsyncData(async () => {
+    if (!calculateTopKRows) {
+      return null;
+    }
+    const res = await calculateTopKRows({ column: column.id, k: TOP_K_ROWS });
+    return res.data;
+  }, [calculateTopKRows, column.id]);
+
+  const filteredData = useMemo(() => {
+    if (!data) {
+      return [];
+    }
+    try {
+      // try to do includes and also smart match for prefixes
+      return data.filter(([value, _count]) => {
+        if (value === undefined) {
+          return false;
+        }
+        const str = String(value);
+        return (
+          smartMatch(query, str) ||
+          str.toLowerCase().includes(query.toLowerCase())
+        );
+      });
+    } catch (error_) {
+      Logger.error("Error filtering data", error_);
+      return [];
+    }
+  }, [data, query]);
+
+  const handleToggle = (value: unknown) => {
+    onChange([...Sets.toggle(chosenValues, value)]);
+  };
+
+  const allVisibleChecked =
+    filteredData.length > 0 &&
+    filteredData.every(([value]) => chosenValues.has(value));
+
+  const selectAllState: boolean | "indeterminate" = allVisibleChecked
+    ? true
+    : chosenValues.size > 0
+      ? "indeterminate"
+      : false;
+
+  const handleToggleAll = () => {
+    if (!data) {
+      return;
+    }
+    const next = new Set(chosenValues);
+    if (allVisibleChecked) {
+      for (const [value] of filteredData) {
+        next.delete(value);
+      }
+    } else {
+      for (const [value] of filteredData) {
+        next.add(value);
+      }
+    }
+    onChange([...next]);
+  };
+
+  if (isPending) {
+    return <Spinner size="medium" className="mx-auto mt-12 mb-10" />;
+  }
+
+  if (error) {
+    return <ErrorBanner error={error} className="my-10 mx-4" />;
+  }
+
+  if (!data) {
+    return (
+      <div className="py-6 px-4 text-sm text-muted-foreground text-center">
+        No values available
+      </div>
+    );
+  }
+
+  return (
+    <Command className="text-sm outline-hidden" shouldFilter={false}>
+      <CommandInput
+        placeholder={`Search among the top ${data.length} values`}
+        autoFocus={true}
+        onValueChange={(value) => setQuery(value.trim())}
+      />
+      <CommandEmpty>No results found.</CommandEmpty>
+      <CommandList>
+        {filteredData.length > 0 && (
+          <CommandItem
+            value="__select-all__"
+            className="border-b rounded-none px-3"
+            onSelect={handleToggleAll}
+          >
+            <Checkbox
+              checked={selectAllState}
+              aria-label="Select all"
+              className="mr-3 h-3.5 w-3.5"
+            />
+            <span className="font-bold flex-1">{column.id}</span>
+            <span className="font-bold">Count</span>
+          </CommandItem>
+        )}
+        {filteredData.map(([value, count]) => {
+          const isSelected = chosenValues.has(value);
+          const valueString = stringifyUnknownValue({ value });
+          const sentinel = detectSentinel(
+            value,
+            column.columnDef.meta?.dataType,
+          );
+          return (
+            <CommandItem
+              key={valueString}
+              value={valueString}
+              className="not-last:border-b rounded-none px-3"
+              onSelect={() => handleToggle(value)}
+            >
+              <Checkbox
+                checked={isSelected}
+                aria-label="Select row"
+                className="mr-3 h-3.5 w-3.5"
+              />
+              <span className="flex-1 overflow-hidden max-h-20 line-clamp-3">
+                {sentinel ? <SentinelCell sentinel={sentinel} /> : valueString}
+              </span>
+              <span className="ml-3">{count}</span>
+            </CommandItem>
+          );
+        })}
+      </CommandList>
+      {data.length === TOP_K_ROWS && (
+        <span className="text-xs text-muted-foreground py-1.5 text-center">
+          Only showing the top {TOP_K_ROWS} values
+        </span>
+      )}
+    </Command>
+  );
+};