Merge pull request #117 from AddSearch/sc-9880/js-client-setpaging-is…

…-overriden-by-search-ui fix: [sc-9880] Search UI overrides default page (from client.setPaging)
AddSearch · May 8, 2024 · e37b16c · e37b16c
2 parents ae3d6dd + 6016995
commit e37b16c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/dist/addsearch-search-ui.min.css b/dist/addsearch-search-ui.min.css
diff --git a/dist/addsearch-search-ui.min.js b/dist/addsearch-search-ui.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "addsearch-search-ui",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "JavaScript library to develop Search UIs for the web",
   "main": "./dist/addsearch-search-ui.min.js",
   "jsdelivr": "./dist/addsearch-search-ui.min.js",

diff --git a/src/actions/sortby.js b/src/actions/sortby.js
@@ -7,7 +7,7 @@ export function sortBy(client, field, order, store) {
     setHistory(HISTORY_PARAMETERS.SORTBY, JSON.stringify({field: field, order: order}), null, store);
   }
   const paging = client.getSettings().paging;
-  client.setPaging(1, paging.pageSize, field, order);
+  client.setPaging(paging.page, paging.pageSize, field, order);
 
   return {
     type: SORTBY,

diff --git a/src/util/history.js b/src/util/history.js
@@ -166,7 +166,8 @@ function handleURLParams(client, store, qs, createFilterObjectFunction, searchFu
     store.dispatch(setPage(client, parseInt(qs[HISTORY_PARAMETERS.PAGE], 10), null, store));
   }
   else {
-    store.dispatch(setPage(client, 1, null, store));
+    const paging = client.getSettings().paging;
+    store.dispatch(setPage(client, paging.page, null, store));
   }
 
   if (qs[HISTORY_PARAMETERS.SEARCH]) {