Skip to content

[WIP] Get Example app working with React 0.24+ #536

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

Merged
merged 10 commits into from
Apr 18, 2016
Merged

[WIP] Get Example app working with React 0.24+ #536

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3561582
direction support for rn 0.24+
joenoon Apr 11, 2016
1256e03
fix || logic and optimize duration 0
joenoon Apr 11, 2016
ea8aad1
Merge pull request #1 from aksonov/master
cridenour Apr 17, 2016
aa74423
Bump example project dependency.
cridenour Apr 17, 2016
a3a6087
Merge branch 'jn-direction1' of github.com:joenoon/react-native-route…
cridenour Apr 17, 2016
1f2c98c
Cleanup styles and unused imports.
cridenour Apr 17, 2016
495c794
Remove optionals.
cridenour Apr 17, 2016
546c00c
Make sure panHandler can be passed as null.
cridenour Apr 17, 2016
6aac7bd
Actually run react-native upgrade.
cridenour Apr 17, 2016
ff69aaa
Document why we removed optionals.
cridenour Apr 17, 2016
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
Prev Previous commit
Next Next commit
Cleanup styles and unused imports.
  • Loading branch information
@cridenour
cridenour committed Apr 17, 2016
commit 1f2c98cfa097a623d74cc7592538bef5753edfc4
36 changes: 17 additions & 19 deletions src/DefaultRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@
import React, {Component, Animated, PropTypes, StyleSheet, View, NavigationExperimental} from "react-native";
const {
AnimatedView: NavigationAnimatedView,
Card: NavigationCard,
RootContainer: NavigationRootContainer,
Header: NavigationHeader,
} = NavigationExperimental;
Card: NavigationCard
} = NavigationExperimental;

const {
CardStackPanResponder: NavigationCardStackPanResponder,
CardStackStyleInterpolator: NavigationCardStackStyleInterpolator
} = NavigationCard;
} = NavigationCard;

import TabBar from "./TabBar";
import NavBar from "./NavBar";
Expand Down Expand Up @@ -46,13 +44,13 @@ export default class DefaultRenderer extends Component {
return null;
}
let Component = navigationState.component;
if (navigationState.tabs && !Component){
if (navigationState.tabs && !Component) {
Component = TabBar;
}
if (Component) {
return (
<View style={[{flex: 1}, navigationState.sceneStyle]}>
<Component {...navigationState} navigationState={navigationState} />
<Component {...navigationState} navigationState={navigationState}/>
</View>
)
}
Expand Down Expand Up @@ -93,30 +91,30 @@ export default class DefaultRenderer extends Component {

_renderHeader(/*NavigationSceneRendererProps*/ props) {
return <NavBar
{...props}
getTitle={state => state.title}
/>;
{...props}
getTitle={state => state.title}
/>;
}

_renderCard(/*NavigationSceneRendererProps*/ props) {
const { key, direction, getSceneStyle } = props.scene.navigationState;
let { panHandlers, animationStyle } = props.scene.navigationState;
const {key, direction, getSceneStyle} = props.scene.navigationState;
let {panHandlers, animationStyle} = props.scene.navigationState;

let style = {};
if (getSceneStyle) style = getSceneStyle(props);

const isVertical = direction === "vertical";

if (!animationStyle) {
animationStyle = (isVertical ?
NavigationCardStackStyleInterpolator.forVertical(props) :
NavigationCardStackStyleInterpolator.forHorizontal(props));
animationStyle = (isVertical ?
NavigationCardStackStyleInterpolator.forVertical(props) :
NavigationCardStackStyleInterpolator.forHorizontal(props));
}

if (!panHandlers) {
panHandlers = panHandlers || (isVertical ?
NavigationCardStackPanResponder.forVertical(props) :
NavigationCardStackPanResponder.forHorizontal(props));
panHandlers = panHandlers || (isVertical ?
NavigationCardStackPanResponder.forVertical(props) :
NavigationCardStackPanResponder.forHorizontal(props));
}

return (
Expand All @@ -140,6 +138,6 @@ export default class DefaultRenderer extends Component {
const styles = StyleSheet.create({
animatedView: {
flex: 1,
backgroundColor:"transparent"
backgroundColor: "transparent"
},
});