From c2286978d4005a32badb87debb2f715ca2d7c722 Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Fri, 15 May 2026 19:34:13 +0000
Subject: [PATCH 1/6] feat(view): add viewStyle preset to paginationNav and
 pageNumberLinks for Bootstrap markup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The viewStyle argument accepts "plain" (default), "bootstrap5", "bootstrap4", or
"tailwind". Bootstrap presets emit the canonical
<nav><ul class="pagination"><li class="page-item active" aria-current="page">
<span class="page-link">N</span></li> structure — active class on the <li>
wrapper, <span> for the current page — so Bootstrap-styled apps no longer need
a Replace() regex hack to move the active class off the anchor.

Default remains "plain" to preserve today's output byte-for-byte.

Fixes #2718

Signed-off-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  |   1 +
 vendor/wheels/events/init/functions.cfm       |   2 +
 .../specs/view/paginationHelpersSpec.cfc      |  76 +++++++
 vendor/wheels/view/pagination.cfc             | 214 +++++++++++++++++-
 4 files changed, 292 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9745e1b3cd..c7dd46e4bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All historical references to "CFWheels" in this changelog have been preserved fo
 
 ### Added
 
+- `paginationNav()` and `pageNumberLinks()` now accept a `viewStyle` argument with named CSS-framework presets (`"plain"`, `"bootstrap5"`, `"bootstrap4"`, `"tailwind"`). Bootstrap presets emit the canonical `<nav><ul class="pagination"><li class="page-item active" aria-current="page"><span class="page-link">N</span></li>` structure — with the active class on the `<li>` wrapper and a `<span>` (not anchor) for the current page — so Bootstrap-styled apps no longer need a `Replace()` regex hack to move the active class off the anchor. `viewStyle` defaults to `"plain"`, preserving today's output byte-for-byte (#2718)
 - `wheels deploy init` now scaffolds a starter `Dockerfile` (Lucee 7 + Java 21 multi-stage, `/up` HEALTHCHECK aligned with the generated `kamal-proxy` healthcheck) and a `.dockerignore` alongside `config/deploy.yml` and `.kamal/secrets`. `--force` also gates the `Dockerfile` — an existing user-authored Dockerfile aborts the init without `--force`, while an existing `.dockerignore` is silently preserved (since it's commonly user-curated even before adopting `wheels deploy`). The npm builder stage works for any Wheels app — projects without a JS pipeline pass through unchanged; projects with a `package.json` install + build automatically. Secrets (reload password, DB password, registry password) are injected at deploy time via `.kamal/secrets`, never baked into the image (#2673)
 
 ### Changed
diff --git a/vendor/wheels/events/init/functions.cfm b/vendor/wheels/events/init/functions.cfm
index 13d4bcaed8..fc17a65e23 100644
--- a/vendor/wheels/events/init/functions.cfm
+++ b/vendor/wheels/events/init/functions.cfm
@@ -307,6 +307,7 @@
 			prependToPage = "",
 			appendToPage = "",
 			pageNumberAsParam = true,
+			viewStyle = "plain",
 			encode = true
 		};
 		application.$wheels.functions.paginationNav = {
@@ -317,6 +318,7 @@
 			showNext = true,
 			showInfo = false,
 			showSinglePage = false,
+			viewStyle = "plain",
 			encode = true
 		};
 		application.$wheels.functions.paginationLinks = {
diff --git a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
index b03a8238b7..927c0af827 100644
--- a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
+++ b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
@@ -225,6 +225,82 @@ component extends="wheels.WheelsTest" {
 
 			})
 
