fix: work with rc-form

If tipFormatter is null, don't show the tip

README.md

@@ -144,9 +144,9 @@ ReactDOM.render(<Rcslider />, container);
         </tr>
         <tr>
           <td>tipFormatter</td>
-          <td>function</td>
+          <td>function or `null`</td>
           <td></td>
-          <td>Format the value of the tooltip if it shows.</td>
+          <td>Format the value of the tooltip if it shows. If `null` the tooltip will always be hidden.</td>
         </tr>
         <tr>
           <td>dots</td>

examples/marks.js

@@ -10,6 +10,7 @@ const marks = {
   0: '0°C',
   26: '26°C',
   37: '37°C',
+  50: '50°C',
   100: '100°C',
 };
 
@@ -25,7 +26,7 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <p>Slider with marks and steps</p>
-      <Slider min={-10} marks={marks} step={10} onChange={log} defaultValue={20} />
+      <Slider dots min={-10} marks={marks} step={10} onChange={log} defaultValue={20} />
     </div>
 
     <div style={style}>

examples/slider.js

@@ -86,6 +86,10 @@ ReactDOM.render(
       <p>Basic Slider with `tipFormatter`</p>
       <Slider tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
     </div>
+    <div style={style}>
+      <p>Basic Slider without tooltip</p>
+      <Slider tipFormatter={null} onChange={log} />
+    </div>
     <div style={style}>
       <p>Controlled Slider</p>
       <Slider value={50} />

package.json

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

src/Dots.jsx

@@ -5,6 +5,7 @@ function calcPoints(marks, dots, step, min, max) {
   const points = Object.keys(marks).map(parseFloat);
   if (dots) {
     for (let i = min; i <= max; i = i + step) {
+      if (points.indexOf(i) >= 0) continue;
       points.push(i);
     }
   }

src/Handle.jsx

@@ -42,7 +42,7 @@ export default class Handle extends React.Component {
               prefixCls={className.replace('slider-handle', 'tooltip')}
               placement="top"
               visible={isTooltipVisible}
-              overlay={<span>{tipFormatter ? tipFormatter(value) : value}</span>}
+              overlay={<span>{tipFormatter(value)}</span>}
               delay={0}
               transitionName={tipTransitionName}>
               {handle}

src/Slider.jsx

@@ -34,7 +34,7 @@ class Slider extends React.Component {
     const {range, min, max} = props;
     const initialValue = range ? [min, min] : min;
     const defaultValue = ('defaultValue' in props ? props.defaultValue : initialValue);
-    const value = ('value' in props ? props.value : defaultValue);
+    const value = (props.value !== undefined ? props.value : defaultValue);
 
     let upperBound;
     let lowerBound;
@@ -85,7 +85,7 @@ class Slider extends React.Component {
         this.props.onChange([nextLowerBound, nextUpperBound]);
       }
     } else {
-      const value = 'value' in nextProps ? nextProps.value : upperBound;
+      const value = nextProps.value !== undefined ? nextProps.value : upperBound;
       const nextValue = this.trimAlignValue(value, nextProps);
       if (nextValue === upperBound && lowerBound === nextProps.min) return;
 
@@ -339,17 +339,17 @@ class Slider extends React.Component {
     const lowerOffset = this.calcOffset(lowerBound);
 
     const handleClassName = prefixCls + '-handle';
-    const isNoTip = (step === null) && !tipFormatter;
+    const isNoTip = (step === null) || (tipFormatter === null);
 
     const upper = (<Handle className={handleClassName}
                            noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
+                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>);
 
     let lower = null;
     if (range) {
       lower = (<Handle className={handleClassName}
                        noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
+                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>);
     }
 
     const sliderClassName = classNames({
@@ -368,10 +368,10 @@ class Slider extends React.Component {
                offset={lowerOffset} length={upperOffset - lowerOffset}/>
         <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
               included={isIncluded} lowerBound={lowerBound}
-              upperBound={upperBound} max={max} min={min} />
+              upperBound={upperBound} max={max} min={min}/>
         <Marks className={prefixCls + '-mark'} marks={marks}
                included={isIncluded} lowerBound={lowerBound}
-               upperBound={upperBound} max={max} min={min} />
+               upperBound={upperBound} max={max} min={min}/>
         {children}
       </div>
     );
@@ -417,6 +417,7 @@ Slider.defaultProps = {
   onBeforeChange: noop,
   onChange: noop,
   onAfterChange: noop,
+  tipFormatter: value => value,
   included: true,
   disabled: false,
   dots: false,

tests/index.spec.js

@@ -22,28 +22,36 @@ describe('rc-slider', function() {
     expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-track').length).to.be(1);
   });
 
-  it('should render a Slider with correct value and CSS style', () => {
+  it('should render a Slider with default value correctly', () => {
     const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div);
     expect(sliderWithDefaultValue.state.upperBound).to.be(50);
     expect(ReactTestUtils
            .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
            .style.cssText)
-      .to.be('left: 50%; ');
+      .to.match(/left: 50%;/);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
 
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+            .style.cssText;
+    expect(trackStyle).to.match(/left: 0%;/);
+    expect(trackStyle).to.match(/width: 50%;/);
+    expect(trackStyle).to.match(/visibility: visible;/);
+  });
+
+  it('should render a Slider with value corrently', () => {
     const sliderWithValue = ReactDOM.render(<Slider value={50} />, div);
     expect(sliderWithValue.state.upperBound).to.be(50);
     expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .scryRenderedDOMComponentsWithClass(sliderWithValue, 'rc-slider-handle')[0]
            .style.cssText)
-      .to.be('left: 50%; ');
+      .to.match(/left: 50%;/);
-    expect(ReactTestUtils
+
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+    const trackStyle = ReactTestUtils
-           .style.cssText)
+            .scryRenderedDOMComponentsWithClass(sliderWithValue, 'rc-slider-track')[0]
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
+            .style.cssText;
+    expect(trackStyle).to.match(/left: 0%;/);
+    expect(trackStyle).to.match(/width: 50%;/);
+    expect(trackStyle).to.match(/visibility: visible;/);
   });
 
   it('should render a Range with correct DOM structure', () => {
@@ -53,38 +61,46 @@ describe('rc-slider', function() {
     expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1);
   });
 
-  it('should render a Range with correct value and CSS style', () => {
+  it('should render a Range with default value correctly', () => {
-    const sliderWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
+    const rangeWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
-    expect(sliderWithDefaultValue.state.lowerBound).to.be(0);
+    expect(rangeWithDefaultValue.state.lowerBound).to.be(0);
-    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
+    expect(rangeWithDefaultValue.state.upperBound).to.be(50);
     expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[0]
            .style.cssText)
-      .to.be('left: 50%; ');
+      .to.match(/left: 50%;/);
     expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
+           .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[1]
            .style.cssText)
-      .to.be('left: 0%; ');
+      .to.match(/left: 0%;/);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
 
-    const sliderWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div);
+    const trackStyle = ReactTestUtils
-    expect(sliderWithValue.state.lowerBound).to.be(50);
+            .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-track')[0]
-    expect(sliderWithValue.state.upperBound).to.be(100);
+            .style.cssText;
+    expect(trackStyle).to.match(/left: 0%;/);
+    expect(trackStyle).to.match(/width: 50%;/);
+    expect(trackStyle).to.match(/visibility: visible;/);
+  });
+
+  it('should render a Range with value correctly', () => {
+    const rangeWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div);
+    expect(rangeWithValue.state.lowerBound).to.be(50);
+    expect(rangeWithValue.state.upperBound).to.be(100);
     expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[0]
            .style.cssText)
-      .to.be('left: 100%; ');
+      .to.match(/left: 100%;/);
     expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[1]
            .style.cssText)
-      .to.be('left: 50%; ');
+      .to.match(/left: 50%;/);
-    expect(ReactTestUtils
+
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+    const trackStyle = ReactTestUtils
-           .style.cssText)
+            .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-track')[0]
-      .to.be('width: 50%; visibility: visible; left: 50%; ');
+            .style.cssText;
+    expect(trackStyle).to.match(/left: 50%;/);
+    expect(trackStyle).to.match(/width: 50%;/);
+    expect(trackStyle).to.match(/visibility: visible;/);
   });
 
   it('should render dots correctly when `dots=true`', () => {