Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/funny-pugs-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@finsweet/attributes-list': patch
---

fix: force a pagination hook trigger when initializing non-CMS pagination
7 changes: 6 additions & 1 deletion packages/list/src/components/List.ts
Original file line number Diff line number Diff line change
Expand Up @@ -806,12 +806,17 @@ export class List {
* Adds a hook.
* @param key
* @param callback
* @param options.forceTrigger Whether to trigger the hook immediately after adding it.
*/
addHook(key: HookKey, callback: HookCallback) {
addHook(key: HookKey, callback: HookCallback, { forceTrigger }: { forceTrigger?: boolean } = {}) {
const hook = this.hooks[key];

hook.callbacks.push(callback);

if (forceTrigger) {
this.triggerHook(key);
}

return () => {
hook.callbacks = hook.callbacks.filter((cb) => cb !== callback);
};
Expand Down
12 changes: 8 additions & 4 deletions packages/list/src/load/infinite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ export const initInfiniteMode = (list: List) => {
const thresholdCoefficient = getInfiniteThreshold(list);

// Add hook
list.addHook('pagination', (items) => {
const paginatedItems = items.slice(0, list.itemsPerPage.value);
return paginatedItems;
});
list.addHook(
'pagination',
(items) => {
const paginatedItems = items.slice(0, list.itemsPerPage.value);
return paginatedItems;
},
{ forceTrigger: !list.paginationNextCMSElement.value && !list.paginationPreviousCMSElement.value } // Force a render if the list is static
);

// Init
loadPaginatedCMSItems(list);
Expand Down
12 changes: 8 additions & 4 deletions packages/list/src/load/more.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ import { loadPaginatedCMSItems } from './load';
*/
export const initMoreMode = (list: List) => {
// Add hook
list.addHook('pagination', (items) => {
const paginatedItems = items.slice(0, list.itemsPerPage.value);
return paginatedItems;
});
list.addHook(
'pagination',
(items) => {
const paginatedItems = items.slice(0, list.itemsPerPage.value);
return paginatedItems;
},
{ forceTrigger: !list.paginationNextCMSElement.value && !list.paginationPreviousCMSElement.value } // Force a render if the list is static
);

// Init
loadPaginatedCMSItems(list);
Expand Down
18 changes: 11 additions & 7 deletions packages/list/src/load/pagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,20 @@ export const initPaginationMode = async (list: List) => {
if (!paginationWrapperElement) return;

// Init hook
list.addHook('pagination', (items) => {
const $itemsPerPage = itemsPerPage.value;
list.addHook(
'pagination',
(items) => {
const $itemsPerPage = itemsPerPage.value;

const start = (currentPage.value - 1) * $itemsPerPage;
const end = start + $itemsPerPage;
const start = (currentPage.value - 1) * $itemsPerPage;
const end = start + $itemsPerPage;

const paginatedItems = items.slice(start, end);
const paginatedItems = items.slice(start, end);

return paginatedItems;
});
return paginatedItems;
},
{ forceTrigger: !list.paginationNextCMSElement.value && !list.paginationPreviousCMSElement.value } // Force a render if the list is static
);

const currentPageCleanup = watch(
list.currentPage,
Expand Down