Skip to content
Snippets Groups Projects
Commit 433f7aa7 authored by Julia Friesel's avatar Julia Friesel
Browse files

Merge branch '297-bug-overspilling-text-in-pain-mood-note' into 'master'

Use built-in numberOfLines prop instead of truncating by hand

Closes #297

See merge request bloodyhealth/drip!174
parents bdda36de d2282f66
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ export default function AppText(props) { ...@@ -7,6 +7,7 @@ export default function AppText(props) {
<Text <Text
style={[styles.appText, props.style]} style={[styles.appText, props.style]}
onPress={props.onPress} onPress={props.onPress}
numberOfLines={props.numberOfLines}
> >
{props.children} {props.children}
</Text> </Text>
......
...@@ -167,10 +167,7 @@ export default class CycleDayOverView extends Component { ...@@ -167,10 +167,7 @@ export default class CycleDayOverView extends Component {
} }
const symptomValue = cycleDay[symptomName] const symptomValue = cycleDay[symptomName]
const label = l[symptomName](symptomValue) return l[symptomName](symptomValue)
if (!label) return
if (label.length < 45) return label
return label.slice(0, 42) + '...'
} }
render() { render() {
...@@ -293,7 +290,10 @@ class SymptomBox extends Component { ...@@ -293,7 +290,10 @@ class SymptomBox extends Component {
</AppText> </AppText>
</View> </View>
<View style={[styles.symptomDataBox, disabledStyle]}> <View style={[styles.symptomDataBox, disabledStyle]}>
<AppText style={styles.symptomDataText}>{this.props.data}</AppText> <AppText
style={styles.symptomDataText}
numberOfLines={3}
>{this.props.data}</AppText>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment