@google/gemini-cli 0.7.0-nightly.20250912.68035591 → 0.7.0-preview.0

package/dist/src/ui/components/shared/RadioButtonSelect.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState, useRef } from 'react';
-import { Text, Box } from 'ink';
+import { Text } from 'ink';
 import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
+import { BaseSelectionList } from './BaseSelectionList.js';
 /**
  * A custom component that displays a list of items with radio buttons,
  * supporting scrolling and keyboard navigation.
@@ -10,107 +9,13 @@ import { useKeypress } from '../../hooks/useKeypress.js';
  * @template T The type of the value associated with each radio item.
  */
 export function RadioButtonSelect({ items, initialIndex = 0, onSelect, onHighlight, isFocused = true, showScrollArrows = false, maxItemsToShow = 10, showNumbers = true, }) {
-    const [activeIndex, setActiveIndex] = useState(initialIndex);
-    const [scrollOffset, setScrollOffset] = useState(0);
-    const [numberInput, setNumberInput] = useState('');
-    const numberInputTimer = useRef(null);
-    useEffect(() => {
-        const newScrollOffset = Math.max(0, Math.min(activeIndex - maxItemsToShow + 1, items.length - maxItemsToShow));
-        if (activeIndex < scrollOffset) {
-            setScrollOffset(activeIndex);
-        }
-        else if (activeIndex >= scrollOffset + maxItemsToShow) {
-            setScrollOffset(newScrollOffset);
-        }
-    }, [activeIndex, items.length, scrollOffset, maxItemsToShow]);
-    useEffect(() => () => {
-        if (numberInputTimer.current) {
-            clearTimeout(numberInputTimer.current);
-        }
-    }, []);
-    useKeypress((key) => {
-        const { sequence, name } = key;
-        const isNumeric = showNumbers && /^[0-9]$/.test(sequence);
-        // Any key press that is not a digit should clear the number input buffer.
-        if (!isNumeric && numberInputTimer.current) {
-            clearTimeout(numberInputTimer.current);
-            setNumberInput('');
-        }
-        if (name === 'k' || name === 'up') {
-            const newIndex = activeIndex > 0 ? activeIndex - 1 : items.length - 1;
-            setActiveIndex(newIndex);
-            onHighlight?.(items[newIndex].value);
-            return;
-        }
-        if (name === 'j' || name === 'down') {
-            const newIndex = activeIndex < items.length - 1 ? activeIndex + 1 : 0;
-            setActiveIndex(newIndex);
-            onHighlight?.(items[newIndex].value);
-            return;
-        }
-        if (name === 'return') {
-            onSelect(items[activeIndex].value);
-            return;
-        }
-        // Handle numeric input for selection.
-        if (isNumeric) {
-            if (numberInputTimer.current) {
-                clearTimeout(numberInputTimer.current);
+    return (_jsx(BaseSelectionList, { items: items, initialIndex: initialIndex, onSelect: onSelect, onHighlight: onHighlight, isFocused: isFocused, showNumbers: showNumbers, showScrollArrows: showScrollArrows, maxItemsToShow: maxItemsToShow, renderItem: (item, { titleColor }) => {
+            // Handle special theme display case for ThemeDialog compatibility
+            if (item.themeNameDisplay && item.themeTypeDisplay) {
+                return (_jsxs(Text, { color: titleColor, wrap: "truncate", children: [item.themeNameDisplay, ' ', _jsx(Text, { color: theme.text.secondary, children: item.themeTypeDisplay })] }));
             }
-            const newNumberInput = numberInput + sequence;
-            setNumberInput(newNumberInput);
-            const targetIndex = Number.parseInt(newNumberInput, 10) - 1;
-            // A single '0' is not a valid selection since items are 1-indexed.
-            if (newNumberInput === '0') {
-                numberInputTimer.current = setTimeout(() => setNumberInput(''), 350);
-                return;
-            }
-            if (targetIndex >= 0 && targetIndex < items.length) {
-                const targetItem = items[targetIndex];
-                setActiveIndex(targetIndex);
-                onHighlight?.(targetItem.value);
-                // If the typed number can't be a prefix for another valid number,
-                // select it immediately. Otherwise, wait for more input.
-                const potentialNextNumber = Number.parseInt(newNumberInput + '0', 10);
-                if (potentialNextNumber > items.length) {
-                    onSelect(targetItem.value);
-                    setNumberInput('');
-                }
-                else {
-                    numberInputTimer.current = setTimeout(() => {
-                        onSelect(targetItem.value);
-                        setNumberInput('');
-                    }, 350); // Debounce time for multi-digit input.
-                }
-            }
-            else {
-                // The typed number is out of bounds, clear the buffer
-                setNumberInput('');
-            }
-        }
-    }, { isActive: !!(isFocused && items.length > 0) });
-    const visibleItems = items.slice(scrollOffset, scrollOffset + maxItemsToShow);
-    return (_jsxs(Box, { flexDirection: "column", children: [showScrollArrows && (_jsx(Text, { color: scrollOffset > 0 ? theme.text.primary : theme.text.secondary, children: "\u25B2" })), visibleItems.map((item, index) => {
-                const itemIndex = scrollOffset + index;
-                const isSelected = activeIndex === itemIndex;
-                let textColor = theme.text.primary;
-                let numberColor = theme.text.primary;
-                if (isSelected) {
-                    textColor = theme.status.success;
-                    numberColor = theme.status.success;
-                }
-                else if (item.disabled) {
-                    textColor = theme.text.secondary;
-                    numberColor = theme.text.secondary;
-                }
-                if (!showNumbers) {
-                    numberColor = theme.text.secondary;
-                }
-                const numberColumnWidth = String(items.length).length;
-                const itemNumberText = `${String(itemIndex + 1).padStart(numberColumnWidth)}.`;
-                return (_jsxs(Box, { alignItems: "center", children: [_jsx(Box, { minWidth: 2, flexShrink: 0, children: _jsx(Text, { color: isSelected ? theme.status.success : theme.text.primary, "aria-hidden": true, children: isSelected ? '●' : ' ' }) }), _jsx(Box, { marginRight: 1, flexShrink: 0, minWidth: itemNumberText.length, "aria-state": { checked: isSelected }, children: _jsx(Text, { color: numberColor, children: itemNumberText }) }), item.themeNameDisplay && item.themeTypeDisplay ? (_jsxs(Text, { color: textColor, wrap: "truncate", children: [item.themeNameDisplay, ' ', _jsx(Text, { color: theme.text.secondary, children: item.themeTypeDisplay })] })) : (_jsx(Text, { color: textColor, wrap: "truncate", children: item.label }))] }, item.label));
-            }), showScrollArrows && (_jsx(Text, { color: scrollOffset + maxItemsToShow < items.length
-                    ? theme.text.primary
-                    : theme.text.secondary, children: "\u25BC" }))] }));
+            // Regular label display
+            return (_jsx(Text, { color: titleColor, wrap: "truncate", children: item.label }));
+        } }));
 }
 //# sourceMappingURL=RadioButtonSelect.js.map

package/dist/src/ui/components/shared/RadioButtonSelect.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadioButtonSelect.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/RadioButtonSelect.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RadioButtonSelect.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/RadioButtonSelect.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAqC3D;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAI,EACnC,KAAK,EACL,YAAY,GAAG,CAAC,EAChB,QAAQ,EACR,WAAW,EACX,SAAS,GAAG,IAAI,EAChB,gBAAgB,GAAG,KAAK,EACxB,cAAc,GAAG,EAAE,EACnB,WAAW,GAAG,IAAI,GACQ;IAC1B,OAAO,CACL,KAAC,iBAAiB,IAChB,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACnC,kEAAkE;YAClE,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACnD,OAAO,CACL,MAAC,IAAI,IAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAC,UAAU,aACrC,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAC3B,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,YAAG,IAAI,CAAC,gBAAgB,GAAQ,IAC5D,CACR,CAAC;YACJ,CAAC;YACD,wBAAwB;YACxB,OAAO,CACL,KAAC,IAAI,IAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAC,UAAU,YACrC,IAAI,CAAC,KAAK,GACN,CACR,CAAC;QACJ,CAAC,GACD,CACH,CAAC;AACJ,CAAC"}

package/dist/src/ui/components/shared/RadioButtonSelect.test.js

@@ -4,107 +4,128 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { renderWithProviders } from '../../../test-utils/render.js';
-import { waitFor } from '@testing-library/react';
 import { RadioButtonSelect, } from './RadioButtonSelect.js';
-import { describe, it, expect, vi } from 'vitest';
-const ITEMS = [
-    { label: 'Option 1', value: 'one' },
-    { label: 'Option 2', value: 'two' },
-    { label: 'Option 3', value: 'three', disabled: true },
-];
-describe('<RadioButtonSelect />', () => {
-    it('renders a list of items and matches snapshot', () => {
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: () => { }, isFocused: true }));
-        expect(lastFrame()).toMatchSnapshot();
+import { BaseSelectionList, } from './BaseSelectionList.js';
+vi.mock('./BaseSelectionList.js', () => ({
+    BaseSelectionList: vi.fn(() => null),
+}));
+vi.mock('../../semantic-colors.js', () => ({
+    theme: {
+        text: { secondary: 'COLOR_SECONDARY' },
+    },
+}));
+const MockedBaseSelectionList = vi.mocked(BaseSelectionList);
+const extractRenderItem = () => {
+    const mockCalls = MockedBaseSelectionList.mock.calls;
+    if (mockCalls.length === 0) {
+        throw new Error('BaseSelectionList was not called. Ensure RadioButtonSelect is rendered before calling extractRenderItem.');
+    }
+    const props = mockCalls[0][0];
+    if (typeof props.renderItem !== 'function') {
+        throw new Error('renderItem prop was not found on BaseSelectionList call.');
+    }
+    return props.renderItem;
+};
+describe('RadioButtonSelect', () => {
+    const mockOnSelect = vi.fn();
+    const mockOnHighlight = vi.fn();
+    const ITEMS = [
+        { label: 'Option 1', value: 'one' },
+        { label: 'Option 2', value: 'two' },
+        { label: 'Option 3', value: 'three', disabled: true },
+    ];
+    const renderComponent = (props = {}) => {
+        const defaultProps = {
+            items: ITEMS,
+            onSelect: mockOnSelect,
+            ...props,
+        };
+        return renderWithProviders(_jsx(RadioButtonSelect, { ...defaultProps }));
+    };
+    beforeEach(() => {
+        vi.clearAllMocks();
     });
-    it('renders with the second item selected and matches snapshot', () => {
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, initialIndex: 1, onSelect: () => { } }));
-        expect(lastFrame()).toMatchSnapshot();
-    });
-    it('renders with numbers hidden and matches snapshot', () => {
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: () => { }, showNumbers: false }));
-        expect(lastFrame()).toMatchSnapshot();
-    });
-    it('renders with scroll arrows and matches snapshot', () => {
-        const manyItems = Array.from({ length: 20 }, (_, i) => ({
-            label: `Item ${i + 1}`,
-            value: `item-${i + 1}`,
-        }));
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: manyItems, onSelect: () => { }, showScrollArrows: true, maxItemsToShow: 5 }));
-        expect(lastFrame()).toMatchSnapshot();
+    describe('Prop forwarding to BaseSelectionList', () => {
+        it('should forward all props correctly when provided', () => {
+            const props = {
+                items: ITEMS,
+                initialIndex: 1,
+                onSelect: mockOnSelect,
+                onHighlight: mockOnHighlight,
+                isFocused: false,
+                showScrollArrows: true,
+                maxItemsToShow: 5,
+                showNumbers: false,
+            };
+            renderComponent(props);
+            expect(BaseSelectionList).toHaveBeenCalledTimes(1);
+            expect(BaseSelectionList).toHaveBeenCalledWith(expect.objectContaining({
+                ...props,
+                renderItem: expect.any(Function),
+            }), undefined);
+        });
+        it('should use default props if not provided', () => {
+            renderComponent({
+                items: ITEMS,
+                onSelect: mockOnSelect,
+            });
+            expect(BaseSelectionList).toHaveBeenCalledWith(expect.objectContaining({
+                initialIndex: 0,
+                isFocused: true,
+                showScrollArrows: false,
+                maxItemsToShow: 10,
+                showNumbers: true,
+            }), undefined);
+        });
     });
