Refactors AppText and Segment components

This commit is contained in:
mashazyu
2020-04-22 21:40:58 +02:00
committed by Sofiya Tepikin
parent 111475b2e3
commit fe5f734cff
2 changed files with 6 additions and 14 deletions
+4 -13
View File
@@ -6,20 +6,11 @@ import Link from './link'
import { Colors, Typography } from '../../styles/redesign' import { Colors, Typography } from '../../styles/redesign'
export default function AppText({ const AppText = ({ children, linkStyle, style, ...props }) => {
children,
linkStyle,
onPress,
numberOfLines,
style
}) {
// we parse for links in case the text contains any // we parse for links in case the text contains any
return ( return (
<Link style={linkStyle}> <Link style={linkStyle}>
<Text style={[styles.text, style]} <Text style={[styles.text, style]} {...props}>
onPress={onPress}
numberOfLines={numberOfLines}
>
{children} {children}
</Text> </Text>
</Link> </Link>
@@ -29,8 +20,6 @@ export default function AppText({
AppText.propTypes = { AppText.propTypes = {
children: PropTypes.node, children: PropTypes.node,
linkStyle: PropTypes.object, linkStyle: PropTypes.object,
onPress: PropTypes.func,
numberOfLines: PropTypes.number,
style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
} }
@@ -40,3 +29,5 @@ const styles = StyleSheet.create({
...Typography.mainText ...Typography.mainText
} }
}) })
export default AppText
+1
View File
@@ -20,6 +20,7 @@ const Segment = ({ children, last, title }) => {
Segment.propTypes = { Segment.propTypes = {
children: PropTypes.node, children: PropTypes.node,
last: PropTypes.bool, last: PropTypes.bool,
style: PropTypes.object,
title: PropTypes.string title: PropTypes.string
} }