tweaks

malte-wessel · Aug 7, 2015 · 71edfd7 · 71edfd7
1 parent 3a03b76
commit 71edfd7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Scrollbars.js b/src/Scrollbars.js
@@ -115,6 +115,10 @@ export default class Scrollbars extends Component {
         this.setState({ width, height }, this.update);
     }
 
+    componentWillReceiveProps() {
+        this.update();
+    }
+
     componentWillUnmount() {
         this.removeListeners();
     }
@@ -297,11 +301,11 @@ export default class Scrollbars extends Component {
         const thumbTranslateY = 'translateY(' + y + '%)';
 
         const containerStyle = {
-            ...style,
             position: 'relative',
             overflow: 'hidden',
             width: '100%',
-            height: '100%'
+            height: '100%',
+            ...style
         };
 
         const thumbStyle = {