Skip to content

fix: render extension widgets next to the editor #358

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

fix: render extension widgets next to the editor #358

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
16 changes: 13 additions & 3 deletions components/ChatWindow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,9 @@ export function ChatWindow({ session, newSessionCwd, onAgentEnd, onSessionCreate
</div>
</div>
<NoticeShelf notices={notices} align="right" />
<ExtensionWidgets widgets={aboveEditorWidgets} />
{chatInputElement}
<ExtensionWidgets widgets={belowEditorWidgets} />
</div>
</div>
) : (
Expand All @@ -510,8 +512,6 @@ export function ChatWindow({ session, newSessionCwd, onAgentEnd, onSessionCreate
<div ref={scrollContainerRef} className="min-w-0 flex-1 overflow-x-hidden overflow-y-auto pt-4 [scrollbar-width:none]">
<div style={{ minWidth: 0, padding: `0 ${CHAT_COLUMN_PADDING}px` }}>
<div style={{ width: "100%", minWidth: 0, maxWidth: 820, margin: "0 auto" }}>
<ExtensionWidgets widgets={aboveEditorWidgets} />

{(() => {
const toolResultsMap = new Map<string, ToolResultMessage>();
for (const msg of messages) {
Expand Down Expand Up @@ -746,10 +746,20 @@ export function ChatWindow({ session, newSessionCwd, onAgentEnd, onSessionCreate
}}
>
<div style={{ maxWidth: 820, margin: "0 auto" }}>
<ExtensionWidgets widgets={belowEditorWidgets} />
<ExtensionWidgets widgets={aboveEditorWidgets} />
</div>
</div>
{chatInputElement}
<div
style={{
padding: `0 ${CHAT_COLUMN_PADDING}px`,
paddingRight: isMobile ? CHAT_COLUMN_PADDING : CHAT_INPUT_RIGHT_PADDING,
}}
>
<div style={{ maxWidth: 820, margin: "0 auto" }}>
<ExtensionWidgets widgets={belowEditorWidgets} />
</div>
</div>
<ExtensionStatusBar statuses={extensionStatuses} />
</div>
</>
Expand Down