From dd6987efe9f32fece6d720f0a32562a5ef73d770 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Mon, 15 Jan 2018 16:56:00 +0100 Subject: [PATCH] fix(SortedTable): infinite loop when displaying last page (#2568) Fixes #2569 --- src/common/sorted-table/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/sorted-table/index.js b/src/common/sorted-table/index.js index 72d16cb08..63f0005df 100644 --- a/src/common/sorted-table/index.js +++ b/src/common/sorted-table/index.js @@ -518,8 +518,9 @@ export default class SortedTable extends Component { return this._setPage(1) } - if (page * itemsPerPage > n) { - return this._setPage(ceil(n / itemsPerPage)) + const last = ceil(n / itemsPerPage) + if (page > last) { + return this._setPage(last) } }