summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Ambas <jon@jonambas.com>2017-08-21 16:33:29 -0400
committerJon Ambas <jon@jonambas.com>2017-08-21 16:33:29 -0400
commit88036e13ea057be7d3c4038e5709eb710a6e2e27 (patch)
tree8f5ddb6a1f33b1c7ef346dfa29e2c1f37bfc201a
parent0829b699d8d13522d433495c2bfae891cb6308f5 (diff)
downloadmatchbox-88036e13ea057be7d3c4038e5709eb710a6e2e27.zip
matchbox-88036e13ea057be7d3c4038e5709eb710a6e2e27.tar.gz
matchbox-88036e13ea057be7d3c4038e5709eb710a6e2e27.tar.bz2
Fix pagination prop change, & disable pointer events on selectedorigin/pagination-fixes
-rw-r--r--src/components/Pagination/Pagination.js7
-rw-r--r--src/components/Pagination/Pagination.module.scss1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/components/Pagination/Pagination.js b/src/components/Pagination/Pagination.js
index 8b60f3b..534dab2 100644
--- a/src/components/Pagination/Pagination.js
+++ b/src/components/Pagination/Pagination.js
@@ -51,6 +51,13 @@ class Pagination extends Component {
this.handlePageChange(this.props.initialIndex);
}
+ componentWillReceiveProps(nextProps) {
+ const { pages, pageRange, initialIndex } = this.props;
+ if (pages !== nextProps.pages || pageRange !== nextProps.pageRange) {
+ this.handlePageChange(initialIndex)
+ }
+ }
+
handlePageChange(index) {
this.setState({
index,
diff --git a/src/components/Pagination/Pagination.module.scss b/src/components/Pagination/Pagination.module.scss
index 2bba764..76debba 100644
--- a/src/components/Pagination/Pagination.module.scss
+++ b/src/components/Pagination/Pagination.module.scss
@@ -23,6 +23,7 @@
.Selected {
font-weight: 700;
color: color(orange);
+ pointer-events: none;
}
.Ellipse {