fix(Pagination): dont reset page to 1 for pageSizes (#4239)

carbon-design-system · Oct 22, 2019 · 5b42ce2 · 5b42ce2
1 parent 4a7521e
commit 5b42ce2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/packages/react/src/components/Pagination/Pagination-test.js b/packages/react/src/components/Pagination/Pagination-test.js
@@ -153,6 +153,24 @@ describe('Pagination', () => {
           expect(pager.state().page).toEqual(1);
         });
 
+        it('should not return to first page on changes to pageSizes where current pageSize is in new list', () => {
+          const pager = mount(
+            <Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
+          );
+          pager.setState({ page: 2 });
+          pager.setProps({ pageSizes: [5, 10, 20] });
+          expect(pager.state().page).toEqual(2);
+        });
+
+        it('should return to first page on changes to pageSizes where current pageSize is not in new list', () => {
+          const pager = mount(
+            <Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
+          );
+          pager.setState({ page: 2 });
+          pager.setProps({ pageSizes: [25, 50, 100] });
+          expect(pager.state().page).toEqual(1);
+        });
+
         it('should avoid returning to first page unless actual change in pageSizes is detected', () => {
           const pager = mount(
             <Pagination pageSizes={[5, 10]} totalItems={50} />

diff --git a/packages/react/src/components/Pagination/Pagination.js b/packages/react/src/components/Pagination/Pagination.js
@@ -154,17 +154,16 @@ export default class Pagination extends Component {
       pageSize: currentPageSize,
     } = state;
     const pageSizesChanged = !equals(pageSizes, prevPageSizes);
+    if (pageSizesChanged && !pageSizes.includes(pageSize)) {
+      pageSize = pageSizes[0];
+    }
     const pageChanged = page !== prevPage;
     const pageSizeChanged = pageSize !== prevPageSize;
     return !pageSizesChanged && !pageChanged && !pageSizeChanged
       ? null
       : {
-          page: pageSizesChanged ? 1 : pageChanged ? page : currentPage,
-          pageSize: pageSizesChanged
-            ? pageSizes[0]
-            : pageSizeChanged
-            ? pageSize
-            : currentPageSize,
+          page: pageSizeChanged && 1 || pageChanged && page || currentPage,
+          pageSize: pageSizeChanged ? pageSize : currentPageSize,
           prevPageSizes: pageSizes,
           prevPage: page,
           prevPageSize: pageSize,