@marimo-team/islands 0.25.3-dev3 → 0.25.3-dev5

package/dist/{swimlanes-42K2YHIH-BkSppxp8.js → swimlanes-42K2YHIH-Do6L-cYg.js}

@@ -9,7 +9,7 @@ import "./chunk-4HAMMTFA-D4eFPyFh.js";
 import "./chunk-GVQU2GXP-Cwbt-lF0.js";
 import "./chunk-L3NEJ4N5-n-zgIVSy.js";
 import { o as n } from "./chunk-OSK3NFVY-DXa-Cxbn.js";
-import { c as r } from "./mermaid-CiAXjLpA.js";
+import { c as r } from "./mermaid-CHo49Yv-.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/swimlanes-42K2YHIH.mjs
 var i = 5, a = 1e-5, o = 1e-6;
 function s(e) {

package/dist/{swimlanesDiagram-VR7AAH4N-c8G5pGxC.js → swimlanesDiagram-VR7AAH4N-DUzPvSVU.js}

@@ -9,11 +9,11 @@ import "./chunk-4HAMMTFA-D4eFPyFh.js";
 import "./chunk-GVQU2GXP-Cwbt-lF0.js";
 import "./chunk-L3NEJ4N5-n-zgIVSy.js";
 import "./chunk-OSK3NFVY-DXa-Cxbn.js";
-import "./mermaid-CiAXjLpA.js";
+import "./mermaid-CHo49Yv-.js";
 import "./chunk-F27PBJKO-ufseIn5y.js";
 import "./chunk-XXDRQBXY-Dnl5VBqG.js";
 import "./chunk-POPQ4Y6H-hYOXbYH_.js";
-import { r as t, t as n } from "./chunk-SHT3W25Y-lHiGx3ZC.js";
+import { r as t, t as n } from "./chunk-SHT3W25Y-CV9J3rAB.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/swimlanesDiagram-VR7AAH4N.mjs
 var r = n({
 	defaultLayout: "swimlane",

package/dist/{timeline-definition-24CTP7MA-CaMQayqK.js → timeline-definition-24CTP7MA-D3c46WM5.js}

@@ -3,7 +3,7 @@ import { p as t } from "./chunk-75Z2AOVW-D7gxIs2Q.js";
 import { n, t as r } from "./src-CA_m4ONl.js";
 import { n as i, t as a } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { $ as o, J as s, a as c, b as l, et as u, nt as d, o as f, x as p } from "./chunk-DU6HZSFF-BwiyaNpg.js";
-import { p as m } from "./mermaid-CiAXjLpA.js";
+import { p as m } from "./mermaid-CHo49Yv-.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/timeline-definition-24CTP7MA.mjs
 var h = (function() {
 	var e = /* @__PURE__ */ i(function(e, t, n, r) {

package/dist/{toDate-BNJf01u1.js → toDate-vIXljnsr.js}

@@ -465,54 +465,55 @@ function M({ href: e, queryParams: t, keys: n }) {
 	let m = f.toString();
 	return m ? `${o}?${m}${s}` : e;
 }
-a(null);
-var N = (0, O.init)({ length: 6 });
-function P() {
-	return `s_${N()}`;
+//#endregion
+//#region src/core/kernel/session.ts
+var N = a(null), P = (0, O.init)({ length: 6 });
+function F() {
+	return `s_${P()}`;
 }
-function F(e) {
+function I(e) {
 	return e ? /^s_[\da-z]{6}$/.test(e) : !1;
 }
-var I = null;
-function L() {
-	let e = o.get(v) === "edit", n = new URL(window.location.href).searchParams.get(s.sessionId), r = F(n) ? n : null;
+var L = null;
+function R() {
+	let e = o.get(v) === "edit", n = new URL(window.location.href).searchParams.get(s.sessionId), r = I(n) ? n : null;
 	return k((t) => {
 		if (!e) {
 			t.delete(s.sessionId), t.delete(s.kiosk);
 			return;
 		}
 		t.has(s.kiosk) || t.delete(s.sessionId);
-	}), r === null ? (t.debug("Starting a new session", { sessionId: n }), P()) : e ? (t.debug("Connecting to existing session", { sessionId: r }), r) : (t.debug("Ignoring session_id from URL outside the editor", { sessionId: r }), P());
+	}), r === null ? (t.debug("Starting a new session", { sessionId: n }), F()) : e ? (t.debug("Connecting to existing session", { sessionId: r }), r) : (t.debug("Ignoring session_id from URL outside the editor", { sessionId: r }), F());
 }
-function R() {
-	return I === null && (I = L()), I;
+function z() {
+	return L === null && (L = R()), L;
 }
 //#endregion
 //#region src/core/static/static-state.ts
-function z(e) {
+function B(e) {
 	if (typeof e != "object" || !e || Array.isArray(e)) return !1;
 	for (let t of Object.values(e)) if (typeof t != "string") return !1;
 	return !0;
 }
-function B(e) {
+function V(e) {
 	if (typeof e != "object" || !e || Array.isArray(e)) return !1;
 	let t = e;
-	return !(!z(t.files) || t.modelNotifications !== void 0 && !Array.isArray(t.modelNotifications));
-}
-function V() {
-	let e = typeof window > "u" ? void 0 : window.__MARIMO_STATIC__;
-	return B(e) ? e : void 0;
+	return !(!B(t.files) || t.modelNotifications !== void 0 && !Array.isArray(t.modelNotifications));
 }
 function H() {
-	return V() !== void 0;
+	let e = typeof window > "u" ? void 0 : window.__MARIMO_STATIC__;
+	return V(e) ? e : void 0;
 }
 function U() {
-	let e = V();
+	return H() !== void 0;
+}
+function W() {
+	let e = H();
 	return l(e !== void 0, "Not a static notebook"), e.files;
 }
 //#endregion
 //#region src/core/runtime/runtime.ts
-var W = class {
+var G = class {
 	initialHealthyCheck = new m();
 	config;
 	lazy;
@@ -535,7 +536,7 @@ var W = class {
 		return this.httpURL.origin === window.location.origin;
 	}
 	get isServerless() {
-		return p() || c() || H();
+		return p() || c() || U();
 	}
 	formatHttpURL({ path: e = "", searchParams: t, restrictToKnownQueryParams: n = !0 }) {
 		let r = this.httpURL, i = new URLSearchParams(window.location.search);
@@ -559,7 +560,7 @@ var W = class {
 			searchParams: t,
 			restrictToKnownQueryParams: !1
 		});
-		return G(this.appendCrossOriginAuth(n).toString());
+		return K(this.appendCrossOriginAuth(n).toString());
 	}
 	getSessionSearchParams(e) {
 		let t = new URL(this.config.url), n = new URLSearchParams(t.search);
@@ -645,17 +646,17 @@ var W = class {
 	}
 	headers() {
 		let e = {
-			"Marimo-Session-Id": R(),
+			"Marimo-Session-Id": z(),
 			"Marimo-Server-Token": this.config.serverToken ?? "",
 			"x-runtime-url": this.httpURL.toString()
 		};
 		return this.config.authToken && (e.Authorization = `Bearer ${this.config.authToken}`), e;
 	}
 	sessionHeaders() {
-		return { "Marimo-Session-Id": R() };
+		return { "Marimo-Session-Id": z() };
 	}
 };
-function G(e) {
+function K(e) {
 	if (!e.startsWith("http")) {
 		t.warn(`URL must start with http: ${e}`);
 		let n = new URL(e);
@@ -665,29 +666,29 @@ function G(e) {
 }
 //#endregion
 //#region src/core/runtime/config.ts
-function K() {
+function q() {
 	let e = new URL(document.baseURI);
 	return e.search = "", e.hash = "", e.toString();
 }
-var q = {
+var J = {
 	lazy: !0,
-	url: K()
-}, J = a(q), Y = a((e) => {
-	let t = e(J);
-	return new W(t, t.lazy);
+	url: q()
+}, Y = a(J), ee = a((e) => {
+	let t = e(Y);
+	return new G(t, t.lazy);
 });
 function X() {
-	return o.get(Y);
+	return o.get(ee);
 }
-function ee(e) {
+function te(e) {
 	if (e.startsWith("http")) return new URL(e);
 	let t = X().httpURL.toString();
 	return t.startsWith("blob:") && (t = t.replace("blob:", "")), new URL(e, t);
 }
 //#endregion
 //#region ../node_modules/.pnpm/date-fns@4.4.0/node_modules/date-fns/constants.js
-var te = 365.2425, ne = 6048e5, re = 864e5, Z = 86400;
-Z * 7, Z * te / 12 * 3;
+var ne = 365.2425, re = 6048e5, ie = 864e5, Z = 86400;
+Z * 7, Z * ne / 12 * 3;
 var Q = Symbol.for("constructDateFrom");
 //#endregion
 //#region ../node_modules/.pnpm/date-fns@4.4.0/node_modules/date-fns/constructFrom.js
@@ -696,8 +697,8 @@ function $(e, t) {
 }
 //#endregion
 //#region ../node_modules/.pnpm/date-fns@4.4.0/node_modules/date-fns/toDate.js
-function ie(e, t) {
+function ae(e, t) {
 	return $(t || e, e);
 }
 //#endregion
-export { u as S, x as _, ee as a, p as b, H as c, k as d, D as f, b as g, y as h, ne as i, M as l, v as m, $ as n, X as o, g as p, re as r, U as s, ie as t, j as u, _ as v, f as x, m as y };
+export { u as C, f as S, b as _, te as a, m as b, U as c, j as d, k as f, y as g, v as h, re as i, N as l, g as m, $ as n, X as o, D as p, ie as r, W as s, ae as t, M as u, x as v, p as x, _ as y };

package/dist/{vega-component-DG29TAB7.js → vega-component-DTG6zxaY.js}

@@ -3,15 +3,15 @@ import { g as t, h as n, m as r, o as i } from "./button-CvjkwdSk.js";
 import { t as a } from "./react-sHtZdjeP.js";
 import { t as o } from "./compiler-runtime-CldRdSsv.js";
 import { t as s } from "./tooltip-BO1REbqs.js";
-import { S as c, a as l } from "./toDate-BNJf01u1.js";
+import { C as c, a as l } from "./toDate-vIXljnsr.js";
 import { t as u } from "./jsx-runtime-3BD1kT0s.js";
-import { n as d } from "./error-banner-Da600cwz.js";
+import { n as d } from "./error-banner-D-WCIiMt.js";
 import { t as f } from "./debounce-C3jyATpc.js";
 import { A as p, n as ee } from "./useTheme-CRnjkku0.js";
 import { c as m } from "./arrays-CN1djC4k.js";
 import { t as te } from "./objects-CzUgoMIF.js";
 import { t as h } from "./useAsyncData-Deh5kszT.js";
-import { a as ne, i as re, n as ie, t as g } from "./formats-BGh2thRc.js";
+import { a as ne, i as re, n as ie, t as g } from "./formats-CeOmU1MU.js";
 import { M as ae, n as oe } from "./vega-loader.browser-DNST6uVf.js";
 import { t as se } from "./react-vega-BED0DjiB.js";
 import { a as ce, n as _ } from "./loader-BQOfjTIJ.js";

package/dist/{vennDiagram-4TSXK5OY-CF8pfaK3.js → vennDiagram-4TSXK5OY-BSZD8JcZ.js}

@@ -3,7 +3,7 @@ import { t } from "./src-CA_m4ONl.js";
 import { n } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { $ as r, H as i, K as a, U as o, a as s, b as c, c as l, et as u, f as d, nt as f, tt as p, v as m, w as h, y as g } from "./chunk-DU6HZSFF-BwiyaNpg.js";
 import { t as _ } from "./rough.esm-CtV9AnV1.js";
-import { p as v } from "./mermaid-CiAXjLpA.js";
+import { p as v } from "./mermaid-CHo49Yv-.js";
 //#region ../node_modules/.pnpm/khroma@2.1.0/node_modules/khroma/dist/methods/transparentize.js
 var y = (e, t) => p(e, "a", -t), b = 1e-10;
 function x(e, t) {

package/dist/{wardleyDiagram-VM6X3IG4-dGPu39d-.js → wardleyDiagram-VM6X3IG4-48cUWkfA.js}

@@ -2,7 +2,7 @@ import { i as e } from "./chunk-75Z2AOVW-D7gxIs2Q.js";
 import { n as t } from "./src-CA_m4ONl.js";
 import { n } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { D as r, H as i, K as a, U as o, a as s, b as c, c as l, v as u, w as d, x as f, y as p } from "./chunk-DU6HZSFF-BwiyaNpg.js";
-import { p as m } from "./mermaid-CiAXjLpA.js";
+import { p as m } from "./mermaid-CHo49Yv-.js";
 import { n as h } from "./mermaid-parser.core-DxuSfYwJ.js";
 import { t as g } from "./chunk-JWPE2WC7-DJvv1t8U.js";
 //#region ../node_modules/.pnpm/mermaid@11.17.2/node_modules/mermaid/dist/chunks/mermaid.core/wardleyDiagram-VM6X3IG4.mjs

package/dist/{xychartDiagram-S5SC5T6Z-CP6-9q56.js → xychartDiagram-S5SC5T6Z-CswYgYeu.js}

@@ -9,7 +9,7 @@ import { n as s } from "./chunk-Y2CYZVJY-DKKS1VyV.js";
 import { D as c, H as l, K as u, U as d, a as f, b as p, c as m, f as h, v as g, w as _, y as v, z as y } from "./chunk-DU6HZSFF-BwiyaNpg.js";
 import "./chunk-PWAF6VOD-CQw5qATZ.js";
 import { t as b } from "./chunk-GMAD6QVW-BhaJx0X3.js";
-import { p as x } from "./mermaid-CiAXjLpA.js";
+import { p as x } from "./mermaid-CHo49Yv-.js";
 //#region ../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/band.js
 function S() {
 	var e = t().unknown(void 0), r = e.domain, i = e.range, o = 0, s = 1, c, l, u = !1, d = 0, f = 0, p = .5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.25.3-dev3",
+  "version": "0.25.3-dev5",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/data-table/__tests__/context-menu.test.ts

@@ -0,0 +1,176 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { buildCellFilter } from "../context-menu";
+
+describe("buildCellFilter", () => {
+  // Use a non-UTC, non-DST-ambiguous offset so date-only parsing bugs
+  // (UTC vs. local midnight) can't hide behind a host machine that
+  // happens to run in UTC.
+  let originalTimezone: string | undefined;
+  beforeAll(() => {
+    originalTimezone = process.env.TZ;
+    process.env.TZ = "America/New_York";
+  });
+  afterAll(() => {
+    process.env.TZ = originalTimezone;
+  });
+
+  it("builds an equality filter for a normal date value", () => {
+    const filter = buildCellFilter({
+      type: "date",
+      value: "2024-01-15",
+      comparison: "eq",
+      dataType: "date",
+      dtype: "date",
+    });
+    expect(filter).toEqual({
+      type: "date",
+      operator: "==",
+      // Must be local midnight, not `new Date("2024-01-15")` (UTC
+      // midnight), or the filter shifts by a day in UTC- timezones.
+      value: new Date(2024, 0, 15),
+    });
+  });
+
+  it("returns undefined for an empty-string date value in a non-temporal-looking context", () => {
+    const filter = buildCellFilter({
+      type: "date",
+      value: "",
+      comparison: "eq",
+      dataType: "date",
+      dtype: "date",
+    });
+    expect(filter).toBeUndefined();
+  });
+
+  it("returns undefined for an unparsable date value instead of an Invalid Date filter", () => {
+    const filter = buildCellFilter({
+      type: "date",
+      value: "not-a-date",
+      comparison: "eq",
+      dataType: "date",
+      dtype: "date",
+    });
+    expect(filter).toBeUndefined();
+  });
+
+  it("builds an equality filter for a normal datetime value", () => {
+    const filter = buildCellFilter({
+      type: "datetime",
+      value: "2024-01-15 08:30:00",
+      comparison: "eq",
+      dataType: "datetime",
+      dtype: "datetime64[ns]",
+    });
+    expect(filter).toEqual({
+      type: "datetime",
+      operator: "==",
+      value: new Date(2024, 0, 15, 8, 30, 0),
+    });
+  });
+
+  it("returns undefined for an unparsable datetime value", () => {
+    const filter = buildCellFilter({
+      type: "datetime",
+      value: "not-a-datetime",
+      comparison: "eq",
+      dataType: "datetime",
+      dtype: "datetime64[ns]",
+    });
+    expect(filter).toBeUndefined();
+  });
+
+  it("builds an equality filter for a normal time value", () => {
+    const filter = buildCellFilter({
+      type: "time",
+      value: "08:30:00",
+      comparison: "eq",
+      dataType: "time",
+    });
+    expect(filter).toEqual({
+      type: "time",
+      operator: "==",
+      value: new Date(1970, 0, 1, 8, 30, 0),
+    });
+  });
+
+  it("returns undefined instead of an unparsable time value", () => {
+    const filter = buildCellFilter({
+      type: "time",
+      value: "25:00:00",
+      comparison: "eq",
+      dataType: "time",
+    });
+    expect(filter).toBeUndefined();
+  });
+
+  it("maps a NaT date value to is_null instead of an invalid Date filter", () => {
+    const filter = buildCellFilter({
+      type: "date",
+      value: "NaT",
+      comparison: "eq",
+      dataType: "date",
+      dtype: "date",
+    });
+    expect(filter).toEqual({ type: "date", operator: "is_null" });
+  });
+
+  it("maps a NaT datetime value to is_not_null for the neq comparison", () => {
+    const filter = buildCellFilter({
+      type: "datetime",
+      value: "NaT",
+      comparison: "neq",
+      dataType: "datetime",
+      dtype: "datetime64[ns]",
+    });
+    expect(filter).toEqual({ type: "datetime", operator: "is_not_null" });
+  });
+
+  it("does not treat the string 'NaT' in a non-temporal column as a sentinel", () => {
+    const filter = buildCellFilter({
+      type: "text",
+      value: "NaT",
+      comparison: "eq",
+      dataType: "string",
+    });
+    expect(filter).toEqual({ type: "text", operator: "equals", text: "NaT" });
+  });
+
+  it("maps an actual null value to is_null", () => {
+    const filter = buildCellFilter({
+      type: "number",
+      value: null,
+      comparison: "eq",
+      dataType: "number",
+    });
+    expect(filter).toEqual({ type: "number", operator: "is_null" });
+  });
+
+  it("builds a literal (always-false) equality filter for a NaN number value", () => {
+    // NaN is a real float value, not a missing-value marker like null/NaT,
+    // and the backend's is_null() (narwhals/polars semantics) doesn't match
+    // it, so it falls through to a normal (if unsatisfiable) == filter.
+    const filter = buildCellFilter({
+      type: "number",
+      value: Number.NaN,
+      comparison: "eq",
+      dataType: "number",
+    });
+    expect(filter).toEqual({
+      type: "number",
+      operator: "==",
+      value: Number.NaN,
+    });
+  });
+
+  it("builds a literal equality filter for a normal number value", () => {
+    const filter = buildCellFilter({
+      type: "number",
+      value: 42,
+      comparison: "eq",
+      dataType: "number",
+    });
+    expect(filter).toEqual({ type: "number", operator: "==", value: 42 });
+  });
+});

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

@@ -1,7 +1,30 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { describe, expect, it } from "vitest";
 import { dateToLocalISODate } from "@/utils/dates";
-import { parsePastedRange } from "../date-filter-inputs";
+import { parsePastedDate, parsePastedRange } from "../date-filter-inputs";
+
+describe("parsePastedDate", () => {
+  it("parses a time-only string for the time filter type", () => {
+    const result = parsePastedDate("time", "2:30 PM");
+    expect(result).toEqual(new Date(1970, 0, 1, 14, 30));
+  });
+
+  it("parses a local ISO datetime for the datetime filter type", () => {
+    const result = parsePastedDate("datetime", "2026-02-01T08:30:00");
+    expect(result).toEqual(new Date(2026, 1, 1, 8, 30, 0));
+  });
+
+  it("falls back to the Date constructor for other formats", () => {
+    const result = parsePastedDate("datetime", "Feb 1, 2026 08:30:00");
+    expect(result).toBeDefined();
+    expect(result?.getFullYear()).toBe(2026);
+  });
+
+  it("returns undefined for an empty or unparsable string", () => {
+    expect(parsePastedDate("date", "")).toBeUndefined();
+    expect(parsePastedDate("time", "not-a-time")).toBeUndefined();
+  });
+});
 
 describe("parsePastedRange", () => {
   it.each([

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

@@ -1,12 +1,19 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
+import type { DataType } from "@/core/kernel/messages";
+import { assertNever } from "@/utils/assertNever";
+import { copyToClipboard } from "@/utils/copy";
+import {
+  parseLocalISODate,
+  parseLocalISODateTime,
+  parseTimeToDate,
+} from "@/utils/dates";
+import { Logger } from "@/utils/Logger";
 import type { Cell } from "@tanstack/react-table";
 import { useAtomValue } from "jotai";
 import { CopyIcon, FilterIcon, SquareStack } from "lucide-react";
 import type { RefObject } from "react";
 import useEvent from "react-use-event-hook";
-import { copyToClipboard } from "@/utils/copy";
-import { Logger } from "@/utils/Logger";
 import {
   ContextMenu,
   ContextMenuContent,
@@ -16,13 +23,94 @@ import {
   ContextMenuTrigger,
 } from "../ui/context-menu";
 import { DATA_CELL_ID } from "./cell-utils";
-import {
-  Filter,
-  isMembershipFilterType,
-  type MembershipFilterType,
-} from "./filters";
+import { type FilterType, Filter } from "./filters";
 import { selectedCellsAtom } from "./range-focus/atoms";
-import { getClipboardContent, getRawValue } from "./utils";
+import { getClipboardContent, getRawValue, isNullishSentinel } from "./utils";
+
+type Comparison = "eq" | "neq";
+
+const symbolOp = {
+  eq: "==",
+  neq: "!=",
+} as const;
+
+const textOp = {
+  eq: "equals",
+  neq: "does_not_equal",
+} as const;
+
+export function buildCellFilter({
+  type,
+  value,
+  comparison = "eq",
+  dataType,
+  dtype,
+}: {
+  type: FilterType;
+  value: unknown;
+  comparison?: Comparison;
+  dataType?: DataType;
+  dtype?: string;
+}) {
+  if (isNullishSentinel(value, dataType, dtype)) {
+    return { type, operator: comparison === "eq" ? "is_null" : "is_not_null" };
+  }
+
+  switch (type) {
+    case "number":
+      if (typeof value !== "number") {
+        return undefined;
+      }
+
+      return Filter.number({
+        operator: symbolOp[comparison],
+        value,
+      });
+    case "text":
+      return Filter.text({
+        operator: textOp[comparison],
+        text: value as string,
+      });
+    case "date": {
+      const date = parseLocalISODate(value as string);
+      if (!date) {
+        return undefined;
+      }
+      return Filter.date({
+        operator: symbolOp[comparison],
+        value: date,
+      });
+    }
+    case "datetime": {
+      const date = parseLocalISODateTime(value as string);
+      if (!date) {
+        return undefined;
+      }
+      return Filter.datetime({
+        operator: symbolOp[comparison],
+        value: date,
+      });
+    }
+    case "time": {
+      const time = parseTimeToDate(value as string);
+      if (!time) {
+        return undefined;
+      }
+      return Filter.time({
+        operator: symbolOp[comparison],
+        value: time,
+      });
+    }
+    case "boolean": {
+      const target = comparison === "eq" ? value : !(value as boolean);
+      return Filter.boolean({
+        operator: target ? "is_true" : "is_false",
+      });
+    }
+    default:
+      assertNever(type);
+  }
+}
 
 export const DataTableContextMenu = <TData,>({
   contextMenuRef,
@@ -102,19 +190,34 @@ export const CellContextMenu = <TData,>({
 
   const column = cell.column;
   const filterType = column.columnDef.meta?.filterType;
-  const membershipFilterType: MembershipFilterType | undefined =
-    column.getCanFilter() && filterType && isMembershipFilterType(filterType)
-      ? filterType
+  const dataType = column.columnDef.meta?.dataType;
+  const dtype = column.columnDef.meta?.dtype;
+
+  const canFilter = Boolean(filterType && column.getCanFilter());
+  const buildFilter = (comparison: Comparison) =>
+    canFilter
+      ? buildCellFilter({
+          type: filterType as FilterType,
+          value: rawValue,
+          comparison,
+          dataType,
+          dtype,
+        })
       : undefined;
+  const eqFilter = buildFilter("eq");
+  const canFilterByValue = eqFilter !== undefined;
+
+  const handleFilterCellByValue = (comparison: Comparison) => {
+    if (!filterType) {
+      return;
+    }
+
+    const filter = comparison === "eq" ? eqFilter : buildFilter("neq");
+
+    if (!filter) {
+      return;
+    }
 
-  const handleFilterCell = (
-    type: MembershipFilterType,
-    operator: "in" | "not_in",
-  ) => {
-    const filter =
-      type === "number"
-        ? Filter.number({ operator, values: [rawValue] })
-        : Filter.text({ operator, values: [rawValue] });
     column.setFilterValue(filter);
   };
 
@@ -130,18 +233,14 @@ export const CellContextMenu = <TData,>({
           Copy selected cells
         </ContextMenuItem>
       )}
-      {membershipFilterType && (
+      {canFilterByValue && (
         <>
           <ContextMenuSeparator />
-          <ContextMenuItem
-            onClick={() => handleFilterCell(membershipFilterType, "in")}
-          >
+          <ContextMenuItem onClick={() => handleFilterCellByValue("eq")}>
             <FilterIcon className="mo-dropdown-icon h-3 w-3" />
             Filter by this value
           </ContextMenuItem>
-          <ContextMenuItem
-            onClick={() => handleFilterCell(membershipFilterType, "not_in")}
-          >
+          <ContextMenuItem onClick={() => handleFilterCellByValue("neq")}>
             <FilterIcon className="mo-dropdown-icon h-3 w-3" />
             Remove rows with this value
           </ContextMenuItem>