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.

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

HighlightText now retains spacing and linebreaks #60

Merged
merged 1 commit into from
May 29, 2023
Merged
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions frontend/components/HighlightText.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,23 @@ const HighlightText = ({ content }) => {
const { mention, artifact } = useChatColorMode();

const formattedContent = React.useMemo(() => {
// Match @mentions and {artifacts} and return an array of Chakra Text components
return content.split(" ").map((word, idx) => {
if (word.startsWith("@")) {
// Word is a mention
return content.split(/(\s|\n)/).map((segment, idx) => {
if (segment.startsWith("@")) {
return (
<Text as="span" color={mention} key={idx}>
{word + " "}
{segment}
</Text>
);
} else if (word.startsWith("{") && word.endsWith("}")) {
// Word is an artifact
} else if (segment.startsWith("{") && segment.endsWith("}")) {
return (
<Text as="span" color={artifact} key={idx}>
{word + " "}
{segment}
</Text>
);
} else if (segment === "\n") {
return <br key={idx} />;
} else {
return word + " ";
return segment;
}
});
}, [content]);
Expand Down