@salesforce/ui-bundle-template-feature-react-search 11.10.0 → 11.11.0

package/dist/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.11.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.10.1...v11.11.0) (2026-07-08)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [11.10.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.10.0...v11.10.1) (2026-07-07)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
 ## [11.10.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v11.9.0...v11.10.0) (2026-07-07)
 
 **Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project

package/dist/force-app/main/default/uiBundles/feature-react-search/package.json

@@ -18,8 +18,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/platform-sdk": "^11.10.0",
-    "@salesforce/ui-bundle": "^11.10.0",
+    "@salesforce/platform-sdk": "^11.11.0",
+    "@salesforce/ui-bundle": "^11.11.0",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -44,8 +44,8 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/graphiti": "^11.10.0",
-    "@salesforce/vite-plugin-ui-bundle": "^11.10.0",
+    "@salesforce/graphiti": "^11.11.0",
+    "@salesforce/vite-plugin-ui-bundle": "^11.11.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/MergedSearchResults.tsx

@@ -0,0 +1,263 @@
+/**
+ * Merged results layout — a single combined grid across every in-scope source,
+ * driven by one global pager over the cumulative result set.
+ *
+ * This is the counterpart to {@link SearchResults} (which renders one stacked
+ * section per source). Use it when you want a unified "search everything" grid:
+ * heterogeneous cards laid out together, one shared pagination control, and a
+ * single results count — the layout the drop-in `<Search>` renders when the
+ * config sets `pagination.mode: "merged"`, and the same shape most apps
+ * hand-build on top of `useSearch`.
+ *
+ * It reads three aggregate accessors off the {@link SearchHandle}
+ * (`mergedResults`, `globalPagination`, `inScopeSources`), so it honours the
+ * config's `pagination.mode` / `mergeOrder` automatically. For a true combined
+ * grid, pair it with `pagination.mode: "merged"` (see the feature README, §9).
+ *
+ * Layout, top to bottom:
+ *   - **Single-source filter chrome** — when the scope is narrowed to one
+ *     source (selected or `lockedScope`), that source's filter panel + sort +
+ *     active-filter chips render here. Under "All", per-source filters can't be
+ *     combined across heterogeneous objects, so this row is omitted.
+ *   - **Results count** — the cumulative in-scope total, on its own row directly
+ *     above the grid, in every scope. Hidden when there are no results.
+ *   - **The grid** — one card per `mergedResults` item, rendered via the
+ *     per-source `renderResult[sourceKey]` callback. In a mixed grid (2+ sources
+ *     in scope) each card is topped with an auto source badge — the source's
+ *     `labelSingular` (falling back to `label`), colored from a palette by its
+ *     config order — so heterogeneous results stay self-identifying with no
+ *     configuration. Skeletons while loading; an empty-state message when there
+ *     are none.
+ *   - **Global pager** — one {@link PaginationControls} over the cumulative set.
+ */
+
+import type { ReactNode } from "react";
+import { AlertCircle } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "../../../components/ui/alert";
+import { Skeleton } from "../../../components/ui/skeleton";
+import { ActiveFilters } from "./filters/ActiveFilters";
+import { DefaultFilterPanel } from "./filters/DefaultFilterPanel";
+import { FilterProvider, FilterResetButton } from "./filters/FilterContext";
+import { PaginationControls } from "./controls/PaginationControls";
+import { SortControl } from "./controls/SortControl";
+import { DefaultResultRow } from "./results/DefaultResultRow";
+import { ALL_SCOPE, type SearchHandle, type SourceController } from "../types";
+
+type ResultRenderer = ((node: unknown) => ReactNode) | false;
+
+export interface MergedSearchResultsProps {
+	handle: SearchHandle;
+	/**
+	 * Per source key: how to render one node in the merged grid. Falls back to
+	 * the built-in {@link DefaultResultRow} for any source without an entry.
+	 * Pass `false` to skip a source's cards entirely.
+	 */
+	renderResult?: Record<string, ResultRenderer>;
+	/** Message shown when there are no results. Defaults to "No results found." */
+	emptyMessage?: string;
+	/** Number of skeleton placeholders to show while loading. Defaults to `pageSize`. */
+	skeletonCount?: number;
+	/** Extra classes on the grid container. Defaults to a responsive 1/2/3-column grid. */
+	gridClassName?: string;
+	/** Extra classes on the outer wrapper. */
+	className?: string;
+}
+
+const DEFAULT_GRID_CLASS = "grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3";
+
+/**
+ * Palette for the auto source badges in a mixed grid. A source's color is its
+ * index in the config's `sources` array, wrapped around the palette — so badges
+ * stay stable and distinct without any per-source configuration. Add more
+ * entries here if you routinely mix more source types than there are colors.
+ */
+const BADGE_PALETTE = [
+	"bg-blue-100 text-blue-700",
+	"bg-amber-100 text-amber-700",
+	"bg-purple-100 text-purple-700",
+	"bg-pink-100 text-pink-700",
+	"bg-emerald-100 text-emerald-700",
+	"bg-sky-100 text-sky-700",
+] as const;
+
+export function MergedSearchResults({
+	handle,
+	renderResult,
+	emptyMessage,
+	skeletonCount,
+	gridClassName = DEFAULT_GRID_CLASS,
+	className,
+}: MergedSearchResultsProps) {
+	const { globalPagination: page, mergedResults, loading, error } = handle;
+
+	// A single source is in scope when the scope is narrowed (selected from the
+	// dropdown) or locked (`lockedScope` / restrictTo). Its filter chrome can
+	// render meaningfully; under "All" it can't (heterogeneous sources).
+	const singleSourceInScope = handle.scope !== ALL_SCOPE;
+	const soleController = singleSourceInScope ? handle.inScopeSources[0] : undefined;
+	// Per-card source badges only make sense when the grid is genuinely mixed —
+	// a single-source grid (narrowed or locked) has one type throughout.
+	const showSourceBadges = !singleSourceInScope;
+	// Assign each source a stable badge color by its declaration order. Badges
+	// only show in "All" scope, where `inScopeSources` is every source in config
+	// order, so the index here is the source's config position.
+	const badgeColorByKey: Record<string, string> = {};
+	handle.inScopeSources.forEach((controller, i) => {
+		badgeColorByKey[controller.config.key] = BADGE_PALETTE[i % BADGE_PALETTE.length];
+	});
+
+	const skeletons = skeletonCount ?? page.pageSize;
+
+	return (
+		<div className={`space-y-6 ${className ?? ""}`}>
+			{soleController && <SingleSourceChrome controller={soleController} />}
+
+			{error && (
+				<Alert variant="destructive" role="alert">
+					<AlertCircle />
+					<AlertTitle>Search failed</AlertTitle>
+					<AlertDescription>{error}</AlertDescription>
+				</Alert>
+			)}
+
+			{/* Results count — its own row, directly above the grid, in every scope.
+			    Hidden when there are none (the empty state covers that case). */}
+			{!loading && !error && page.totalCount > 0 && (
+				<p className="text-sm text-muted-foreground" role="status">
+					{page.totalCount} result{page.totalCount === 1 ? "" : "s"}
+				</p>
+			)}
+
+			{loading ? (
+				<div className={gridClassName}>
+					{Array.from({ length: Math.min(skeletons, 6) }, (_, i) => (
+						<Skeleton key={i} className="h-48 w-full rounded-lg" />
+					))}
+				</div>
+			) : mergedResults.length === 0 ? (
+				<p className="py-12 text-center text-sm text-muted-foreground">
+					{emptyMessage ?? "No results found."}
+				</p>
+			) : (
+				<div className={gridClassName}>
+					{mergedResults.map(({ sourceKey, node }, i) => {
+						const override = renderResult?.[sourceKey];
+						if (override === false) return null;
+						const source = handle.sources[sourceKey]?.config;
+						const rendered = override ? (
+							override(node)
+						) : source ? (
+							<DefaultResultRow node={node} source={source} />
+						) : null;
+						const badge =
+							showSourceBadges && source ? (
+								<SourceBadge
+									label={source.labelSingular ?? source.label}
+									colorClass={badgeColorByKey[sourceKey]}
+								/>
+							) : null;
+						return (
+							<div
+								key={getItemKey(sourceKey, node, i)}
+								className="flex flex-col gap-1.5 [&>:last-child]:min-h-0 [&>:last-child]:flex-1"
+							>
+								{badge}
+								{rendered}
+							</div>
+						);
+					})}
+				</div>
+			)}
+
+			{page.totalCount > 0 && (
+				<PaginationControls
+					pageIndex={page.pageIndex}
+					pageCount={page.pageCount}
+					hasNextPage={page.hasNextPage}
+					hasPreviousPage={page.hasPreviousPage}
+					pageSize={page.pageSize}
+					pageSizeOptions={page.pageSizeOptions}
+					onNextPage={page.goToNextPage}
+					onPreviousPage={page.goToPreviousPage}
+					onGoToPage={page.goToPage}
+					onPageSizeChange={page.setPageSize}
+					disabled={loading || !!error}
+				/>
+			)}
+		</div>
+	);
+}
+
+function getItemKey(sourceKey: string, node: unknown, fallback: number): string {
+	const id = node && typeof node === "object" ? (node as { Id?: unknown }).Id : undefined;
+	return typeof id === "string" ? `${sourceKey}:${id}` : `${sourceKey}:${fallback}`;
+}
+
+interface SourceBadgeProps {
+	label: string;
+	colorClass: string;
+}
+
+/**
+ * Auto source badge shown above each card in a mixed grid — the source's
+ * `labelSingular` (falling back to `label`), colored from {@link BADGE_PALETTE}
+ * by its config order. Identifies which object type a heterogeneous card came
+ * from with no per-app config.
+ */
+function SourceBadge({ label, colorClass }: SourceBadgeProps) {
+	return (
+		<span className={`w-fit rounded-full px-2.5 py-0.5 text-xs font-medium ${colorClass}`}>
+			{label}
+		</span>
+	);
+}
+
+interface SingleSourceChromeProps {
+	controller: SourceController;
+}
+
+/**
+ * Filter panel + sort + active-filter chips for the one source in scope. Shown
+ * whenever the search is narrowed to a single object (selected or locked).
+ * Hidden under "All", where heterogeneous per-source filters can't be combined.
+ */
+function SingleSourceChrome({ controller }: SingleSourceChromeProps) {
+	const { config: source, filters, sort } = controller;
+	const showFilterPanel = (source.filterBy?.length ?? 0) > 0;
+	const showSortControl = (source.sortBy?.length ?? 0) > 0;
+	const showActiveChips = filters.active.length > 0;
+
+	if (!showFilterPanel && !showSortControl && !showActiveChips) return null;
+
+	return (
+		<div className="flex flex-col gap-4">
+			{showFilterPanel && (
+				<FilterProvider
+					filters={filters.active}
+					onFilterChange={filters.set}
+					onFilterRemove={filters.remove}
+					onReset={() => filters.active.forEach((f) => filters.remove(f.field))}
+				>
+					<div className="rounded-md border p-3 space-y-3">
+						<div className="flex items-center justify-between">
+							<h3 className="text-sm font-semibold">Filters</h3>
+							<FilterResetButton size="sm" />
+						</div>
+						<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3">
+							<DefaultFilterPanel source={source} />
+						</div>
+					</div>
+				</FilterProvider>
+			)}
+
+			{(showSortControl || showActiveChips) && (
+				<div className="flex flex-wrap items-center gap-2">
+					{showSortControl && source.sortBy && (
+						<SortControl configs={source.sortBy} sort={sort.current} onSortChange={sort.set} />
+					)}
+					{showActiveChips && <ActiveFilters filters={filters.active} onRemove={filters.remove} />}
+				</div>
+			)}
+		</div>
+	);
+}

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/Search.tsx

