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

Fix for Android

This commit is contained in:
Diego Mello 2023-05-29 19:15:43 -03:00
parent 806149447b
commit 1350116591
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__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

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

@ -21,8 +21,10 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
if (mention === 'all' || mention === 'here') { if (mention === 'all' || mention === 'here') {
return ( return (
<View style={styles.mentionView}> <View style={styles.mentionView}>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}> <Text>
@ <View>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
</View>
<View> <View>
<Text <Text
style={[ style={[
@ -72,8 +74,10 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
const m = useRealName && user.name ? user.name : user.username; const m = useRealName && user.name ? user.name : user.username;
return ( return (
<View style={styles.mentionView}> <View style={styles.mentionView}>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}> <Text>
@ <View>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
</View>
<View> <View>
<Text style={[styles.mention, mentionStyle, ...style]} onPress={handlePress}> <Text style={[styles.mention, mentionStyle, ...style]} onPress={handlePress}>
{` ${m} `} {` ${m} `}

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

@ -39,8 +39,10 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
if (channels && channels.length && channels.findIndex(channel => channel.name === hashtag) !== -1) { if (channels && channels.length && channels.findIndex(channel => channel.name === hashtag) !== -1) {
return ( return (
<View style={styles.mentionView}> <View style={styles.mentionView}>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}> <Text>
# <View>
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
</View>
<View> <View>
<Text <Text
style={[ style={[

5
app/containers/markdown/styles.ts
View File

@ -1,5 +1,6 @@
import { Platform, StyleSheet } from 'react-native'; import { Platform, StyleSheet } from 'react-native';
import { isIOS } from '../../lib/methods/helpers';
import sharedStyles from '../../views/Styles'; import sharedStyles from '../../views/Styles';
const codeFontFamily = Platform.select({ const codeFontFamily = Platform.select({
@ -57,13 +58,13 @@ export default StyleSheet.create({
height: 30 height: 30
}, },
temp: { opacity: 0.3 }, temp: { opacity: 0.3 },
mentionView: { marginBottom: -4 }, mentionView: { height: 20, marginBottom: isIOS ? -2 : -4 },
mention: { mention: {
fontSize: 16, fontSize: 16,
...sharedStyles.textMedium, ...sharedStyles.textMedium,
borderRadius: 4, borderRadius: 4,
overflow: 'hidden', overflow: 'hidden',
marginBottom: -2 marginBottom: -4
}, },
paragraph: { paragraph: {
marginTop: 0, marginTop: 0,