diff options
author | Brian Kim <brian@tagg.id> | 2021-05-17 16:51:48 -0700 |
---|---|---|
committer | Brian Kim <brian@tagg.id> | 2021-05-17 16:51:48 -0700 |
commit | 4aca9fc0916240ce5e4284d625f240998db17bff (patch) | |
tree | 0a3c75d12487c4298bce1fb9ddb8d8c8ebf4d4e6 /src/components/common/BasicButton.tsx | |
parent | 6a74b270d24f04e36821398b83863d5b97e1b44b (diff) | |
parent | 183ce2b263e7282f42d204ebd59676b8e28352ec (diff) |
Merge with master
Diffstat (limited to 'src/components/common/BasicButton.tsx')
-rw-r--r-- | src/components/common/BasicButton.tsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/components/common/BasicButton.tsx b/src/components/common/BasicButton.tsx index 1fe29cd9..e2274dbd 100644 --- a/src/components/common/BasicButton.tsx +++ b/src/components/common/BasicButton.tsx @@ -1,5 +1,12 @@ import React from 'react'; -import {StyleProp, StyleSheet, Text, View, ViewStyle} from 'react-native'; +import { + StyleProp, + StyleSheet, + Text, + TextStyle, + View, + ViewStyle, +} from 'react-native'; import {TAGG_LIGHT_BLUE} from '../../constants'; import {TouchableOpacity} from 'react-native-gesture-handler'; import {normalize} from '../../utils'; @@ -8,7 +15,7 @@ interface BasicButtonProps { title: string; onPress: () => void; solid?: boolean; - externalStyles?: Record<string, StyleProp<ViewStyle>>; + externalStyles?: Record<string, StyleProp<ViewStyle | TextStyle>>; } const BasicButton: React.FC<BasicButtonProps> = ({ title, @@ -27,6 +34,7 @@ const BasicButton: React.FC<BasicButtonProps> = ({ <Text style={[ styles.buttonTitle, + externalStyles?.buttonTitle, solid ? styles.solidButtonTitleColor : styles.outlineButtonTitleColor, |