merge #808, added capitalize prop for button and text

GeekyAnts · May 8, 2017 · 1a5f123 · 1a5f123
1 parent 56f9c6b
commit 1a5f123
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 31 deletions.
diff --git a/dist/src/basic/Button.js b/dist/src/basic/Button.js
diff --git a/dist/src/basic/Button.js.map b/dist/src/basic/Button.js.map
diff --git a/dist/src/basic/Text.js b/dist/src/basic/Text.js
diff --git a/dist/src/basic/Text.js.map b/dist/src/basic/Text.js.map
diff --git a/index.d.ts b/index.d.ts
@@ -514,7 +514,7 @@ declare module 'native-base' {
         /**
          * see Widget CheckBox.js
          */
-        interface Radio extends ReactNative.TouchableOpacityProperties{
+        interface Radio extends ReactNative.TouchableOpacityProperties {
             selected?: boolean
         }
         /**
@@ -575,31 +575,31 @@ declare module 'native-base' {
             springFriction?: number
         }
 
-        interface Tab{
+        interface Tab {
             heading:TabHeading,
 
         }
-        interface TabHeading{
+        interface TabHeading {
             activeTabStyle?:ReactNative.ViewStyle,
             textStyle?:ReactNative.TextStyle,
             activeTextStyle?:ReactNative.TextStyle
         }
 
         interface Item {
-            fixedLabel?:boolean,
-            floatingLabel?:boolean,
-            inlineLabel?:boolean,
-            stackedLabel?:boolean,
-            placeholderLabel?:boolean,
-            bordered?:boolean,
-            underline?:boolean,
-            rounded?:boolean,
+            fixedLabel?: boolean,
+            floatingLabel?: boolean,
+            inlineLabel?: boolean,
+            stackedLabel?: boolean,
+            placeholderLabel?: boolean,
+            bordered?: boolean,
+            underline?: boolean,
+            rounded?: boolean,
             disabled?: boolean,
             error?: boolean,
-            placeholder?:string,
-            secureTextEntry?:boolean,
+            placeholder?: string,
+            secureTextEntry?: boolean,
             success?: boolean,
-            last?:boolean,
+            last?: boolean,
         }
 
         interface Form{

diff --git a/src/basic/Button.js b/src/basic/Button.js
@@ -2,11 +2,9 @@
 
 
 import React, { Component } from 'react';
-import _ from 'lodash';
 import { TouchableOpacity, Platform, View, TouchableNativeFeedback } from 'react-native';
 import { connectStyle } from 'native-base-shoutem-theme';
 import variables from './../theme/variables/platform';
-import { Badge } from './Badge';
 import { Text } from './Text';
 import computeProps from '../Utils/computeProps';
 
@@ -31,14 +29,17 @@ class Button extends Component {
     return computeProps(this.props, defaultProps);
   }
   render() {
+    const children = Platform.OS === 'ios'
+        ? this.props.children
+        : React.Children.map(this.props.children, child => child.type === Text ? React.cloneElement(child, { capitalize: true, ...child.props }) : child);
     if (Platform.OS==='ios' || variables.androidRipple===false || Platform['Version'] <= 21) {
       return (
         <TouchableOpacity
           {...this.prepareRootProps()}
           ref={c => this._root = c}
           activeOpacity={(this.props.activeOpacity) ? this.props.activeOpacity : 0.5}
         >
-          {this.props.children}
+          {children}
         </TouchableOpacity>
       );
     }
@@ -49,7 +50,7 @@ class Button extends Component {
               background={(this.props.androidRippleColor) ? TouchableNativeFeedback.Ripple(this.props.androidRippleColor) : TouchableNativeFeedback.Ripple(variables.androidRippleColor)}
                {...this.prepareRootProps()}>
               <View {...this.prepareRootProps()}>
-                  {this.props.children}
+                  {children}
               </View>
           </TouchableNativeFeedback>
       );
@@ -74,8 +75,6 @@ Button.propTypes = {
   large: React.PropTypes.bool,
   small: React.PropTypes.bool,
   active: React.PropTypes.bool,
-  badgeColor: React.PropTypes.string,
-  badgeValueStyle: React.PropTypes.object,
 };
 
 Button.defaultProps = {