@@ -1,8 +1,13 @@
 /**
  * Drop-in search component. Given a `SearchConfig`, renders a complete
- * search experience: search bar, an aggregate result count (shown only when
- * 2+ sources are in scope), and one results section per configured source
- * (with auto-rendered rows + filters).
+ * search experience: search bar, an aggregate result count, and results.
+ *
+ * The results layout follows the config's pagination mode — no separate prop:
+ *   - `pagination.mode: "per-source"` (default): one stacked section per
+ *     source, each with its own filters, sort, and pagination.
+ *   - `pagination.mode: "merged"`: a single combined grid across every in-scope
+ *     source, driven by one global pager over the cumulative result set (with a
+ *     results count and, under a single scope, that source's filter chrome).
  *
  * The simplest possible integration:
  *
@@ -28,6 +33,7 @@ import { useSearch } from "../hooks/useSearch";
 import { SearchBar } from "./controls/SearchBar";
 import { ScopeSelector } from "./controls/ScopeSelector";
 import { SearchResults } from "./SearchResults";
+import { MergedSearchResults } from "./MergedSearchResults";
 import { ALL_SCOPE } from "../types";
 import type { SearchConfig, SearchHandle, SObjectSourceConfig } from "../types";
 
@@ -108,6 +114,10 @@ export function Search({
 	}, [restrictTo, config.sources]);
 
 	const handle = useSearch(config, { lockedScope });
+	// The results layout follows the pagination mode — a "merged" config means a
+	// single combined grid, "per-source" (default) means one section per source.
+	// There is no separate `layout` prop: the two would only ever be set in lockstep.
+	const merged = config.pagination?.mode === "merged";
 	const totalResults = Object.values(handle.sources).reduce(
 		(acc, controller) => acc + (controller.result?.totalCount ?? 0),
 		0,
@@ -119,7 +129,9 @@ export function Search({
 	// and that source's own section already shows its count — so suppress the
 	// redundant total here.
 	const sourcesInScope = handle.scope === ALL_SCOPE ? config.sources.length : 1;
-	const showTotalResults = sourcesInScope >= 2;
+	// In merged mode the results grid renders its own count row directly above the
+	// grid (in every scope), so the inline aggregate here would be redundant.
+	const showTotalResults = !merged && sourcesInScope >= 2;
 
 	return (
 		<div className={`max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6 space-y-6 ${className ?? ""}`}>
@@ -142,19 +154,32 @@ export function Search({
 						allLabel={allScopeLabel}
 					/>
 				)}
-				{showTotalResults && !handle.loading && (
-					<span className="text-sm text-muted-foreground">
-						{totalResults} total result{totalResults === 1 ? "" : "s"}
-					</span>
-				)}
 			</div>
 
-			<SearchResults
-				handle={handle}
-				renderResult={renderResult}
-				renderFilters={renderFilters}
-				emptyMessages={emptyMessages}
-			/>
+			{merged ? (
+				<MergedSearchResults
+					handle={handle}
+					renderResult={renderResult}
+					emptyMessage={emptyMessages?.[handle.scope]}
+				/>
+			) : (
+				<>
+					{/* Aggregate count on its own row, directly above the results —
+					    only in "All" scope, where the per-source sections don't each
+					    carry a single meaningful total. */}
+					{showTotalResults && !handle.loading && (
+						<p className="text-sm text-muted-foreground" role="status">
+							{totalResults} total result{totalResults === 1 ? "" : "s"}
+						</p>
+					)}
+					<SearchResults
+						handle={handle}
+						renderResult={renderResult}
+						renderFilters={renderFilters}
+						emptyMessages={emptyMessages}
+					/>
+				</>
+			)}
 		</div>
 	);
 }

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/SearchResults.tsx

