Merge pull request #97 from bryanmylee:fix-server-side-sort

Fix `addSortBy` interaction with `serverSide`

Author: bryanmylee

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "svelte-headless-table",
 	"description": "Unopinionated and extensible data tables for Svelte",
-	"version": "0.17.0",
+	"version": "0.17.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",

package.json

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

src/lib/plugins/addColumnFilters.ts

@@ -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) {
@@ -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;
 			});
 		};
 

src/lib/plugins/addPagination.ts

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

src/lib/plugins/addSortBy.ts

@@ -134,9 +134,8 @@ export const addTableFilter =
 				tableCellMatches.set($tableCellMatches);
 				if (serverSide) {
 					return $rows;
-				} else {
-					return $filteredRows;
 				}
+				return $filteredRows;
 			});
 		};