-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Merge 4.44.1 into master (#5433)
- Loading branch information
Showing
32 changed files
with
237 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
__tests__/containers/CollapsibleText/__snapshots__/CollapsibleText.stories.storyshot
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`Storyshots Collapsible Text Item 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"padding\\":20}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"Lorem ipsum dolor sit amet\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-Lorem ipsum dolor sit amet\\"},\\"children\\":[\\"Lorem ipsum dolor sit amet\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"},\\"children\\":[\\"linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"},\\"children\\":[\\"linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"]}]}"`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
app/containers/CollapsibleText/CollapsibleText.stories.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import React from 'react'; | ||
| import { View } from 'react-native'; | ||
|
|
||
| import CollapsibleText from '.'; | ||
|
|
||
| const smallText = 'Lorem ipsum dolor sit amet'; | ||
|
|
||
| const text120 = | ||
| 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.'; | ||
|
|
||
| export default { | ||
| title: 'Collapsible Text' | ||
| }; | ||
|
|
||
| export const Item = () => ( | ||
| <View style={{ padding: 20 }}> | ||
| <CollapsibleText linesToTruncate={1} msg={`${smallText}`} /> | ||
| <CollapsibleText linesToTruncate={1} msg={`linesToTruncate: 1 - ${text120}`} /> | ||
| <CollapsibleText linesToTruncate={2} msg={`linesToTruncate: 2 - ${text120}`} /> | ||
| </View> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import React, { useState } from 'react'; | ||
| import { TextStyle, Text, StyleSheet } from 'react-native'; | ||
|
|
||
| import sharedStyles from '../../views/Styles'; | ||
| import { useTheme } from '../../theme'; | ||
| import { previewFormatText } from '../markdown/previewFormatText'; | ||
| import I18n from '../../i18n'; | ||
|
|
||
| interface ICollapsibleText { | ||
| msg?: string; | ||
| style?: TextStyle[]; | ||
| linesToTruncate?: number; | ||
| } | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| text: { | ||
| fontSize: 16, | ||
| ...sharedStyles.textRegular, | ||
| textAlignVertical: 'center' | ||
| }, | ||
| textInfo: { | ||
| fontSize: 14, | ||
| ...sharedStyles.textRegular | ||
| } | ||
| }); | ||
|
|
||
| const CollapsibleText = ({ msg, style = [], linesToTruncate = 1 }: ICollapsibleText) => { | ||
| const [truncatedText, setTruncatedText] = useState(''); | ||
| const [showTruncated, setShowTruncated] = useState(true); | ||
|
|
||
| const { colors } = useTheme(); | ||
|
|
||
| if (!msg) { | ||
| return null; | ||
| } | ||
|
|
||
| const m = previewFormatText(msg); | ||
|
|
||
| if (truncatedText && showTruncated) { | ||
| return ( | ||
| <Text testID={`collapsible-text-truncated-${m}`}> | ||
| <Text accessibilityLabel={truncatedText} style={[styles.text, { color: colors.bodyText }, ...style]}> | ||
| {`${truncatedText}... `} | ||
| </Text> | ||
| <Text onPress={() => setShowTruncated(false)} style={[styles.textInfo, { color: colors.actionTintColor }]}> | ||
| {I18n.t('Show_more')} | ||
| </Text> | ||
| </Text> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Text | ||
| accessibilityLabel={m} | ||
| style={[styles.text, { color: colors.bodyText, height: !showTruncated ? undefined : 0 }, ...style]} | ||
| testID={`collapsible-text-${m}`} | ||
| onTextLayout={event => { | ||
| const { lines } = event.nativeEvent; | ||
| if (lines.length > linesToTruncate) { | ||
| const text = lines | ||
| .splice(0, linesToTruncate) | ||
| .map(line => line.text) | ||
| .join(''); | ||
| const truncatedTextLengthWithShowMore = text.length - (4 + I18n.t('Show_more').length); | ||
| const clippedText = text.slice(0, truncatedTextLengthWithShowMore); | ||
| setTruncatedText(clippedText); | ||
| } else { | ||
| setShowTruncated(false); | ||
| } | ||
| }} | ||
| > | ||
| {m} | ||
| {truncatedText ? ( | ||
| <Text | ||
| testID='collapsible-text-show-less' | ||
| onPress={() => setShowTruncated(true)} | ||
| style={[styles.textInfo, { color: colors.actionTintColor }]} | ||
| > | ||
| {` ${I18n.t('Show_less')}`} | ||
| </Text> | ||
| ) : null} | ||
| </Text> | ||
| ); | ||
| }; | ||
|
|
||
| export default CollapsibleText; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.