feat(RN): 添加 config.window.navigationStyle 配置 close #675

NervJS · Sep 26, 2018 · fe94303 · fe94303
1 parent 9648a60
commit fe94303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/taro-router-rn/src/getWrappedScreen.js b/packages/taro-router-rn/src/getWrappedScreen.js
@@ -21,16 +21,16 @@ function getWrappedScreen (Screen, Taro, globalNavigationOptions) {
     static navigationOptions = ({navigation}) => {
       const navigationOptions = getNavigationOptions(Screen.config)
       const title = navigation.getParam('title') || navigationOptions.title || globalNavigationOptions.title
+      const rest = globalNavigationOptions.navigationStyle === 'custom' ? {header: null} : {}
       return {
+        ...rest,
         headerTitle: <View style={{flexDirection: 'row', alignItems: 'center'}}>
           {navigation.getParam('isNavigationBarLoadingShow') && <LoadingView/>}
-          <Text>{title}</Text>
+          <Text style={{fontSize: 17, fontWeight: 600}}>{title}</Text>
         </View>,
         headerTintColor: navigation.getParam('headerTintColor') || navigationOptions.headerTintColor || globalNavigationOptions.headerTintColor,
         headerStyle: {
-          backgroundColor: navigation.getParam('backgroundColor') ||
-          (navigationOptions.headerStyle && navigationOptions.headerStyle.backgroundColor) ||
-          (globalNavigationOptions.headerStyle && globalNavigationOptions.headerStyle.backgroundColor)
+          backgroundColor: navigation.getParam('backgroundColor') || navigationOptions.backgroundColor || globalNavigationOptions.backgroundColor
         }
       }
     }

diff --git a/packages/taro-router-rn/src/utils.js b/packages/taro-router-rn/src/utils.js
@@ -2,7 +2,8 @@ export const HEADER_CONFIG_MAP = {
   navigationBarTitleText: 'title', // 导航栏标题文字内容
   navigationBarTextStyle: 'headerTintColor', // 导航栏标题颜色，仅支持 black/white
   navigationBarBackgroundColor: 'backgroundColor', // 导航栏背景颜色
-  enablePullDownRefresh: 'enablePullDownRefresh' // 是否全局开启下拉刷新，暂时放这里吧
+  enablePullDownRefresh: 'enablePullDownRefresh', // 是否全局开启下拉刷新，暂时放这里吧
+  navigationStyle: 'navigationStyle' // 导航栏样式，仅支持以下值：default 默认样式 custom 自定义导航栏，只保留右上角胶囊按钮
 }
 
 export function getNavigationOptions (config) {