Merge branch '7brend7-master'

react-component · Feb 25, 2018 · c7f6f22 · c7f6f22
2 parents 88a662e + 1a99375
commit c7f6f22
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/src/common/Track.jsx b/src/common/Track.jsx
@@ -13,11 +13,10 @@ const Track = (props) => {
   };
 
   const elStyle = {
-    visibility: included ? 'visible' : 'hidden',
     ...style,
     ...positonStyle,
   };
-  return <div className={className} style={elStyle} />;
+  return included ? <div className={className} style={elStyle} /> : null;
 };
 
 export default Track;
diff --git a/tests/Range.test.js b/tests/Range.test.js
@@ -27,7 +27,6 @@ describe('Range', () => {
     const trackStyle = wrapper.find('.rc-slider-track > .rc-slider-track').at(0).props().style;
     expect(trackStyle.left).toMatch('0%');
     expect(trackStyle.width).toMatch('50%');
-    expect(trackStyle.visibility).toMatch('visible');
   });
 
   it('should render Range with tabIndex correctly', () => {
@@ -50,17 +49,14 @@ describe('Range', () => {
     const track1Style = wrapper.find('.rc-slider-track > .rc-slider-track').at(0).props().style;
     expect(track1Style.left).toMatch('0%');
     expect(track1Style.width).toMatch('25%');
-    expect(track1Style.visibility).toMatch('visible');
 
     const track2Style = wrapper.find('.rc-slider-track > .rc-slider-track').at(1).props().style;
     expect(track2Style.left).toMatch('25%');
     expect(track2Style.width).toMatch('25%');
-    expect(track2Style.visibility).toMatch('visible');
 
     const track3Style = wrapper.find('.rc-slider-track > .rc-slider-track').at(2).props().style;
     expect(track3Style.left).toMatch('50%');
     expect(track3Style.width).toMatch('25%');
-    expect(track3Style.visibility).toMatch('visible');
   });
 
   it('should update Range correctly in controllered model', () => {

diff --git a/tests/Slider.test.js b/tests/Slider.test.js
@@ -18,7 +18,6 @@ describe('Slider', () => {
     const trackStyle = wrapper.find('.rc-slider-track').at(1).props().style;
     expect(trackStyle.left).toMatch('0%');
     expect(trackStyle.width).toMatch('50%');
-    expect(trackStyle.visibility).toMatch('visible');
   });
 
   it('should allow tabIndex to be set on Handle via Slider', () => {

diff --git a/tests/__snapshots__/Range.test.js.snap b/tests/__snapshots__/Range.test.js.snap
@@ -11,19 +11,19 @@ exports[`Range should render Multi-Range with correct DOM structure 1`] = `
   </div>
   <div
     class="rc-slider-track rc-slider-track-1"
-    style="visibility:visible;left:0%;width:0%"
+    style="left:0%;width:0%"
   >
     
   </div>
   <div
     class="rc-slider-track rc-slider-track-2"
-    style="visibility:visible;left:0%;width:0%"
+    style="left:0%;width:0%"
   >
     
   </div>
   <div
     class="rc-slider-track rc-slider-track-3"
-    style="visibility:visible;left:0%;width:0%"
+    style="left:0%;width:0%"
   >
     
   </div>
@@ -99,7 +99,7 @@ exports[`Range should render Range with correct DOM structure 1`] = `
   </div>
   <div
     class="rc-slider-track rc-slider-track-1"
-    style="visibility:visible;left:0%;width:0%"
+    style="left:0%;width:0%"
   >
     
   </div>

diff --git a/tests/__snapshots__/Slider.test.js.snap b/tests/__snapshots__/Slider.test.js.snap
@@ -11,7 +11,7 @@ exports[`Slider should render Slider with correct DOM structure 1`] = `
   </div>
   <div
     class="rc-slider-track"
-    style="visibility:visible;left:0%;width:0%"
+    style="left:0%;width:0%"
   >
     
   </div>