Refactors AppText and Segment components
This commit is contained in:
@@ -6,20 +6,11 @@ import Link from './link'
|
||||
|
||||
import { Colors, Typography } from '../../styles/redesign'
|
||||
|
||||
export default function AppText({
|
||||
children,
|
||||
linkStyle,
|
||||
onPress,
|
||||
numberOfLines,
|
||||
style
|
||||
}) {
|
||||
const AppText = ({ children, linkStyle, style, ...props }) => {
|
||||
// we parse for links in case the text contains any
|
||||
return (
|
||||
<Link style={linkStyle}>
|
||||
<Text style={[styles.text, style]}
|
||||
onPress={onPress}
|
||||
numberOfLines={numberOfLines}
|
||||
>
|
||||
<Text style={[styles.text, style]} {...props}>
|
||||
{children}
|
||||
</Text>
|
||||
</Link>
|
||||
@@ -29,8 +20,6 @@ export default function AppText({
|
||||
AppText.propTypes = {
|
||||
children: PropTypes.node,
|
||||
linkStyle: PropTypes.object,
|
||||
onPress: PropTypes.func,
|
||||
numberOfLines: PropTypes.number,
|
||||
style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
|
||||
}
|
||||
|
||||
@@ -39,4 +28,6 @@ const styles = StyleSheet.create({
|
||||
color: Colors.greyDark,
|
||||
...Typography.mainText
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
export default AppText
|
||||
@@ -20,6 +20,7 @@ const Segment = ({ children, last, title }) => {
|
||||
Segment.propTypes = {
|
||||
children: PropTypes.node,
|
||||
last: PropTypes.bool,
|
||||
style: PropTypes.object,
|
||||
title: PropTypes.string
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user