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

fixed all markdown issues #614

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

fixed all markdown issues #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743b4cc
fix mardown
smritidoneria Jul 25, 2024
31cb12d
fix conflicts
smritidoneria Oct 22, 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
3 changes: 2 additions & 1 deletion packages/react/src/views/ChatHeader/ChatHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import useSettingsStore from '../../store/settingsStore';
import getChatHeaderStyles from './ChatHeader.styles';
import useSetExclusiveState from '../../hooks/useSetExclusiveState';
import SurfaceMenu from '../SurfaceMenu/SurfaceMenu';
import { Markdown } from '../Markdown';

const ChatHeader = ({
isClosable,
Expand Down Expand Up @@ -384,7 +385,7 @@ const ChatHeader = ({
</Box>
</Box>
{isThreadOpen && (
<DynamicHeader
<DynamicHeader Markdown
title={threadTitle}
handleClose={closeThread}
iconName="arrow-back"
Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/views/ChatInput/ChatInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { getChatInputStyles } from './ChatInput.styles';
import useShowCommands from '../../hooks/useShowCommands';
import useSearchMentionUser from '../../hooks/useSearchMentionUser';
import formatSelection from '../../lib/formatSelection';
import { Markdown } from '../Markdown';

const ChatInput = ({ scrollToBottom }) => {
const { styleOverrides, classNames } = useComponentOverrides('ChatInput');
Expand Down Expand Up @@ -155,7 +156,7 @@ const ChatInput = ({ scrollToBottom }) => {
messageRef.current.value =
editMessage.attachments[0]?.description || editMessage.msg;
} else if (editMessage.msg) {
messageRef.current.value = editMessage.msg;
messageRef.current.value = <Markdown body={editMessage} />;
} else {
messageRef.current.value = '';
}
Expand Down
4 changes: 3 additions & 1 deletion packages/react/src/views/Message/MessageToolbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { EmojiPicker } from '../EmojiPicker';
import { parseEmoji } from '../../lib/emoji';
import { getMessageToolboxStyles } from './Message.styles';
import SurfaceMenu from '../SurfaceMenu/SurfaceMenu';
import { Markdown } from '../Markdown';
import { useMessageToolboxStyles } from './Message.styles';

export const MessageToolbox = ({
className = '',
Expand Down Expand Up @@ -240,7 +242,7 @@ export const MessageToolbox = ({
padding: '0 0.5rem 0.5rem',
}}
>
{parseEmoji(message.msg)}
<Markdown body={message} isReaction={false} />
</Modal.Content>
<Modal.Footer>
<Button type="secondary" onClick={handleOnClose}>
Expand Down
13 changes: 8 additions & 5 deletions packages/react/src/views/QuoteMessage/QuoteMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import RCContext from '../../context/RCInstance';
import { useMessageStore } from '../../store';
import getQuoteMessageStyles from './QuoteMessage.styles';
import { Markdown } from '../Markdown';

const QuoteMessage = ({ className = '', style = {}, message }) => {
const { RCInstance } = useContext(RCContext);
Expand Down Expand Up @@ -45,11 +46,13 @@ const QuoteMessage = ({ className = '', style = {}, message }) => {
<Box>{format(new Date(message.ts), 'h:mm a')}</Box>
</Box>
<Box css={styles.message}>
{message.msg
? message.msg
: `${message.file?.name} (${
message.file?.size ? (message.file.size / 1024).toFixed(2) : 0
} kB)`}
{message.msg ? (
<Markdown body={message} isReaction={false} />
) : (
`${message.file?.name} (${
message.file?.size ? (message.file.size / 1024).toFixed(2) : 0
} kB)`
)}
</Box>
</Box>
);
Expand Down
Loading