bump 3.5.0

feat: support set style of specific mark point

README.md

@@ -90,9 +90,9 @@ ReactDOM.render(<Rcslider />, container);
         </tr>
         <tr>
           <td>marks</td>
-          <td>object {number: string}</td>
+          <td>object{number: string} or object{number: object{ style, label }}</td>
           <td>{}</td>
-          <td>Mark on the slider. The key determines the position, and the value determines what will show.</td>
+          <td>Mark on the slider. The key determines the position, and the value determines what will show. If you want to set the style of a specific mark point, the value should be an object which contains `style` and `label` properties.</td>
         </tr>
         <tr>
           <td>step</td>
@@ -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

@@ -7,10 +7,16 @@ const Slider = require('rc-slider');
 const style = {width: 400, margin: 50};
 const marks = {
   '-10': '-10°C',
-  0: '0°C',
+  0: <strong>0°C</strong>,
   26: '26°C',
   37: '37°C',
-  100: '100°C',
+  50: '50°C',
+  100: {
+    style: {
+      color: 'red',
+    },
+    label: <strong>100°C</strong>,
+  },
 };
 
 function log(value) {
@@ -25,7 +31,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.5.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",

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/Marks.jsx

@@ -8,7 +8,7 @@ const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) =
   const markWidth = unit * 0.9;
 
   const range = max - min;
-  const elements = marksKeys.map(parseFloat).map((point) => {
+  const elements = marksKeys.map(parseFloat).sort((a, b) => a - b).map((point) => {
     const isActived = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
     const markClassName = classNames({
@@ -19,8 +19,14 @@ const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) =
     const style = { width: markWidth + '%' };
     style.left = (point - min) / range * 100 - markWidth / 2 + '%';
 
-    return (<span className={markClassName} style={style} key={point}>
-             {marks[point]}
+    const markPoint = marks[point];
+    const markPointIsObject = typeof markPoint === 'object' &&
+            !React.isValidElement(markPoint);
+    const markLabel = markPointIsObject ? markPoint.label : markPoint;
+    const markStyle = markPointIsObject ?
+            { ...style, ...markPoint.style } : style;
+    return (<span className={markClassName} style={markStyle} key={point}>
+             {markLabel}
             </span>);
   });
 

src/Slider.jsx

@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import objectAssign from 'object-assign';
 import Track from './Track';
 import Handle from './Handle';
-import Dots from './Dots';
+import Steps from './Steps';
 import Marks from './Marks';
 
 function noop() {
@@ -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;
@@ -81,11 +81,11 @@ class Slider extends React.Component {
         lowerBound: nextLowerBound,
       });
       if (this.isValueOutOfBounds(upperBound, nextProps) ||
-          this.isValueOutOfBounds(lowerBound, nextProps)) {
+        this.isValueOutOfBounds(lowerBound, nextProps)) {
         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;
 
@@ -333,23 +333,23 @@ class Slider extends React.Component {
   render() {
     const {handle, upperBound, lowerBound} = this.state;
     const {className, prefixCls, disabled, dots, included, range, step,
-           marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
+      marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
 
     const upperOffset = this.calcOffset(upperBound);
     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({
@@ -366,12 +366,12 @@ class Slider extends React.Component {
         {lower}
         <Track className={prefixCls + '-track'} included={isIncluded}
                offset={lowerOffset} length={upperOffset - lowerOffset}/>
-        <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
+        <Steps 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,

src/Steps.jsx

@@ -5,13 +5,15 @@ 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);
     }
   }
   return points;
 }
 
-const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, max, min}) => {
+const Steps = ({prefixCls, marks, dots, step, included,
+                lowerBound, upperBound, max, min}) => {
   const range = max - min;
   const elements = calcPoints(marks, dots, step, min, max).map((point) => {
     const offset = (point - min) / range * 100 + '%';
@@ -30,4 +32,4 @@ const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, m
   return <div className={prefixCls + '-step'}>{elements}</div>;
 };
 
-export default Dots;
+export default Steps;

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%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
+      .to.match(/left: 50%;/);
 
+    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%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
+      .to.match(/left: 50%;/);
+
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(sliderWithValue, '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 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', () => {
-    const sliderWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
-    expect(sliderWithDefaultValue.state.lowerBound).to.be(0);
-    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
+  it('should render a Range with default value correctly', () => {
+    const rangeWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
+    expect(rangeWithDefaultValue.state.lowerBound).to.be(0);
+    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%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
+      .to.match(/left: 0%;/);
 
-    const sliderWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div);
-    expect(sliderWithValue.state.lowerBound).to.be(50);
-    expect(sliderWithValue.state.upperBound).to.be(100);
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, '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 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%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('width: 50%; visibility: visible; left: 50%; ');
+      .to.match(/left: 50%;/);
+
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-track')[0]
+            .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`', () => {