Skip to content

Commit

Permalink
fix: server side addSortBy
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanmylee committed Jan 18, 2023
1 parent 1b51ade commit 248678f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
9 changes: 4 additions & 5 deletions src/lib/plugins/addColumnFilters.ts
Expand Up @@ -109,14 +109,13 @@ export const addColumnFilters =
const deriveRows: DeriveRowsFn<Item> = (rows) => {
return derived([rows, filterValues], ([$rows, $filterValues]) => {
preFilteredRows.set($rows);
if (!serverSide) {
const _filteredRows = getFilteredRows($rows, $filterValues, columnOptions);
filteredRows.set(_filteredRows);
return _filteredRows;
} else {
if (serverSide) {
filteredRows.set($rows);
return $rows;
}
const _filteredRows = getFilteredRows($rows, $filterValues, columnOptions);
filteredRows.set(_filteredRows);
return _filteredRows;
});
};

Expand Down
16 changes: 9 additions & 7 deletions src/lib/plugins/addPagination.ts
Expand Up @@ -36,7 +36,10 @@ export const createPageStore = ({

const pageIndex = writable(initialPageIndex);

function calcPageCountAndLimitIndex([$pageSize, $itemsCount]: [$pageSize: number, $itemsCount: number]) {
function calcPageCountAndLimitIndex([$pageSize, $itemsCount]: [
$pageSize: number,
$itemsCount: number
]) {
const $pageCount = Math.ceil($itemsCount / $pageSize);
pageIndex.update(($pageIndex) => {
if ($pageCount > 0 && $pageIndex >= $pageCount) {
Expand Down Expand Up @@ -117,15 +120,14 @@ export const addPagination =
const derivePageRows: DeriveRowsFn<Item> = (rows) => {
return derived([rows, pageSize, pageIndex], ([$rows, $pageSize, $pageIndex]) => {
prePaginatedRows.set($rows);
if (!serverSide) {
const startIdx = $pageIndex * $pageSize;
const _paginatedRows = $rows.slice(startIdx, startIdx + $pageSize);
paginatedRows.set(_paginatedRows);
return _paginatedRows;
} else {
if (serverSide) {
paginatedRows.set($rows);
return $rows;
}
const startIdx = $pageIndex * $pageSize;
const _paginatedRows = $rows.slice(startIdx, startIdx + $pageSize);
paginatedRows.set(_paginatedRows);
return _paginatedRows;
});
};

Expand Down
3 changes: 1 addition & 2 deletions src/lib/plugins/addSortBy.ts
Expand Up @@ -183,10 +183,9 @@ export const addSortBy =
return derived([rows, sortKeys], ([$rows, $sortKeys]) => {
preSortedRows.set($rows);
if (serverSide) {
return getSortedRows<Item, typeof $rows[number]>($rows, $sortKeys, columnOptions);
} else {
return $rows;
}
return getSortedRows<Item, typeof $rows[number]>($rows, $sortKeys, columnOptions);
});
};

Expand Down
3 changes: 1 addition & 2 deletions src/lib/plugins/addTableFilter.ts
Expand Up @@ -134,9 +134,8 @@ export const addTableFilter =
tableCellMatches.set($tableCellMatches);
if (serverSide) {
return $rows;
} else {
return $filteredRows;
}
return $filteredRows;
});
};

Expand Down

1 comment on commit 248678f

@blerrgh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops, good catch!

Please sign in to comment.