Skip to content

fix(gui): prevent Accept/Reject buttons from being clipped in narrow sidebar #13131

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
thanhnnict wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(gui): prevent Accept/Reject buttons from being clipped in narrow sidebar #13131

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
4 changes: 2 additions & 2 deletions gui/src/components/StyledMarkdownPreview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const StyledMarkdown = styled.div<{
background-color: ${vscEditorBackground};
border-radius: ${defaultBorderRadius};

max-width: calc(100vw - 24px);
overflow-x: scroll;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden;

padding: 8px;
Expand Down
4 changes: 2 additions & 2 deletions gui/src/components/UnifiedTerminal/UnifiedTerminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ const StyledTerminalContainer = styled.div<{
const TerminalContent = styled.div`
pre {
white-space: pre-wrap;
max-width: calc(100vw - 24px);
overflow-x: scroll;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden;
padding: 8px;
margin: 0;
Expand Down
8 changes: 4 additions & 4 deletions gui/src/components/mainInput/Lump/LumpToolbar/PendingToolCallToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ export function PendingToolCallToolbar() {
};

return (
<div className="flex w-full flex-col pb-0.5">
<div className="flex w-full min-w-0 flex-col pb-0.5">
{pendingToolCalls.map((toolCall, index) => (
<div
key={toolCall.toolCallId}
className="border-input bg-input flex items-center gap-2 rounded border"
className="border-input bg-input grid min-w-0 grid-cols-[minmax(0,1fr)_auto] items-center rounded border"
>
<span className="text-description flex-1 truncate text-xs italic">
<span className="text-description truncate px-1 text-xs italic">
{toolCall.tool?.displayTitle ?? toolCall.toolCall.function.name}
</span>

<div className="flex items-center gap-1">
<div className="flex items-center gap-1 pr-1">
<Button
variant="ghost"
size="sm"
Expand Down
4 changes: 2 additions & 2 deletions gui/src/components/mainInput/Lump/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { LumpToolbar } from "./LumpToolbar/LumpToolbar";
*/
export function Lump() {
return (
<div className="bg-input rounded-t-default border-command-border mx-1.5 border-l border-r border-t">
<div className="xs:px-2 px-1 py-0.5">
<div className="bg-input rounded-t-default border-command-border mx-1 min-w-0 overflow-hidden border-l border-r border-t">
<div className="min-w-0 px-1 py-0.5">
<LumpToolbar />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions gui/src/pages/gui/Chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ import { ToolCallDiv } from "./ToolCallDiv";
import { useStore } from "react-redux";
import FeedbackDialog from "../../components/dialogs/FeedbackDialog";

import { DeprecationBanner } from "../../components/DeprecationBanner";
import { FatalErrorIndicator } from "../../components/config/FatalErrorNotice";
import { DeprecationBanner } from "../../components/DeprecationBanner";
import InlineErrorMessage from "../../components/mainInput/InlineErrorMessage";
import { resolveEditorContent } from "../../components/mainInput/TipTapEditor/utils/resolveEditorContent";
import { setDialogMessage, setShowDialog } from "../../redux/slices/uiSlice";
import { RootState } from "../../redux/store";
import { cancelStream } from "../../redux/thunks/cancelStream";
Expand All @@ -71,6 +70,7 @@ function findLatestSummaryIndex(history: ChatHistoryItem[]): number {
const StepsDiv = styled.div`
position: relative;
background-color: transparent;
overflow-x: hidden;

& > * {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion gui/src/pages/gui/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function GUI() {
<aside className="4xl:flex border-vsc-input-border no-scrollbar hidden min-h-0 w-96 overflow-y-auto border-0 border-r border-solid">
<History />
</aside>
<main className="no-scrollbar flex min-h-0 flex-1 flex-col">
<main className="no-scrollbar flex min-h-0 min-w-0 flex-1 flex-col">
<Chat />
</main>
</div>
Expand Down
Loading