From 6b06e9011213146fe150d7f3b6a9c0863f50cdda Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sun, 17 Apr 2016 22:15:56 +0100 Subject: [PATCH 1/2] Expose onResize hook in gemini-scrollbar --- dist/index.js | 9 ++++++--- src/index.jsx | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 858471c..be61054 100644 --- a/dist/index.js +++ b/dist/index.js @@ -13,7 +13,8 @@ module.exports = React.createClass({ propTypes: { autoshow: React.PropTypes.bool, - forceGemini: React.PropTypes.bool + forceGemini: React.PropTypes.bool, + onResize: React.PropTypes.func }, getDefaultProps: function getDefaultProps() { @@ -34,7 +35,8 @@ module.exports = React.createClass({ element: ReactDOM.findDOMNode(this), autoshow: this.props.autoshow, forceGemini: this.props.forceGemini, - createElements: false + createElements: false, + onResize: this.props.onResize }).create(); }, @@ -51,7 +53,8 @@ module.exports = React.createClass({ var _props = this.props; var className = _props.className; var children = _props.children; - var other = _objectWithoutProperties(_props, ['className', 'children']); + var onResize = _props.onResize; + var other = _objectWithoutProperties(_props, ['className', 'children', 'onResize']); var classes = ''; if (className) { diff --git a/src/index.jsx b/src/index.jsx index 56581be..4d09d3e 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -7,7 +7,8 @@ module.exports = React.createClass({ propTypes: { autoshow: React.PropTypes.bool, - forceGemini: React.PropTypes.bool + forceGemini: React.PropTypes.bool, + onResize: React.PropTypes.func, }, getDefaultProps() { @@ -28,7 +29,8 @@ module.exports = React.createClass({ element: ReactDOM.findDOMNode(this), autoshow: this.props.autoshow, forceGemini: this.props.forceGemini, - createElements: false + createElements: false, + onResize: this.props.onResize, }).create(); }, @@ -42,7 +44,7 @@ module.exports = React.createClass({ }, render() { - var {className, children, ...other} = this.props, + var {className, children, onResize, ...other} = this.props, classes = ''; if (className) { From 85fdba60edf61882496915639854dcc6c4a527f7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 22 Jul 2016 09:53:37 +0100 Subject: [PATCH 2/2] Bump gemini-scrollbar to 1.4.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3c6ed6..ebe388a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "license": "MIT", "homepage": "https://github.com/noeldelgado/react-gemini-scrollbar", "dependencies": { - "gemini-scrollbar": "1.3.x" + "gemini-scrollbar": "^1.4.2" }, "peerDependencies": { "react": "^0.14.0 || ^15.0.0",