verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Line height 23

This commit is contained in:
Diego Mello 2023-05-31 11:13:12 -03:00
parent c130355a2e
commit 444d293c38
10 changed files with 154 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
__tests__/containers/RoomHeader/__snapshots__/RoomHeader.stories.storyshot
View File

File diff suppressed because one or more lines are too long

6
__tests__/containers/RoomItem/__snapshots__/RoomItem.stories.storyshot
View File

File diff suppressed because one or more lines are too long

6
__tests__/containers/markdown/__snapshots__/Markdown.stories.storyshot
View File

File diff suppressed because one or more lines are too long

6
__tests__/containers/markdown/new/__snapshots__/NewMarkdown.stories.storyshot
View File

File diff suppressed because one or more lines are too long

4
__tests__/views/DiscussionsView/__snapshots__/Item.stories.storyshot
View File

File diff suppressed because one or more lines are too long

6
__tests__/views/ThreadMessagesView/__snapshots__/Item.stories.storyshot
View File

File diff suppressed because one or more lines are too long

10
app/containers/markdown/AtMention.tsx
View File

@ -23,7 +23,7 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
if (mention === 'all' || mention === 'here') {
return (
<Text style={[styles.plainText, styles.text]}>
<View style={{ marginBottom: isIOS ? -3 : 0 }}>
<View style={{ marginBottom: isIOS ? -2 : 0 }}>
<Text
style={[
styles.plainText,
@ -35,7 +35,8 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
overflow: 'hidden',
marginBottom: isIOS ? 0 : -5,
color: themes[theme].pureWhite,
backgroundColor: themes[theme].mentionGroupColor
backgroundColor: themes[theme].mentionGroupColor,
lineHeight: 23
}
]}
>
@ -76,7 +77,7 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
const m = useRealName && user.name ? user.name : user.username;
return (
<Text style={[styles.plainText, styles.text]}>
<View style={{ marginBottom: isIOS ? -3 : 0 }}>
<View style={{ marginBottom: isIOS ? -2 : 0 }}>
<Text
style={[
styles.plainText,
@ -86,7 +87,8 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
...sharedStyles.textMedium,
borderRadius: 4,
overflow: 'hidden',
marginBottom: isIOS ? 0 : -5
marginBottom: isIOS ? 0 : -5,
lineHeight: 23
},
mentionStyle
]}

5
app/containers/markdown/Hashtag.tsx
View File

@ -41,7 +41,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
if (channels && channels.length && channels.findIndex(channel => channel.name === hashtag) !== -1) {
return (
<Text style={[styles.plainText, styles.text]}>
<View style={{ marginBottom: isIOS ? -3 : 0 }}>
<View style={{ marginBottom: isIOS ? -2 : 0 }}>
<Text
style={[
styles.plainText,
@ -53,7 +53,8 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
overflow: 'hidden',
marginBottom: isIOS ? 0 : -5,
color: themes[theme].mentionOthersColor,
backgroundColor: themes[theme].mentionOthersBackground
backgroundColor: themes[theme].mentionOthersBackground,
lineHeight: 23
}
]}
onPress={handlePress}

2
app/containers/markdown/Preview.tsx
View File

@ -33,7 +33,7 @@ const MarkdownPreview = ({ msg, numberOfLines = 1, testID, style = [] }: IMarkdo
return (
<Text
accessibilityLabel={m}
style={[styles.text, { color: themes[theme].bodyText }, ...style]}
style={[styles.text, { color: themes[theme].bodyText, lineHeight: 16 }, ...style]}
numberOfLines={numberOfLines}
testID={testID}
>

144
app/containers/markdown/new/NewMarkdown.stories.tsx
View File

@ -136,6 +136,131 @@ const allMentionTokens = [
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'rocket.cat'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
},
{
type: 'MENTION_USER',
value: {
type: 'PLAIN_TEXT',
value: 'all'
}
},
{
type: 'PLAIN_TEXT',
value: ' testing '
}
]
}
@ -260,25 +385,6 @@ export const Mentions = () => (
</View>
);
// export const Mentions = () => (
// <View style={styles.container}>
// <Text style={{ lineHeight: 24, fontSize: 16, fontFamily: 'Inter', fontWeight: '400' }}>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// <AtMention mention='all' />
// <Text> asd as das dasd asd asd asd asd asd asd ads adas </Text>
// </Text>
// </View>
// );
const channelTokens = [
{
type: 'PARAGRAPH',