Skip to content

PR for beta.8 #2015

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 11 commits into from
Jul 13, 2017
Merged

PR for beta.8 #2015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e47e23
- Fix: ‘clone’ scenes declared at the end and were not visible for sc…
Jul 12, 2017
81a755c
fix travis yml
Jul 12, 2017
f06cb75
bump version
Jul 12, 2017
b63add0
adjust navbar properties, disable observable state (use scene name in…
Jul 12, 2017
6c61a7b
make params observable;re-build
Jul 12, 2017
346c5b3
test rightTitle for login page
Jul 12, 2017
6a8598a
trying to fix postinstall option
Jul 12, 2017
553c2eb
fix dependency
Jul 12, 2017
904c8db
comment out stringify call to allow clones
prefontaineman1 Jul 12, 2017
a5666a6
support onRight/rightTitle/rightButtonImage for Actions.refresh
Jul 12, 2017
7c31ed9
onRight/rightTitle support for Actions.refresh
Jul 12, 2017
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
adjust navbar properties, disable observable state (use scene name in… 
…stead)
  • Loading branch information
aksonov committed Jul 12, 2017
commit b63add08e85ae47b4b4047c704e6f5261b1d0319
11 changes: 6 additions & 5 deletions Example/Example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ class Example extends Component {
render() {
return (
<Router createReducer={reducerCreate}>
<Scene key="lightbox" lightbox leftButtonTextStyle={{ color: 'red' }} backButtonTextStyle={{ color:'red' }} >
<Scene key="lightbox" lightbox leftButtonTextStyle={{ color: 'green' }} backButtonTextStyle={{ color:'red' }} >
<Scene key="modal" modal hideNavBar>
<Scene key="drawer" drawer contentComponent={TabView} >
<Scene key="root" hideNavBar hideTabBar>
<Scene key="echo" back clone component={EchoView} getTitle={({navigation}) => navigation.state.key}/>
<Scene key="register" back>
<Scene key="_register" component={Register} title="Register"/>
<Scene key="register2" component={Register} title="Register2"/>
<Scene key="home" component={Home} title="Replace" type='replace'/>
<Scene key="_register" component={Register} title="Register" />
<Scene key="register2" component={Register} title="Register2" />
<Scene key="home" component={Home} title="Replace" type='replace' />
</Scene>
<Scene key="launch" component={Launch} title="Launch" initial/>
<Scene key="launch" component={Launch} title="Launch" initial />
<Scene
key="tabbar"
gestureEnabled={false}
Expand Down Expand Up @@ -120,6 +120,7 @@ class Example extends Component {
key="loginModal2"
component={Login2}
title="Login2"
backTitle="Back"
panHandlers={null}
duration={1}
/>
Expand Down
1 change: 1 addition & 0 deletions Example/components/Launch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const styles = StyleSheet.create({

class Launch extends React.Component {
render(){
console.log("Launch RENDER");
return (
<View {...this.props} style={styles.container}>
<Text>Launch page</Text>
Expand Down
1 change: 1 addition & 0 deletions Example/components/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export default class extends React.Component {
render() {
const title = this.props.title || 'No Title';
const data = this.props.data || 'No Data';
console.log("Login RENDER");
return (
<View style={[styles.container, this.props.style]}>
<Text>Login page 1</Text>
Expand Down
8 changes: 4 additions & 4 deletions Example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
},
"dependencies": {
"autobind-decorator": "^1.4.1",
"mobx": "^3.1.16",
"mobx": "^3.2.1",
"mobx-react": "^4.2.1",
"react": "16.0.0-alpha.6",
"react-native": "0.44.0",
"react-native-button": "^2.0.0",
"react-navigation": "^1.0.0-beta.11",
"react-native-router-flux": "^4.0.0-beta.7",
"react": "16.0.0-alpha.6",
"react-native": "0.44.0"
"react-navigation": "^1.0.0-beta.11"
},
"devDependencies": {
"babel-jest": "20.0.3",
Expand Down
Loading