Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-snap-carousel",
"version": "3.9.1",
"version": "3.9.2",
"description": "Swiper/carousel component for React Native with previews, multiple layouts, parallax images, performant handling of huge numbers of items, and RTL support. Compatible with Android & iOS.",
"main": "src/index.js",
"repository": {
Expand Down Expand Up @@ -37,6 +37,7 @@
"author": "Meliorence <[email protected]> (github.com/meliorence)",
"license": "BSD-3-Clause",
"dependencies": {
"deprecated-react-native-prop-types": "^5.0.0",
"prop-types": "^15.6.1",
"react-addons-shallow-compare": "15.6.2"
},
Expand Down
61 changes: 31 additions & 30 deletions src/carousel/Carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { Animated, Easing, FlatList, I18nManager, Platform, ScrollView, View, ViewPropTypes } from 'react-native';
import { Animated, Easing, FlatList, I18nManager, Platform, ScrollView, View } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import shallowCompare from 'react-addons-shallow-compare';
import {
Expand Down Expand Up @@ -263,7 +264,7 @@ export default class Carousel extends Component {
}

if (this.props.onScroll !== prevProps.onScroll) {
this._setScrollHandler(this.props);
this._setScrollHandler(this.props);
}
}

Expand Down Expand Up @@ -291,34 +292,34 @@ export default class Carousel extends Component {
return this._currentContentOffset;
}

_setScrollHandler(props) {
// Native driver for scroll events
const scrollEventConfig = {
listener: this._onScroll,
useNativeDriver: true,
};
this._scrollPos = new Animated.Value(0);
const argMapping = props.vertical
? [{ nativeEvent: { contentOffset: { y: this._scrollPos } } }]
: [{ nativeEvent: { contentOffset: { x: this._scrollPos } } }];
_setScrollHandler (props) {
// Native driver for scroll events
const scrollEventConfig = {
listener: this._onScroll,
useNativeDriver: true
};
this._scrollPos = new Animated.Value(0);
const argMapping = props.vertical ?
[{ nativeEvent: { contentOffset: { y: this._scrollPos } } }] :
[{ nativeEvent: { contentOffset: { x: this._scrollPos } } }];

if (props.onScroll && Array.isArray(props.onScroll._argMapping)) {
if (props.onScroll && Array.isArray(props.onScroll._argMapping)) {
// Because of a react-native issue https://github.com/facebook/react-native/issues/13294
argMapping.pop();
const [ argMap ] = props.onScroll._argMapping;
if (argMap && argMap.nativeEvent && argMap.nativeEvent.contentOffset) {
// Shares the same animated value passed in props
this._scrollPos =
argMapping.pop();
const [ argMap ] = props.onScroll._argMapping;
if (argMap && argMap.nativeEvent && argMap.nativeEvent.contentOffset) {
// Shares the same animated value passed in props
this._scrollPos =
argMap.nativeEvent.contentOffset.x ||
argMap.nativeEvent.contentOffset.y ||
this._scrollPos;
}
argMapping.push(...props.onScroll._argMapping);
}
argMapping.push(...props.onScroll._argMapping);
}
this._onScrollHandler = Animated.event(
argMapping,
scrollEventConfig
);
this._onScrollHandler = Animated.event(
argMapping,
scrollEventConfig
);
}

_needsScrollView () {
Expand Down Expand Up @@ -822,7 +823,7 @@ export default class Carousel extends Component {
this._repositionScroll(nextActiveItem);
}

if (typeof onScroll === "function" && event) {
if (typeof onScroll === 'function' && event) {
onScroll(event);
}
}
Expand All @@ -838,28 +839,28 @@ export default class Carousel extends Component {
}

_onTouchStart () {
const { onTouchStart } = this.props
const { onTouchStart } = this.props;

// `onTouchStart` is fired even when `scrollEnabled` is set to `false`
if (this._getScrollEnabled() !== false && this._autoplaying) {
this.pauseAutoPlay();
}

if (onTouchStart) {
onTouchStart()
onTouchStart();
}
}

_onTouchEnd () {
const { onTouchEnd } = this.props
const { onTouchEnd } = this.props;

if (this._getScrollEnabled() !== false && this._autoplay && !this._autoplaying) {
// This event is buggy on Android, so a fallback is provided in _onScrollEnd()
this.startAutoplay();
}

if (onTouchEnd) {
onTouchEnd()
onTouchEnd();
}
}

Expand Down Expand Up @@ -1354,7 +1355,7 @@ export default class Carousel extends Component {
...this._getComponentStaticProps()
};

const ScrollViewComponent = typeof useScrollView === 'function' ? useScrollView : AnimatedScrollView
const ScrollViewComponent = typeof useScrollView === 'function' ? useScrollView : AnimatedScrollView;

return this._needsScrollView() ? (
<ScrollViewComponent {...props}>
Expand Down
3 changes: 2 additions & 1 deletion src/pagination/Pagination.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { I18nManager, Platform, View, ViewPropTypes } from 'react-native';
import { I18nManager, Platform, View } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import PaginationDot from './PaginationDot';
import styles from './Pagination.style';
Expand Down
3 changes: 2 additions & 1 deletion src/pagination/PaginationDot.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { View, Animated, Easing, TouchableOpacity, ViewPropTypes } from 'react-native';
import { View, Animated, Easing, TouchableOpacity } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import styles from './Pagination.style';

Expand Down
3 changes: 2 additions & 1 deletion src/parallaximage/ParallaxImage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Parallax effect inspired by https://github.com/oblador/react-native-parallax/

import React, { Component } from 'react';
import { View, ViewPropTypes, Image, Animated, Easing, ActivityIndicator, findNodeHandle } from 'react-native';
import { View, Image, Animated, Easing, ActivityIndicator, findNodeHandle } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import styles from './ParallaxImage.style';

Expand Down