From 9069a530b03b264ced8fd5815faa2731cb85daa6 Mon Sep 17 00:00:00 2001
From: Liangyu <rilyu@sina.com>
Date: Mon, 22 May 2017 11:08:37 +0800
Subject: [PATCH] fix some bugs

---
 components/SegmentedBar/SegmentedItem.js   |  2 +-
 components/SegmentedView/SegmentedSheet.js |  6 ++++--
 components/SegmentedView/SegmentedView.js  | 13 +++++++++++--
 docs/cn/SegmentedView.md                   |  9 ---------
 example/views/SegmentedViewExample.js      |  5 ++++-
 package.json                               |  2 +-
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/components/SegmentedBar/SegmentedItem.js b/components/SegmentedBar/SegmentedItem.js
index ab4039b..c732a2f 100644
--- a/components/SegmentedBar/SegmentedItem.js
+++ b/components/SegmentedBar/SegmentedItem.js
@@ -51,7 +51,7 @@ export default class SegmentedItem extends Component {
         textStyle = [{
           color: Theme.sbBtnActiveTitleColor,
           fontSize: Theme.sbBtnActiveTextFontSize,
-        }].concat(titleStyle).concat(activeTitleStyle);
+        }].concat(activeTitleStyle);
       } else {
         textStyle = [{
           color: Theme.sbBtnTitleColor,
diff --git a/components/SegmentedView/SegmentedSheet.js b/components/SegmentedView/SegmentedSheet.js
index 5db419f..6dccc1d 100644
--- a/components/SegmentedView/SegmentedSheet.js
+++ b/components/SegmentedView/SegmentedSheet.js
@@ -3,7 +3,7 @@
 'use strict';
 
 import React, {Component, PropTypes} from 'react';
-import {View} from 'react-native';
+import {View, Text} from 'react-native';
 
 import Theme from 'teaset/themes/Theme';
 
@@ -12,11 +12,13 @@ export default class SegmentedSheet extends Component {
   static propTypes = {
     ...View.propTypes,
     title: PropTypes.oneOfType([PropTypes.element, PropTypes.string, PropTypes.number]).isRequired,
+    titleStyle: Text.propTypes.style,
+    activeTitleStyle: Text.propTypes.style,
     badge: PropTypes.oneOfType([PropTypes.element, PropTypes.string, PropTypes.number]),
   };
 
   render() {
-    let {style, ...others} = this.props;
+    let {style, title, titleStyle, activeTitleStyle, badge, ...others} = this.props;
     style = [{flexGrow: 1}].concat(style);
     return <View style={style} {...others} />;
   }
diff --git a/components/SegmentedView/SegmentedView.js b/components/SegmentedView/SegmentedView.js
index 7117e3e..691daed 100644
--- a/components/SegmentedView/SegmentedView.js
+++ b/components/SegmentedView/SegmentedView.js
@@ -86,7 +86,7 @@ export default class SegmentedView extends Component {
   }
 
   renderBar() {
-    let {barPosition, barStyle, justifyItem, indicatorType, indicatorPosition, animated, autoScroll, onChange, children} = this.props;
+    let {barPosition, barStyle, justifyItem, indicatorType, indicatorPosition, indicatorLineColor, indicatorLineWidth, indicatorPositionPadding, animated, autoScroll, onChange, children} = this.props;
 
     if (!indicatorPosition && barPosition == 'bottom') {
       indicatorPosition = 'top';
@@ -98,13 +98,22 @@ export default class SegmentedView extends Component {
         justifyItem={justifyItem}
         indicatorType={indicatorType}
         indicatorPosition={indicatorPosition}
+        indicatorLineColor={indicatorLineColor}
+        indicatorLineWidth={indicatorLineWidth}
+        indicatorPositionPadding={indicatorPositionPadding}
         animated={animated}
         autoScroll={autoScroll}
         activeIndex={this.activeIndex}
         onChange={index => this.onSegmentedBarChange(index)}
       >
         {children.map((item, index) => (
-          <SegmentedBar.Item key={index} title={item.props.title} badge={item.props.badge} />
+          <SegmentedBar.Item
+            key={index}
+            title={item.props.title}
+            titleStyle={item.props.titleStyle}
+            activeTitleStyle={item.props.activeTitleStyle}
+            badge={item.props.badge}
+            />
         ))}
       </SegmentedBar>
     );
diff --git a/docs/cn/SegmentedView.md b/docs/cn/SegmentedView.md
index e6e5f8b..79923d5 100644
--- a/docs/cn/SegmentedView.md
+++ b/docs/cn/SegmentedView.md
@@ -28,7 +28,6 @@ SegmentedView 组件定义一个分段器组件, 一般用于同一页面中多
 | Prop | Type | Default | Note |
 |---|---|---|---|
 | [Sheet](#segmentedviewsheet--props) | class |  | 分段器 Sheet 组件。
-| [Button](#segmentedviewbutton--props) | class |  | 分段器按钮组件。<br/>此组件由 Sheet 组件自动渲染, 无须代码显式声明, 但可以修改 SegmentedView.Button 为自定义类以更改分段器按钮组件。
 
 <!--
 ## Methods
@@ -45,14 +44,6 @@ None.
 | title | string<br/>number<br/>element |  | 标题, 可以是字符串、数字或 React Native 组件。
 | badge | string<br/>number<br/>element |  | 徽章, 可以是字符串、数字或 React Native 组件, 为字符串、数字时使用 `<Badge />`组件渲染。
 
-## `<SegmentedView.Button />` Props
-| Prop | Type | Default | Note |
-|---|---|---|---|
-| [TouchableOpacity props...](https://facebook.github.io/react-native/docs/touchableopacity.html) |  |  | SegmentedView.Button 组件继承 TouchableOpacity 组件的全部属性。
-| title | string<br/>number<br/>element |  | 标题, 可以是字符串、数字或 React Native 组件。
-| badge | string<br/>number<br/>element |  | 徽章, 可以是字符串、数字或 React Native 组件, 为字符串、数字时使用 `<Badge />`组件渲染。
-| active | bool | false | 是否激活。
-
 ## Example
 简单用法
 ```
diff --git a/example/views/SegmentedViewExample.js b/example/views/SegmentedViewExample.js
index 8817991..114b6e7 100644
--- a/example/views/SegmentedViewExample.js
+++ b/example/views/SegmentedViewExample.js
@@ -64,12 +64,15 @@ export default class SegmentedViewExample extends NavigationPage {
   }
 
   renderPage() {
-
+    let {custom} = this.state;
     return (
       <View style={{flex: 1}}>
         <SegmentedView
           style={{flex: 1}}
           type={this.state.type}
+          indicatorLineColor={custom ? '#5cb85c' : undefined}
+          indicatorLineWidth={custom ? 1 : undefined}
+          indicatorPositionPadding={custom ? 3 : undefined}
           onChange={index => this.setState({activeIndex: index})}
         >
           <SegmentedView.Sheet title={this.renderTitle(0)}>
diff --git a/package.json b/package.json
index 1b45bbc..bb7d256 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "teaset",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "A UI library for react native.",
   "main": "index.js",
   "scripts": {