#69 : Add 0th page to loaded

This commit is contained in:
Vadim
2021-09-09 23:35:13 +03:00
parent f830b69bea
commit 2949683d1a
2 changed files with 15 additions and 15 deletions

View File

@@ -281,7 +281,7 @@
await tick() await tick()
infinite && addClones() infinite && addClones()
initPageSizes()
// TODO: validate initialScrollIndex // TODO: validate initialScrollIndex
store.init(getPageIndexByScrollIndex({ store.init(getPageIndexByScrollIndex({
@@ -292,6 +292,8 @@
pagesCount, pagesCount,
pagesToShow, pagesToShow,
})) }))
initPageSizes()
} }
addResizeEventListener(initPageSizes) addResizeEventListener(initPageSizes)

View File

@@ -88,32 +88,30 @@ export function getAdjacentIndexes({
let rangeStart = _scrollIndex - 1 let rangeStart = _scrollIndex - 1
let rangeEnd = _scrollIndex + 1 let rangeEnd = _scrollIndex + 1
rangeStart = rangeStart < 0
? infinite rangeStart = infinite
? scrollsCount - 1 ? rangeStart < 0 ? scrollsCount - 1 : rangeStart
: 0 : Math.max(0, rangeStart)
: rangeStart
rangeEnd = rangeEnd > scrollsCount - 1 rangeEnd = infinite
? infinite ? rangeEnd > scrollsCount - 1 ? 0 : rangeEnd
? 0 : Math.min(scrollsCount - 1, rangeEnd)
: scrollsCount - 1
: rangeEnd
const scrollIndexes = [...new Set([ const scrollIndexes = [...new Set([
rangeStart, rangeStart,
_scrollIndex, _scrollIndex,
rangeEnd, rangeEnd,
0, // needed to clone first scroll pages
scrollsCount - 1, // needed to clone last scroll pages scrollsCount - 1, // needed to clone last scroll pages
])].sort((a, b) => a - b) ])].sort((a, b) => a - b)
const pageIndexes = [] const pageIndexes = scrollIndexes.flatMap(
scrollIndexes.forEach(scrollIndex => pageIndexes.push( scrollIndex => getIndexesOfPagesWithoutClonesInScroll({
...getIndexesOfPagesWithoutClonesInScroll({
scrollIndex, scrollIndex,
pagesToShow, pagesToShow,
pagesToScroll, pagesToScroll,
pagesCount, pagesCount,
}) })
)) )
return { return {
scrollIndexes, scrollIndexes,
pageIndexes: [...new Set(pageIndexes)].sort((a, b) => a - b), pageIndexes: [...new Set(pageIndexes)].sort((a, b) => a - b),