A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: virtualize dataframe page selector to fix "No matching page" bug (#9178)
Kiran Gadhave3b3b018e4ae4
diff --git a/frontend/src/components/data-table/TableBottomBar.tsx b/frontend/src/components/data-table/TableBottomBar.tsxindex 695aff8d63..bf1ad1229f 100644--- a/frontend/src/components/data-table/TableBottomBar.tsx+++ b/frontend/src/components/data-table/TableBottomBar.tsx@@ -142,7 +142,11 @@ export const TableBottomBar = <TData,>({return (<span>- {prettifyRowColumnCount(table.getRowCount(), totalColumns, locale)}+ {prettifyRowColumnCount({+ numRows: table.getRowCount(),+ totalColumns,+ locale,+ })}</span>);};diff --git a/frontend/src/components/data-table/__tests__/pagination.test.tsx b/frontend/src/components/data-table/__tests__/pagination.test.tsxindex bea0597c9e..6a94bb0dca 100644--- a/frontend/src/components/data-table/__tests__/pagination.test.tsx+++ b/frontend/src/components/data-table/__tests__/pagination.test.tsx@@ -1,144 +1,58 @@/* Copyright 2026 Marimo. All rights reserved. */import { expect, test } from "vitest";-import { getPageRanges } from "../pagination";-import type { PageRange } from "../types";+import { matchingPageRanges } from "../pagination";-function getLabels(currentPage: number): string[] {- const ranges = getPageRanges(currentPage, 200);- return ranges.map((item: PageRange) =>- item.type === "ellipsis" ? "..." : String(item.page),- );-}+test("empty prefix returns no ranges", () => {+ expect(matchingPageRanges("", 500)).toEqual([]);+});++test("zero prefix returns no ranges", () => {+ expect(matchingPageRanges("0", 500)).toEqual([]);+});-test("pagination start / middle / end", () => {- expect(getLabels(1)).toMatchInlineSnapshot(`- [- "1",- "2",- "3",- "4",- "5",- "6",- "7",- "8",- "9",- "10",- "...",- "96",- "97",- "98",- "99",- "100",- "101",- "102",- "103",- "104",- "105",- "...",- "191",- "192",- "193",- "194",- "195",- "196",- "197",- "198",- "199",- "200",- ]- `);+test("leading-zero prefix returns no ranges", () => {+ expect(matchingPageRanges("01", 500)).toEqual([]);+});++test("single digit prefix", () => {+ expect(matchingPageRanges("5", 500)).toEqual([+ [5, 5],+ [50, 59],+ [500, 500],+ ]);+});- // all fall in the top/middle/bottom 10- expect(getLabels(1)).toEqual(getLabels(10));- expect(getLabels(96)).toEqual(getLabels(105));- expect(getLabels(191)).toEqual(getLabels(200));+test("single digit prefix with exact totalPages boundary", () => {+ expect(matchingPageRanges("5", 55)).toEqual([+ [5, 5],+ [50, 55],+ ]);+});++test("multi-digit prefix", () => {+ expect(matchingPageRanges("12", 5000)).toEqual([+ [12, 12],+ [120, 129],+ [1200, 1299],+ ]);+});++test("prefix larger than totalPages returns no ranges", () => {+ expect(matchingPageRanges("999", 100)).toEqual([]);+});- // Check off by one- expect(getLabels(1)).not.toEqual(getLabels(11));- expect(getLabels(1)).not.toEqual(getLabels(95));- expect(getLabels(1)).not.toEqual(getLabels(106));- expect(getLabels(1)).not.toEqual(getLabels(190));+test("prefix equal to totalPages", () => {+ expect(matchingPageRanges("100", 100)).toEqual([[100, 100]]);});-test("pagination lower middle", () => {- expect(getLabels(50)).toMatchInlineSnapshot(`- [- "1",- "2",- "3",- "4",- "5",- "6",- "7",- "8",- "9",- "10",- "...",- "50",- "...",- "96",- "97",- "98",- "99",- "100",- "101",- "102",- "103",- "104",- "105",- "...",- "191",- "192",- "193",- "194",- "195",- "196",- "197",- "198",- "199",- "200",- ]- `);+test("prefix 1 with small totalPages", () => {+ expect(matchingPageRanges("1", 10)).toEqual([+ [1, 1],+ [10, 10],+ ]);});-test("pagination upper middle", () => {- expect(getLabels(150)).toMatchInlineSnapshot(`- [- "1",- "2",- "3",- "4",- "5",- "6",- "7",- "8",- "9",- "10",- "...",- "96",- "97",- "98",- "99",- "100",- "101",- "102",- "103",- "104",- "105",- "...",- "150",- "...",- "191",- "192",- "193",- "194",- "195",- "196",- "197",- "198",- "199",- "200",- ]- `);+test("prefix 1 with totalPages=1", () => {+ expect(matchingPageRanges("1", 1)).toEqual([[1, 1]]);});diff --git a/frontend/src/components/data-table/column-explorer-panel/column-explorer.tsx b/frontend/src/components/data-table/column-explorer-panel/column-explorer.tsxindex a6ae51dee9..55b6fd1a0e 100644--- a/frontend/src/components/data-table/column-explorer-panel/column-explorer.tsx+++ b/frontend/src/components/data-table/column-explorer-panel/column-explorer.tsx@@ -74,7 +74,7 @@ export const ColumnExplorerPanel = ({return (<div className="mb-3"><span className="text-xs font-semibold ml-2 flex">- {prettifyRowColumnCount(totalRows, totalColumns, locale)}+ {prettifyRowColumnCount({ numRows: totalRows, totalColumns, locale })}<CopyClipboardIcontooltip="Copy column names"value={columns?.map(([columnName]) => columnName).join(",\n") || ""}diff --git a/frontend/src/components/data-table/pagination.tsx b/frontend/src/components/data-table/pagination.tsxindex 5efcaa4289..17960a1252 100644--- a/frontend/src/components/data-table/pagination.tsx+++ b/frontend/src/components/data-table/pagination.tsx@@ -2,7 +2,7 @@"use no memo";import type { Table } from "@tanstack/react-table";-import { range } from "lodash-es";+import { useVirtualizer } from "@tanstack/react-virtual";import {ChevronDown,ChevronLeft,@@ -37,9 +37,6 @@ import { cn } from "@/utils/cn";import { Events } from "@/utils/events";import { prettyNumber } from "@/utils/numbers";import { PluralWord } from "@/utils/pluralize";-import type { PageRange } from "./types";--const MAX_PAGES_BEFORE_CLAMPING = 100;interface DataTablePaginationProps<TData> {table: Table<TData>;@@ -189,6 +186,81 @@ export const DataTablePagination = <TData,>({);};+const PAGE_ITEM_HEIGHT = 32;++/**+ * Compute contiguous ranges of page numbers whose string starts with `prefix`,+ * without scanning every page. O(log10(totalPages)).+ *+ * For prefix "5", totalPages=500: [[5,5], [50,59], [500,500]]+ */+export function matchingPageRanges(+ prefix: string,+ totalPages: number,+): [number, number][] {+ const n = Number.parseInt(prefix, 10);+ if (Number.isNaN(n) || n <= 0 || String(n) !== prefix) {+ return [];+ }++ const ranges: [number, number][] = [];+ let power = 1;+ while (n * power <= totalPages) {+ const start = n * power;+ const end = Math.min((n + 1) * power - 1, totalPages);+ ranges.push([start, end]);+ power *= 10;+ }+ return ranges;+}++interface PageMapping {+ count: number;+ pageAtIndex: (index: number) => number;+ indexOfPage: (page: number) => number;+}++function createPageMapping(search: string, totalPages: number): PageMapping {+ if (search === "") {+ return {+ count: totalPages,+ pageAtIndex: (i) => i + 1,+ indexOfPage: (p) => p - 1,+ };+ }++ const ranges = matchingPageRanges(search, totalPages);+ let count = 0;+ for (const [s, e] of ranges) {+ count += e - s + 1;+ }++ return {+ count,+ pageAtIndex: (i) => {+ let offset = 0;+ for (const [start, end] of ranges) {+ const size = end - start + 1;+ if (i < offset + size) {+ return start + (i - offset);+ }+ offset += size;+ }+ return -1;+ },+ indexOfPage: (p) => {+ let offset = 0;+ for (const [start, end] of ranges) {+ if (p >= start && p <= end) {+ return offset + (p - start);+ }+ offset += end - start + 1;+ }+ return -1;+ },+ };+}+export const PageSelector = ({currentPage,totalPages,@@ -199,19 +271,31 @@ export const PageSelector = ({onPageChange: (page: number) => void;}) => {const [open, setOpen] = React.useState(false);+ const [search, setSearch] = React.useState("");- const pageRanges = React.useMemo(- () => getPageRanges(currentPage, totalPages),- [currentPage, totalPages],+ const mapping = React.useMemo(+ () => createPageMapping(search, totalPages),+ [search, totalPages],);const handleSelect = (page: number) => {onPageChange(page - 1);+ setSearch("");setOpen(false);};+ const listHeight = Math.min(mapping.count * PAGE_ITEM_HEIGHT, 240);+return (- <Popover open={totalPages > 1 ? open : false} onOpenChange={setOpen}>+ <Popover+ open={totalPages > 1 ? open : false}+ onOpenChange={(next) => {+ setOpen(next);+ if (!next) {+ setSearch("");+ }+ }}+ ><PopoverTrigger asChild={true} disabled={totalPages <= 1}><buttontype="button"@@ -229,18 +313,15 @@ export const PageSelector = ({</button></PopoverTrigger><PopoverContent className="w-36 p-0" align="center" sideOffset={6}>- <Command- shouldFilter={true}- filter={(value, search) => {- return value.startsWith(search) ? 1 : 0;- }}- >+ <Command shouldFilter={false} value={String(currentPage)}><CommandInputplaceholder={`Page (1–${totalPages})`}rootClassName="px-2 h-8"className="text-xs h-8"autoFocus={true}icon={null}+ value={search}+ onValueChange={setSearch}onKeyDown={(e) => {// Allow navigation/editing keys, block non-numeric inputconst allowed = [@@ -248,6 +329,8 @@ export const PageSelector = ({"Delete","ArrowLeft","ArrowRight",+ "ArrowUp",+ "ArrowDown","Tab","Enter","Escape",@@ -257,27 +340,19 @@ export const PageSelector = ({}}}/>- <CommandList className="max-h-60">- {pageRanges.map((item) =>- item.type === "ellipsis" ? null : (- <CommandItem- key={item.page}- value={String(item.page)}- data-testid="page-option"- className={cn(- "text-xs cursor-pointer",- item.page === currentPage && "font-semibold bg-accent",- )}- onSelect={() => handleSelect(item.page)}- onMouseDown={Events.preventFocus}- >- {item.page}- </CommandItem>- ),+ <CommandList className="max-h-60 overflow-hidden">+ {mapping.count === 0 ? (+ <CommandEmpty className="py-2 text-center text-xs text-muted-foreground">+ No matching page+ </CommandEmpty>+ ) : (+ <VirtualizedPageList+ mapping={mapping}+ currentPage={currentPage}+ listHeight={listHeight}+ onSelect={handleSelect}+ />)}- <CommandEmpty className="py-2 text-center text-xs text-muted-foreground">- No matching page- </CommandEmpty></CommandList></Command></PopoverContent>@@ -285,57 +360,95 @@ export const PageSelector = ({);};-export function getPageRanges(- currentPage: number,- totalPages: number,-): PageRange[] {- if (totalPages <= MAX_PAGES_BEFORE_CLAMPING) {- return range(totalPages).map((i) => ({ type: "page", page: i + 1 }));- }-- const middle = Math.floor(totalPages / 2);-- const items: PageRange[] = [];- const addPages = (start: number, count: number) => {- for (let i = 0; i < count; i++) {- items.push({ type: "page", page: start + i });- }- };-- addPages(1, 10);- items.push({ type: "ellipsis", key: "e1" });-- if (currentPage > 10 && currentPage <= middle - 5) {- items.push(- { type: "page", page: currentPage },- { type: "ellipsis", key: "e1b" },- );- }+const VirtualizedPageList = ({+ mapping,+ currentPage,+ listHeight,+ onSelect,+}: {+ mapping: PageMapping;+ currentPage: number;+ listHeight: number;+ onSelect: (page: number) => void;+}) => {+ const parentRef = React.useRef<HTMLDivElement>(null);- addPages(middle - 4, 10);- items.push({ type: "ellipsis", key: "e2" });+ const currentIndex = mapping.indexOfPage(currentPage);- if (currentPage > middle + 5 && currentPage <= totalPages - 10) {- items.push(- { type: "page", page: currentPage },- { type: "ellipsis", key: "e2b" },- );- }+ const virtualizer = useVirtualizer({+ count: mapping.count,+ getScrollElement: () => parentRef.current,+ estimateSize: () => PAGE_ITEM_HEIGHT,+ overscan: 10,+ initialOffset:+ currentIndex > 0+ ? Math.max(0, currentIndex * PAGE_ITEM_HEIGHT - listHeight / 2)+ : 0,+ });- addPages(totalPages - 9, 10);+ // Scroll to top when filtered results change (user is searching)+ const prevCount = React.useRef(mapping.count);+ React.useEffect(() => {+ if (mapping.count !== prevCount.current) {+ virtualizer.scrollToIndex(0);+ prevCount.current = mapping.count;+ }+ }, [mapping.count, virtualizer]);- return items;-}+ return (+ <div ref={parentRef} style={{ height: listHeight, overflow: "auto" }}>+ <div+ style={{+ height: virtualizer.getTotalSize(),+ width: "100%",+ position: "relative",+ }}+ >+ {virtualizer.getVirtualItems().map((virtualItem) => {+ const page = mapping.pageAtIndex(virtualItem.index);+ return (+ <CommandItem+ key={page}+ value={String(page)}+ data-testid="page-option"+ aria-selected={page === currentPage}+ className={cn(+ "text-xs cursor-pointer",+ page === currentPage && "font-semibold bg-accent",+ )}+ style={{+ position: "absolute",+ top: 0,+ left: 0,+ width: "100%",+ height: virtualItem.size,+ transform: `translateY(${virtualItem.start}px)`,+ }}+ onSelect={() => onSelect(page)}+ onMouseDown={Events.preventFocus}+ >+ {page}+ </CommandItem>+ );+ })}+ </div>+ </div>+ );+};export function prettifyRowCount(rowCount: number, locale: string): string {return `${prettyNumber(rowCount, locale)} ${new PluralWord("row").pluralize(rowCount)}`;}-export const prettifyRowColumnCount = (- numRows: number | "too_many",- totalColumns: number,- locale: string,-): string => {+export const prettifyRowColumnCount = ({+ numRows,+ totalColumns,+ locale,+}: {+ numRows: number | "too_many";+ totalColumns: number;+ locale: string;+}): string => {const rowsLabel =numRows === "too_many" ? "Unknown" : prettifyRowCount(numRows, locale);const columnsLabel = `${prettyNumber(totalColumns, locale)} ${new PluralWord("column").pluralize(totalColumns)}`;diff --git a/frontend/src/components/data-table/types.ts b/frontend/src/components/data-table/types.tsindex 43be0f851f..9153ac8ac1 100644--- a/frontend/src/components/data-table/types.ts+++ b/frontend/src/components/data-table/types.ts@@ -105,7 +105,3 @@ export function extractTimezone(dtype: string | undefined): string | undefined {const match = /^datetime(?:64)?\[[^,]+,([^,]+)]$/.exec(dtype);return match?.[1]?.trim();}--export type PageRange =- | { type: "page"; page: number }- | { type: "ellipsis"; key: string };