Skip to content

Settings: migrate VoidButtonBgDarken to design-system buttons #86

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

Settings: migrate VoidButtonBgDarken to design-system buttons #86

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
65 changes: 33 additions & 32 deletions src/vs/workbench/contrib/cortexide/browser/react/src/settings/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react'; // Added useRef import just in case it was missed, though likely already present
import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, CortexideStatefulModelInfo, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, nonlocalProviderNames, localProviderNames, GlobalSettingName, featureNames, displayInfoOfFeatureName, isProviderNameDisabled, FeatureName, hasDownloadButtonsOnModelsProviderNames, subTextMdOfProviderName } from '../../../../common/cortexideSettingsTypes.js'
import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'
import { VoidButtonBgDarken, VoidCustomDropdownBox, VoidInputBox2, VoidSimpleInputBox, VoidSwitch } from '../util/inputs.js'
import { VoidCustomDropdownBox, VoidInputBox2, VoidSimpleInputBox, VoidSwitch } from '../util/inputs.js'
import { useAccessor, useIsDark, useIsOptedOut, useRefreshModelListener, useRefreshModelState, useSettingsState } from '../util/services.js'
import { X, RefreshCw, Loader2, Check, Asterisk, Plus } from 'lucide-react'
import { URI } from '../../../../../../../base/common/uri.js'
Expand Down Expand Up @@ -262,7 +262,7 @@ const ConfirmButton = ({ children, onConfirm, className }: { children: React.Rea
}, [confirm]);
return (
<div ref={ref} className={`inline-block`}>
<VoidButtonBgDarken className={className} onClick={() => {
<button type="button" className={`btn btn-secondary btn-sm ${className ?? ''}`.trim()} onClick={() => {
if (!confirm) {
setConfirm(true);
} else {
Expand All @@ -271,7 +271,7 @@ const ConfirmButton = ({ children, onConfirm, className }: { children: React.Rea
}
}}>
{confirm ? `Confirm Reset` : children}
</VoidButtonBgDarken>
</button>
</div>
);
};
Expand Down Expand Up @@ -431,9 +431,9 @@ const SimpleModelSettingsDialog = ({


<div className="flex justify-end gap-2 mt-4">
<VoidButtonBgDarken onClick={onClose}>
<button type="button" className="btn btn-secondary btn-sm" onClick={onClose}>
Cancel
</VoidButtonBgDarken>
</button>
<button type="button" onClick={onSave} className="btn btn-primary btn-sm">
Save
</button>
Expand Down Expand Up @@ -918,12 +918,12 @@ const ProjectRulesSection = () => {
{t('rules.description')}
</h4>
<div className='flex gap-2 mb-4'>
<VoidButtonBgDarken className='px-4 py-1' onClick={openRulesDir}>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={openRulesDir}>
{t('rules.openRulesDir')}
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1' onClick={createRuleFile}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={createRuleFile}>
{t('rules.createRule')}
</VoidButtonBgDarken>
</button>
</div>
{rules.length === 0 ? (
<p className='text-void-fg-3 text-sm'>{t('rules.noRules')}</p>
Expand Down Expand Up @@ -1529,13 +1529,13 @@ export const OneClickSwitchButton = ({ fromEditor = 'VS Code', className = '' }:
}

return <>
<VoidButtonBgDarken className={`max-w-48 p-4 ${className}`} disabled={transferState.type !== 'done'} onClick={onClick}>
<button type="button" className={`btn btn-secondary btn-sm max-w-48 p-4 ${className ?? ''}`.trim()} disabled={transferState.type !== 'done'} onClick={onClick}>
{transferState.type === 'done' ? `Transfer from ${fromEditor}`
: transferState.type === 'loading' ? <span className='text-nowrap flex flex-nowrap items-center gap-1'>Transferring<IconLoading state="processing" inline /></span>
: transferState.type === 'justfinished' ? <AnimatedCheckmarkButton text='Settings Transferred' className='bg-none' />
: null
}
</VoidButtonBgDarken>
</button>
{transferState.type === 'done' && transferState.error ? <WarningBox text={transferState.error} /> : null}
</>
}
Expand Down Expand Up @@ -2134,12 +2134,12 @@ export const Settings = () => {
{/* Settings Subcategory */}
<div className='flex flex-col gap-2 max-w-48 w-full'>
<input key={2 * s} ref={fileInputSettingsRef} type='file' accept='.json' className='hidden' onChange={handleUpload('Settings')} />
<VoidButtonBgDarken className='px-4 py-1 w-full' onClick={() => { fileInputSettingsRef.current?.click() }}>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1 w-full" onClick={() => { fileInputSettingsRef.current?.click() }}>
Import Settings
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1 w-full' onClick={() => onDownload('Settings')}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1 w-full" onClick={() => onDownload('Settings')}>
Export Settings
</VoidButtonBgDarken>
</button>
<ConfirmButton className='px-4 py-1 w-full' onConfirm={() => { cortexideSettingsService.resetState(); }}>
Reset Settings
</ConfirmButton>
Expand All @@ -2148,12 +2148,12 @@ export const Settings = () => {
{/* Chats Subcategory */}
<div className='flex flex-col gap-2 max-w-48 w-full'>
<input key={2 * s + 1} ref={fileInputChatsRef} type='file' accept='.json' className='hidden' onChange={handleUpload('Chats')} />
<VoidButtonBgDarken className='px-4 py-1 w-full' onClick={() => { fileInputChatsRef.current?.click() }}>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1 w-full" onClick={() => { fileInputChatsRef.current?.click() }}>
Import Chats
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1 w-full' onClick={() => onDownload('Chats')}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1 w-full" onClick={() => onDownload('Chats')}>
Export Chats
</VoidButtonBgDarken>
</button>
<ConfirmButton className='px-4 py-1 w-full' onConfirm={() => { chatThreadsService.resetState(); }}>
Reset Chats
</ConfirmButton>
Expand All @@ -2170,18 +2170,18 @@ export const Settings = () => {

<ErrorBoundary>
<div className='flex flex-col gap-2 justify-center max-w-48 w-full'>
<VoidButtonBgDarken className='px-4 py-1' onClick={() => { commandService.executeCommand('workbench.action.openSettings') }}>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={() => { commandService.executeCommand('workbench.action.openSettings') }}>
General Settings
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1' onClick={() => { commandService.executeCommand('workbench.action.openGlobalKeybindings') }}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={() => { commandService.executeCommand('workbench.action.openGlobalKeybindings') }}>
Keyboard Settings
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1' onClick={() => { commandService.executeCommand('workbench.action.selectTheme') }}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={() => { commandService.executeCommand('workbench.action.selectTheme') }}>
Theme Settings
</VoidButtonBgDarken>
<VoidButtonBgDarken className='px-4 py-1' onClick={() => { nativeHostService.showItemInFolder(environmentService.logsHome.fsPath) }}>
</button>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1" onClick={() => { nativeHostService.showItemInFolder(environmentService.logsHome.fsPath) }}>
Open Logs
</VoidButtonBgDarken>
</button>
</div>
</ErrorBoundary>
</div>
Expand Down Expand Up @@ -2266,11 +2266,12 @@ Use Model Context Protocol to provide Agent mode with more tools.
`} chatMessageLocation={undefined} />
</h4>
<div className='my-2 flex flex-wrap gap-2'>
<VoidButtonBgDarken className='px-4 py-1 max-w-48' onClick={async () => { await mcpService.revealMCPConfigFile() }}>
<button type="button" className="btn btn-secondary btn-sm px-4 py-1 max-w-48" onClick={async () => { await mcpService.revealMCPConfigFile() }}>
Add MCP Server
</VoidButtonBgDarken>
<VoidButtonBgDarken
className='px-4 py-1 max-w-64'
</button>
<button
type="button"
className="btn btn-secondary btn-sm px-4 py-1 max-w-64"
onClick={async () => {
try {
const result = await mcpService.addRecommendedMCPServer('playwright')
Expand All @@ -2285,7 +2286,7 @@ Use Model Context Protocol to provide Agent mode with more tools.
}}
>
+ Playwright (browser automation)
</VoidButtonBgDarken>
</button>
</div>

<ErrorBoundary>
Expand Down
10 changes: 0 additions & 10 deletions src/vs/workbench/contrib/cortexide/browser/react/src/util/inputs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,16 +1829,6 @@ export const BlockCode = ({ initValue, language, maxHeight, showScrollbars }: Bl

}


export const VoidButtonBgDarken = ({ children, disabled, onClick, className }: { children: React.ReactNode; disabled?: boolean; onClick: () => void; className?: string }) => {
return <button
type="button"
disabled={disabled}
className={`btn btn-secondary btn-sm ${className || ''}`}
onClick={onClick}
>{children}</button>
}

// export const VoidScrollableElt = ({ options, children }: { options: ScrollableElementCreationOptions, children: React.ReactNode }) => {
// const instanceRef = useRef<DomScrollableElement | null>(null);
// const [childrenPortal, setChildrenPortal] = useState<React.ReactNode | null>(null)
Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/contrib/cortexide/test/common/designSystem.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ suite('designSystem (Phase 1 — settings adoption)', () => {
const src = readFileSync(settingsPath, 'utf8');
assert.ok(src.includes('btn btn-primary'), 'expected btn-primary in settings');
assert.ok(src.includes('btn btn-secondary'), 'expected btn-secondary in settings');
assert.ok(!src.includes('VoidButtonBgDarken'), 'settings should use native buttons, not VoidButtonBgDarken');
assert.ok((src.match(/btn btn-secondary/g) ?? []).length >= 10, 'expected direct btn-secondary usage');
assert.ok(src.includes('btn-stop'), 'expected btn-stop for destructive Ollama delete');
assert.ok(src.includes("'dropdown "), 'expected dropdown class on Ollama selects');
});
Expand Down
Loading