From b97e4d5a62a29b3f033c4b52087c6e6e2074e5ad Mon Sep 17 00:00:00 2001 From: Joe Noon Date: Thu, 30 Jun 2016 15:23:08 -0700 Subject: [PATCH 1/2] pull in navigationBarStyle and titleStyle from props.navigationState in TabbedView. refs #870 --- src/TabbedView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/TabbedView.js b/src/TabbedView.js index 2c33ed324..67b5798f5 100644 --- a/src/TabbedView.js +++ b/src/TabbedView.js @@ -54,7 +54,8 @@ class TabbedView extends Component { return; } this.renderedSceneKeys[key] = true; - scenes.push(this.renderScene(item, i)); + const {navigationBarStyle,titleStyle} = this.props.navigationState; + scenes.push(this.renderScene({navigationBarStyle,titleStyle,...item}, i)); }); return ( From 036eebac19fd68e7344febbdf7e6f5a232f69039 Mon Sep 17 00:00:00 2001 From: Joe Noon Date: Thu, 30 Jun 2016 15:25:06 -0700 Subject: [PATCH 2/2] fix eslint warnings --- src/TabbedView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TabbedView.js b/src/TabbedView.js index 67b5798f5..de31341b4 100644 --- a/src/TabbedView.js +++ b/src/TabbedView.js @@ -54,8 +54,8 @@ class TabbedView extends Component { return; } this.renderedSceneKeys[key] = true; - const {navigationBarStyle,titleStyle} = this.props.navigationState; - scenes.push(this.renderScene({navigationBarStyle,titleStyle,...item}, i)); + const { navigationBarStyle, titleStyle } = this.props.navigationState; + scenes.push(this.renderScene({ navigationBarStyle, titleStyle, ...item }, i)); }); return (