@@ -7,7 +7,7 @@
  *     `displayFields[0]`, subtitle from the rest, optional `<Link>` driven
  *     by `routePattern`.
  *   - `renderFilters[sourceKey]` — sidebar filter UI. Default: one input per
- *     `filterFields` entry, with picklist options resolved from inline
+ *     `filterBy` entry, with picklist options resolved from inline
  *     config or auto-fetched from the GraphQL aggregate API.
  *
  * Pass `false` for either entry to suppress the default for that source.
@@ -52,7 +52,7 @@ export function SearchResults({
 					overrideResult ?? ((node) => <DefaultResultRow node={node} source={controller.config} />);
 
 				const overrideFilters = renderFilters?.[key];
-				const hasFilterFields = (controller.config.filterFields?.length ?? 0) > 0;
+				const hasFilterFields = (controller.config.filterBy?.length ?? 0) > 0;
 				const resolvedRenderFilters: (() => ReactNode) | undefined =
 					overrideFilters === false
 						? undefined

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/SourceSection.tsx

@@ -52,11 +52,11 @@ export function SourceSection({
 	const showResults = !loading && !error && nodes.length > 0;
 	const showEmpty = !loading && !error && nodes.length === 0;
 
-	const pageSizeOptions = config.validPageSizes ?? [pagination.pageSize];
+	const pageSizeOptions = pagination.pageSizeOptions ?? [pagination.pageSize];
 
 	const showFilterPanel = !!renderFilters && !hideFilterChrome;
 	const showActiveChips = !hideFilterChrome && filters.active.length > 0;
-	const showSortControl = !hideFilterChrome && (config.sortFields?.length ?? 0) > 0;
+	const showSortControl = !hideFilterChrome && (config.sortBy?.length ?? 0) > 0;
 
 	return (
 		<section className={`flex flex-col gap-6 ${className ?? ""}`}>
@@ -82,21 +82,12 @@ export function SourceSection({
 			<div className="min-w-0">
 				<header className="flex flex-wrap items-baseline gap-3 mb-3">
 					<h2 className="text-lg font-semibold">{config.label}</h2>
-					{totalCount != null && (
-						<span className="text-sm text-muted-foreground">
-							{totalCount} {totalCount === 1 ? "result" : "results"}
-						</span>
-					)}
 				</header>
 
 				{(showSortControl || showActiveChips) && (
 					<div className="flex flex-wrap items-center gap-2 mb-3">
-						{showSortControl && config.sortFields ? (
-							<SortControl
-								configs={config.sortFields}
-								sort={sort.current}
-								onSortChange={sort.set}
-							/>
+						{showSortControl && config.sortBy ? (
+							<SortControl configs={config.sortBy} sort={sort.current} onSortChange={sort.set} />
 						) : null}
 						{showActiveChips && (
 							<ActiveFilters filters={filters.active} onRemove={filters.remove} />
@@ -104,6 +95,14 @@ export function SourceSection({
 					</div>
 				)}
 
+				{/* Result count, shown just above the results in every scope —
+				    including a locked / single-source (restrictTo) view. */}
+				{!loading && !error && totalCount != null && (
+					<p className="text-sm text-muted-foreground mb-3">
+						{totalCount} {totalCount === 1 ? "result" : "results"}
+					</p>
+				)}
+
 				<div className="min-h-32">
 					{loading && (
 						<div className="space-y-2">

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/controls/PaginationControls.tsx

@@ -1,7 +1,9 @@
 import {
 	Pagination,
 	PaginationContent,
+	PaginationEllipsis,
 	PaginationItem,
+	PaginationLink,
 	PaginationNext,
 	PaginationPrevious,
 } from "../../../../components/ui/pagination";
@@ -24,10 +26,43 @@ interface PaginationControlsProps {
 	onNextPage: () => void;
 	onPreviousPage: () => void;
 	onPageSizeChange: (size: number) => void;
+	/**
+	 * Total number of pages. When provided (with {@link onGoToPage}) and `> 1`,
+	 * the control renders numbered page buttons with ellipsis truncation instead
+	 * of a plain "Page N" label. Omit for cursor-style sources where the total
+	 * page count is unknown.
+	 */
+	pageCount?: number;
+	/** Jump to a 0-based page. Required to render numbered page buttons. */
+	onGoToPage?: (pageIndex: number) => void;
 	disabled?: boolean;
 	idPrefix?: string;
 }
 
+/**
+ * Builds the list of page tokens to render: 0-based page numbers plus
+ * `"ellipsis"` gap markers. Always shows the first and last page, a window
+ * around the current page, and collapses the rest. e.g. for current=5,
+ * total=12 → [0, ellipsis, 4, 5, 6, ellipsis, 11].
+ */
+function getPageTokens(currentIndex: number, pageCount: number): Array<number | "ellipsis"> {
+	const SIBLINGS = 1; // pages shown on each side of the current page
+	const last = pageCount - 1;
+	const pages = new Set<number>([0, last]);
+	for (let p = currentIndex - SIBLINGS; p <= currentIndex + SIBLINGS; p++) {
+		if (p >= 0 && p <= last) pages.add(p);
+	}
+	const sorted = [...pages].sort((a, b) => a - b);
+	const tokens: Array<number | "ellipsis"> = [];
+	let prev = -1;
+	for (const p of sorted) {
+		if (prev !== -1 && p - prev > 1) tokens.push("ellipsis");
+		tokens.push(p);
+		prev = p;
+	}
+	return tokens;
+}
+
 export function PaginationControls({
 	pageIndex,
 	hasNextPage,
@@ -37,6 +72,8 @@ export function PaginationControls({
 	onNextPage,
 	onPreviousPage,
 	onPageSizeChange,
+	pageCount,
+	onGoToPage,
 	disabled = false,
 	idPrefix = "page-size",
 }: PaginationControlsProps) {
@@ -48,6 +85,9 @@ export function PaginationControls({
 	const nextDisabled = disabled || !hasNextPage;
 	const selectId = `${idPrefix}-select`;
 
+	// Numbered page buttons require both a known page count and a seek callback.
+	const showNumberedPages = pageCount != null && pageCount > 1 && onGoToPage != null;
+
 	// The underlying pagination control renders an <a> without an href, so it is
 	// not keyboard-operable on its own. Activate it on Enter/Space to match the
 	// behaviour of a native button (WCAG 2.2 SC 2.1.1 Keyboard).
@@ -93,11 +133,41 @@ export function PaginationControls({
 							className={prevDisabled ? "pointer-events-none opacity-50" : "cursor-pointer"}
 						/>
 					</PaginationItem>
-					<PaginationItem>
-						<span className="min-w-16 text-center text-sm text-muted-foreground px-2">
-							Page {pageIndex + 1}
-						</span>
-					</PaginationItem>
+
+					{showNumberedPages ? (
+						getPageTokens(pageIndex, pageCount).map((token, i) =>
+							token === "ellipsis" ? (
+								<PaginationItem key={`ellipsis-${i}`}>
+									<PaginationEllipsis />
+								</PaginationItem>
+							) : (
+								<PaginationItem key={token}>
+									<PaginationLink
+										role="button"
+										tabIndex={disabled ? -1 : 0}
+										isActive={token === pageIndex}
+										aria-label={`Go to page ${token + 1}`}
+										aria-current={token === pageIndex ? "page" : undefined}
+										onClick={disabled ? undefined : () => onGoToPage(token)}
+										onKeyDown={disabled ? undefined : handleActivationKey(() => onGoToPage(token))}
+										aria-disabled={disabled}
+										className={disabled ? "pointer-events-none opacity-50" : "cursor-pointer"}
+									>
+										{token + 1}
+									</PaginationLink>
+								</PaginationItem>
+							),
+						)
+					) : (
+						<PaginationItem>
+							<span className="min-w-16 text-center text-sm text-muted-foreground px-2">
+								{pageCount != null && pageCount > 0
+									? `Page ${pageIndex + 1} of ${pageCount}`
+									: `Page ${pageIndex + 1}`}
+							</span>
+						</PaginationItem>
+					)}
+
 					<PaginationItem>
 						<PaginationNext
 							role="button"

package/dist/force-app/main/default/uiBundles/feature-react-search/src/features/search/components/filters/DefaultFilterPanel.tsx

@@ -1,7 +1,7 @@
 /**
  * Default filter panel used when no `renderFilters` is supplied for a source.
  *
- * Renders one input per entry in `source.filterFields`, picking the right
+ * Renders one input per entry in `source.filterBy`, picking the right
  * component for each `FilterFieldType`:
  *
  *   - text                                  → TextFilter
@@ -10,6 +10,7 @@
  *   - numeric                               → NumericRangeFilter
  *   - boolean                               → BooleanFilter
  *   - date / daterange / datetime / datetimerange → DateRangeFilter
+ *       (its Between / After / Before chrome is chosen by `filter.dateMode`)
  *
  * Applications can still pass `renderFilters[sourceKey]` to override the
  * entire panel for a specific source.
@@ -30,7 +31,7 @@ interface DefaultFilterPanelProps {
 }
 
 export function DefaultFilterPanel({ source }: DefaultFilterPanelProps) {
-	const filters = source.filterFields ?? [];
+	const filters = source.filterBy ?? [];
 	if (filters.length === 0) return null;
 	return (
 		<>
@@ -75,6 +76,7 @@ function DefaultFilterField({ filter, source }: DefaultFilterFieldProps) {
 					label={filter.label}
 					helpText={filter.helpText}
 					filterType="daterange"
+					mode={filter.dateMode}
 				/>
 			);
 		case "datetime":
@@ -85,6 +87,7 @@ function DefaultFilterField({ filter, source }: DefaultFilterFieldProps) {
 					label={filter.label}
 					helpText={filter.helpText}
 					filterType="datetimerange"
+					mode={filter.dateMode}
 				/>
 			);
 		default: