bump 3.2.0

fix: crash when rerender #57

README.md

@@ -106,6 +106,12 @@ ReactDOM.render(<Rcslider />, container);
           <td>false</td>
           <td>Determines the type of slider. If range is `true`, two handles will be rendered in order to select a range.</td>
         </tr>
+        <tr>
+          <td>allowCross</td>
+          <td>boolean</td>
+          <td>true</td>
+          <td>When `range` is `true`, `allowCross` could be set as `true` to allow those two handles cross.</td>
+        </tr>
         <tr>
           <td>defaultValue</td>
           <td>number or [number, number]</td>

examples/range.js

@@ -1,3 +1,4 @@
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
 const React = require('react');
@@ -22,6 +23,21 @@ const CustomizedRange = React.createClass({
       value: value,
     });
   },
+  render: function() {
+    return <Slider range value={this.state.value} onChange={this.onSliderChange} />;
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState() {
+    return {
+      min: 0,
+      max: 100,
+    };
+  },
+  onSliderChange: function(value) {
+    log(value);
+  },
   onMinChange: function(e) {
     this.setState({
       min: +e.target.value || 0,
@@ -41,7 +57,7 @@ const CustomizedRange = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider range value={this.state.value} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider range defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
       </div>
     );
   },
@@ -50,8 +66,8 @@ const CustomizedRange = React.createClass({
 ReactDOM.render(
   <div>
     <div style={style}>
-      <p>Basic Range</p>
-      <Slider range defaultValue={[0, 20]} onChange={log} />
+      <p>Basic Range，`allowCross=false`</p>
+      <Slider range allowCross={false} defaultValue={[0, 20]} onChange={log} />
     </div>
     <div style={style}>
       <p>Basic Range，`step=20` </p>
@@ -69,5 +85,9 @@ ReactDOM.render(
       <p>Customized Range</p>
       <CustomizedRange />
     </div>
+    <div style={style}>
+      <p>Range with dynamic `max` `min`</p>
+      <DynamicBounds />
+    </div>
   </div>
   , document.getElementById('__react-content'));

examples/slider.js

@@ -1,3 +1,4 @@
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
 const React = require('react');
@@ -19,8 +20,6 @@ const CustomizedSlider = React.createClass({
   getInitialState: function() {
     return {
       value: 50,
-      min: 0,
-      max: 100,
     };
   },
   onSliderChange: function(value) {
@@ -29,6 +28,21 @@ const CustomizedSlider = React.createClass({
       value: value,
     });
   },
+  render: function() {
+    return <Slider value={this.state.value} onChange={this.onSliderChange} />;
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState: function() {
+    return {
+      min: 0,
+      max: 100,
+    };
+  },
+  onSliderChange: function(value) {
+    log(value);
+  },
   onMinChange: function(e) {
     this.setState({
       min: +e.target.value || 0,
@@ -48,7 +62,7 @@ const CustomizedSlider = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider value={this.state.value} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
       </div>
     );
   },
@@ -80,5 +94,9 @@ ReactDOM.render(
       <p>Customized Slider</p>
       <CustomizedSlider />
     </div>
+    <div style={style}>
+      <p>Slider with dynamic `min` `max`</p>
+      <DynamicBounds />
+    </div>
   </div>
   , document.getElementById('__react-content'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",

src/Slider.jsx

@@ -71,7 +71,7 @@ class Slider extends React.Component {
 
     const {lowerBound, upperBound} = this.state;
     if (nextProps.range) {
-      const value = nextProps.value;
+      const value = nextProps.value || [lowerBound, upperBound];
       const nextUpperBound = this.trimAlignValue(value[1], nextProps);
       const nextLowerBound = this.trimAlignValue(value[0], nextProps);
       if (nextLowerBound === lowerBound && nextUpperBound === upperBound) return;
@@ -85,7 +85,8 @@ class Slider extends React.Component {
         this.props.onChange([nextLowerBound, nextUpperBound]);
       }
     } else {
-      const nextValue = this.trimAlignValue(nextProps.value, nextProps);
+      const value = 'value' in nextProps ? nextProps.value : upperBound;
+      const nextValue = this.trimAlignValue(value, nextProps);
       if (nextValue === upperBound && lowerBound === nextProps.min) return;
 
       this.setState({
@@ -98,19 +99,16 @@ class Slider extends React.Component {
     }
   }
 
-  onChange(handle, value) {
+  onChange(state) {
     const props = this.props;
     const isNotControlled = !('value' in props);
     if (isNotControlled) {
-      this.setState({[handle]: value});
+      this.setState(state);
+    } else if (state.handle) {
+      this.setState({handle: state.handle});
     }
 
-    const state = this.state;
-    const data = {
-      upperBound: state.upperBound,
-      lowerBound: state.lowerBound,
-    };
-    data[handle] = value;
+    const data = objectAssign({}, this.state, state);
     const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
     props.onChange(changedValue);
   }
@@ -142,7 +140,26 @@ class Slider extends React.Component {
     const oldValue = state[state.handle];
     if (value === oldValue) return;
 
-    this.onChange(state.handle, value);
+    if (props.allowCross && value < state.lowerBound && state.handle === 'upperBound') {
+      this.onChange({
+        handle: 'lowerBound',
+        lowerBound: value,
+        upperBound: this.state.lowerBound,
+      });
+      return;
+    }
+    if (props.allowCross && value > state.upperBound && state.handle === 'lowerBound') {
+      this.onChange({
+        handle: 'upperBound',
+        upperBound: value,
+        lowerBound: this.state.upperBound,
+      });
+      return;
+    }
+
+    this.onChange({
+      [state.handle]: value,
+    });
   }
 
   onTouchStart(e) {
@@ -197,7 +214,9 @@ class Slider extends React.Component {
     const oldValue = state[valueNeedChanging];
     if (value === oldValue) return;
 
-    this.onChange(valueNeedChanging, value);
+    this.onChange({
+      [valueNeedChanging]: value,
+    });
   }
 
   getValue() {
@@ -238,7 +257,7 @@ class Slider extends React.Component {
   trimAlignValue(v, nextProps) {
     const state = this.state || {};
     const {handle, lowerBound, upperBound} = state;
-    const {marks, step, min, max} = objectAssign({}, this.props, nextProps || {});
+    const {marks, step, min, max, allowCross} = objectAssign({}, this.props, nextProps || {});
 
     let val = v;
     if (val <= min) {
@@ -247,10 +266,10 @@ class Slider extends React.Component {
     if (val >= max) {
       val = max;
     }
-    if (handle === 'upperBound' && val <= lowerBound) {
+    if (!allowCross && handle === 'upperBound' && val <= lowerBound) {
       val = lowerBound;
     }
-    if (handle === 'lowerBound' && val >= upperBound) {
+    if (!allowCross && handle === 'lowerBound' && val >= upperBound) {
       val = upperBound;
     }
 
@@ -384,6 +403,7 @@ Slider.propTypes = {
   tipFormatter: React.PropTypes.func,
   dots: React.PropTypes.bool,
   range: React.PropTypes.bool,
+  allowCross: React.PropTypes.bool,
 };
 
 Slider.defaultProps = {
@@ -401,6 +421,7 @@ Slider.defaultProps = {
   disabled: false,
   dots: false,
   range: false,
+  allowCross: true,
 };
 
 export default Slider;