diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx index 90df4a53..7bb432ee 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx @@ -26,7 +26,7 @@ import { ILLMMessageService } from '../../../../../../../platform/void/common/ll import { IModelService } from '../../../../../../../editor/common/services/model.js'; -const IconX = ({ size, className = '' }: { size: number, className?: string }) => { +const IconX = ({ size, className = '', ...props }: { size: number, className?: string } & React.SVGProps) => { return ( {selections.map((selection, i) => { @@ -225,13 +226,14 @@ export const SelectedFiles = ( {/* selection summary */}
{ setSelectionIsOpened(s => { const newS = [...s] @@ -240,18 +242,37 @@ export const SelectedFiles = ( }); }} > - + {/* file name */} {getBasename(selection.fileURI.fsPath)} {/* selection range */} {selection.selectionStr !== null ? ` (${selection.range.startLineNumber}-${selection.range.endLineNumber})` : ''} - {/* type of selection */} - {selection.selectionStr !== null ? 'Selection' : 'File'} - {/* X button */} - {type === 'staging' && // hoveredIdx === i + {type === 'staging' && + { + e.stopPropagation(); + if (type !== 'staging') return; + setStaging([...selections.slice(0, i), ...selections.slice(i + 1)]) + setSelectionIsOpened(o => [...o.slice(0, i), ...o.slice(i + 1)]) + }} + > + + + } + + {/* type of selection */} + {/* {selection.selectionStr !== null ? 'Selection' : 'File'} */} + {/* X button */} + {/* {type === 'staging' && // hoveredIdx === i { e.stopPropagation(); @@ -262,11 +283,12 @@ export const SelectedFiles = ( > - } + } */} +
{/* selection text */} {showSelectionText && -
+
} @@ -483,7 +505,7 @@ export const SidebarChat = () => { {/* input box */}
0 ? 'absolute bottom-0' : ''}`} + className={`right-0 left-0 m-2 z-[999] overflow-hidden ${previousMessages.length > 0 ? 'absolute bottom-0' : ''}`} >
{ if (ref) { setFormHeight(ref.clientHeight); } }} @@ -539,7 +561,13 @@ export const SidebarChat = () => { // .split(' ') // .map(style => `@@[&_div.monaco-inputbox]:!void-${style}`) // .join(' '); - `@@[&_textarea]:!void-bg-transparent @@[&_textarea]:!void-outline-none @@[&_textarea]:!void-text-vscode-input-fg @@[&_textarea]:!void-min-h-[81px] @@[&_textarea]:!void-max-h-[500px] @@[&_div.monaco-inputbox]:!void-border-none @@[&_div.monaco-inputbox]:!void-outline-none` + `@@[&_textarea]:!void-bg-transparent + @@[&_textarea]:!void-outline-none + @@[&_textarea]:!void-text-vscode-input-fg + @@[&_textarea]:!void-min-h-[81px] + @@[&_textarea]:!void-max-h-[500px] + @@[&_div.monaco-inputbox]:!void-border-none + @@[&_div.monaco-inputbox]:!void-outline-none` } > @@ -557,7 +585,10 @@ export const SidebarChat = () => { className='flex flex-row justify-between items-end gap-1' > {/* submit options */} -
+
diff --git a/src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx b/src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx index 260f8c75..4eccb09f 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx @@ -299,7 +299,7 @@ export const VoidCodeEditor = ({ initValue, language }: { initValue: string, lan return
instantiationService.createInstance( CodeEditorWidget, @@ -312,6 +312,8 @@ export const VoidCodeEditor = ({ initValue, language }: { initValue: string, lan alwaysConsumeMouseWheel: false, vertical: 'auto', horizontal: 'auto', + // verticalScrollbarSize: 3, + // horizontalScrollbarSize: 3, }, scrollBeyondLastLine: false, @@ -335,6 +337,9 @@ export const VoidCodeEditor = ({ initValue, language }: { initValue: string, lan hideCursorInOverviewRuler: true, overviewRulerBorder: false, glyphMargin: false, + stickyScroll: { + enabled: false + }, }, { isSimpleWidget: true, diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx index 20f46435..a1554d14 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/ModelDropdown.tsx @@ -56,7 +56,7 @@ const DummySelectBox = () => { flex items-center flex-nowrap text-ellipsis text-vscode-charts-yellow - hover:brightness-110 transition-all duration-200 + hover:brightness-90 transition-all duration-200 cursor-pointer `} onClick={openSettings} diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx index f1d95780..583e6f56 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx @@ -220,7 +220,7 @@ const ProviderSetting = ({ providerName, settingName }: { providerName: Provider return
{ if (weChangedTextRef) return voidSettingsService.setSettingOfProvider(providerName, settingName, newVal) diff --git a/src/vs/workbench/contrib/void/browser/react/tailwind.config.js b/src/vs/workbench/contrib/void/browser/react/tailwind.config.js index 48b72252..972d9b18 100644 --- a/src/vs/workbench/contrib/void/browser/react/tailwind.config.js +++ b/src/vs/workbench/contrib/void/browser/react/tailwind.config.js @@ -107,12 +107,16 @@ module.exports = { "editor-bg": "var(--vscode-editor-background)", "editor-fg": "var(--vscode-editor-foreground)", - // editor widget colors - "editorwidget-fg": "var(--vscode-editorWidget-foreground)", - "editorwidget-bg": "var(--vscode-editorWidget-background)", - "editorwidget-border": "var(--vscode-editorWidget-border)", + // other + "editorwidget-bg": "var(--vscode-editorWidget-background)", + "toolbar-hover-bg": "var(--vscode-toolbar-hoverBackground)", + "toolbar-foreground": "var(--vscode-editorActionList-foreground)", + + "editorwidget-fg": "var(--vscode-editorWidget-foreground)", + "editorwidget-border": "var(--vscode-editorWidget-border)", + "charts-orange": "var(--vscode-charts-orange)", "charts-yellow": "var(--vscode-charts-yellow)", },