Fork NavigationAnimatedView to NavigationTransitioner

Summary:
- Fork NavigationAnimatedView to NavigationTransitioner
- NavigationAnimatedView will soon be deprecated and we'd ask people to use NavigationTransitioner instead.

Difference between  NavigationTransitioner and NavigationAnimatedView

- prop `applyAnimation` is removed.
- new prop `configureTransition`, `onTransitionStart`, and `onTransitionEnd` are added.

tl;dr;

In NavigationAnimatedView, we `position` (an Animated.Value object) as a proxy of the
transtion which happens whenever the index of navigation state changes.

Because `position` does not change unless navigation index changes, it won't
be possible to build animations for actions that changes the  navigation state
without changing the index.

Also, we believe that the name `Transitioner` is a better name for this core component
that focuses on transitioning. Note that the actual animation work is done via
`<Animated.View />` returnd from the `renderScene` prop.

Reviewed By: ericvicenti

Differential Revision: D3302688

fbshipit-source-id: 720c3a4d3ccf97eb05b038baa44c9e780aad120b
This commit is contained in:
Hedger Wang
2016-05-18 13:32:52 -07:00
committed by Facebook Github Bot 7
parent 0e997c6eab
commit 7db7f78dc7
6 changed files with 304 additions and 5 deletions

View File

@@ -11,6 +11,11 @@
*/
'use strict';
/**
* WARNING: NavigationAnimatedView will be deprecated soon.
* Use NavigationTransitioner instead.
*/
const Animated = require('Animated');
const NavigationPropTypes = require('NavigationPropTypes');
const NavigationScenesReducer = require('NavigationScenesReducer');
@@ -40,6 +45,7 @@ type Props = {
type State = {
layout: NavigationLayout,
position: NavigationAnimatedValue,
progress: NavigationAnimatedValue,
scenes: Array<NavigationScene>,
};
@@ -96,6 +102,9 @@ class NavigationAnimatedView
this.state = {
layout,
position: new Animated.Value(this.props.navigationState.index),
// This `progress` is a adummy placeholder value to meet the values
// as `NavigationSceneRendererProps` requires.
progress: new Animated.Value(1),
scenes: NavigationScenesReducer([], this.props.navigationState),
};
}
@@ -179,6 +188,7 @@ class NavigationAnimatedView
const {
position,
progress,
scenes,
} = this.state;
@@ -187,6 +197,7 @@ class NavigationAnimatedView
navigationState,
onNavigate,
position,
progress,
scene,
scenes,
});
@@ -202,6 +213,7 @@ class NavigationAnimatedView
const {
position,
progress,
scenes,
} = this.state;
@@ -210,6 +222,7 @@ class NavigationAnimatedView
navigationState,
onNavigate,
position,
progress,
scene: scenes[navigationState.index],
scenes,
});

View File