-    it('renders with special theme display and matches snapshot', () => {
-        const themeItems = [
-            {
+    describe('renderItem implementation', () => {
+        let renderItem;
+        const mockContext = {
+            isSelected: false,
+            titleColor: 'MOCK_TITLE_COLOR',
+            numberColor: 'MOCK_NUMBER_COLOR',
+        };
+        beforeEach(() => {
+            renderComponent();
+            renderItem = extractRenderItem();
+        });
+        it('should render the standard label display with correct color and truncation', () => {
+            const item = ITEMS[0];
+            const result = renderItem(item, mockContext);
+            expect(result?.props?.color).toBe(mockContext.titleColor);
+            expect(result?.props?.children).toBe('Option 1');
+            expect(result?.props?.wrap).toBe('truncate');
+        });
+        it('should render the special theme display when theme props are present', () => {
+            const themeItem = {
                 label: 'Theme A (Light)',
                 value: 'a-light',
                 themeNameDisplay: 'Theme A',
                 themeTypeDisplay: '(Light)',
-            },
-            {
-                label: 'Theme B (Dark)',
-                value: 'b-dark',
-                themeNameDisplay: 'Theme B',
-                themeTypeDisplay: '(Dark)',
-            },
-        ];
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: themeItems, onSelect: () => { } }));
-        expect(lastFrame()).toMatchSnapshot();
-    });
-    it('renders a list with >10 items and matches snapshot', () => {
-        const manyItems = Array.from({ length: 12 }, (_, i) => ({
-            label: `Item ${i + 1}`,
-            value: `item-${i + 1}`,
-        }));
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: manyItems, onSelect: () => { } }));
-        expect(lastFrame()).toMatchSnapshot();
-    });
-    it('renders nothing when no items are provided', () => {
-        const { lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: [], onSelect: () => { }, isFocused: true }));
-        expect(lastFrame()).toBe('');
-    });
-});
-describe('keyboard navigation', () => {
-    it('should call onSelect when "enter" is pressed', () => {
-        const onSelect = vi.fn();
-        const { stdin } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: onSelect }));
-        stdin.write('\r');
-        expect(onSelect).toHaveBeenCalledWith('one');
-    });
-    describe('when isFocused is false', () => {
-        it('should not handle any keyboard input', () => {
-            const onSelect = vi.fn();
-            const { stdin } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: onSelect, isFocused: false }));
-            stdin.write('\u001B[B'); // Down arrow
-            stdin.write('\u001B[A'); // Up arrow
-            stdin.write('\r'); // Enter
-            expect(onSelect).not.toHaveBeenCalled();
+            };
+            const result = renderItem(themeItem, mockContext);
+            expect(result?.props?.color).toBe(mockContext.titleColor);
+            expect(result?.props?.wrap).toBe('truncate');
+            const children = result?.props?.children;
+            if (!Array.isArray(children) || children.length < 3) {
+                throw new Error('Expected children to be an array with at least 3 elements for theme display');
+            }
+            expect(children[0]).toBe('Theme A');
+            expect(children[1]).toBe(' ');
+            const nestedTextElement = children[2];
+            expect(nestedTextElement?.props?.color).toBe('COLOR_SECONDARY');
+            expect(nestedTextElement?.props?.children).toBe('(Light)');
         });
