Skip to content

Commit 404cf40

Browse files
remove flex direction.
1 parent ed52266 commit 404cf40

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

src/carousel.less

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@
7777
}
7878

7979
.carousel-top-arrow {
80-
top: 75px;
80+
top: 23px;
8181
}
8282

8383
.carousel-bottom-arrow {
84-
bottom: 75px;
84+
bottom: 23px;
8585
}
8686

8787
.carousel-top-arrow {
8888
&.carousel-arrow-default {
8989
&:before {
9090
content: '\1431';
91+
padding-bottom: 2px;
9192
}
9293
}
9394
}
@@ -96,6 +97,7 @@
9697
&.carousel-arrow-default {
9798
&:before {
9899
content: '\142F';
100+
padding-top: 2px;
99101
}
100102
}
101103
}

src/index.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,7 @@ export default class Carousel extends Component {
442442
width,
443443
height,
444444
marginBottom: dots ? '20px' : 0,
445-
...(isVertical && !arrows) && { display: 'flex', flexDirection: 'row-reverse' },
446-
...(isVertical && arrows) && { display: 'flex', flexDirection: 'row' }
445+
...isVertical && { display: 'flex' }
447446
};
448447
const viewportStyle = { ...(style.viewport || {}),
449448
width: viewportWidth,
@@ -465,13 +464,6 @@ export default class Carousel extends Component {
465464
}
466465

467466
const controls = this.getControls();
468-
let arrowOffset = 0;
469-
if (this._viewport && this._track) {
470-
arrowOffset += this._viewport.offsetHeight / 2;
471-
arrowOffset -= this.props.verticalArrowPadding;
472-
}
473-
474-
const customArrowStyle = { ...(isVertical && !arrows) && { transform: `translateY(${ arrowOffset }px)` } };
475467

476468
return (
477469
<div className={ classes } style={ containerStyle } ref={ c => { this._containerRef = c; } }>
@@ -519,8 +511,7 @@ export default class Carousel extends Component {
519511
prevSlide={ this.prevSlide }
520512
goToSlide={ this.goToSlide }
521513
arrows={ arrows }
522-
infinite={ infinite }
523-
customArrowStyle={ customArrowStyle }/>
514+
infinite={ infinite }/>
524515
))
525516
}
526517
</div>

src/stories/CustomArrows.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33

4-
const CustomArrows = ({ nextSlide, prevSlide, overrideArrowStyle = {}, infinite, numSlides, selectedIndex, topArrowImage, bottomArrowImage, customArrowStyle }) => {
4+
const CustomArrows = ({ nextSlide, prevSlide, overrideArrowStyle = {}, infinite, numSlides, selectedIndex, topArrowImage, bottomArrowImage, arrowDivStyle }) => {
55
const hasNext = (direction) => {
66
return infinite || (['top', 'left'].includes(direction) ? selectedIndex > 0 : selectedIndex < numSlides - 1);
77
}
@@ -10,7 +10,7 @@ const CustomArrows = ({ nextSlide, prevSlide, overrideArrowStyle = {}, infinite,
1010
const hasNextTop = hasNext('top');
1111

1212
return (
13-
<div style={ customArrowStyle } className='custom-arrows-div'>
13+
<div style={ arrowDivStyle } className='custom-arrows-div'>
1414
<button className='carousel-custom-arrow' disabled={ !hasNextTop } onClick={ hasNextTop ? prevSlide : nextSlide } style={{ ...overrideArrowStyle, ...{ opacity: !hasNextTop ? 0.5 : 1 }, ...{ cursor: !hasNextTop ? 'not-allowed' : 'pointer' } }}>
1515
{topArrowImage}
1616
</button>
@@ -32,7 +32,7 @@ CustomArrows.propTypes = {
3232
selectedIndex: PropTypes.number,
3333
topArrowImage: PropTypes.node,
3434
bottomArrowImage: PropTypes.node,
35-
customArrowStyle: PropTypes.object
35+
arrowDivStyle: PropTypes.object
3636
};
3737

3838
export default CustomArrows;

src/stories/index.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const verticalNonInfiniteButtonsWithCellPaddingWithCustomArrows = () =>
8383
<Carousel height='450px' width='450px' cellPadding={ 5 } infinite={ false } arrows={ false }
8484
dots={ false } isVertical={ true } verticalArrowPadding={ 30 } controls={ [{
8585
component: CustomArrows,
86-
props: { overrideArrowStyle: { border: 'none', background: 'none' }, topArrowImage: <UpArrow/>, bottomArrowImage: <DownArrow/> }
86+
props: { overrideArrowStyle: { border: 'none', background: 'none' }, topArrowImage: <UpArrow/>, bottomArrowImage: <DownArrow/>, arrowDivStyle: { transform: 'translate(-450px, 196px)' } }
8787
}] }>
8888
{ testButtons }
8989
</Carousel>;

0 commit comments

Comments
 (0)