Merge branch 'master' into bugfix/keep-pushable

assets/index.less

@@ -115,12 +115,6 @@
     cursor: pointer;
     border-radius: 50%;
     vertical-align: middle;
-    &:first-child {
-      margin-left: -4px;
-    }
-    &:last-child {
-      margin-left: -4px;
-    }
     &-active {
       border-color: tint(@primary-color, 50%);
     }

examples/range.js

@@ -126,7 +126,12 @@ class ControlledRangeDisableAcross extends React.Component {
   }
   render() {
     return (
-      <Range value={this.state.value} onChange={this.handleChange} allowCross={false} />
+      <Range
+        value={this.state.value}
+        onChange={this.handleChange}
+        allowCross={false}
+        {...this.props}
+      />
     );
   }
 }
@@ -175,9 +180,13 @@ ReactDOM.render(
       <ControlledRange />
     </div>
     <div style={style}>
-    <p>Controlled Range, not allow across</p>
-    <ControlledRangeDisableAcross />
-  </div>
+      <p>Controlled Range, not allow across</p>
+      <ControlledRangeDisableAcross />
+    </div>
+    <div style={style}>
+      <p>Controlled Range, not allow across, pushable</p>
+      <ControlledRangeDisableAcross pushable/>
+    </div>
     <div style={style}>
       <p>Multi Range</p>
       <Range count={3} defaultValue={[20, 40, 60, 80]} pushable />

package.json

@@ -68,6 +68,7 @@
     "jest": "^20.0.0",
     "pre-commit": "1.x",
     "rc-tools": "6.x",
+    "rc-trigger": "^2.2.0",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-test-renderer": "^16.0.0"

src/common/Marks.jsx

@@ -17,6 +17,14 @@ const Marks = ({
 
   const range = max - min;
   const elements = marksKeys.map(parseFloat).sort((a, b) => a - b).map(point => {
+    const markPoint = marks[point];
+    const markPointIsObject = typeof markPoint === 'object' &&
+            !React.isValidElement(markPoint);
+    const markLabel = markPointIsObject ? markPoint.label : markPoint;
+    if (!markLabel) {
+      return null;
+    }
+
     const isActive = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
     const markClassName = classNames({
@@ -36,11 +44,6 @@ const Marks = ({
     };
 
     const style = vertical ? bottomStyle : leftStyle;
-
-    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 (

tests/__mocks__/rc-trigger.js

@@ -0,0 +1,3 @@
+import Trigger from 'rc-trigger/lib/mock';
+
+export default Trigger;

tests/common/marks.test.js

@@ -6,7 +6,7 @@ const { Range } = Slider;
 
 describe('marks', () => {
   it('should render marks correctly when `marks` is not an empty object', () => {
-    const marks = { 0: '0', 30: '30', 100: '100' };
+    const marks = { 0: '0', 30: '30', 99: '', 100: '100' };
 
     const sliderWrapper = mount(<Slider value={30} marks={marks} />);
     expect(sliderWrapper.find('.rc-slider-mark-text').length).toBe(3);