-    });
-    describe.each([
-        { description: 'when isFocused is true', isFocused: true },
-        { description: 'when isFocused is omitted', isFocused: undefined },
-    ])('$description', ({ isFocused }) => {
-        it('should navigate down with arrow key and select with enter', async () => {
-            const onSelect = vi.fn();
-            const { stdin, lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: onSelect, isFocused: isFocused }));
-            stdin.write('\u001B[B'); // Down arrow
-            await waitFor(() => {
-                expect(lastFrame()).toContain('● 2. Option 2');
-            });
-            stdin.write('\r');
-            expect(onSelect).toHaveBeenCalledWith('two');
-        });
-        it('should navigate up with arrow key and select with enter', async () => {
-            const onSelect = vi.fn();
-            const { stdin, lastFrame } = renderWithProviders(_jsx(RadioButtonSelect, { items: ITEMS, onSelect: onSelect, initialIndex: 1, isFocused: isFocused }));
-            stdin.write('\u001B[A'); // Up arrow
-            await waitFor(() => {
-                expect(lastFrame()).toContain('● 1. Option 1');
-            });
-            stdin.write('\r');
-            expect(onSelect).toHaveBeenCalledWith('one');
+        it('should fall back to standard display if only one theme prop is present', () => {
+            const partialThemeItem = {
+                label: 'Incomplete Theme',
+                value: 'incomplete',
+                themeNameDisplay: 'Only Name',
+            };
+            const result = renderItem(partialThemeItem, mockContext);
+            expect(result?.props?.children).toBe('Incomplete Theme');
         });
     });
 });

