Skip to content

Fix(accessibility): add screen reader support to RewindViewer #20750

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
Adib234 merged 10 commits into from
Mar 6, 2026
Merged

Fix(accessibility): add screen reader support to RewindViewer #20750

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e2fa35c
fix(accessibility): add screen reader support to RewindViewer
Famous077 Mar 1, 2026
4b3bb8f
fix(accessibility): use BaseSelectionList for interactive screen read…
Famous077 Mar 1, 2026
05f403d
fix(accessibility): address screen reader review feedback for RewindV…
Famous077 Mar 2, 2026
0b59a52
Merge branch 'main' into fix/rewind-screen-reader-accessibility
Famous077 Mar 2, 2026
80fa113
fix(accessibility): address screen reader review feedback for RewindV…
Famous077 Mar 4, 2026
d4330a5
Merge branch 'main' into fix/rewind-screen-reader-accessibility
Famous077 Mar 4, 2026
e70d028
Merge branch 'main' into fix/rewind-screen-reader-accessibility
Famous077 Mar 5, 2026
311f249
fix(accessibility): remove dev comments, redundant prop, and fix scre…
Famous077 Mar 5, 2026
55e32cf
Merge branch 'main' into fix/rewind-screen-reader-accessibility
Famous077 Mar 5, 2026
58b890d
Merge branch 'main' into fix/rewind-screen-reader-accessibility
Famous077 Mar 6, 2026
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
19 changes: 18 additions & 1 deletion packages/cli/src/ui/components/RewindViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import type React from 'react';
import { useMemo, useState } from 'react';
import { Box, Text } from 'ink';
import { Box, Text, useIsScreenReaderEnabled } from 'ink';
import { useUIState } from '../contexts/UIStateContext.js';
import {
type ConversationRecord,
Expand Down Expand Up @@ -50,6 +50,7 @@ export const RewindViewer: React.FC<RewindViewerProps> = ({
}) => {
const [isRewinding, setIsRewinding] = useState(false);
const { terminalWidth, terminalHeight } = useUIState();
const isScreenReaderEnabled = useIsScreenReaderEnabled();
const {
selectedMessageId,
getStats,
Expand Down Expand Up @@ -182,6 +183,22 @@ export const RewindViewer: React.FC<RewindViewerProps> = ({
);
}

if (isScreenReaderEnabled) {
return (
<Box flexDirection="column" width={terminalWidth}>
<Text bold>Rewind - Select a conversation point:</Text>
{items.map((item, idx) => (
<Text key={item.key}>
{idx + 1}.{' '}
{item.value.id === 'current-position'
? 'Stay at current position'
: getCleanedRewindText(item.value)}
</Text>
))}
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Mar 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The current implementation for the screen reader view renders a static list of items using items.map(). This makes the list non-interactive, as the key press handlers for navigation (arrow keys) and selection (Enter) from BaseSelectionList are not being used. As a result, screen reader users can see the list but cannot interact with it, which prevents them from using the rewind functionality and negates the goal of this accessibility fix.

To address this, you should use the BaseSelectionList component for the screen reader view as well, but with a simplified renderItem function that produces plain text output. This will provide the necessary keyboard interactivity.

As a follow-up, you could extract the onSelect handler into a named function to avoid duplicating it between the screen reader and visual rendering paths.

        <BaseSelectionList
          items={items}
          initialIndex={items.length - 1}
          isFocused={true}
          showNumbers={false}
          wrapAround={false}
          onSelect={(item: MessageRecord) => {
            if (item?.id) {
              if (item.id === 'current-position') {
                onExit();
              } else {
                selectMessage(item.id);
              }
            }
          }}
          renderItem={(itemWrapper) => {
            const item = itemWrapper.value;
            const text =
              item.id === 'current-position'
                ? 'Stay at current position'
                : getCleanedRewindText(item);
            return (
              <Text>
                {itemWrapper.index + 1}. {text}
              </Text>
            );
          }}
        />
References
  1. Maintain consistency with existing UI behavior across components. Defer non-standard UX pattern improvements to be addressed holistically rather than in a single component.

Copy link
Copy Markdown
Contributor Author

@Famous077 Famous077 Mar 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated successfully

<Text>Press Esc to exit, Enter to select, arrow keys to navigate.</Text>
</Box>
);
}
return (
<Box
borderStyle="round"
Expand Down