From 9c656f2cfa04e223d2471e9ebac55987760acc4f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <agstanki@gmail.com>
Date: Wed, 11 Jul 2018 16:13:53 -0400
Subject: [PATCH] fix(pagination): set focus only for explicitly clicked pages

---
 src/Pagination/index.jsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Pagination/index.jsx b/src/Pagination/index.jsx
index 7c08f6be19..6d872aba92 100644
--- a/src/Pagination/index.jsx
+++ b/src/Pagination/index.jsx
@@ -23,7 +23,7 @@ class Pagination extends React.Component {
 
     this.state = {
       currentPage: this.props.currentPage,
-      previousNextButtonClicked: false,
+      pageButtonSelected: false,
     };
   }
 
@@ -39,19 +39,24 @@ class Pagination extends React.Component {
   }
 
   componentDidUpdate() {
-    const { currentPage, previousNextButtonClicked } = this.state;
+    const { currentPage, pageButtonSelected } = this.state;
     const currentPageRef = this.pageRefs[currentPage];
 
-    if (currentPageRef && !previousNextButtonClicked) {
+    if (currentPageRef && pageButtonSelected) {
       currentPageRef.focus();
+      this.setPageButtonSelectedState(false);
     }
   }
 
+  setPageButtonSelectedState(value) {
+    this.setState({ pageButtonSelected: value });
+  }
+
   handlePageSelect(page) {
     if (page !== this.state.currentPage) {
       this.setState({
         currentPage: page,
-        previousNextButtonClicked: false,
+        pageButtonSelected: true,
       });
       this.props.onPageSelect(page);
     }
@@ -60,17 +65,12 @@ class Pagination extends React.Component {
   handlePreviousNextButtonClick(page) {
     const { pageCount } = this.props;
 
-    this.setState({
-      currentPage: page,
-      previousNextButtonClicked: true,
-    });
-
     if (page === 1) {
       this.nextButtonRef.focus();
     } else if (page === pageCount) {
       this.previousButtonRef.focus();
     }
-
+    this.setState({ currentPage: page });
     this.props.onPageSelect(page);
   }