groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-07 09:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: cap visible offset fallback browse range

Browse source
This commit is contained in:
Jonathan Finley 2026-03-13 23:35:42 -04:00
parent 93aa854855
commit 23dfde8d34
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/components/app/LazyBookshelf.vue
View file

@ -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
},

6
client/cypress/tests/components/app/LazyBookshelf.cy.js
View file

@ -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')
})
})