Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added changes to fix the markdown for mention user #5367

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Added changes to fix the markdown for mention user #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13582a1
added changes to fix the markdown for mention user
brf153 Nov 27, 2023
b4f938c
Merge branch 'develop' into mention_slash_error
brf153 Nov 28, 2023
c0fb271
Merge branch 'develop' into mention_slash_error
brf153 Dec 1, 2023
2684a7d
Merge branch 'develop' into mention_slash_error
brf153 Dec 2, 2023
d20ffd9
Merge branch 'RocketChat:develop' into mention_slash_error
brf153 Dec 12, 2023
36a7e4c
Merge branch 'develop' into mention_slash_error
brf153 Dec 14, 2023
4f0d3ce
Merge branch 'develop' into mention_slash_error
brf153 Dec 19, 2023
5202c09
Merge branch 'develop' into mention_slash_error
brf153 Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/containers/markdown/new/Bold.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useContext } from 'react';
import { StyleSheet, Text } from 'react-native';
import { Bold as BoldProps } from '@rocket.chat/message-parser';

Expand All @@ -7,6 +7,8 @@ import Strike from './Strike';
import Italic from './Italic';
import Plain from './Plain';
import Link from './Link';
import AtMention from '../AtMention';
import MarkdownContext from './MarkdownContext';

interface IBoldProps {
value: BoldProps['value'];
Expand All @@ -21,6 +23,7 @@ const styles = StyleSheet.create({
const Bold = ({ value }: IBoldProps) => (
<Text style={styles.text}>
{value.map(block => {
const { useRealName, username, navToRoomInfo, mentions} = useContext(MarkdownContext);
switch (block.type) {
case 'LINK':
return <Link value={block.value} />;
Expand All @@ -32,6 +35,16 @@ const Bold = ({ value }: IBoldProps) => (
return <Italic value={block.value} />;
case 'MENTION_CHANNEL':
return <Plain value={`#${block.value.value}`} />;
case 'MENTION_USER':
return (
<AtMention
mention={block.value.value}
useRealName={useRealName}
username={username}
navToRoomInfo={navToRoomInfo}
mentions={mentions}
/>
);
default:
return null;
}
Expand Down
15 changes: 14 additions & 1 deletion app/containers/markdown/new/Italic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from 'react';
import React, { useContext } from 'react';
import { StyleSheet, Text } from 'react-native';
import { Italic as ItalicProps } from '@rocket.chat/message-parser';

import Strike from './Strike';
import Bold from './Bold';
import Plain from './Plain';
import Link from './Link';
import MarkdownContext from './MarkdownContext';
import AtMention from '../AtMention';

interface IItalicProps {
value: ItalicProps['value'];
Expand All @@ -20,6 +22,7 @@ const styles = StyleSheet.create({
const Italic = ({ value }: IItalicProps) => (
<Text style={styles.text}>
{value.map(block => {
const { useRealName, username, navToRoomInfo, mentions} = useContext(MarkdownContext);
switch (block.type) {
case 'LINK':
return <Link value={block.value} />;
Expand All @@ -31,6 +34,16 @@ const Italic = ({ value }: IItalicProps) => (
return <Bold value={block.value} />;
case 'MENTION_CHANNEL':
return <Plain value={`#${block.value.value}`} />;
case 'MENTION_USER':
return (
<AtMention
mention={block.value.value}
useRealName={useRealName}
username={username}
navToRoomInfo={navToRoomInfo}
mentions={mentions}
/>
);
default:
return null;
}
Expand Down
15 changes: 14 additions & 1 deletion app/containers/markdown/new/Strike.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from 'react';
import React, { useContext } from 'react';
import { StyleSheet, Text } from 'react-native';
import { Strike as StrikeProps } from '@rocket.chat/message-parser';

import Bold from './Bold';
import Italic from './Italic';
import Plain from './Plain';
import Link from './Link';
import AtMention from '../AtMention';
import MarkdownContext from './MarkdownContext';

interface IStrikeProps {
value: StrikeProps['value'];
Expand All @@ -20,6 +22,7 @@ const styles = StyleSheet.create({
const Strike = ({ value }: IStrikeProps) => (
<Text style={styles.text}>
{value.map(block => {
const { useRealName, username, navToRoomInfo, mentions} = useContext(MarkdownContext);
switch (block.type) {
case 'LINK':
return <Link value={block.value} />;
Expand All @@ -31,6 +34,16 @@ const Strike = ({ value }: IStrikeProps) => (
return <Italic value={block.value} />;
case 'MENTION_CHANNEL':
return <Plain value={`#${block.value.value}`} />;
case 'MENTION_USER':
return (
<AtMention
mention={block.value.value}
useRealName={useRealName}
username={username}
navToRoomInfo={navToRoomInfo}
mentions={mentions}
/>
);
default:
return null;
}
Expand Down