@marimo-team/frontend 0.23.7-dev55 → 0.23.7-dev57

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

@@ -44,14 +44,19 @@ import { OPERATOR_LABELS } from "./operator-labels";
 import {
   type ColumnFilterForType,
   type ColumnFilterValue,
+  DATETIME_OPS,
   Filter,
-  NUMBER_COMPARISON_OPS,
-  type NumberComparisonOp,
+  isDatetimeComparisonOp,
+  isNumberComparisonOp,
+  isTextScalarOp,
   NUMBER_OPS,
   TEXT_OPS,
-  TEXT_SCALAR_OPS,
-  type TextScalarOp,
 } from "./filters";
+import {
+  type DateLikeFilterType,
+  DateLikeInput,
+  DateLikeRangeInput,
+} from "./date-filter-inputs";
 import {
   ClearFilterMenuItem,
   FilterButtons,
@@ -283,19 +288,21 @@ export function renderMenuItemFilter<TData, TValue>(
     return null;
   }
 
-  if (filterType === "time") {
-    // Not implemented
-    return null;
-  }
-
-  if (filterType === "datetime") {
-    // Not implemented
-    return null;
-  }
-
-  if (filterType === "date") {
-    // Not implemented
-    return null;
+  if (
+    filterType === "date" ||
+    filterType === "datetime" ||
+    filterType === "time"
+  ) {
+    return (
+      <DropdownMenuSub>
+        {filterMenuItem}
+        <DropdownMenuPortal>
+          <DropdownMenuSubContent>
+            <DateFilterMenu column={column} filterType={filterType} />
+          </DropdownMenuSubContent>
+        </DropdownMenuPortal>
+      </DropdownMenuSub>
+    );
   }
 
   logNever(filterType);
@@ -369,12 +376,6 @@ const BooleanFilter = <TData, TValue>({
   );
 };
 
-const NUMBER_COMPARISON_SET: ReadonlySet<OperatorType> = new Set(
-  NUMBER_COMPARISON_OPS,
-);
-const isNumberComparisonOp = (op: OperatorType): op is NumberComparisonOp =>
-  NUMBER_COMPARISON_SET.has(op);
-
 type NumberComparisonFilter = Extract<
   ColumnFilterForType<"number">,
   { value: number }
@@ -485,9 +486,134 @@ export const NumberFilterMenu = <TData, TValue>({
   );
 };
 
-const TEXT_SCALAR_SET: ReadonlySet<OperatorType> = new Set(TEXT_SCALAR_OPS);
-const isTextScalarOp = (op: OperatorType): op is TextScalarOp =>
-  TEXT_SCALAR_SET.has(op);
+type DateComparisonFilter = Extract<
+  ColumnFilterForType<DateLikeFilterType>,
+  { value: Date }
+>;
+const isDateComparisonFilter = (
+  filter: ColumnFilterForType<DateLikeFilterType>,
+): filter is DateComparisonFilter => isDatetimeComparisonOp(filter.operator);
+
+export const DateFilterMenu = <TData, TValue>({
+  column,
+  filterType,
+}: {
+  column: Column<TData, TValue>;
+  filterType: DateLikeFilterType;
+}) => {
+  const currentFilter = column.getFilterValue() as
+    | ColumnFilterForType<DateLikeFilterType>
+    | undefined;
+  const hasFilter = currentFilter !== undefined;
+
+  const [operator, setOperator] = useState<OperatorType>(
+    currentFilter?.operator ?? "between",
+  );
+  const [min, setMin] = useState<Date | undefined>(
+    currentFilter?.operator === "between" ? currentFilter.min : undefined,
+  );
+  const [max, setMax] = useState<Date | undefined>(
+    currentFilter?.operator === "between" ? currentFilter.max : undefined,
+  );
+  const [value, setValue] = useState<Date | undefined>(
+    currentFilter !== undefined && isDateComparisonFilter(currentFilter)
+      ? currentFilter.value
+      : undefined,
+  );
+
+  const isComparison = isDatetimeComparisonOp(operator);
+  const isNullish = operator === "is_null" || operator === "is_not_null";
+
+  const applyDisabled =
+    (operator === "between" && (min === undefined || max === undefined)) ||
+    (isComparison && value === undefined);
+
+  const buildFilter = (
+    opts: Parameters<typeof Filter.date>[0],
+  ): ColumnFilterForType<DateLikeFilterType> => {
+    switch (filterType) {
+      case "date":
+        return Filter.date(opts);
+      case "datetime":
+        return Filter.datetime(opts);
+      case "time":
+        return Filter.time(opts);
+    }
+  };
+
+  const handleApply = () => {
+    if (isNullish) {
+      column.setFilterValue(buildFilter({ operator }));
+      return;
+    }
+    if (operator === "between" && min !== undefined && max !== undefined) {
+      column.setFilterValue(buildFilter({ operator: "between", min, max }));
+      return;
+    }
+    if (isComparison && value !== undefined) {
+      column.setFilterValue(buildFilter({ operator, value }));
+    }
+  };
+
+  const [resetKey, setResetKey] = useState(0);
+  const handleClear = () => {
+    setMin(undefined);
+    setMax(undefined);
+    setValue(undefined);
+    setResetKey((k) => k + 1);
+    column.setFilterValue(undefined);
+  };
+
+  const handleOperatorChange = (next: OperatorType) => {
+    setOperator(next);
+  };
+
+  return (
+    <div
+      className="flex flex-col gap-1 pt-3 px-2"
+      onKeyDownCapture={(e) => {
+        if (e.key === "Tab") {
+          e.stopPropagation();
+        }
+      }}
+    >
+      <OperatorSelect
+        operator={operator}
+        options={DATETIME_OPS}
+        onChange={handleOperatorChange}
+      />
+      {operator === "between" && (
+        <DateLikeRangeInput
+          key={`${filterType}-${resetKey}`}
+          filterType={filterType}
+          min={min}
+          max={max}
+          onRangeChange={(nextMin, nextMax) => {
+            setMin(nextMin);
+            setMax(nextMax);
+          }}
+          className="shadow-none! border-border hover:shadow-none!"
+        />
+      )}
+      {isComparison && (
+        <DateLikeInput
+          key={`${filterType}-${resetKey}`}
+          filterType={filterType}
+          value={value}
+          onChange={setValue}
+          aria-label="value"
+          className="shadow-none! border-border hover:shadow-none!"
+        />
+      )}
+      <FilterButtons
+        onApply={handleApply}
+        onClear={handleClear}
+        clearButtonDisabled={!hasFilter}
+        applyButtonDisabled={applyDisabled}
+      />
+    </div>
+  );
+};
 
 export const TextFilterMenu = <TData, TValue>({
   column,

package/src/components/data-table/date-filter-inputs.tsx

@@ -0,0 +1,325 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import type {
+  CalendarDate,
+  CalendarDateTime,
+  Time,
+} from "@internationalized/date";
+import { parseDate, parseDateTime, parseTime } from "@internationalized/date";
+import { MinusIcon } from "lucide-react";
+import { useState } from "react";
+import type { DateValue, TimeValue } from "react-aria-components";
+import { TimeField } from "@/components/ui/date-input";
+import { DatePicker, DateRangePicker } from "@/components/ui/date-picker";
+import {
+  dateToISODate,
+  dateToISODateTime,
+  dateToISOTime,
+  type FilterType,
+} from "./filters";
+
+export type DateLikeFilterType = Extract<
+  FilterType,
+  "date" | "datetime" | "time"
+>;
+
+function dateToAria(
+  filterType: DateLikeFilterType,
+  d: Date,
+): DateValue | TimeValue {
+  switch (filterType) {
+    case "date":
+      return parseDate(dateToISODate(d));
+    case "datetime":
+      return parseDateTime(dateToISODateTime(d));
+    case "time":
+      return parseTime(dateToISOTime(d));
+  }
+}
+
+function ariaToDate(
+  filterType: DateLikeFilterType,
+  aria: DateValue | TimeValue,
+): Date {
+  if (filterType === "time") {
+    const t = aria as Time;
+    return new Date(1970, 0, 1, t.hour, t.minute, t.second, t.millisecond);
+  }
+  if (filterType === "date") {
+    const c = aria as CalendarDate;
+    return new Date(c.year, c.month - 1, c.day);
+  }
+  const c = aria as Partial<CalendarDateTime> & CalendarDate;
+  return new Date(
+    c.year,
+    c.month - 1,
+    c.day,
+    c.hour ?? 0,
+    c.minute ?? 0,
+    c.second ?? 0,
+    c.millisecond ?? 0,
+  );
+}
+
+// Parses a pasted string into a Date appropriate for the filter type.
+// Accepts ISO, US, RFC formats via the Date constructor; time-only strings
+// (HH:MM[:SS]) are handled explicitly since `new Date("12:30")` is invalid.
+export function parsePastedDate(
+  filterType: DateLikeFilterType,
+  text: string,
+): Date | undefined {
+  const trimmed = text.trim();
+  if (!trimmed) {
+    return undefined;
+  }
+
+  const timeMatch =
+    filterType === "time"
+      ? trimmed.match(/^(\d{1,2}):(\d{2})(?::(\d{2}))?\s*(am|pm)?$/i)
+      : null;
+  if (timeMatch) {
+    const [, hStr, mStr, sStr, ampm] = timeMatch;
+    let hour = Number.parseInt(hStr, 10);
+    const minute = Number.parseInt(mStr, 10);
+    const second = sStr ? Number.parseInt(sStr, 10) : 0;
+    if (ampm) {
+      const isPm = ampm.toLowerCase() === "pm";
+      if (hour === 12) {
+        hour = isPm ? 12 : 0;
+      } else if (isPm) {
+        hour += 12;
+      }
+    }
+    return new Date(1970, 0, 1, hour, minute, second);
+  }
+
+  const dateOnlyMatch = trimmed.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+  if (dateOnlyMatch) {
+    const [, y, m, d] = dateOnlyMatch;
+    return new Date(
+      Number.parseInt(y, 10),
+      Number.parseInt(m, 10) - 1,
+      Number.parseInt(d, 10),
+    );
+  }
+
+  // Parse ISO datetimes as wall-clock to stay consistent with the picker's
+  // local-time basis. Trailing `Z` or offsets are stripped so that pasting
+  // `2024-01-15T08:30:00Z` displays `08:30` instead of being shifted by the
+  // viewer's timezone.
+  const isoMatch = trimmed.match(
+    /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?(?:Z|[+-]\d{2}:?\d{2})?$/,
+  );
+  if (isoMatch) {
+    const [, y, mo, d, h, mi, s] = isoMatch;
+    return new Date(
+      Number.parseInt(y, 10),
+      Number.parseInt(mo, 10) - 1,
+      Number.parseInt(d, 10),
+      Number.parseInt(h, 10),
+      Number.parseInt(mi, 10),
+      s ? Number.parseInt(s, 10) : 0,
+    );
+  }
+
+  const parsed = new Date(trimmed);
+  if (Number.isNaN(parsed.getTime())) {
+    return undefined;
+  }
+  return parsed;
+}
+
+function parsePastedRange(
+  filterType: DateLikeFilterType,
+  text: string,
+): { min: Date; max: Date } | undefined {
+  const parts = text.split(/\s+(?:-|–|—|to)\s+/i);
+  if (parts.length === 2) {
+    const min = parsePastedDate(filterType, parts[0]);
+    const max = parsePastedDate(filterType, parts[1]);
+    if (min && max) {
+      return { min, max };
+    }
+  }
+  const single = parsePastedDate(filterType, text);
+  if (single) {
+    return { min: single, max: single };
+  }
+  return undefined;
+}
+
+interface DateLikeInputProps {
+  filterType: DateLikeFilterType;
+  value: Date | undefined;
+  onChange: (value: Date | undefined) => void;
+  "aria-label"?: string;
+  className?: string;
+}
+
+export const DateLikeInput = ({
+  filterType,
+  value,
+  onChange,
+  "aria-label": ariaLabel,
+  className,
+}: DateLikeInputProps) => {
+  const [seedKey, setSeedKey] = useState(0);
+  const [seed, setSeed] = useState(value);
+
+  const handleChange = (next: DateValue | TimeValue | null) => {
+    if (next === null) {
+      return;
+    }
+    onChange(ariaToDate(filterType, next));
+  };
+
+  const handlePaste = (e: React.ClipboardEvent<HTMLDivElement>) => {
+    const text = e.clipboardData.getData("text");
+    const parsed = parsePastedDate(filterType, text);
+    if (!parsed) {
+      return;
+    }
+    e.preventDefault();
+    onChange(parsed);
+    setSeed(parsed);
+    setSeedKey((k) => k + 1);
+  };
+
+  const seedValue =
+    seed === undefined ? undefined : dateToAria(filterType, seed);
+
+  return (
+    <div onPasteCapture={handlePaste} className="contents">
+      {filterType === "time" ? (
+        <TimeField<Time>
+          key={seedKey}
+          aria-label={ariaLabel}
+          defaultValue={seedValue as Time | undefined}
+          onChange={handleChange}
+          className={className}
+        />
+      ) : filterType === "date" ? (
+        <DatePicker<CalendarDate>
+          key={seedKey}
+          aria-label={ariaLabel}
+          defaultValue={seedValue as CalendarDate | undefined}
+          onChange={handleChange}
+          className={className}
+        />
+      ) : (
+        <DatePicker<CalendarDateTime>
+          key={seedKey}
+          aria-label={ariaLabel}
+          defaultValue={seedValue as CalendarDateTime | undefined}
+          granularity="second"
+          onChange={handleChange}
+          className={className}
+        />
+      )}
+    </div>
+  );
+};
+
+interface DateLikeRangeInputProps {
+  filterType: DateLikeFilterType;
+  min: Date | undefined;
+  max: Date | undefined;
+  onRangeChange: (min: Date | undefined, max: Date | undefined) => void;
+  className?: string;
+}
+
+export const DateLikeRangeInput = ({
+  filterType,
+  min,
+  max,
+  onRangeChange,
+  className,
+}: DateLikeRangeInputProps) => {
+  const [seedKey, setSeedKey] = useState(0);
+  const [seedMin, setSeedMin] = useState(min);
+  const [seedMax, setSeedMax] = useState(max);
+
+  const handlePaste = (e: React.ClipboardEvent<HTMLDivElement>) => {
+    const text = e.clipboardData.getData("text");
+    const parsed = parsePastedRange(filterType, text);
+    if (!parsed) {
+      return;
+    }
+    e.preventDefault();
+    e.stopPropagation();
+    onRangeChange(parsed.min, parsed.max);
+    setSeedMin(parsed.min);
+    setSeedMax(parsed.max);
+    setSeedKey((k) => k + 1);
+  };
+
+  if (filterType === "time") {
+    return (
+      <div onPasteCapture={handlePaste} className="flex gap-1 items-center">
+        <DateLikeInput
+          key={`min-${seedKey}`}
+          filterType="time"
+          value={seedMin}
+          onChange={(nextMin) => onRangeChange(nextMin, max)}
+          aria-label="min"
+          className={className}
+        />
+        <MinusIcon className="h-5 w-5 text-muted-foreground" />
+        <DateLikeInput
+          key={`max-${seedKey}`}
+          filterType="time"
+          value={seedMax}
+          onChange={(nextMax) => onRangeChange(min, nextMax)}
+          aria-label="max"
+          className={className}
+        />
+      </div>
+    );
+  }
+
+  const handleChange = (next: { start: DateValue; end: DateValue } | null) => {
+    if (next === null) {
+      return;
+    }
+    onRangeChange(
+      ariaToDate(filterType, next.start),
+      ariaToDate(filterType, next.end),
+    );
+  };
+
+  const seedRange =
+    seedMin === undefined || seedMax === undefined
+      ? undefined
+      : {
+          start: dateToAria(filterType, seedMin),
+          end: dateToAria(filterType, seedMax),
+        };
+
+  return (
+    <div onPasteCapture={handlePaste} className="contents">
+      {filterType === "date" ? (
+        <DateRangePicker<CalendarDate>
+          key={seedKey}
+          aria-label="range"
+          defaultValue={
+            seedRange as { start: CalendarDate; end: CalendarDate } | undefined
+          }
+          onChange={handleChange}
+          className={className}
+        />
+      ) : (
+        <DateRangePicker<CalendarDateTime>
+          key={seedKey}
+          aria-label="range"
+          defaultValue={
+            seedRange as
+              | { start: CalendarDateTime; end: CalendarDateTime }
+              | undefined
+          }
+          granularity="second"
+          onChange={handleChange}
+          className={className}
+        />
+      )}
+    </div>
+  );
+};