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

feat: improve user chat input to display spacements #3687

Merged
merged 3 commits into from
Sep 10, 2024
Merged

feat: improve user chat input to display spacements #3687

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61f975d
feat: Refactor chatMessage component for improved readability and per…
Cristhianzl Sep 4, 2024
5ad6e93
Merge branch 'main' into cz/ux-playground-chat
anovazzi1 Sep 10, 2024
4ffbc56
Merge branch 'main' into cz/ux-playground-chat
anovazzi1 Sep 10, 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
51 changes: 20 additions & 31 deletions src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,16 @@ export default function ChatMessage({
}
}, [lastMessage]);

const decodedMessage = decodeURIComponent(chatMessage ?? "");
const isEmpty = decodedMessage?.trim() === "";

return (
<>
<div
className={classNames(
"form-modal-chat-position",
chat.isSend ? "" : " ",
)}
>
<div className={cn("form-modal-chat-position", chat.isSend ? "" : " ")}>
<div
className={classNames(
"mr-3 mt-1 flex w-24 flex-col items-center gap-1 overflow-hidden px-3 pb-3",
)}
className={
"mr-3 mt-1 flex w-24 flex-col items-center gap-1 overflow-hidden px-3 pb-3"
}
>
<div className="flex flex-col items-center gap-1">
<div
Expand Down Expand Up @@ -197,7 +195,7 @@ export default function ChatMessage({
>
{useMemo(
() =>
chatMessage === "" && lockChat ? (
isEmpty && lockChat ? (
<IconComponent
name="MoreHorizontal"
className="h-8 w-8 animate-pulse"
Expand All @@ -208,7 +206,7 @@ export default function ChatMessage({
rehypePlugins={[rehypeMathjax]}
className={cn(
"markdown prose flex flex-col word-break-break-word dark:prose-invert",
chatMessage === ""
isEmpty
? "text-chat-trigger-disabled"
: "text-primary",
)}
Expand Down Expand Up @@ -269,7 +267,7 @@ export default function ChatMessage({
},
}}
>
{chatMessage === "" && !chat.stream_url
{isEmpty && !chat.stream_url
? EMPTY_OUTPUT_SEND_MESSAGE
: chatMessage}
</Markdown>
Expand All @@ -294,18 +292,13 @@ export default function ChatMessage({
Display Prompt
<IconComponent
name="ChevronDown"
className={
"h-3 w-3 transition-all " +
(promptOpen ? "rotate-180" : "")
}
className={`h-3 w-3 transition-all ${promptOpen ? "rotate-180" : ""}`}
/>
</button>
<span
className={cn(
"prose word-break-break-word dark:prose-invert",
chatMessage !== ""
? "text-primary"
: "text-chat-trigger-disabled",
!isEmpty ? "text-primary" : "text-chat-trigger-disabled",
)}
>
{promptOpen
Expand Down Expand Up @@ -337,25 +330,21 @@ export default function ChatMessage({
}
return <p>{parts}</p>;
})
: chatMessage === ""
: isEmpty
? EMPTY_INPUT_SEND_MESSAGE
: chatMessage}
</span>
</>
) : (
<div className="flex flex-col">
<span
className={`prose word-break-break-word dark:prose-invert ${
chatMessage === ""
? "text-chat-trigger-disabled"
: "text-primary"
<div
className={`whitespace-pre-wrap break-words ${
isEmpty ? "text-chat-trigger-disabled" : "text-primary"
}`}
data-testid={
"chat-message-" + chat.sender_name + "-" + chatMessage
}
data-testid={`chat-message-${chat.sender_name}-${chatMessage}`}
>
{chatMessage === "" ? EMPTY_INPUT_SEND_MESSAGE : chatMessage}
</span>
{isEmpty ? EMPTY_INPUT_SEND_MESSAGE : decodedMessage}
</div>
{chat.files && (
<div className="my-2 flex flex-col gap-5">
{chat.files.map((file, index) => {
Expand All @@ -375,7 +364,7 @@ export default function ChatMessage({
</div>
)}
</div>
<div id={lastMessage ? "last-chat-message" : ""}></div>
<div id={lastMessage ? "last-chat-message" : undefined} />
</>
);
}
Loading