Skip to content

refactor(ui): extract ComposerInputArea and ComposerInputSection #85

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
Pterjudin merged 1 commit into from
Jul 23, 2026
Merged

refactor(ui): extract ComposerInputArea and ComposerInputSection #85

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
160 changes: 47 additions & 113 deletions src/vs/workbench/contrib/cortexide/browser/react/src/sidebar-tsx/SidebarChat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ import React, { KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState

import { useAccessor, useChatThreadsState, useChatThreadsStreamState, useSettingsState } from '../util/services.js';

import { TextAreaFns, VoidInputBox2 } from '../util/inputs.js';
import { TextAreaFns } from '../util/inputs.js';
import { PastThreadsList } from './SidebarThreadSelector.js';
import { VoidChatArea, ButtonSubmit, ButtonStop } from './composer/VoidChatArea.js';
import { SelectedFiles } from './composer/SelectedFiles.js';
import { scrollToBottom } from './composer/ScrollToBottomContainer.js';
import { ContextUsageBar } from './composer/ContextUsageBar.js';
import { CommandBarInChat } from './composer/CommandBarInChat.js';
import { ChatMessageList } from './composer/ChatMessageList.js';
import { StagingContextChips } from './composer/StagingContextChips.js';
import { ComposerInputSection } from './composer/ComposerInputSection.js';
import { useContextUsage } from './composer/useContextUsage.js';
import { resolveAtReferencesInMessage } from '../../../../common/resolveAtReferences.js';
import { handleSlashCommand } from './composer/handleSlashCommand.js';
Expand All @@ -31,8 +29,6 @@ import ErrorBoundary from './ErrorBoundary.js';
import { useImageAttachments } from '../util/useImageAttachments.js';
import { usePDFAttachments } from '../util/usePDFAttachments.js';
import { useTranslation } from '../util/useTranslation.js';
import { PDFAttachmentList } from '../util/PDFAttachmentList.js';
import { ImageAttachmentList } from '../util/ImageAttachmentList.js';
import { IconX, IconWarning, IconLoading, TypingCursor } from './shared/icons.js';
import { getBasename, getFolderName, getRelative, voidOpenFileFn } from './shared/pathUtils.js';
import { ToolChildrenWrapper, CodeChildren, ListableToolItem } from './tools/ToolPrimitives.js';
Expand Down Expand Up @@ -260,117 +256,55 @@ export const SidebarChat = () => {
scrollToBottomCallback={scrollToBottomCallback}
/>

const inputChatArea = <VoidChatArea
featureName='Chat'
onSubmit={() => onSubmit()}
onAbort={onAbort}
isStreaming={isActivelyStreaming}
isDisabled={isDisabled}
showSelections={true}
// showProspectiveSelections={previousMessagesHTML.length === 0}
selections={selections}
setSelections={setSelections}
onClickAnywhere={() => { textAreaRef.current?.focus() }}
imageAttachments={
imageAttachments.length > 0 ? (
<>
<ImageAttachmentList
attachments={imageAttachments}
onRemove={removeImage}
onRetry={retryImage}
onCancel={cancelImage}
focusedIndex={focusedImageIndex}
onFocusChange={setFocusedImageIndex}
/>
{imageValidationError && (
<div className="px-2 py-1 text-xs text-[var(--cortex-danger)] bg-[var(--cortex-danger)]/10 border border-[var(--cortex-danger)]/20 rounded-md mx-2">
{imageValidationError.message}
</div>
)}
</>
) : null
}
onImagePaste={addImages}
onImageDrop={addImages}
onPDFDrop={addPDFs}
pdfAttachments={
pdfAttachments.length > 0 ? (
<>
<PDFAttachmentList
attachments={pdfAttachments}
onRemove={removePDF}
onRetry={retryPDF}
onCancel={cancelPDF}
focusedIndex={focusedPDFIndex}
onFocusChange={setFocusedPDFIndex}
/>
{pdfValidationError && (
<div className="px-2 py-1 text-xs text-[var(--cortex-danger)] bg-[var(--cortex-danger)]/10 border border-[var(--cortex-danger)]/20 rounded-md mx-2">
{pdfValidationError}
</div>
)}
</>
) : null
}
>
<VoidInputBox2
enableAtToMention
appearance="chatDark"
className={`min-h-[60px] px-3 py-3 rounded-2xl`}
placeholder="Plan, @ for context"
onChangeText={onChangeText}
onKeyDown={onKeyDown}
onFocus={() => { chatThreadsService.setCurrentlyFocusedMessageIdx(undefined) }}
ref={textAreaRef}
fnsRef={textAreaFnsRef}
multiline={true}
/>

{/* Context chips for current selections */}
<StagingContextChips
selections={selections}
onRemoveLast={() => { chatThreadsService.popStagingSelections(1) }}
const composerInputProps = {
onSubmit: () => onSubmit(),
onAbort,
isStreaming: isActivelyStreaming,
isDisabled,
selections,
setSelections,
textAreaRef,
textAreaFnsRef,
onChangeText,
onKeyDown,
onInputFocus: () => { chatThreadsService.setCurrentlyFocusedMessageIdx(undefined) },
onRemoveStagingLast: () => { chatThreadsService.popStagingSelections(1) },
imageAttachments,
removeImage,
retryImage,
cancelImage,
focusedImageIndex,
setFocusedImageIndex,
imageValidationError,
addImages,
pdfAttachments,
removePDF,
retryPDF,
cancelPDF,
focusedPDFIndex,
setFocusedPDFIndex,
pdfValidationError,
addPDFs,
modelSel,
contextTotal,
contextBudget,
contextPct,
};

const landingPageInput = (
<ComposerInputSection variant="landing" {...composerInputProps} />
);

const threadPageInput = (
<ComposerInputSection
variant="thread"
threadKey={chatThreadsState.currentThreadId}
{...composerInputProps}
/>

</VoidChatArea>

);

const isLandingPage = previousMessages.length === 0


const threadPageInput = <div key={'input' + chatThreadsState.currentThreadId}>
<div className='px-4'>
<CommandBarInChat />
</div>
<div className='px-2 pb-2'>
{inputChatArea}

{/* Context usage indicator */}
{modelSel ? (
<ContextUsageBar
className="mt-1"
contextTotal={contextTotal}
contextBudget={contextBudget}
contextPct={contextPct}
/>
) : null}
</div>
</div>

const landingPageInput = <div>
<div className='pt-8'>
{inputChatArea}
{modelSel ? (
<ContextUsageBar
className="mt-1 px-2"
contextTotal={contextTotal}
contextBudget={contextBudget}
contextPct={contextPct}
/>
) : null}
</div>
</div>

const landingPageContent = <LandingPage
sidebarRef={sidebarRef}
inputSection={landingPageInput}
Expand Down
147 changes: 147 additions & 0 deletions .../workbench/contrib/cortexide/browser/react/src/sidebar-tsx/composer/ComposerInputArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
/*--------------------------------------------------------------------------------------
* Copyright 2025 Glass Devtools, Inc. All rights reserved.
* Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
*--------------------------------------------------------------------------------------*/

import React, { KeyboardEvent, RefObject } from 'react';
import { VoidChatArea } from './VoidChatArea.js';
import { VoidInputBox2, TextAreaFns } from '../../util/inputs.js';
import { StagingContextChips } from './StagingContextChips.js';
import { ImageAttachmentList } from '../../util/ImageAttachmentList.js';
import { PDFAttachmentList } from '../../util/PDFAttachmentList.js';
import { StagingSelectionItem, ChatImageAttachment, ChatPDFAttachment } from '../../../../common/chatThreadServiceTypes.js';
import { ImageValidationError } from '../../util/imageUtils.js';

const AttachmentValidationBanner = ({ message }: { message: string }) => (
<div className="px-2 py-1 text-xs text-[var(--cortex-danger)] bg-[var(--cortex-danger)]/10 border border-[var(--cortex-danger)]/20 rounded-md mx-2">
{message}
</div>
);

export type ComposerInputAreaProps = {
onSubmit: () => void;
onAbort: () => void;
isStreaming: boolean;
isDisabled: boolean;
selections: StagingSelectionItem[];
setSelections: (selections: StagingSelectionItem[]) => void;
textAreaRef: RefObject<HTMLTextAreaElement | null>;
textAreaFnsRef: RefObject<TextAreaFns | null>;
onChangeText: (value: string) => void;
onKeyDown: (e: KeyboardEvent<HTMLTextAreaElement>) => void;
onInputFocus: () => void;
onRemoveStagingLast: () => void;
imageAttachments: ChatImageAttachment[];
removeImage: (id: string) => void;
retryImage: (id: string) => Promise<void>;
cancelImage: (id: string) => void;
focusedImageIndex: number | null;
setFocusedImageIndex: (index: number | null) => void;
imageValidationError: ImageValidationError | null;
addImages: (files: File[]) => Promise<void>;
pdfAttachments: ChatPDFAttachment[];
removePDF: (id: string) => void;
retryPDF: (id: string) => Promise<void>;
cancelPDF: (id: string) => void;
focusedPDFIndex: number | null;
setFocusedPDFIndex: (index: number | null) => void;
pdfValidationError: string | null;
addPDFs: (files: File[]) => Promise<void>;
};

export const ComposerInputArea = ({
onSubmit,
onAbort,
isStreaming,
isDisabled,
selections,
setSelections,
textAreaRef,
textAreaFnsRef,
onChangeText,
onKeyDown,
onInputFocus,
onRemoveStagingLast,
imageAttachments,
removeImage,
retryImage,
cancelImage,
focusedImageIndex,
setFocusedImageIndex,
imageValidationError,
addImages,
pdfAttachments,
removePDF,
retryPDF,
cancelPDF,
focusedPDFIndex,
setFocusedPDFIndex,
pdfValidationError,
addPDFs,
}: ComposerInputAreaProps) => (
<VoidChatArea
featureName='Chat'
onSubmit={onSubmit}
onAbort={onAbort}
isStreaming={isStreaming}
isDisabled={isDisabled}
showSelections={true}
selections={selections}
setSelections={setSelections}
onClickAnywhere={() => { textAreaRef.current?.focus() }}
imageAttachments={
imageAttachments.length > 0 ? (
<>
<ImageAttachmentList
attachments={imageAttachments}
onRemove={removeImage}
onRetry={retryImage}
onCancel={cancelImage}
focusedIndex={focusedImageIndex}
onFocusChange={setFocusedImageIndex}
/>
{imageValidationError ? (
<AttachmentValidationBanner message={imageValidationError.message} />
) : null}
</>
) : null
}
onImagePaste={addImages}
onImageDrop={addImages}
onPDFDrop={addPDFs}
pdfAttachments={
pdfAttachments.length > 0 ? (
<>
<PDFAttachmentList
attachments={pdfAttachments}
onRemove={removePDF}
onRetry={retryPDF}
onCancel={cancelPDF}
focusedIndex={focusedPDFIndex}
onFocusChange={setFocusedPDFIndex}
/>
{pdfValidationError ? (
<AttachmentValidationBanner message={pdfValidationError} />
) : null}
</>
) : null
}
>
<VoidInputBox2
enableAtToMention
appearance="chatDark"
className="min-h-[60px] px-3 py-3 rounded-2xl"
placeholder="Plan, @ for context"
onChangeText={onChangeText}
onKeyDown={onKeyDown}
onFocus={onInputFocus}
ref={textAreaRef}
fnsRef={textAreaFnsRef}
multiline={true}
/>
<StagingContextChips
selections={selections}
onRemoveLast={onRemoveStagingLast}
/>
</VoidChatArea>
);
Loading
Loading