MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-12 14:22:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(accessibility): implement centralized screen reader layo… (#9255)

Browse Source
This commit is contained in:
christine betts
2025-09-23 15:44:33 -04:00
committed by GitHub
parent 16278fd849
commit 39b0948417
10 changed files with 64 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
packages/cli/src/ui/components/MainContent.tsx
View File

@@ -5,19 +5,16 @@
*/
import { Box, Static } from 'ink';
import { HistoryList } from './HistoryList.js';
import { PendingHistoryList } from './PendingHistoryList.js';
import { HistoryItemDisplay } from './HistoryItemDisplay.js';
import { ShowMoreLines } from './ShowMoreLines.js';
import { OverflowProvider } from '../contexts/OverflowContext.js';
import { useUIState } from '../contexts/UIStateContext.js';
import { useAppContext } from '../contexts/AppContext.js';
import { AppHeader } from './AppHeader.js';
import { useLayoutConfig } from '../hooks/useLayoutConfig.js';
export const MainContent = () => {
const { version } = useAppContext();
const uiState = useUIState();
const layout = useLayoutConfig();
const {
pendingHistoryItems,
mainAreaWidth,
@@ -25,60 +22,42 @@ export const MainContent = () => {
availableTerminalHeight,
} = uiState;
// In screen reader mode, use regular layout without Static component
if (!layout.shouldUseStatic) {
return (
<OverflowProvider>
<Box flexDirection="column">
<AppHeader version={version} />
<HistoryList
history={uiState.history}
terminalWidth={mainAreaWidth}
staticAreaMaxItemHeight={staticAreaMaxItemHeight}
slashCommands={uiState.slashCommands}
/>
<PendingHistoryList
pendingHistoryItems={pendingHistoryItems}
terminalWidth={mainAreaWidth}
availableTerminalHeight={availableTerminalHeight}
constrainHeight={uiState.constrainHeight}
isEditorDialogOpen={uiState.isEditorDialogOpen}
/>
<ShowMoreLines constrainHeight={uiState.constrainHeight} />
</Box>
</OverflowProvider>
);
}
// Default mode with Static component
return (
<>
<Static
key={uiState.historyRemountKey}
items={[
<AppHeader key="app-header" version={version} />,
<HistoryList
key="history-list"
history={uiState.history}
terminalWidth={mainAreaWidth}
staticAreaMaxItemHeight={staticAreaMaxItemHeight}
slashCommands={uiState.slashCommands}
/>,
...uiState.history.map((h) => (
<HistoryItemDisplay
terminalWidth={mainAreaWidth}
availableTerminalHeight={staticAreaMaxItemHeight}
key={h.id}
item={h}
isPending={false}
commands={uiState.slashCommands}
/>
)),
]}
>
{(item) => item}
</Static>
<OverflowProvider>
<Box flexDirection="column">
<PendingHistoryList
pendingHistoryItems={pendingHistoryItems}
terminalWidth={mainAreaWidth}
availableTerminalHeight={availableTerminalHeight}
constrainHeight={uiState.constrainHeight}
isEditorDialogOpen={uiState.isEditorDialogOpen}
activePtyId={uiState.activePtyId?.toString()}
embeddedShellFocused={uiState.embeddedShellFocused}
/>
{pendingHistoryItems.map((item, i) => (
<HistoryItemDisplay
key={i}
availableTerminalHeight={
uiState.constrainHeight ? availableTerminalHeight : undefined
}
terminalWidth={mainAreaWidth}
item={{ ...item, id: 0 }}
isPending={true}
isFocused={!uiState.isEditorDialogOpen}
activeShellPtyId={uiState.activePtyId}
embeddedShellFocused={uiState.embeddedShellFocused}
/>
))}
<ShowMoreLines constrainHeight={uiState.constrainHeight} />
</Box>
</OverflowProvider>