Commit aaec0bf

committed

Merge branch 'fix_deprecation_warnings' into implement_additional_eventemitters

2 parents e871e4c + 5f5738b commit aaec0bfCopy full SHA for aaec0bf

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,19 @@ class Router extends React.Component {`
`56`	`56`	`this.emitter = new EventEmitter();`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ componentDidMount() {`
	`60`	`+ this.refs.navigator.navigationContext.addListener('willfocus', (event) => {`
	`61`	`+ const route = event.data.route;`
	`62`	`+ this.setState({ route });`
	`63`	`+ this.emitter.emit('willFocus', route.name);`
	`64`	`+ });`
	`65`	`+`
	`66`	`+ this.refs.navigator.navigationContext.addListener('didfocus', (event) => {`
	`67`	`+ const route = event.data.route;`
	`68`	`+ this.emitter.emit('didFocus', route.name);`
	`69`	`+ });`
	`70`	`+ }`
	`71`	`+`
`59`	`72`	`onWillFocus(route) {`
`60`	`73`	`this.setState({ route });`
`61`	`74`	`this.emitter.emit('willFocus', route.name);`
`@@ -228,8 +241,6 @@ class Router extends React.Component {`
`228`	`241`	`initialRoute={this.props.firstRoute}`
`229`	`242`	`navigationBar={navigationBar}`
`230`	`243`	`renderScene={this.renderScene}`
`231`		`- onDidFocus={this.onDidFocus}`
`232`		`- onWillFocus={this.onWillFocus}`
`233`	`244`	`configureScene={this.configureScene}`
`234`	`245`	`/>`
`235`	`246`	`);`

Comments

(0)