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

feature: allow serialized animated event as onScroll #439

Merged
merged 1 commit into from
May 21, 2019
Merged

feature: allow serialized animated event as onScroll #439

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions src/carousel/Carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,7 @@ export default class Carousel extends Component {

this._getKeyExtractor = this._getKeyExtractor.bind(this);

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

// This bool aims at fixing an iOS bug due to scrollTo that triggers onMomentumScrollEnd.
// onMomentumScrollEnd fires this._snapScroll, thus creating an infinite loop.
Expand Down Expand Up @@ -273,6 +260,10 @@ export default class Carousel extends Component {
this._previousFirstItem = nextFirstItem;
this._snapToItem(nextFirstItem, true, true, false, false);
}

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

componentWillUnmount () {
Expand All @@ -299,6 +290,36 @@ 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 } } }];

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 =
argMap.nativeEvent.contentOffset.x ||
argMap.nativeEvent.contentOffset.y ||
this._scrollPos;
}
argMapping.push(...props.onScroll._argMapping);
}
this._onScrollHandler = Animated.event(
argMapping,
scrollEventConfig
);
}

_needsScrollView () {
const { useScrollView } = this.props;
return useScrollView || !AnimatedFlatList || this._shouldUseStackLayout() || this._shouldUseTinderLayout();
Expand Down Expand Up @@ -794,7 +815,7 @@ export default class Carousel extends Component {
this._repositionScroll(nextActiveItem);
}

if (onScroll && event) {
if (typeof onScroll === "function" && event) {
onScroll(event);
}
}
Expand Down