+			/* ── pageNumberLinks viewStyle presets ─────── */
+
+			describe("pageNumberLinks with viewStyle presets", () => {
+
+				it("emits Bootstrap 5 markup with active class on <li> wrapper and <span> for current page", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.pageNumberLinks(viewStyle = "bootstrap5")
+					expect(result).toInclude('<li class="page-item active" aria-current="page">')
+					expect(result).toInclude('<span class="page-link">2</span>')
+					expect(result).toInclude('<li class="page-item">')
+					expect(result).toInclude('class="page-link"')
+				})
+
+				it("emits Bootstrap 4 markup with active class on <li> wrapper but no aria-current", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.pageNumberLinks(viewStyle = "bootstrap4")
+					expect(result).toInclude('<li class="page-item active">')
+					expect(result).notToInclude('aria-current')
+					expect(result).toInclude('<span class="page-link">2</span>')
+				})
+
+				it("emits Tailwind markup with aria-current on current page", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.pageNumberLinks(viewStyle = "tailwind")
+					expect(result).toInclude('aria-current="page"')
+					expect(result).toInclude("2")
+				})
+
+				it("preserves default (plain) behavior when viewStyle is plain", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					resultDefault = _controller.pageNumberLinks()
+					resultPlain = _controller.pageNumberLinks(viewStyle = "plain")
+					expect(resultPlain).toBe(resultDefault)
+				})
+
+				it("preserves default (plain) behavior — active class stays on anchor, not <li>", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.pageNumberLinks(classForCurrent = "active")
+					expect(result).notToInclude('<li class="page-item active">')
+				})
+
+			})
+
+			/* ── paginationNav viewStyle presets ───────── */
+
+			describe("paginationNav with viewStyle presets", () => {
+
+				it("wraps Bootstrap 5 markup in <ul class='pagination'> inside <nav>", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap5")
+					expect(result).toInclude('<nav')
+					expect(result).toInclude('<ul class="pagination">')
+					expect(result).toInclude('</ul>')
+					expect(result).toInclude('</nav>')
+					expect(result).toInclude('<li class="page-item active" aria-current="page">')
+					expect(result).toInclude('<span class="page-link">2</span>')
+				})
+
+				it("wraps first/previous/next/last in <li class='page-item'> for Bootstrap 5", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap5")
+					expect(result).toInclude('<li class="page-item">')
+					expect(result).toInclude('First')
+					expect(result).toInclude('Previous')
+					expect(result).toInclude('Next')
+					expect(result).toInclude('Last')
+				})
+
+				it("marks first/previous as disabled <li> when on first page in Bootstrap 5", () => {
+					g.model("author").findAll(page = 1, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap5")
+					expect(result).toInclude('<li class="page-item disabled">')
+				})
+
+			})
+
 			/* ── paginationNav ─────────────────────────── */
 
 			describe("paginationNav", () => {
diff --git a/vendor/wheels/view/pagination.cfc b/vendor/wheels/view/pagination.cfc
index 84e9279321..7f54398943 100644
--- a/vendor/wheels/view/pagination.cfc
+++ b/vendor/wheels/view/pagination.cfc
@@ -237,6 +237,9 @@ component {
 	 * @prependToPage String to prepend before each page number.
 	 * @appendToPage String to append after each page number.
 	 * @pageNumberAsParam Decides whether to link the page number as a param or as part of a route.
+	 * @viewStyle CSS-framework preset for markup: "plain" (default), "bootstrap5", "bootstrap4", or "tailwind".
+	 *           When non-plain, emits the canonical wrapper markup for that framework (e.g. `<li class="page-item active">`)
+	 *           and ignores `prependToPage` / `appendToPage` / `classForCurrent` / `class` in favor of the preset.
 	 * @encode [see:styleSheetLinkTag].
 	 */
 	public string function pageNumberLinks(
@@ -249,17 +252,38 @@ component {
 		string prependToPage,
 		string appendToPage,
 		boolean pageNumberAsParam,
+		string viewStyle,
 		any encode
 	) {
 		$args(name = "pageNumberLinks", args = arguments);
 		local.pg = pagination(arguments.handle);
 		local.rv = "";
 
+		local.useViewStyle = Len(arguments.viewStyle) && arguments.viewStyle != "plain";
+
 		// Calculate window boundaries
 		local.startPage = Max(1, local.pg.currentPage - arguments.windowSize);
 		local.endPage = Min(local.pg.totalPages, local.pg.currentPage + arguments.windowSize);
 
 		for (local.i = local.startPage; local.i <= local.endPage; local.i++) {
+			if (local.useViewStyle) {
+				local.linkArgs = $paginationLinkToArgs(
+					page = local.i,
+					text = NumberFormat(local.i),
+					name = arguments.name,
+					pageNumberAsParam = arguments.pageNumberAsParam,
+					encode = arguments.encode,
+					args = arguments
+				);
+				local.rv &= $renderPaginationPage(
+					pageNumber = local.i,
+					isCurrent = (local.i == local.pg.currentPage),
+					viewStyle = arguments.viewStyle,
+					linkArgs = local.linkArgs
+				);
+				continue;
+			}
+
 			if (Len(arguments.prependToPage)) {
 				local.rv &= arguments.prependToPage;
 			}
@@ -322,6 +346,10 @@ component {
 	 * @showNext Whether to show the next page link.
 	 * @showInfo Whether to show the pagination info text.
 	 * @showSinglePage Whether to show pagination when there is only one page.
+	 * @viewStyle CSS-framework preset for markup: "plain" (default), "bootstrap5", "bootstrap4", or "tailwind".
+	 *           When non-plain, the entire nav is rendered with the framework's canonical structure
+	 *           (e.g. `<nav><ul class="pagination"><li class="page-item active">...`), removing the need
+	 *           for `Replace()` post-processing in app code. Passed through to `pageNumberLinks()`.
 	 * @encode [see:styleSheetLinkTag].
 	 */
 	public string function paginationNav(
@@ -333,6 +361,7 @@ component {
 		boolean showNext,
 		boolean showInfo,
 		boolean showSinglePage,
+		string viewStyle,
 		any encode
 	) {
 		$args(name = "paginationNav", args = arguments);
@@ -348,13 +377,28 @@ component {
 		local.subArgs.handle = arguments.handle;
 		local.subArgs.encode = arguments.encode;
 		// Pass through any extra arguments (route, controller, action, key, params, etc.)
-		local.skipArgs = "handle,navClass,showFirst,showLast,showPrevious,showNext,showInfo,showSinglePage,encode";
+		local.skipArgs = "handle,navClass,showFirst,showLast,showPrevious,showNext,showInfo,showSinglePage,viewStyle,encode";
 		for (local.key in arguments) {
 			if (!ListFindNoCase(local.skipArgs, local.key)) {
 				local.subArgs[local.key] = arguments[local.key];
 			}
 		}
 
+		local.useViewStyle = Len(arguments.viewStyle) && arguments.viewStyle != "plain";
+
+		if (local.useViewStyle) {
+			return $renderPaginationNav(
+				viewStyle = arguments.viewStyle,
+				pg = local.pg,
+				showInfo = arguments.showInfo,
+				showFirst = arguments.showFirst,
+				showPrevious = arguments.showPrevious,
+				showNext = arguments.showNext,
+				showLast = arguments.showLast,
+				subArgs = local.subArgs
+			);
+		}
+
 		local.content = "";
 
 		if (arguments.showInfo) {
@@ -484,4 +528,172 @@ component {
 		return linkTo(argumentCollection = local.linkArgs);
 	}
 
+	/**
+	 * Internal: renders one page entry under a viewStyle preset.
+	 * Returns the framework-canonical wrapper (e.g. `<li class="page-item active"><span class="page-link">N</span></li>`)
+	 * for the current page, and a wrapped anchor for non-current pages.
+	 */
+	public string function $renderPaginationPage(
+		required numeric pageNumber,
+		required boolean isCurrent,
+		required string viewStyle,
+		required struct linkArgs
+	) {
+		local.label = NumberFormat(arguments.pageNumber);
+		switch (arguments.viewStyle) {
+			case "bootstrap5":
+				if (arguments.isCurrent) {
+					return '<li class="page-item active" aria-current="page"><span class="page-link">' & local.label & '</span></li>';
+				}
+				arguments.linkArgs.class = "page-link";
+				return '<li class="page-item">' & linkTo(argumentCollection = arguments.linkArgs) & '</li>';
+			case "bootstrap4":
+				if (arguments.isCurrent) {
+					return '<li class="page-item active"><span class="page-link">' & local.label & '</span></li>';
+				}
+				arguments.linkArgs.class = "page-link";
+				return '<li class="page-item">' & linkTo(argumentCollection = arguments.linkArgs) & '</li>';
+			case "tailwind":
+				if (arguments.isCurrent) {
+					return '<span class="pagination-current" aria-current="page">' & local.label & '</span>';
+				}
+				arguments.linkArgs.class = "pagination-link";
+				return linkTo(argumentCollection = arguments.linkArgs);
+			default:
+				return local.label;
+		}
+	}
+
+	/**
+	 * Internal: renders the full paginationNav() output under a viewStyle preset.
+	 * Bootstrap presets emit `<nav><ul class="pagination"><li class="page-item">...`.
+	 * Each first/previous/next/last item resolves its target page from the pagination
+	 * struct directly so we can mark it `disabled` on the wrapper without scraping
+	 * the sub-helper output.
+	 */
+	public string function $renderPaginationNav(
+		required string viewStyle,
+		required struct pg,
+		required boolean showInfo,
+		required boolean showFirst,
+		required boolean showPrevious,
+		required boolean showNext,
+		required boolean showLast,
+		required struct subArgs
+	) {
+		local.firstDisabled = arguments.pg.currentPage <= 1;
+		local.lastDisabled = arguments.pg.currentPage >= arguments.pg.totalPages;
+
+		local.items = "";
+		if (arguments.showFirst) {
+			local.items &= $renderPaginationNavLink(
+				viewStyle = arguments.viewStyle,
+				targetPage = 1,
+				text = $get(name = "text", functionName = "firstPageLink"),
+				isDisabled = local.firstDisabled,
+				subArgs = arguments.subArgs
+			);
+		}
+		if (arguments.showPrevious) {
+			local.items &= $renderPaginationNavLink(
+				viewStyle = arguments.viewStyle,
+				targetPage = Max(1, arguments.pg.currentPage - 1),
+				text = $get(name = "text", functionName = "previousPageLink"),
+				isDisabled = local.firstDisabled,
+				subArgs = arguments.subArgs
+			);
+		}
+
+		// Reuse pageNumberLinks() so the window logic stays in one place.
+		local.pageArgs = StructCopy(arguments.subArgs);
+		local.pageArgs.viewStyle = arguments.viewStyle;
+		local.items &= pageNumberLinks(argumentCollection = local.pageArgs);
+
+		if (arguments.showNext) {
+			local.items &= $renderPaginationNavLink(
+				viewStyle = arguments.viewStyle,
+				targetPage = Min(arguments.pg.totalPages, arguments.pg.currentPage + 1),
+				text = $get(name = "text", functionName = "nextPageLink"),
+				isDisabled = local.lastDisabled,
+				subArgs = arguments.subArgs
+			);
+		}
+		if (arguments.showLast) {
+			local.items &= $renderPaginationNavLink(
+				viewStyle = arguments.viewStyle,
+				targetPage = arguments.pg.totalPages,
+				text = $get(name = "text", functionName = "lastPageLink"),
+				isDisabled = local.lastDisabled,
+				subArgs = arguments.subArgs
+			);
+		}
+
+		local.infoHtml = "";
+		if (arguments.showInfo) {
+			local.infoHtml = paginationInfo(argumentCollection = arguments.subArgs) & " ";
+		}
+
+		switch (arguments.viewStyle) {
+			case "bootstrap5":
+			case "bootstrap4":
+				return '<nav aria-label="Pagination">' & local.infoHtml
+					& '<ul class="pagination">' & local.items & '</ul></nav>';
+			case "tailwind":
+				return '<nav aria-label="Pagination" class="pagination">' & local.infoHtml & local.items & '</nav>';
+			default:
+				return '<nav>' & local.infoHtml & local.items & '</nav>';
+		}
+	}
+
+	/**
+	 * Internal: renders a single first/previous/next/last item under a viewStyle preset.
+	 */
+	public string function $renderPaginationNavLink(
+		required string viewStyle,
+		required numeric targetPage,
+		required string text,
+		required boolean isDisabled,
+		required struct subArgs
+	) {
+		local.encode = StructKeyExists(arguments.subArgs, "encode") ? arguments.subArgs.encode : true;
+		local.pageName = StructKeyExists(arguments.subArgs, "name") ? arguments.subArgs.name : "page";
+		local.pageNumberAsParam = StructKeyExists(arguments.subArgs, "pageNumberAsParam")
+			? arguments.subArgs.pageNumberAsParam
+			: true;
+
+		switch (arguments.viewStyle) {
+			case "bootstrap5":
+			case "bootstrap4":
+				if (arguments.isDisabled) {
+					return '<li class="page-item disabled"><span class="page-link">' & arguments.text & '</span></li>';
+				}
+				local.linkArgs = $paginationLinkToArgs(
+					page = arguments.targetPage,
+					text = arguments.text,
+					name = local.pageName,
+					pageNumberAsParam = local.pageNumberAsParam,
+					encode = local.encode,
+					args = arguments.subArgs
+				);
+				local.linkArgs.class = "page-link";
+				return '<li class="page-item">' & linkTo(argumentCollection = local.linkArgs) & '</li>';
+			case "tailwind":
+				if (arguments.isDisabled) {
+					return '<span class="pagination-disabled">' & arguments.text & '</span>';
+				}
+				local.linkArgs = $paginationLinkToArgs(
+					page = arguments.targetPage,
+					text = arguments.text,
+					name = local.pageName,
+					pageNumberAsParam = local.pageNumberAsParam,
+					encode = local.encode,
+					args = arguments.subArgs
+				);
+				local.linkArgs.class = "pagination-link";
+				return linkTo(argumentCollection = local.linkArgs);
+			default:
+				return arguments.text;
+		}
+	}
+
 }

From 25096be24ef2241cb676d2affcf4f0a07c2755da Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Fri, 15 May 2026 19:40:43 +0000
Subject: [PATCH 2/6] docs: document viewStyle preset in CLAUDE.md pagination
 quick reference

Signed-off-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
---
 CLAUDE.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CLAUDE.md b/CLAUDE.md
index d51a1ea955..a520fcf93d 100755
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -464,6 +464,16 @@ Requires a paginated query: `findAll(page=params.page, perPage=25)`. The recomme
 #paginationNav()#
 #paginationNav(showInfo=true, showFirst=false, showLast=false, navClass="my-pagination")#
 
+// Bootstrap 5 — active class on <li>, current page as <span class="page-link">, aria-current
+#paginationNav(viewStyle="bootstrap5")#
+#pageNumberLinks(viewStyle="bootstrap5")#
+
+// Bootstrap 4 — same as bootstrap5 but omits aria-current
+#pageNumberLinks(viewStyle="bootstrap4")#
+
+// Tailwind — flat structure with pagination-current / pagination-link utility classes
+#pageNumberLinks(viewStyle="tailwind")#
+
 // Individual helpers for custom layouts
 #paginationInfo()#            // "Showing 26-50 of 1,000 records"
 #firstPageLink()#             // link to page 1
@@ -474,6 +484,8 @@ Requires a paginated query: `findAll(page=params.page, perPage=25)`. The recomme
 #pageNumberLinks(windowSize=5, classForCurrent="active")#
 ```
 
+`viewStyle` accepts `"plain"` (default, preserves original output), `"bootstrap5"`, `"bootstrap4"`, or `"tailwind"`. Bootstrap presets emit `<li class="page-item active" aria-current="page"><span class="page-link">N</span></li>` for the current page, with the active class on the `<li>` wrapper — no `Replace()` post-processing needed. Non-plain presets ignore `prependToPage`, `appendToPage`, `classForCurrent`, and `class` in favour of the preset markup.
+
 Disabled links render as `<span class="disabled">` by default. All helpers accept `handle` for named pagination queries.
 
 ## Testing Quick Reference

From cbf015d80cd6c974328e11061e53bfbca1fe302e Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Fri, 15 May 2026 19:48:42 +0000
Subject: [PATCH 3/6] fix(view): address Reviewer A/B consensus findings (round
 1)

- vendor/wheels/view/pagination.cfc: encode arguments.text via
  EncodeForHTML when encode=true in the Bootstrap/Tailwind disabled
  branches of $renderPaginationNavLink. Previously local.encode was
  resolved but ignored, causing custom HTML-entity nav text (e.g.
  &laquo;) to render literally in the preset path while being
  decoded in the plain path.
- vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc: replace
  the weak Tailwind pageNumberLinks assertion (which passed even if
  Bootstrap markup was accidentally emitted) with Tailwind-specific
  class assertions (pagination-current, pagination-link), plus
  paginationNav coverage for viewStyle="bootstrap4" (active class on
  <li>, no aria-current) and viewStyle="tailwind" (flat
  <nav class="pagination"> with no <ul>, pagination-disabled spans
  on first page), and a showInfo=true positioning spec for
  Bootstrap 5.

Signed-off-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
---
 .../specs/view/paginationHelpersSpec.cfc      | 57 ++++++++++++++++++-
 vendor/wheels/view/pagination.cfc             |  8 ++-
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
index 927c0af827..4098cef942 100644
--- a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
+++ b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
@@ -246,11 +246,13 @@ component extends="wheels.WheelsTest" {
 					expect(result).toInclude('<span class="page-link">2</span>')
 				})
 
-				it("emits Tailwind markup with aria-current on current page", () => {
+				it("emits Tailwind markup with pagination-current/pagination-link wrappers", () => {
 					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
 					result = _controller.pageNumberLinks(viewStyle = "tailwind")
-					expect(result).toInclude('aria-current="page"')
-					expect(result).toInclude("2")
+					expect(result).toInclude('<span class="pagination-current" aria-current="page">')
+					expect(result).toInclude('class="pagination-link"')
+					expect(result).toInclude("2</span>")
+					expect(result).notToInclude('<li class="page-item')
 				})
 
 				it("preserves default (plain) behavior when viewStyle is plain", () => {
@@ -299,6 +301,55 @@ component extends="wheels.WheelsTest" {
 					expect(result).toInclude('<li class="page-item disabled">')
 				})
 
+				it("wraps Bootstrap 4 markup in <ul class='pagination'> without aria-current on current page", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap4")
+					expect(result).toInclude('<nav')
+					expect(result).toInclude('<ul class="pagination">')
+					expect(result).toInclude('<li class="page-item active">')
+					expect(result).toInclude('<span class="page-link">2</span>')
+					// BS4 omits aria-current on the active page
+					expect(result).notToInclude('aria-current="page"')
+				})
+
+				it("marks first/previous as disabled <li> when on first page in Bootstrap 4", () => {
+					g.model("author").findAll(page = 1, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap4")
+					expect(result).toInclude('<li class="page-item disabled">')
+				})
+
+				it("wraps Tailwind markup in a flat <nav class='pagination'> with no <ul>", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "tailwind")
+					expect(result).toInclude('<nav aria-label="Pagination" class="pagination">')
+					expect(result).toInclude('<span class="pagination-current" aria-current="page">')
+					expect(result).toInclude('class="pagination-link"')
+					expect(result).notToInclude('<ul')
+					expect(result).notToInclude('<li class="page-item')
+				})
+
+				it("emits Tailwind pagination-disabled span for first/previous when on first page", () => {
+					g.model("author").findAll(page = 1, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "tailwind")
+					expect(result).toInclude('<span class="pagination-disabled">')
+					expect(result).toInclude('First')
+					expect(result).toInclude('Previous')
+				})
+
+				it("places paginationInfo between <nav> and <ul> for Bootstrap 5 with showInfo=true", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					result = _controller.paginationNav(viewStyle = "bootstrap5", showInfo = true)
+					expect(result).toInclude('<nav aria-label="Pagination">')
+					expect(result).toInclude('Showing')
+					expect(result).toInclude('<ul class="pagination">')
+					// Info text must appear before the <ul>
+					infoPos = FindNoCase("Showing", result)
+					ulPos = FindNoCase("<ul", result)
+					expect(infoPos).toBeGT(0)
+					expect(ulPos).toBeGT(0)
+					expect(infoPos).toBeLT(ulPos)
+				})
+
 			})
 
 			/* ── paginationNav ─────────────────────────── */
diff --git a/vendor/wheels/view/pagination.cfc b/vendor/wheels/view/pagination.cfc
index 7f54398943..dd13133235 100644
--- a/vendor/wheels/view/pagination.cfc
+++ b/vendor/wheels/view/pagination.cfc
@@ -661,11 +661,15 @@ component {
 			? arguments.subArgs.pageNumberAsParam
 			: true;
 
+		local.safeText = (IsBoolean(local.encode) && local.encode)
+			? EncodeForHTML(arguments.text)
+			: arguments.text;
+
 		switch (arguments.viewStyle) {
 			case "bootstrap5":
 			case "bootstrap4":
 				if (arguments.isDisabled) {
-					return '<li class="page-item disabled"><span class="page-link">' & arguments.text & '</span></li>';
+					return '<li class="page-item disabled"><span class="page-link">' & local.safeText & '</span></li>';
 				}
 				local.linkArgs = $paginationLinkToArgs(
 					page = arguments.targetPage,
@@ -679,7 +683,7 @@ component {
 				return '<li class="page-item">' & linkTo(argumentCollection = local.linkArgs) & '</li>';
 			case "tailwind":
 				if (arguments.isDisabled) {
-					return '<span class="pagination-disabled">' & arguments.text & '</span>';
+					return '<span class="pagination-disabled">' & local.safeText & '</span>';
 				}
 				local.linkArgs = $paginationLinkToArgs(
 					page = arguments.targetPage,

From 35473fab6b97431074cf49a13ed69ad788a50213 Mon Sep 17 00:00:00 2001
From: Peter Amiri <peter@alurium.com>
Date: Fri, 15 May 2026 16:18:21 -0700
Subject: [PATCH 4/6] fix(view): throw Wheels.InvalidViewStyle on unknown
 viewStyle (round 2)

Reviewer A flagged in round 2 that the three internal $renderPagination*
helpers silently emit structurally broken HTML when handed an unknown
viewStyle value (e.g. a typo like "boostrap5"). The call-site guard
`local.useViewStyle = Len(arguments.viewStyle) && arguments.viewStyle
!= "plain"` already filters out the empty/plain case, so reaching the
default branch is by definition a developer typo. Replace the silent
fallbacks with a Wheels.InvalidViewStyle throw so the failure is loud
and immediate at development time instead of surfacing as garbled output.

Specs cover both the pageNumberLinks() and paginationNav() public entry
points, asserting the typed throw using the existing toThrow matcher
pattern from assetsSpec/viteSpec.

Round-2 carry-over per Reviewer A; round-1 address-review intentionally
skipped this per Reviewer B's "nice-to-have" classification, but
Reviewer A held it open as still required.

Signed-off-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Signed-off-by: Peter Amiri <peter@alurium.com>
---
 .../tests/specs/view/paginationHelpersSpec.cfc | 14 ++++++++++++++
 vendor/wheels/view/pagination.cfc              | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
index 4098cef942..c7c15d5532 100644
--- a/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
+++ b/vendor/wheels/tests/specs/view/paginationHelpersSpec.cfc
@@ -350,6 +350,20 @@ component extends="wheels.WheelsTest" {
 					expect(infoPos).toBeLT(ulPos)
 				})
 
+				it("throws Wheels.InvalidViewStyle on typo passed to pageNumberLinks", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					expect(function() {
+						_controller.pageNumberLinks(viewStyle = "boostrap5")
+					}).toThrow("Wheels.InvalidViewStyle")
+				})
+
+				it("throws Wheels.InvalidViewStyle on typo passed to paginationNav", () => {
+					g.model("author").findAll(page = 2, perPage = 3, order = "lastName")
+					expect(function() {
+						_controller.paginationNav(viewStyle = "boostrap5")
+					}).toThrow("Wheels.InvalidViewStyle")
+				})
+
 			})
 
 			/* ── paginationNav ─────────────────────────── */
diff --git a/vendor/wheels/view/pagination.cfc b/vendor/wheels/view/pagination.cfc
index dd13133235..9ae6840c29 100644
--- a/vendor/wheels/view/pagination.cfc
+++ b/vendor/wheels/view/pagination.cfc
@@ -560,7 +560,11 @@ component {
 				arguments.linkArgs.class = "pagination-link";
 				return linkTo(argumentCollection = arguments.linkArgs);
 			default:
-				return local.label;
+				Throw(
+					type = "Wheels.InvalidViewStyle",
+					message = "Unknown viewStyle [#arguments.viewStyle#] passed to pageNumberLinks().",
+					detail = "Supported values are ""plain"", ""bootstrap5"", ""bootstrap4"", and ""tailwind""."
+				);
 		}
 	}
 
@@ -641,7 +645,11 @@ component {
 			case "tailwind":
 				return '<nav aria-label="Pagination" class="pagination">' & local.infoHtml & local.items & '</nav>';
 			default:
-				return '<nav>' & local.infoHtml & local.items & '</nav>';
+				Throw(
+					type = "Wheels.InvalidViewStyle",
+					message = "Unknown viewStyle [#arguments.viewStyle#] passed to paginationNav().",
+					detail = "Supported values are ""plain"", ""bootstrap5"", ""bootstrap4"", and ""tailwind""."
+				);
 		}
 	}
 
@@ -696,7 +704,11 @@ component {
 				local.linkArgs.class = "pagination-link";
 				return linkTo(argumentCollection = local.linkArgs);
 			default:
-				return arguments.text;
+				Throw(
+					type = "Wheels.InvalidViewStyle",
+					message = "Unknown viewStyle [#arguments.viewStyle#] passed to paginationNav() nav link rendering.",
+					detail = "Supported values are ""plain"", ""bootstrap5"", ""bootstrap4"", and ""tailwind""."
+				);
 		}
 	}
 

From baccfd43113f1bb396e9f76a713dd38bf67fb6ec Mon Sep 17 00:00:00 2001
From: Peter Amiri <peter@alurium.com>
Date: Fri, 15 May 2026 16:22:21 -0700
Subject: [PATCH 5/6] docs: list bootstrap4 and tailwind under paginationNav
 too

Reviewer A's round-2 docs nit: the CLAUDE.md "Pagination View Helpers"
quick reference showed paginationNav with bootstrap5 only, while
bootstrap4 and tailwind appeared only under pageNumberLinks. Both
presets are equally valid on both helpers, so add the paginationNav
companion lines for the two missing presets.

Signed-off-by: Peter Amiri <peter@alurium.com>
---
 CLAUDE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CLAUDE.md b/CLAUDE.md
index a520fcf93d..a1f315d446 100755
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -469,9 +469,11 @@ Requires a paginated query: `findAll(page=params.page, perPage=25)`. The recomme
 #pageNumberLinks(viewStyle="bootstrap5")#
 
 // Bootstrap 4 — same as bootstrap5 but omits aria-current
+#paginationNav(viewStyle="bootstrap4")#
 #pageNumberLinks(viewStyle="bootstrap4")#
 
 // Tailwind — flat structure with pagination-current / pagination-link utility classes
+#paginationNav(viewStyle="tailwind")#
 #pageNumberLinks(viewStyle="tailwind")#
 
 // Individual helpers for custom layouts

From 625089ca41bd31c3844015ff8b719c6917448c36 Mon Sep 17 00:00:00 2001
From: Peter Amiri <peter@alurium.com>
Date: Fri, 15 May 2026 20:54:34 -0700
Subject: [PATCH 6/6] docs: extend viewStyle ignore list with
 prepend/append/anchorDivider

Reviewer A round-6 docs gap: the CLAUDE.md "Non-plain presets ignore..."
list was written before PR #2730 added prepend/append/anchorDivider
args. Those args also land in local.skipArgs and are NOT forwarded into
$renderPaginationNav(), so the preset path silently drops them. Add the
three names to the explicit ignore list so anyone reading the docs
sequentially sees the full picture.

Signed-off-by: Peter Amiri <peter@alurium.com>
---
 CLAUDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 84057329c9..104d5ace7e 100755
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -504,7 +504,7 @@ Requires a paginated query: `findAll(page=params.page, perPage=25)`. The recomme
 #pageNumberLinks(windowSize=5, classForCurrent="active", addActiveClassToPrependedParent=true)#
 ```
 
-`viewStyle` accepts `"plain"` (default, preserves original output), `"bootstrap5"`, `"bootstrap4"`, or `"tailwind"`. Bootstrap presets emit `<li class="page-item active" aria-current="page"><span class="page-link">N</span></li>` for the current page, with the active class on the `<li>` wrapper — no `Replace()` post-processing needed. Non-plain presets ignore `prependToPage`, `appendToPage`, `classForCurrent`, and `class` in favour of the preset markup.
+`viewStyle` accepts `"plain"` (default, preserves original output), `"bootstrap5"`, `"bootstrap4"`, or `"tailwind"`. Bootstrap presets emit `<li class="page-item active" aria-current="page"><span class="page-link">N</span></li>` for the current page, with the active class on the `<li>` wrapper — no `Replace()` post-processing needed. Non-plain presets ignore `prependToPage`, `appendToPage`, `classForCurrent`, `class`, `prepend`, `append`, and `anchorDivider` in favour of the preset markup.
 
 Disabled links render as `<span class="disabled">` by default. All helpers accept `handle` for named pagination queries. `paginationNav()` also accepts `prepend`/`append` (HTML inside `<nav>` before/after the link list), `prependToPage`/`appendToPage` (per-anchor wrappers applied to all navigation anchors including first/prev/next/last), `addActiveClassToPrependedParent` (injects `active ` into the current-page `prependToPage` class attribute), and `anchorDivider` (separator between sections, default `" "`) — these compose into the same Bootstrap-style output as the `viewStyle="bootstrap5"` preset but with finer-grained control.