Skip to content

fix: wrap text in codeblocks to prevent layout glitch #2282

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

Merged
skeptrunedev merged 2 commits into from
Sep 3, 2024
Merged

fix: wrap text in codeblocks to prevent layout glitch #2282

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
79d484c
fix: wrap text in codeblocks to prevent layout glitch
Sep 3, 2024
f6cbd39
styling: make code block scrollable instead of wrapping code
Sep 3, 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
13 changes: 8 additions & 5 deletions frontends/chat/src/components/Atoms/AfMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export const AfMessage = (props: AfMessageProps) => {
orientation={screenWidth() > 768 ? "horizontal" : "vertical"}
sizes={sizes()}
onSizesChange={(sizes) => setSizes(sizes)}
class="max-w-full"
classList={{
"self-start": props.role == "assistant",
"self-end": props.role == "user",
Expand All @@ -174,7 +175,7 @@ export const AfMessage = (props: AfMessageProps) => {
minSize={0.1}
ref={setLeftColumnRef}
classList={{
"dark:text-white self-start group grow shadow-sm w-full h-full rounded border dark:border-neutral-700 md:px-6 px-4 py-4 flex items-start":
"dark:text-white self-start group grow shadow-sm max-w-full overflow-hidden h-full rounded border dark:border-neutral-700 md:px-6 px-4 py-4 flex items-start":
true,
"bg-neutral-200 border-neutral-300 dark:bg-neutral-700/70":
props.role === "assistant",
Expand All @@ -183,7 +184,7 @@ export const AfMessage = (props: AfMessageProps) => {
"md:mr-16": props.role === "assistant" && metadata().length <= 0,
}}
>
<div class="flex w-full items-center gap-4 self-start text-black dark:text-neutral-100 md:flex-row">
<div class="flex w-full items-center gap-4 self-start text-wrap text-black dark:text-neutral-100 md:flex-row">
<div class="mt-1 self-start">
{props.role === "user" ? (
<BiSolidUserRectangle class="fill-current" />
Expand All @@ -194,7 +195,7 @@ export const AfMessage = (props: AfMessageProps) => {
<div
classList={{
"w-full": true,
"flex gap-y-8 items-start lg:gap-4 flex-col-reverse lg:flex-row":
"flex overflow-hidden gap-y-8 items-start lg:gap-4 flex-col-reverse lg:flex-row":
!!chunkMetadatas(),
}}
>
Expand Down Expand Up @@ -245,7 +246,7 @@ export const AfMessage = (props: AfMessageProps) => {
<SolidMarkdown
remarkPlugins={[remarkBreaks, remarkGfm]}
rehypePlugins={[rehypeSanitize]}
class="w-full select-text space-y-2"
class="w-full max-w-[full] select-text space-y-2 overflow-hidden"
components={{
h1: (props) => {
return (
Expand Down Expand Up @@ -331,7 +332,9 @@ export const AfMessage = (props: AfMessageProps) => {
</Switch>
</button>

<code ref={setCodeBlock}>{props.children}</code>
<div class="overflow-x-auto">
<code ref={setCodeBlock}>{props.children}</code>
</div>
</div>
);
},
Expand Down
2 changes: 1 addition & 1 deletion frontends/chat/src/components/Layouts/MainLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ const MainLayout = (props: LayoutProps) => {
<>
<div class="relative flex w-full flex-col justify-between">
<div
class="flex flex-col items-stretch gap-6 px-4 pb-32 pt-4"
class="flex max-w-full flex-col items-stretch gap-6 overflow-hidden px-4 pb-32 pt-4"
id="topic-messages"
>
<For each={messages()}>
Expand Down