Skip to content

Commit 526c942

Browse files
Fix unit tests.
1 parent 0609498 commit 526c942

File tree

6 files changed

+214
-24
lines changed

6 files changed

+214
-24
lines changed

.babelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@babel/preset-react"
1010
],
1111
"plugins": [
12-
"@babel/plugin-transform-runtime"
12+
"@babel/plugin-transform-runtime",
13+
"inline-react-svg"
1314
]
1415
}

package-lock.json

Lines changed: 197 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"autoprefixer": "^10.0.4",
5151
"babel-eslint": "^10.1.0",
5252
"babel-loader": "^8.0.0",
53+
"babel-plugin-inline-react-svg": "^2.0.2",
5354
"chai": "^4.2.0",
5455
"css-loader": "^0.28.11",
5556
"enzyme": "^3.11.0",

src/controls/arrow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default class Arrow extends Component {
2929
upArrowImage: PropTypes.node,
3030
downArrowImage: PropTypes.node,
3131
leftArrowImage: PropTypes.node,
32-
rightArrowImage: PropTypes.node,
32+
rightArrowImage: PropTypes.node
3333
};
3434
}
3535

src/index.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default class Carousel extends Component {
8484
upArrowImage: PropTypes.node,
8585
downArrowImage: PropTypes.node,
8686
leftArrowImage: PropTypes.node,
87-
rightArrowImage: PropTypes.node,
87+
rightArrowImage: PropTypes.node
8888
};
8989
}
9090

@@ -417,8 +417,8 @@ export default class Carousel extends Component {
417417

418418
if (arrows) {
419419
arr = arr.concat([
420-
{ component: Arrow, props: { ...isVertical ? {direction: 'top', upArrowImage} : {direction: 'left', leftArrowImage} } },
421-
{ component: Arrow, props: { ...isVertical ? {direction: 'bottom', downArrowImage} : {direction: 'right', rightArrowImage} } }
420+
{ component: Arrow, props: { ...isVertical ? { direction: 'top', upArrowImage } : { direction: 'left', leftArrowImage } } },
421+
{ component: Arrow, props: { ...isVertical ? { direction: 'bottom', downArrowImage } : { direction: 'right', rightArrowImage } } }
422422
]);
423423
}
424424

@@ -468,14 +468,13 @@ export default class Carousel extends Component {
468468
}
469469

470470
const controls = this.getControls();
471-
let arrowOffset = 0, visibleSlideCount = 0;
472-
if(this._viewport && this._track){
473-
const slides = this._track.childNodes;
474-
arrowOffset += this._viewport.offsetHeight /2;
471+
let arrowOffset = 0;
472+
if (this._viewport && this._track) {
473+
arrowOffset += this._viewport.offsetHeight / 2;
475474
arrowOffset -= this.props.verticalArrowPadding;
476475
}
477476

478-
const arrowStyle = {...isVertical && { transform: `translateY(${arrowOffset}px)` }};
477+
const arrowStyle = { ...isVertical && { transform: `translateY(${ arrowOffset }px)` } };
479478

480479
return (
481480
<div className={ classes } style={ containerStyle } ref={ c => { this._containerRef = c; } }>
@@ -498,7 +497,7 @@ export default class Carousel extends Component {
498497
<div className='carousel-viewport' ref={ v => { this._viewport = v; } } style={ viewportStyle }>
499498
<ul
500499
className='carousel-track'
501-
style={ {...trackStyle, ...isVertical && { display: 'flex', flexDirection: 'column' } } }
500+
style={{ ...trackStyle, ...isVertical && { display: 'flex', flexDirection: 'column' } }}
502501
ref={ t => { this._track = t; } }
503502
onTransitionEnd={ this.slideTransitionEnd }
504503
onMouseDown={ this.onMouseDown }
@@ -510,7 +509,7 @@ export default class Carousel extends Component {
510509
{ this.renderSlides() }
511510
</ul>
512511
</div>
513-
<div style={{...arrowStyle}}>
512+
<div style={{ ...arrowStyle }}>
514513
{
515514
controls.filter(Control => {
516515
return Control.position !== 'top';

src/stories/index.stories.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable react/jsx-key */
2+
/* eslint-disable id-length */
13
import React, { Fragment, useState } from 'react';
24
import PropTypes from 'prop-types';
35
import Carousel from '../index';
@@ -63,7 +65,7 @@ CustomDots.propTypes = {
6365
title: PropTypes.node
6466
};
6567

66-
const testButtons = ['test1', 'test2', 'test3', 'test4'].map((item) => <button style={{fontSize: '20px'}}>{item}</button>);
68+
const testButtons = ['test1', 'test2', 'test3', 'test4'].map((item) => <button style={{ fontSize: '20px' }}>{item}</button>);
6769

6870
export const verticalInfiniteWithCellPadding = () =>
6971
<Carousel height='450px' width='450px' cellPadding={ 5 } infinite={ true } arrows={ true }
@@ -79,7 +81,7 @@ export const verticalNonInfiniteWithCellPadding = () =>
7981

8082
export const verticalNonInfiniteWithCellPaddingWithCustomArrows = () =>
8183
<Carousel height='450px' width='450px' cellPadding={ 5 } infinite={ false } arrows={ true }
82-
dots={ false } isVertical={ true } upArrowImage={<UpImage/>} downArrowImage={<DownImage/>} >
84+
dots={ false } isVertical={ true } upArrowImage={ <UpImage/> } downArrowImage={ <DownImage/> } >
8385
{ imgElements }
8486
</Carousel>;
8587

0 commit comments

Comments
 (0)