From 23dfde8d34992450d333793c5430e92ee48d5069 Mon Sep 17 00:00:00 2001
From: Jonathan Finley <jonathan.finley@efiia.com>
Date: Fri, 13 Mar 2026 23:35:42 -0400
Subject: [PATCH] fix: cap visible offset fallback browse range

---
 client/components/app/LazyBookshelf.vue       | 24 +++++++++++++++----
 .../tests/components/app/LazyBookshelf.cy.js  |  6 +++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index f224cd0ee..bcc8c4878 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -62,6 +62,7 @@ export default {
       shelvesPerPage: 0,
       entitiesPerShelf: 8,
       currentPage: 0,
+      serverTotalEntities: 0,
       totalEntities: 0,
       entities: [],
       pagesLoaded: {},
@@ -348,6 +349,20 @@ export default {
       this.isCountDeferred = false
       this.pageCursors = { 0: null }
     },
+    updateVisibleBrowseRange(totalEntities = this.serverTotalEntities) {
+      this.serverTotalEntities = Number(totalEntities) || 0
+
+      const visibleTotalEntities = this.deepScrollBlocked
+        ? Math.min(this.serverTotalEntities, this.maxOffsetPages * this.booksPerFetch)
+        : this.serverTotalEntities
+
+      this.totalEntities = visibleTotalEntities
+      this.totalShelves = Math.ceil(this.totalEntities / this.entitiesPerShelf)
+
+      if (this.initialized) {
+        this.entities.length = this.totalEntities
+      }
+    },
     getFetchQueryString(page = 0) {
       const cursor = this.paginationMode === 'keyset' && page > 0 ? this.pageCursors[page] : null
       const searchParams = new URLSearchParams()
@@ -398,6 +413,7 @@ export default {
         this.maxOffsetPages = this.deepScrollBlocked ? 3 : Infinity
         this.nextCursor = payload.nextCursor || null
         this.isCountDeferred = !!payload.isCountDeferred
+        this.updateVisibleBrowseRange(payload.total)
 
         if (this.paginationMode === 'keyset') {
           if (this.nextCursor) {
@@ -409,8 +425,6 @@ export default {
 
         if (!this.initialized) {
           this.initialized = true
-          this.totalEntities = payload.total
-          this.totalShelves = Math.ceil(this.totalEntities / this.entitiesPerShelf)
           this.entities = new Array(this.totalEntities)
         }
 
@@ -575,6 +589,7 @@ export default {
       this.resetPaginationState()
       this.entities = []
       this.totalShelves = 0
+      this.serverTotalEntities = 0
       this.totalEntities = 0
       this.currentPage = 0
       this.isSelectionMode = false
@@ -889,13 +904,14 @@ export default {
       if (booksPerFetch !== this.booksPerFetch) {
         this.booksPerFetch = booksPerFetch
         if (this.totalEntities) {
+          this.updateVisibleBrowseRange()
           this.updatePagesLoaded()
         }
       }
 
       this.currentBookWidth = this.bookWidth
-      if (this.totalEntities) {
-        this.totalShelves = Math.ceil(this.totalEntities / this.entitiesPerShelf)
+      if (this.serverTotalEntities) {
+        this.updateVisibleBrowseRange()
       }
       return entitiesPerShelfBefore < this.entitiesPerShelf // Books per shelf has changed
     },
diff --git a/client/cypress/tests/components/app/LazyBookshelf.cy.js b/client/cypress/tests/components/app/LazyBookshelf.cy.js
index 15d1ce777..16fb7e0a2 100644
--- a/client/cypress/tests/components/app/LazyBookshelf.cy.js
+++ b/client/cypress/tests/components/app/LazyBookshelf.cy.js
@@ -189,6 +189,8 @@ describe('LazyBookshelf', () => {
           expect(wrapper.vm.paginationMode).to.equal('offset')
           expect(wrapper.vm.deepScrollBlocked).to.equal(true)
           expect(wrapper.vm.maxOffsetPages).to.equal(3)
+          expect(wrapper.vm.totalEntities).to.equal(3)
+          expect(wrapper.vm.totalShelves).to.equal(3)
           expect(requestUrls).to.have.length(3)
           expect(requestUrls.some((url) => url.includes('page=0'))).to.equal(true)
           expect(requestUrls.some((url) => url.includes('page=1'))).to.equal(true)
@@ -197,5 +199,9 @@ describe('LazyBookshelf', () => {
           expect(requestUrls.every((url) => !url.includes('cursor='))).to.equal(true)
         })
     })
+
+    cy.get('[id^="shelf-"]').should('have.length', 3)
+    cy.get('#shelf-2').should('exist')
+    cy.get('#shelf-3').should('not.exist')
   })
 })