kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-03-06 17:34:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow Transitioner to queue single animation (#191)

Browse Source 
remove some extra spaces

use navigationScene type

fix index race condition
This commit is contained in:
Daniel Hood
2017-02-07 14:19:27 -08:00
committed by Eric Vicenti
parent edad95a96d
commit 5501bcdb44
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/Transitioner.js
View File

@@ -95,6 +95,8 @@ class Transitioner extends React.Component<*, Props, State> {
this._prevTransitionProps = null;
this._transitionProps = buildTransitionProps(props, this.state);
this._isMounted = false;
this._isTransitionRunning = false;
this._queuedTransition = null;
}
componentWillMount(): void {
@@ -121,6 +123,16 @@ class Transitioner extends React.Component<*, Props, State> {
return;
}
const indexHasChanged = nextProps.navigation.state.index !== this.props.navigation.state.index;
if (this._isTransitionRunning) {
this._queuedTransition = { nextProps, nextScenes, indexHasChanged };
return;
}
this._startTransition(nextProps, nextScenes, indexHasChanged);
}
_startTransition(nextProps: Props, nextScenes: Array<NavigationScene>, indexHasChanged: boolean) {
const nextState = {
...this.state,
scenes: nextScenes,
@@ -162,7 +174,7 @@ class Transitioner extends React.Component<*, Props, State> {
),
];
if (nextProps.navigation.state.index !== this.props.navigation.state.index) {
if (indexHasChanged) {
animations.push(
timing(
position,
@@ -173,8 +185,8 @@ class Transitioner extends React.Component<*, Props, State> {
),
);
}
// update scenes and play the transition
this._isTransitionRunning = true;
this.setState(nextState, () => {
nextProps.onTransitionStart && nextProps.onTransitionStart(
this._transitionProps,
@@ -239,6 +251,16 @@ class Transitioner extends React.Component<*, Props, State> {
this._transitionProps,
prevTransitionProps,
);
if (this._queuedTransition) {
this._startTransition(
this._queuedTransition.nextProps,
this._queuedTransition.nextScenes,
this._queuedTransition.indexHasChanged
);
this._queuedTransition = null;
} else {
this._isTransitionRunning = false;
}
});
}
}