Merge pull request #58 from zerkms/ISSUE-56_MAXSIZE_PROP

Added maxSize property
storybookjs · Mar 31, 2016 · 1cb47c5 · 1cb47c5
2 parents 894cb0c + b4db70a
commit 1cb47c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/demo/Example.js b/demo/Example.js
@@ -7,7 +7,7 @@ var Example = React.createClass({
 
     render: function() {
         return (
-            <SplitPane split="vertical" minSize="50" defaultSize="100" className="primary">
+            <SplitPane split="vertical" minSize="50" maxSize="300" defaultSize="100" className="primary">
                 <div></div>
                 <SplitPane split="horizontal">
                     <div></div>

diff --git a/demo/bundle.js b/demo/bundle.js
diff --git a/src/SplitPane.js b/src/SplitPane.js
@@ -12,6 +12,7 @@ export default React.createClass({
     propTypes: {
         primary: React.PropTypes.oneOf(['first', 'second']),
         minSize: React.PropTypes.number,
+        maxSize: React.PropTypes.number,
         defaultSize: React.PropTypes.number,
         size: React.PropTypes.number,
         allowResize: React.PropTypes.bool,
@@ -100,7 +101,9 @@ export default React.createClass({
                     let newSize =  size - newPosition;
 
                     if (newSize < this.props.minSize) {
-                      newSize = this.props.minSize;
+                        newSize = this.props.minSize;
+                    } else if (newSize > this.props.maxSize) {
+                        newSize = this.props.maxSize;
                     } else {
                       this.setState({
                           position: current,