package/dist/src/ui/components/shared/RadioButtonSelect.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadioButtonSelect.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/RadioButtonSelect.test.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RadioButtonSelect.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/RadioButtonSelect.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/shared/text-buffer.d.ts

@@ -271,6 +271,12 @@ export interface TextBuffer {
     viewportVisualLines: string[];
     visualCursor: [number, number];
     visualScrollRow: number;
+    /**
+     * For each visual line (by absolute index in allVisualLines) provides a tuple
+     * [logicalLineIndex, startColInLogical] that maps where that visual line
+     * begins within the logical buffer. Indices are code-point based.
+     */
+    visualToLogicalMap: Array<[number, number]>;
     /**
      * Replaces the entire buffer content with the provided text.
      * The operation is undoable.

package/dist/src/ui/components/shared/text-buffer.js

@@ -1140,7 +1140,7 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
     const { lines, cursorRow, cursorCol, preferredCol, selectionAnchor, visualLayout, } = state;
     const text = useMemo(() => lines.join('\n'), [lines]);
     const visualCursor = useMemo(() => calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]), [visualLayout, cursorRow, cursorCol]);
-    const { visualLines } = visualLayout;
+    const { visualLines, visualToLogicalMap } = visualLayout;
     const [visualScrollRow, setVisualScrollRow] = useState(0);
     useEffect(() => {
         if (onChange) {
@@ -1156,6 +1156,8 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
     // Update visual scroll (vertical)
     useEffect(() => {
         const { height } = viewport;
+        const totalVisualLines = visualLines.length;
+        const maxScrollStart = Math.max(0, totalVisualLines - height);
         let newVisualScrollRow = visualScrollRow;
         if (visualCursor[0] < visualScrollRow) {
             newVisualScrollRow = visualCursor[0];
@@ -1163,10 +1165,13 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
         else if (visualCursor[0] >= visualScrollRow + height) {
             newVisualScrollRow = visualCursor[0] - height + 1;
         }
+        // When the number of visual lines shrinks (e.g., after widening the viewport),
+        // ensure scroll never starts beyond the last valid start so we can render a full window.
+        newVisualScrollRow = clamp(newVisualScrollRow, 0, maxScrollStart);
         if (newVisualScrollRow !== visualScrollRow) {
             setVisualScrollRow(newVisualScrollRow);
         }
-    }, [visualCursor, visualScrollRow, viewport]);
+    }, [visualCursor, visualScrollRow, viewport, visualLines.length]);
     const insert = useCallback((ch, { paste = false } = {}) => {
         if (/[\n\r]/.test(ch)) {
             dispatch({ type: 'insert', payload: ch });
@@ -1432,10 +1437,24 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
             backspace();
         else if (key.name === 'delete' || (key.ctrl && key.name === 'd'))
             del();
+        else if (key.ctrl && !key.shift && key.name === 'z')
+            undo();
+        else if (key.ctrl && key.shift && key.name === 'z')
+            redo();
         else if (input && !key.ctrl && !key.meta) {
             insert(input, { paste: key.paste });
         }
-    }, [newline, move, deleteWordLeft, deleteWordRight, backspace, del, insert]);
+    }, [
+        newline,
+        move,
+        deleteWordLeft,
+        deleteWordRight,
+        backspace,
+        del,
+        insert,
+        undo,
+        redo,
+    ]);
     const renderedVisualLines = useMemo(() => visualLines.slice(visualScrollRow, visualScrollRow + viewport.height), [visualLines, visualScrollRow, viewport.height]);
     const replaceRange = useCallback((startRow, startCol, endRow, endCol, text) => {
         dispatch({
@@ -1451,7 +1470,7 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
     const moveToOffset = useCallback((offset) => {
         dispatch({ type: 'move_to_offset', payload: { offset } });
     }, []);
-    const returnValue = {
+    const returnValue = useMemo(() => ({
         lines,
         text,
         cursor: [cursorRow, cursorCol],
@@ -1461,6 +1480,7 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
         viewportVisualLines: renderedVisualLines,
         visualCursor,
         visualScrollRow,
+        visualToLogicalMap,
         setText,
         insert,
         newline,
@@ -1511,7 +1531,68 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
         vimMoveToLastLine,
         vimMoveToLine,
         vimEscapeInsertMode,
-    };
+    }), [
+        lines,
+        text,
+        cursorRow,
+        cursorCol,
+        preferredCol,
+        selectionAnchor,
+        visualLines,
+        renderedVisualLines,
+        visualCursor,
+        visualScrollRow,
+        setText,
+        insert,
+        newline,
+        backspace,
+        del,
+        move,
+        undo,
+        redo,
+        replaceRange,
+        replaceRangeByOffset,
+        moveToOffset,
+        deleteWordLeft,
+        deleteWordRight,
+        killLineRight,
+        killLineLeft,
+        handleInput,
+        openInExternalEditor,
+        vimDeleteWordForward,
+        vimDeleteWordBackward,
+        vimDeleteWordEnd,
+        vimChangeWordForward,
+        vimChangeWordBackward,
+        vimChangeWordEnd,
+        vimDeleteLine,
+        vimChangeLine,
+        vimDeleteToEndOfLine,
+        vimChangeToEndOfLine,
+        vimChangeMovement,
+        vimMoveLeft,
+        vimMoveRight,
+        vimMoveUp,
+        vimMoveDown,
+        vimMoveWordForward,
+        vimMoveWordBackward,
+        vimMoveWordEnd,
+        vimDeleteChar,
+        vimInsertAtCursor,
+        vimAppendAtCursor,
+        vimOpenLineBelow,
+        vimOpenLineAbove,
+        vimAppendAtLineEnd,
+        vimInsertAtLineStart,
+        vimMoveToLineStart,
+        vimMoveToLineEnd,
+        vimMoveToFirstNonWhitespace,
+        vimMoveToFirstLine,
+        vimMoveToLastLine,
+        vimMoveToLine,
+        vimEscapeInsertMode,
+        visualToLogicalMap,
+    ]);
     return returnValue;
 }
 //# sourceMappingURL=text-buffer.js.map