Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#112: Fix emulateTouch #116

Merged
merged 1 commit into from
Apr 29, 2017
Merged

#112: Fix emulateTouch #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
168 changes: 86 additions & 82 deletions src/components/Carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import klass from '../cssClasses';
import merge from '../object-assign';
import CSSTranslate from '../CSSTranslate';
import Swipe from 'react-easy-swipe';
import Thumbs from './Thumbs';
import * as customPropTypes from '../customPropTypes';

const noop = () => {};

class Carousel extends Component {
static displayName = 'Carousel';

Expand All @@ -20,9 +21,9 @@ class Carousel extends Component {
infiniteLoop: PropTypes.bool,
showThumbs: PropTypes.bool,
selectedItem: PropTypes.number,
onClickItem: PropTypes.func,
onClickThumb: PropTypes.func,
onChange: PropTypes.func,
onClickItem: PropTypes.func.isRequired,
onClickThumb: PropTypes.func.isRequired,
onChange: PropTypes.func.isRequired,
axis: PropTypes.oneOf(['horizontal', 'vertical']),
width: customPropTypes.unit,
useKeyboardArrows: PropTypes.bool,
Expand Down Expand Up @@ -51,7 +52,10 @@ class Carousel extends Component {
transitionTime: 350,
swipeScrollTolerance: 5,
dynamicHeight: false,
emulateTouch: false
emulateTouch: false,
onClickItem: noop,
onClickThumb: noop,
onChange: noop
};

constructor(props) {
Expand Down Expand Up @@ -150,25 +154,6 @@ class Carousel extends Component {
}
}

autoPlay = () => {
this.timer = setTimeout(() => {
this.increment();
}, this.props.interval);
}

clearAutoPlay = () => {
clearTimeout(this.timer);
}

resetAutoPlay = () => {
this.clearAutoPlay();
this.autoPlay();
}

stopOnHover = () => {
this.clearAutoPlay();
}

bindEvents () {
// as the widths are calculated, we need to resize
// the carousel when the window is resized
Expand Down Expand Up @@ -196,6 +181,33 @@ class Carousel extends Component {
}
}

autoPlay = () => {
if (!this.props.autoPlay) {
return;
}

this.timer = setTimeout(() => {
this.increment();
}, this.props.interval);
}

clearAutoPlay = () => {
if (!this.props.autoPlay) {
return;
}

clearTimeout(this.timer);
}

resetAutoPlay = () => {
this.clearAutoPlay();
this.autoPlay();
}

stopOnHover = () => {
this.clearAutoPlay();
}

navigateWithKeyboard = (e) => {
const nextKeys = ['ArrowDown', 'ArrowRight'];
const prevKeys = ['ArrowUp', 'ArrowLeft'];
Expand Down Expand Up @@ -232,18 +244,14 @@ class Carousel extends Component {

handleClickItem = (index, item) => {
if (this.state.cancelClick) {
this.selectItem({
this.setState({
cancelClick: false
});

return;
}

const handler = this.props.onClickItem;

if (typeof handler === 'function') {
handler(index, item);
}
this.props.onClickItem(index, item);

if (index !== this.state.selectedItem) {
this.setState({
Expand All @@ -253,36 +261,29 @@ class Carousel extends Component {
}

handleOnChange = (index, item) => {
const handler = this.props.onChange;

if (typeof handler === 'function') {
handler(index, item);
}
this.props.onChange(index, item);
}

handleClickThumb = (index, item) => {
const handler = this.props.onClickThumb;

if (typeof handler === 'function') {
handler(index, item);
}
this.props.onClickThumb(index, item);

this.selectItem({
selectedItem: index
});
}

onSwipeStart = () => {
this.clearAutoPlay();
this.setState({
swiping: true
});
}

onSwipeEnd = () => {
this.setState({
swiping: false,
cancelClick: true
swiping: false
});
this.autoPlay();
}

onSwipeMove = (delta) => {
Expand Down Expand Up @@ -321,7 +322,15 @@ class Carousel extends Component {
});

// allows scroll if the swipe was within the tolerance
return Math.abs(axisDelta) > this.props.swipeScrollTolerance;
const hasMoved = Math.abs(axisDelta) > this.props.swipeScrollTolerance;

if (hasMoved && !this.state.cancelClick) {
this.setState({
cancelClick: true
});
}

return hasMoved;
}

decrement = (positions) => {
Expand Down Expand Up @@ -366,6 +375,36 @@ class Carousel extends Component {
this.handleOnChange(state.selectedItem, this.props.children[state.selectedItem]);
}

getInitialImage = () => {
const selectedItem = this.props.selectedItem;
const item = this.refs[`item${selectedItem}`];
const images = item && item.getElementsByTagName('img');
return images && images[selectedItem];
}

getVariableImageHeight = (position) => {
const item = this.refs[`item${position}`];
const images = item && item.getElementsByTagName('img');
if (this.state.hasMount && images.length > 0) {
const image = images[0];

if (!image.complete) {
// if the image is still loading, the size won't be available so we trigger a new render after it's done
const onImageLoad = () => {
this.forceUpdate();
image.removeEventListener('load', onImageLoad);
}

image.addEventListener('load', onImageLoad);
}

const height = image.clientHeight;
return height > 0 ? height : null;
}

return null;
}

renderItems () {
return React.Children.map(this.props.children, (item, index) => {
const hasMount = this.state.hasMount;
Expand Down Expand Up @@ -414,36 +453,6 @@ class Carousel extends Component {
);
}

getInitialImage () {
const selectedItem = this.props.selectedItem;
const item = this.refs[`item${selectedItem}`];
const images = item && item.getElementsByTagName('img');
return images && images[selectedItem];
}

getVariableImageHeight (position) {
const item = this.refs[`item${position}`];
const images = item && item.getElementsByTagName('img');
if (this.state.hasMount && images.length > 0) {
const image = images[0];

if (!image.complete) {
// if the image is still loading, the size won't be available so we trigger a new render after it's done
const onImageLoad = () => {
this.forceUpdate();
image.removeEventListener('load', onImageLoad);
}

image.addEventListener('load', onImageLoad);
}

const height = image.clientHeight;
return height > 0 ? height : null;
}

return null;
}

render () {
if (!this.props.children || this.props.children.length === 0) {
return null;
Expand Down Expand Up @@ -497,10 +506,8 @@ class Carousel extends Component {
const containerStyles = {};

if (isHorizontal) {
merge(swiperProps, {
onSwipeLeft: this.increment,
onSwipeRight: this.decrement
});
swiperProps.onSwipeLeft = this.increment;
swiperProps.onSwipeRight = this.decrement;

if (this.props.dynamicHeight) {
const itemHeight = this.getVariableImageHeight(this.state.selectedItem);
Expand All @@ -509,11 +516,8 @@ class Carousel extends Component {
}

} else {
merge(swiperProps, {
onSwipeUp: this.decrement,
onSwipeDown: this.increment
});

swiperProps.onSwipeUp = this.decrement;
swiperProps.onSwipeDown = this.increment;
swiperProps.style.height = this.state.itemSize;
containerStyles.height = this.state.itemSize;
}
Expand Down
1 change: 1 addition & 0 deletions src/components/_carousel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
img {
width: 100%;
display: inline-block;
pointer-events: none;
}

.carousel {
Expand Down
82 changes: 43 additions & 39 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,55 @@
var React = require('react');
var ReactDOM = require('react-dom');
var Carousel = require('./components/Carousel');
var CreateReactClass = require('create-react-class');
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import Carousel from './components/Carousel';

function onChange() {
function _onChange() {
console.log('onChange', arguments);
}

function onClickItem() {
function _onClickItem() {
console.log('onClickItem', arguments);
}

function onClickThumb() {
function _onClickThumb() {
console.log('onClickThumb', arguments);
}

// Begin DemoSliderControls
var DemoCarousel = CreateReactClass({
render() {
return (
<Carousel showArrows infiniteLoop autoPlay emulateTouch onChange={onChange} onClickItem={onClickItem} onClickThumb={onClickThumb}>
<div>
<img src="assets/1.jpeg" />
<p className="legend">Legend 1</p>
</div>
<div>
<img src="assets/2.jpeg" />
<p className="legend">Legend 2</p>
</div>
<div>
<img src="assets/3.jpeg" />
<p className="legend">Legend 3</p>
</div>
<div>
<img src="assets/4.jpeg" />
<p className="legend">Legend 4</p>
</div>
<div>
<img src="assets/5.jpeg" />
<p className="legend">Legend 5</p>
</div>
<div>
<img src="assets/6.jpeg" />
<p className="legend">Legend 6</p>
</div>
</Carousel>
);
}
});
const DemoCarousel = () => (
<Carousel
showArrows
infiniteLoop
autoPlay
emulateTouch
onClickItem={_onClickItem}
onChange={_onChange}
onClickThumb={_onClickThumb}
>
<div>
<img src="assets/1.jpeg" />
<p className="legend">Legend 1</p>
</div>
<div>
<img src="assets/2.jpeg" />
<p className="legend">Legend 2</p>
</div>
<div>
<img src="assets/3.jpeg" />
<p className="legend">Legend 3</p>
</div>
<div>
<img src="assets/4.jpeg" />
<p className="legend">Legend 4</p>
</div>
<div>
<img src="assets/5.jpeg" />
<p className="legend">Legend 5</p>
</div>
<div>
<img src="assets/6.jpeg" />
<p className="legend">Legend 6</p>
</div>
</Carousel>
);

ReactDOM.render(<DemoCarousel />, document.querySelector('.demo-carousel'));