Skip to content

[CLNP-7019] fix: Pass isByMe prop to TextFragment for correct URL link color #1394

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

Open
OnestarLee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CLNP-7019] fix: Pass isByMe prop to TextFragment for correct URL link color #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/modules/Message/components/TextFragment/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ import { asSafeURL } from '../../utils/tokens/asSafeURL';

export type TextFragmentProps = {
tokens: Token[];
isByMe?: boolean;
};

export default function TextFragment({
tokens,
isByMe: isByMeProp,
}: TextFragmentProps): React.ReactElement {
const messageStore = useMessageContext();

const message = messageStore?.message as UserMessage;
const isByMe = messageStore?.isByMe;
const isByMe = isByMeProp ?? messageStore?.isByMe;
const { updatedAt, createdAt } = message;

return (
Expand All @@ -38,7 +40,7 @@ export default function TextFragment({
match(markdownToken.markdownType)
.with('bold', () => (
<span style={{ fontWeight: 'bold' }}>
<TextFragment tokens={tokenizeMarkdown({ messageText: groups[1] })}/>
<TextFragment tokens={tokenizeMarkdown({ messageText: groups[1] })} isByMe={isByMe}/>
</span>
))
.with('url', () => {
Expand All @@ -53,7 +55,7 @@ export default function TextFragment({
target="_blank"
rel="noopener noreferrer"
>
<TextFragment tokens={tokenizeMarkdown({ messageText: groups[1] })}/>
<TextFragment tokens={tokenizeMarkdown({ messageText: groups[1] })} isByMe={isByMe}/>
</a>
);
})
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default function ParentMessageInfoItem({
type={LabelTypography.BODY_1}
color={LabelColors.ONBACKGROUND_1}
>
<TextFragment tokens={tokens} />
<TextFragment tokens={tokens} isByMe={false} />
{isEditedMessage(message) && (
<Label
className="sendbird-parent-message-info-item__text-message edited"
Expand Down