@@ -15,9 +15,10 @@ const NavigationAnimatedView = require('NavigationAnimatedView');
const NavigationCard = require('NavigationCard');
const NavigationCardStack = require('NavigationCardStack');
const NavigationHeader = require('NavigationHeader');
const NavigationPropTypes = require('NavigationPropTypes');
const NavigationReducer = require('NavigationReducer');
const NavigationStateUtils = require('NavigationStateUtils');
const NavigationPropTypes = require('NavigationPropTypes');
const NavigationTransitioner = require('NavigationTransitioner');
const NavigationExperimental = {
// Core
@@ -26,6 +27,7 @@ const NavigationExperimental = {
// Views
AnimatedView: NavigationAnimatedView,
Transitioner: NavigationTransitioner,
// CustomComponents:
Card: NavigationCard,

View File

@@ -70,6 +70,7 @@ const SceneRendererProps = {
navigationState: navigationParentState.isRequired,
onNavigate: PropTypes.func.isRequired,
position: animatedValue.isRequired,
progress: animatedValue.isRequired,
scene: scene.isRequired,
scenes: PropTypes.arrayOf(scene).isRequired,
};
@@ -103,6 +104,7 @@ function extractSceneRendererProps(
navigationState: props.navigationState,
onNavigate: props.onNavigate,
position: props.position,
progress: props.progress,
scene: props.scene,
scenes: props.scenes,
};

View File

@@ -0,0 +1,266 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @providesModule NavigationTransitioner
* @flow
*/
'use strict';
const Animated = require('Animated');
const Easing = require('Easing');
const NavigationPropTypes = require('NavigationPropTypes');
const NavigationScenesReducer = require('NavigationScenesReducer');
const React = require('React');
const StyleSheet = require('StyleSheet');
const View = require('View');
import type {
NavigationActionCaller,
NavigationAnimatedValue,
NavigationLayout,
NavigationParentState,
NavigationScene,
NavigationSceneRenderer,
NavigationTransitionConfigurator,
} from 'NavigationTypeDefinition';
type Props = {
configureTransition: NavigationTransitionConfigurator,
navigationState: NavigationParentState,
onNavigate: NavigationActionCaller,
onTransitionEnd: () => void,
onTransitionStart: () => void,
renderOverlay: ?NavigationSceneRenderer,
renderScene: NavigationSceneRenderer,
style: any,
};
type State = {
layout: NavigationLayout,
position: NavigationAnimatedValue,
progress: NavigationAnimatedValue,
scenes: Array<NavigationScene>,
};
const {PropTypes} = React;
const DefaultTransitionSpec = {
duration: 250,
easing: Easing.inOut(Easing.ease),
};
function isSceneNotStale(scene: NavigationScene): boolean {
return !scene.isStale;
}
class NavigationTransitioner extends React.Component<any, Props, State> {
_onLayout: (event: any) => void;
_onTransitionEnd: () => void;
props: Props;
state: State;
static propTypes = {
configureTransition: PropTypes.func,
navigationState: NavigationPropTypes.navigationState.isRequired,
onNavigate: PropTypes.func.isRequired,
onTransitionEnd: PropTypes.func,
onTransitionStart: PropTypes.func,
renderOverlay: PropTypes.func,
renderScene: PropTypes.func.isRequired,
};
constructor(props: Props, context: any) {
super(props, context);
// The initial layout isn't measured. Measured layout will be only available
// when the component is mounted.
const layout = {
height: new Animated.Value(0),
initHeight: 0,
initWidth: 0,
isMeasured: false,
width: new Animated.Value(0),
};
this.state = {
layout,
position: new Animated.Value(this.props.navigationState.index),
progress: new Animated.Value(1),
scenes: NavigationScenesReducer([], this.props.navigationState),
};
}
componentWillMount(): void {
this._onLayout = this._onLayout.bind(this);
this._onTransitionEnd = this._onTransitionEnd.bind(this);
}
componentWillReceiveProps(nextProps: Props): void {
const nextScenes = NavigationScenesReducer(
this.state.scenes,
nextProps.navigationState,
this.props.navigationState
);
if (nextScenes === this.state.scenes) {
return;
}
const {
position,
progress,
} = this.state;
// update scenes.
this.setState({
scenes: nextScenes,
});
// get the transition spec.
const transitionUserSpec = nextProps.configureTransition ?
nextProps.configureTransition() :
null;
const transtionSpec = {
...DefaultTransitionSpec,
...transitionUserSpec,
};
progress.setValue(0);
const animations = [
Animated.timing(
progress,
{
...transtionSpec,
toValue: 1,
},
),
];
if (nextProps.navigationState.index !== this.props.navigationState.index) {
animations.push(
Animated.timing(
position,
{
...transtionSpec,
toValue: nextProps.navigationState.index,
},
),
);
}
// play the transition.
nextProps.onTransitionStart && nextProps.onTransitionStart();
Animated.parallel(animations).start(this._onTransitionEnd);
}
render(): ReactElement {
const overlay = this._renderOverlay();
const scenes = this._renderScenes();
return (
<View
onLayout={this._onLayout}
style={this.props.style}>
<View style={styles.scenes} key="scenes">
{scenes}
</View>
{overlay}
</View>
);
}
_renderScenes(): Array<?ReactElement> {
return this.state.scenes.map(this._renderScene, this);
}
_renderScene(scene: NavigationScene): ?ReactElement {
const {
navigationState,
onNavigate,
renderScene,
} = this.props;
const {
position,
progress,
scenes,
} = this.state;
return renderScene({
layout: this.state.layout,
navigationState,
onNavigate,
position,
progress,
scene,
scenes,
});
}
_renderOverlay(): ?ReactElement {
if (this.props.renderOverlay) {
const {
navigationState,
onNavigate,
renderOverlay,
} = this.props;
const {
position,
progress,
scenes,
} = this.state;
return renderOverlay({
layout: this.state.layout,
navigationState,
onNavigate,
position,
progress,
scene: scenes[navigationState.index],
scenes,
});
}
return null;
}
_onLayout(event: any): void {
const {height, width} = event.nativeEvent.layout;
const layout = {
...this.state.layout,
initHeight: height,
initWidth: width,
isMeasured: true,
};
layout.height.setValue(height);
layout.width.setValue(width);
this.setState({ layout });
}
_onTransitionEnd(): void {
const scenes = this.state.scenes.filter(isSceneNotStale);
if (scenes.length !== this.state.scenes.length) {
this.setState({ scenes });
}
this.props.onTransitionEnd && this.props.onTransitionEnd();
}
}
const styles = StyleSheet.create({
scenes: {
flex: 1,
},
});
module.exports = NavigationTransitioner;

View File

@@ -41,8 +41,6 @@ export type NavigationLayout = {
width: NavigationAnimatedValue,
};
export type NavigationPosition = NavigationAnimatedValue;
export type NavigationScene = {
index: number,
isStale: boolean,
@@ -61,7 +59,14 @@ export type NavigationSceneRendererProps = {
onNavigate: NavigationActionCaller,
// The progressive index of the containing view's navigation state.
position: NavigationPosition,
position: NavigationAnimatedValue,
// The value that represents the progress of the transition when navigation
// state changes from one to another. Its numberic value will range from 0
// to 1.
// progress.__getAnimatedValue() < 1 : transtion is happening.
// progress.__getAnimatedValue() == 1 : transtion completes.
progress: NavigationAnimatedValue,
// The scene to render.
scene: NavigationScene,
@@ -85,6 +90,12 @@ export type NavigationPanPanHandlers = {
onStartShouldSetResponderCapture: Function,
};
export type NavigationTransitionSpec = {
duration?: number,
// An easing function from `Easing`.
easing?: () => any,
};
// Functions.
export type NavigationActionCaller = Function;
@@ -112,3 +123,5 @@ export type NavigationSceneRenderer = (
export type NavigationStyleInterpolator = (
props: NavigationSceneRendererProps,
) => Object;
export type NavigationTransitionConfigurator = () => NavigationTransitionSpec;

View File

@@ -24,7 +24,7 @@ const SCENE_KEY_PREFIX = 'scene_';
* Helper function to compare route keys (e.g. "9", "11").
*/
function compareKey(one: string, two: string): number {
var delta = one.length - two.length;
const delta = one.length - two.length;
if (delta > 0) {
return 1;
}
@@ -72,6 +72,9 @@ function NavigationScenesReducer(
nextState: NavigationParentState,
prevState: ?NavigationParentState,
): Array<NavigationScene> {
if (prevState === nextState) {
return scenes;
}
const prevScenes = new Map();
const freshScenes = new Map();