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

Fixed warnings and Android #183

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed warnings and Android #183

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@
"bugs": {
"url": "https://github.com/zbtang/React-Native-ViewPager/issues"
},
"homepage": "https://github.com/zbtang/React-Native-ViewPager#readme"
"homepage": "https://github.com/zbtang/React-Native-ViewPager#readme",
"dependencies": {
"@react-native-community/viewpager": "^1.1.7"
}
}
235 changes: 119 additions & 116 deletions viewpager/IndicatorViewPager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,129 +2,132 @@
* Created by tangzhibin on 16/3/23.
*/

'use strict'
"use strict";

import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { StyleSheet, View, ViewPropTypes } from 'react-native'
import ViewPager from './ViewPager'
import React, { Component } from "react";
import PropTypes from "prop-types";
import { StyleSheet, View, ViewPropTypes } from "react-native";
import ViewPager from "./ViewPager";

const VIEWPAGER_REF = 'viewPager'
const INDICATOR_REF = 'indicator'
const VIEWPAGER_REF = "viewPager";
const INDICATOR_REF = "indicator";
export default class IndicatorViewPager extends Component {
static propTypes = {
...ViewPager.propTypes,
indicator: PropTypes.node,
pagerStyle: ViewPropTypes.style,
autoPlayEnable: PropTypes.bool,
autoPlayInterval: PropTypes.number,
horizontalScroll: PropTypes.bool
static propTypes = {
...ViewPager.propTypes,
indicator: PropTypes.node,
pagerStyle: ViewPropTypes.style,
autoPlayEnable: PropTypes.bool,
autoPlayInterval: PropTypes.number,
horizontalScroll: PropTypes.bool
};

static defaultProps = {
indicator: null,
initialPage: 0,
autoPlayInterval: 3000,
autoPlayEnable: false,
horizontalScroll: true
};

constructor(props) {
super(props);
this._onPageScroll = this._onPageScroll.bind(this);
this._onPageSelected = this._onPageSelected.bind(this);
this._goToNextPage = this._goToNextPage.bind(this);
this._renderIndicator = this._renderIndicator.bind(this);
this.setPage = this.setPage.bind(this);
this.setPageWithoutAnimation = this.setPageWithoutAnimation.bind(this);
this._startAutoPlay = this._startAutoPlay.bind(this);
this._stopAutoPlay = this._stopAutoPlay.bind(this);
this._currentIndex = props.initialPage;
this._childrenCount = React.Children.count(props.children);
}

componentDidMount() {
if (this.props.autoPlayEnable) this._startAutoPlay();
else this._stopAutoPlay();
}

UNSAFE_componentWillUpdate(nextProps, nextState) {
this._childrenCount = React.Children.count(nextProps.children);
if (this.props.autoPlayEnable !== nextProps.autoPlayEnable) {
nextProps.autoPlayEnable ? this._startAutoPlay() : this._stopAutoPlay();
}

static defaultProps = {
indicator: null,
initialPage: 0,
autoPlayInterval: 3000,
autoPlayEnable: false,
horizontalScroll: true
}

constructor (props) {
super(props)
this._onPageScroll = this._onPageScroll.bind(this)
this._onPageSelected = this._onPageSelected.bind(this)
this._goToNextPage = this._goToNextPage.bind(this)
this._renderIndicator = this._renderIndicator.bind(this)
this.setPage = this.setPage.bind(this)
this.setPageWithoutAnimation = this.setPageWithoutAnimation.bind(this)
this._startAutoPlay = this._startAutoPlay.bind(this)
this._stopAutoPlay = this._stopAutoPlay.bind(this)
this._currentIndex = props.initialPage
this._childrenCount = React.Children.count(props.children)
}

render() {
return (
<View style={[styles.container, this.props.style]}>
<ViewPager
{...this.props}
horizontalScroll={this.props.horizontalScroll}
ref={VIEWPAGER_REF}
style={[styles.pager, this.props.pagerStyle]}
onPageScroll={this._onPageScroll}
onPageSelected={this._onPageSelected}
/>
{this._renderIndicator()}
</View>
);
}

componentWillUnmount() {
this._stopAutoPlay();
}

_onPageScroll(params) {
let indicator = this.refs[INDICATOR_REF];
indicator && indicator.onPageScroll && indicator.onPageScroll(params);
this.props.onPageScroll && this.props.onPageScroll(params);
}

_onPageSelected(params) {
let indicator = this.refs[INDICATOR_REF];
indicator && indicator.onPageSelected && indicator.onPageSelected(params);
this.props.onPageSelected && this.props.onPageSelected(params);
this._currentIndex = params.position;
}

_renderIndicator() {
let { indicator, initialPage } = this.props;
if (!indicator) return null;
return React.cloneElement(indicator, {
ref: INDICATOR_REF,
pager: this,
initialPage: initialPage
});
}

_goToNextPage() {
let nextIndex = (this._currentIndex + 1) % this._childrenCount;
this.setPage(nextIndex);
}

_startAutoPlay() {
if (this._timerId) clearInterval(this._timerId);
this._timerId = setInterval(
this._goToNextPage,
this.props.autoPlayInterval
);
}

_stopAutoPlay() {
if (this._timerId) {
clearInterval(this._timerId);
this._timerId = null;
}
}

componentDidMount () {
if (this.props.autoPlayEnable) this._startAutoPlay()
else this._stopAutoPlay()
}
setPage(selectedPage) {
this.refs[VIEWPAGER_REF].setPage(selectedPage);
}

componentWillUpdate (nextProps, nextState) {
this._childrenCount = React.Children.count(nextProps.children)
if (this.props.autoPlayEnable !== nextProps.autoPlayEnable) {
nextProps.autoPlayEnable ? this._startAutoPlay() : this._stopAutoPlay()
}
}

render () {
return (
<View style={[styles.container, this.props.style]} >
<ViewPager
{...this.props}
horizontalScroll={this.props.horizontalScroll}
ref={VIEWPAGER_REF}
style={[styles.pager, this.props.pagerStyle]}
onPageScroll={this._onPageScroll}
onPageSelected={this._onPageSelected}
/>
{this._renderIndicator()}
</View>
)
}

componentWillUnmount () {
this._stopAutoPlay()
}

_onPageScroll (params) {
let indicator = this.refs[INDICATOR_REF]
indicator && indicator.onPageScroll && indicator.onPageScroll(params)
this.props.onPageScroll && this.props.onPageScroll(params)
}

_onPageSelected (params) {
let indicator = this.refs[INDICATOR_REF]
indicator && indicator.onPageSelected && indicator.onPageSelected(params)
this.props.onPageSelected && this.props.onPageSelected(params)
this._currentIndex = params.position
}

_renderIndicator () {
let {indicator, initialPage} = this.props
if (!indicator)return null
return React.cloneElement(indicator, {
ref: INDICATOR_REF,
pager: this,
initialPage: initialPage
})
}

_goToNextPage () {
let nextIndex = (this._currentIndex + 1) % this._childrenCount
this.setPage(nextIndex)
}

_startAutoPlay () {
if (this._timerId) clearInterval(this._timerId)
this._timerId = setInterval(this._goToNextPage, this.props.autoPlayInterval)
}

_stopAutoPlay () {
if (this._timerId) {
clearInterval(this._timerId)
this._timerId = null
}
}

setPage (selectedPage) {
this.refs[VIEWPAGER_REF].setPage(selectedPage)
}

setPageWithoutAnimation (selectedPage) {
this.refs[VIEWPAGER_REF].setPageWithoutAnimation(selectedPage)
}
setPageWithoutAnimation(selectedPage) {
this.refs[VIEWPAGER_REF].setPageWithoutAnimation(selectedPage);
}
}

const styles = StyleSheet.create({
container: {},
pager: {flex: 1}
})
container: {},
pager: { flex: 1 }
});
Loading