npm - @google/gemini-cli - Versions diffs - 0.31.0-preview.2 → 0.32.0-preview.0 - Mend

@google/gemini-cli 0.31.0-preview.2 → 0.32.0-preview.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (335) hide show

package/dist/src/ui/components/shared/MaxSizedBox.js CHANGED Viewed

@@ -3,6 +3,9 @@ import { useCallback, useEffect, useId, useRef, useState } from 'react';
 import { Box, Text, ResizeObserver } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import { useOverflowActions } from '../../contexts/OverflowContext.js';
+import { isNarrowWidth } from '../../utils/isNarrowWidth.js';
+import { Command } from '../../../config/keyBindings.js';
+import { formatCommand } from '../../utils/keybindingUtils.js';
 /**
  * Minimum height for the MaxSizedBox component.
  * This ensures there is room for at least one line of content as well as the
@@ -47,6 +50,8 @@ export const MaxSizedBox = ({ children, maxWidth, maxHeight, overflowDirection =
         ? Math.max(0, contentHeight - visibleContentHeight)
         : 0;
     const totalHiddenLines = hiddenLinesCount + additionalHiddenLinesCount;
+    const isNarrow = maxWidth !== undefined && isNarrowWidth(maxWidth);
+    const showMoreKey = formatCommand(Command.SHOW_MORE_LINES);
     useEffect(() => {
         if (totalHiddenLines > 0) {
             addOverflowingId?.(id);
@@ -62,6 +67,10 @@ export const MaxSizedBox = ({ children, maxWidth, maxHeight, overflowDirection =
         return (_jsx(Box, { flexDirection: "column", width: maxWidth, children: children }));
     }
     const offset = hiddenLinesCount > 0 && overflowDirection === 'top' ? -hiddenLinesCount : 0;
-    return (_jsxs(Box, { flexDirection: "column", width: maxWidth, maxHeight: effectiveMaxHeight, flexShrink: 0, children: [totalHiddenLines > 0 && overflowDirection === 'top' && (_jsxs(Text, { color: theme.text.secondary, wrap: "truncate", children: ["... first ", totalHiddenLines, " line", totalHiddenLines === 1 ? '' : 's', ' ', "hidden ..."] })), _jsx(Box, { flexDirection: "column", overflow: "hidden", flexGrow: 0, maxHeight: isOverflowing ? visibleContentHeight : undefined, children: _jsx(Box, { flexDirection: "column", ref: onRefChange, flexShrink: 0, marginTop: offset, children: children }) }), totalHiddenLines > 0 && overflowDirection === 'bottom' && (_jsxs(Text, { color: theme.text.secondary, wrap: "truncate", children: ["... last ", totalHiddenLines, " line", totalHiddenLines === 1 ? '' : 's', ' ', "hidden ..."] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", width: maxWidth, maxHeight: effectiveMaxHeight, flexShrink: 0, children: [totalHiddenLines > 0 && overflowDirection === 'top' && (_jsx(Text, { color: theme.text.secondary, wrap: "truncate", children: isNarrow
+                    ? `... ${totalHiddenLines} hidden (${showMoreKey}) ...`
+                    : `... first ${totalHiddenLines} line${totalHiddenLines === 1 ? '' : 's'} hidden (${showMoreKey} to show) ...` })), _jsx(Box, { flexDirection: "column", overflow: "hidden", flexGrow: 0, maxHeight: isOverflowing ? visibleContentHeight : undefined, children: _jsx(Box, { flexDirection: "column", ref: onRefChange, flexShrink: 0, marginTop: offset, children: children }) }), totalHiddenLines > 0 && overflowDirection === 'bottom' && (_jsx(Text, { color: theme.text.secondary, wrap: "truncate", children: isNarrow
+                    ? `... ${totalHiddenLines} hidden (${showMoreKey}) ...`
+                    : `... last ${totalHiddenLines} line${totalHiddenLines === 1 ? '' : 's'} hidden (${showMoreKey} to show) ...` }))] }));
 };
 //# sourceMappingURL=MaxSizedBox.js.map

package/dist/src/ui/components/shared/MaxSizedBox.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaxSizedBox.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAmB,MAAM,KAAK,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;~~AAEvE~~;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAUpC;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,iBAAiB,GAAG,KAAK,EACzB,0BAA0B,GAAG,CAAC,GAC/B,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;IACnB,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,kBAAkB,EAAE,IAAI,EAAE,CAAC;IAC7E,MAAM,WAAW,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,IAAuB,EAAE,EAAE;QAC1B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACjC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,CAAC;QAED,IAAI,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACzB,IAAI,KAAK,EAAE,CAAC;oBACV,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACvB,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;QACjC,CAAC;IACH,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,kBAAkB,GACtB,SAAS,KAAK,SAAS;QACrB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;QACrD,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,aAAa,GACjB,CAAC,kBAAkB,KAAK,SAAS,IAAI,aAAa,GAAG,kBAAkB,CAAC;QACxE,0BAA0B,GAAG,CAAC,CAAC;IAEjC,yEAAyE;IACzE,MAAM,oBAAoB,GACxB,aAAa,IAAI,kBAAkB,KAAK,SAAS;QAC/C,CAAC,CAAC,kBAAkB,GAAG,CAAC;QACxB,CAAC,CAAC,kBAAkB,CAAC;IAEzB,MAAM,gBAAgB,GACpB,oBAAoB,KAAK,SAAS;QAChC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,aAAa,GAAG,oBAAoB,CAAC;QACnD,CAAC,CAAC,CAAC,CAAC;IAER,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,0BAA0B,CAAC;IAEvE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;YACzB,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,GAAG,EAAE;YACV,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAElE,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,KAAK,EAAE,QAAQ,YACxC,QAAQ,GACL,CACP,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GACV,gBAAgB,GAAG,CAAC,IAAI,iBAAiB,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,CACL,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,UAAU,EAAE,CAAC,aAEZ,gBAAgB,GAAG,CAAC,IAAI,iBAAiB,KAAK,KAAK,IAAI,CACtD,~~MAAC~~,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAC,UAAU,~~2BACrC~~,gBAAgB,~~WAAO~~,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,~~EAAE~~,~~GAAG~~,~~kBAEnE~~,CACR,EACD,KAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,QAAQ,EAAC,QAAQ,EACjB,QAAQ,EAAE,CAAC,EACX,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,YAE3D,KAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,GAAG,EAAE,WAAW,EAChB,UAAU,EAAE,CAAC,EACb,SAAS,EAAE,MAAM,YAEhB,QAAQ,GACL,GACF,EACL,gBAAgB,GAAG,CAAC,IAAI,iBAAiB,KAAK,QAAQ,IAAI,CACzD,~~MAAC~~,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAC,UAAU,~~0BACtC~~,gBAAgB,~~WAAO~~,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,~~EAAE~~,~~GAAG~~,~~kBAElE~~,CACR,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"MaxSizedBox.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/shared/MaxSizedBox.test.js CHANGED Viewed

@@ -21,35 +21,35 @@ describe('<MaxSizedBox />', () => {
     it('hides lines when content exceeds maxHeight', async () => {
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... first 2 lines hidden ...');
+        expect(lastFrame()).toContain('... first 2 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
     it('hides lines at the end when content exceeds maxHeight and overflowDirection is bottom', async () => {
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, overflowDirection: "bottom", children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... last 2 lines hidden ...');
+        expect(lastFrame()).toContain('... last 2 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
     it('shows plural "lines" when more than one line is hidden', async () => {
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... first 2 lines hidden ...');
+        expect(lastFrame()).toContain('... first 2 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
     it('shows singular "line" when exactly one line is hidden', async () => {
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, additionalHiddenLinesCount: 1, children: _jsx(Box, { flexDirection: "column", children: _jsx(Text, { children: "Line 1" }) }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... first 1 line hidden ...');
+        expect(lastFrame()).toContain('... first 1 line hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
     it('accounts for additionalHiddenLinesCount', async () => {
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, additionalHiddenLinesCount: 5, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... first 7 lines hidden ...');
+        expect(lastFrame()).toContain('... first 7 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
@@ -84,7 +84,7 @@ describe('<MaxSizedBox />', () => {
         const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join('\n');
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 10, overflowDirection: "top", children: _jsx(Box, { children: _jsx(Text, { children: THIRTY_LINES }) }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... first 21 lines hidden ...');
+        expect(lastFrame()).toContain('... first 21 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
@@ -92,7 +92,7 @@ describe('<MaxSizedBox />', () => {
         const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join('\n');
         const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 10, overflowDirection: "bottom", children: _jsx(Box, { children: _jsx(Text, { children: THIRTY_LINES }) }) }) }));
         await waitUntilReady();
-        expect(lastFrame()).toContain('... last 21 lines hidden ...');
+        expect(lastFrame()).toContain('... last 21 lines hidden (Ctrl+O to show) ...');
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });
@@ -105,7 +105,7 @@ describe('<MaxSizedBox />', () => {
         const lines = frame.trim().split('\n');
         const lastLine = lines[lines.length - 1];
         // The last line should only contain the hidden indicator, no leaked content
-        expect(lastLine).toMatch(/^\.\.\. last \d+ lines? hidden \.\.\.$/);
+        expect(lastLine).toMatch(/^\.\.\. last \d+ lines? hidden \(Ctrl\+O to show\) \.\.\.$/);
         expect(lastFrame()).toMatchSnapshot();
         unmount();
     });

package/dist/src/ui/components/shared/MaxSizedBox.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaxSizedBox.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,YACtC,KAAC,GAAG,cACF,KAAC,IAAI,gCAAqB,GACtB,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,YACrC,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACf,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~8BAA8B~~,CAAC~~,CAAC~~;~~QAC9D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uFAAuF,EAAE,KAAK,IAAI,EAAE;QACrG,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,iBAAiB,EAAC,QAAQ,YACjE,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACf,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~6BAA6B~~,~~CAAC~~,CAAC;~~QAC7D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,YACrC,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACf,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~8BAA8B~~,CAAC~~,CAAC~~;~~QAC9D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,0BAA0B,EAAE,CAAC,YACpE,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACzB,KAAC,IAAI,yBAAc,GACf,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~6BAA6B~~,~~CAAC~~,CAAC;~~QAC7D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,0BAA0B,EAAE,CAAC,YACpE,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACf,GACM,GACG,CACpB,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~8BAA8B~~,CAAC~~,CAAC~~;~~QAC9D~~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~~CAAC,+BAA+B~~,~~CAAC~~,CAAC;~~QAC/D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAC7B,EAAE,MAAM,EAAE,EAAE,EAAE,EACd,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,gBAAgB,cACf,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,iBAAiB,EAAC,QAAQ,YAClE,KAAC,GAAG,cACF,KAAC,IAAI,cAAE,YAAY,GAAQ,GACvB,GACM,GACG,CACpB,CAAC;QAEF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,~~CAAC~~,~~8BAA8B~~,CAAC~~,CAAC~~;~~QAC9D~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAChC,EAAE,MAAM,EAAE,EAAE,EAAE,EACd,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,0BAA0B,CACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,iBAAiB,EAAC,QAAQ,YACjE,KAAC,eAAe,IACd,IAAI,EAAE,cAAc,eAAe,EAAE,EACrC,SAAS,EAAE,KAAK,EAChB,aAAa,EAAE,EAAE,GACjB,GACU,EACd,EAAE,KAAK,EAAE,EAAE,EAAE,CACd,CAAC;QAEF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEzC,4EAA4E;QAC5E,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,~~CAAC~~,~~wCAAwC~~,~~CAAC~~,CAAC;~~QACnE~~,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"MaxSizedBox.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/shared/Scrollable.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import React from 'react';
+import type React from 'react';
 interface ScrollableProps {
     children?: React.ReactNode;
     width?: number;

package/dist/src/ui/components/shared/Scrollable.js CHANGED Viewed

@@ -1,11 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import React, { useState, useEffect, useRef, useLayoutEffect, useCallback, useMemo, } from 'react';
-import { Box, getInnerHeight, getScrollHeight } from 'ink';
+import { useState, useRef, useCallback, useMemo, useLayoutEffect } from 'react';
+import { Box, ResizeObserver } from 'ink';
 import { useKeypress } from '../../hooks/useKeypress.js';
 import { useScrollable } from '../../contexts/ScrollProvider.js';
 import { useAnimatedScrollbar } from '../../hooks/useAnimatedScrollbar.js';
@@ -13,55 +8,90 @@ import { useBatchedScroll } from '../../hooks/useBatchedScroll.js';
 import { keyMatchers, Command } from '../../keyMatchers.js';
 export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFocus, scrollToBottom, flexGrow, }) => {
     const [scrollTop, setScrollTop] = useState(0);
-    const ref = useRef(null);
+    const viewportRef = useRef(null);
+    const contentRef = useRef(null);
     const [size, setSize] = useState({
-        innerHeight: 0,
+        innerHeight: typeof height === 'number' ? height : 0,
         scrollHeight: 0,
     });
     const sizeRef = useRef(size);
-    useEffect(() => {
+    const scrollTopRef = useRef(scrollTop);
+    useLayoutEffect(() => {
         sizeRef.current = size;
     }, [size]);
-    const childrenCountRef = useRef(0);
-    // This effect needs to run on every render to correctly measure the container
-    // and scroll to the bottom if new children are added.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     useLayoutEffect(() => {
-        if (!ref.current) {
-            return;
-        }
-        const innerHeight = Math.round(getInnerHeight(ref.current));
-        const scrollHeight = Math.round(getScrollHeight(ref.current));
-        const isAtBottom = scrollHeight > innerHeight && scrollTop >= scrollHeight - innerHeight - 1;
-        if (size.innerHeight !== innerHeight ||
-            size.scrollHeight !== scrollHeight) {
-            setSize({ innerHeight, scrollHeight });
-            if (isAtBottom) {
-                setScrollTop(Math.max(0, scrollHeight - innerHeight));
-            }
+        scrollTopRef.current = scrollTop;
+    }, [scrollTop]);
+    const viewportObserverRef = useRef(null);
+    const contentObserverRef = useRef(null);
+    const viewportRefCallback = useCallback((node) => {
+        viewportObserverRef.current?.disconnect();
+        viewportRef.current = node;
+        if (node) {
+            const observer = new ResizeObserver((entries) => {
+                const entry = entries[0];
+                if (entry) {
+                    const innerHeight = Math.round(entry.contentRect.height);
+                    setSize((prev) => {
+                        const scrollHeight = prev.scrollHeight;
+                        const isAtBottom = scrollHeight > prev.innerHeight &&
+                            scrollTopRef.current >= scrollHeight - prev.innerHeight - 1;
+                        if (isAtBottom) {
+                            setScrollTop(Number.MAX_SAFE_INTEGER);
+                        }
+                        return { ...prev, innerHeight };
+                    });
+                }
+            });
+            observer.observe(node);
+            viewportObserverRef.current = observer;
         }
-        const childCountCurrent = React.Children.count(children);
-        if (scrollToBottom && childrenCountRef.current !== childCountCurrent) {
-            setScrollTop(Math.max(0, scrollHeight - innerHeight));
+    }, []);
+    const contentRefCallback = useCallback((node) => {
+        contentObserverRef.current?.disconnect();
+        contentRef.current = node;
+        if (node) {
+            const observer = new ResizeObserver((entries) => {
+                const entry = entries[0];
+                if (entry) {
+                    const scrollHeight = Math.round(entry.contentRect.height);
+                    setSize((prev) => {
+                        const innerHeight = prev.innerHeight;
+                        const isAtBottom = prev.scrollHeight > innerHeight &&
+                            scrollTopRef.current >= prev.scrollHeight - innerHeight - 1;
+                        if (isAtBottom ||
+                            (scrollToBottom && scrollHeight > prev.scrollHeight)) {
+                            setScrollTop(Number.MAX_SAFE_INTEGER);
+                        }
+                        return { ...prev, scrollHeight };
+                    });
+                }
+            });
+            observer.observe(node);
+            contentObserverRef.current = observer;
         }
-        childrenCountRef.current = childCountCurrent;
-    });
+    }, [scrollToBottom]);
     const { getScrollTop, setPendingScrollTop } = useBatchedScroll(scrollTop);
     const scrollBy = useCallback((delta) => {
         const { scrollHeight, innerHeight } = sizeRef.current;
-        const current = getScrollTop();
-        const next = Math.min(Math.max(0, current + delta), Math.max(0, scrollHeight - innerHeight));
+        const maxScroll = Math.max(0, scrollHeight - innerHeight);
+        const current = Math.min(getScrollTop(), maxScroll);
+        let next = Math.max(0, current + delta);
+        if (next >= maxScroll) {
+            next = Number.MAX_SAFE_INTEGER;
+        }
         setPendingScrollTop(next);
         setScrollTop(next);
-    }, [sizeRef, getScrollTop, setPendingScrollTop]);
+    }, [getScrollTop, setPendingScrollTop]);
     const { scrollbarColor, flashScrollbar, scrollByWithAnimation } = useAnimatedScrollbar(hasFocus, scrollBy);
     useKeypress((key) => {
         const { scrollHeight, innerHeight } = sizeRef.current;
         const scrollTop = getScrollTop();
         const maxScroll = Math.max(0, scrollHeight - innerHeight);
+        const actualScrollTop = Math.min(scrollTop, maxScroll);
         // Only capture scroll-up events if there's room;
         // otherwise allow events to bubble.
-        if (scrollTop > 0) {
+        if (actualScrollTop > 0) {
             if (keyMatchers[Command.PAGE_UP](key)) {
                 scrollByWithAnimation(-innerHeight);
                 return true;
@@ -73,7 +103,7 @@ export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFo
         }
         // Only capture scroll-down events if there's room;
         // otherwise allow events to bubble.
-        if (scrollTop < maxScroll) {
+        if (actualScrollTop < maxScroll) {
             if (keyMatchers[Command.PAGE_DOWN](key)) {
                 scrollByWithAnimation(innerHeight);
                 return true;
@@ -86,21 +116,24 @@ export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFo
         // bubble keypress
         return false;
     }, { isActive: hasFocus });
-    const getScrollState = useCallback(() => ({
-        scrollTop: getScrollTop(),
-        scrollHeight: size.scrollHeight,
-        innerHeight: size.innerHeight,
-    }), [getScrollTop, size.scrollHeight, size.innerHeight]);
+    const getScrollState = useCallback(() => {
+        const maxScroll = Math.max(0, size.scrollHeight - size.innerHeight);
+        return {
+            scrollTop: Math.min(getScrollTop(), maxScroll),
+            scrollHeight: size.scrollHeight,
+            innerHeight: size.innerHeight,
+        };
+    }, [getScrollTop, size.scrollHeight, size.innerHeight]);
     const hasFocusCallback = useCallback(() => hasFocus, [hasFocus]);
     const scrollableEntry = useMemo(() => ({
         // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        ref: ref,
+        ref: viewportRef,
         getScrollState,
         scrollBy: scrollByWithAnimation,
         hasFocus: hasFocusCallback,
         flashScrollbar,
     }), [getScrollState, scrollByWithAnimation, hasFocusCallback, flashScrollbar]);
     useScrollable(scrollableEntry, true);
-    return (_jsx(Box, { ref: ref, maxHeight: maxHeight, width: width ?? maxWidth, height: height, flexDirection: "column", overflowY: "scroll", overflowX: "hidden", scrollTop: scrollTop, flexGrow: flexGrow, scrollbarThumbColor: scrollbarColor, children: _jsx(Box, { flexShrink: 0, paddingRight: 1, flexDirection: "column", children: children }) }));
+    return (_jsx(Box, { ref: viewportRefCallback, maxHeight: maxHeight, width: width ?? maxWidth, height: height, flexDirection: "column", overflowY: "scroll", overflowX: "hidden", scrollTop: scrollTop, flexGrow: flexGrow, scrollbarThumbColor: scrollbarColor, children: _jsx(Box, { ref: contentRefCallback, flexShrink: 0, paddingRight: 1, flexDirection: "column", children: children }) }));
 };
 //# sourceMappingURL=Scrollable.js.map

package/dist/src/ui/components/shared/Scrollable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Scrollable.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.tsx"],"names":[],"mappings":";~~AAAA;;;;GAIG;AAEH~~,OAAO,~~KAAK,~~EAAE,~~EACZ,~~QAAQ,~~EACR~~,~~SAAS,EACT,~~MAAM,~~EACN~~,~~eAAe,EACf,~~WAAW,~~EACX~~,OAAO,~~GACR~~,MAAM,OAAO,CAAC;~~AACf~~,OAAO,EAAE,GAAG,EAAE,cAAc,~~EAAE,eAAe,~~EAAmB,MAAM,KAAK,CAAC;~~AAC5E~~,OAAO,EAAE,WAAW,EAAY,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAa5D,MAAM,CAAC,MAAM,UAAU,GAA8B,CAAC,EACpD,QAAQ,EACR,KAAK,EACL,MAAM,EACN,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,cAAc,EACd,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,~~CAAa~~,IAAI,CAAC,CAAC;~~IACrC~~,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC;QAC/B,WAAW,EAAE,CAAC;~~QACd~~,YAAY,EAAE,CAAC;KAChB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7B,SAAS,CAAC,GAAG,EAAE;~~QACb~~,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IACzB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,~~MAAM~~,~~gBAAgB~~,GAAG,~~MAAM~~,CAAC,CAAC,CAAC,CAAC~~;IAEnC~~,~~8EAA8E;IAC9E~~,~~sDAAsD;IACtD~~,~~uDAAuD~~;~~IACvD~~,~~eAAe~~,~~CAAC~~,GAAG,~~EAAE~~;~~QACnB~~,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;~~YACjB~~,OAAO;~~QACT~~,CAAC;~~QACD~~,MAAM,~~WAAW~~,GAAG,IAAI,CAAC,~~KAAK,~~CAAC,~~cAAc~~,~~CAAC~~,GAAG,CAAC,~~OAAO~~,CAAC,CAAC,CAAC;~~QAC5D~~,MAAM,~~YAAY~~,GAAG,IAAI,CAAC,KAAK,CAAC,~~eAAe~~,CAAC,~~GAAG~~,CAAC,OAAO,CAAC,CAAC,CAAC;~~QAE9D~~,MAAM,UAAU,GACd,YAAY,GAAG,WAAW,~~IAAI~~,~~SAAS~~,IAAI,YAAY,GAAG,WAAW,GAAG,CAAC,CAAC;~~QAE5E~~,~~IACE,~~IAAI,CAAC,~~WAAW~~,~~KAAK~~,~~WAAW~~;~~YAChC~~,IAAI,CAAC,~~YAAY~~,~~KAAK~~,~~YAAY~~,~~EAClC~~,CAAC;~~YACD~~,OAAO,CAAC,~~EAAE~~,~~WAAW~~,~~EAAE~~,~~YAAY~~,EAAE,CAAC,CAAC;~~YACvC~~,~~IAAI~~,UAAU,EAAE,CAAC;~~gBACf~~,~~YAAY~~,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,~~YAAY~~,GAAG,~~WAAW~~,CAAC,CAAC,CAAC~~;YACxD~~,CAAC;~~QACH~~,CAAC;~~QAED~~,MAAM,~~iBAAiB~~,GAAG,~~KAAK~~,CAAC,~~QAAQ~~,CAAC,KAAK,CAAC,~~QAAQ~~,CAAC,CAAC;~~QACzD~~,IAAI,~~cAAc~~,IAAI,~~gBAAgB~~,CAAC,~~OAAO~~,~~KAAK~~,~~iBAAiB~~,~~EAAE~~,CAAC;~~YACrE~~,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,~~EAAE~~,YAAY,GAAG,~~WAAW~~,CAAC,CAAC,CAAC;~~QACxD~~,CAAC~~;QACD~~,gBAAgB,CAAC,OAAO,GAAG,~~iBAAiB~~,CAAC;~~IAC/C~~,CAAC,CAAC,CAAC;~~IAEH~~,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAE1E,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,KAAa,EAAE,EAAE;QAChB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtD,MAAM,~~OAAO~~,GAAG,~~YAAY~~,EAAE,CAAC;~~QAC/B~~,MAAM,~~IAAI~~,GAAG,IAAI,CAAC,GAAG,~~CACnB~~,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,~~EAC5B~~,IAAI,~~CAAC~~,~~GAAG~~,~~CAAC~~,CAAC,~~EAAE~~,~~YAAY,~~GAAG,~~WAAW~~,CAAC,~~CACxC~~,CAAC;~~QACF~~,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC1B,YAAY,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,EACD,CAAC,~~OAAO,EAAE,~~YAAY,EAAE,mBAAmB,CAAC,~~CAC7C~~,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,qBAAqB,EAAE,GAC7D,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,WAAW,CACT,CAAC,GAAQ,EAAE,EAAE;QACX,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC,CAAC;~~QAE1D~~,iDAAiD;QACjD,oCAAoC;QACpC,IAAI,~~SAAS~~,GAAG,CAAC,EAAE,CAAC;~~YAClB~~,IAAI,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtC,qBAAqB,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,mDAAmD;QACnD,oCAAoC;QACpC,IAAI,~~SAAS~~,GAAG,SAAS,EAAE,CAAC;~~YAC1B~~,IAAI,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1C,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBACzB,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,kBAAkB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC,EACD,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB,CAAC;IAEF,MAAM,cAAc,GAAG,WAAW,~~CAChC~~,GAAG,EAAE,CAAC,CAAC;~~QACL~~,SAAS,EAAE,YAAY,EAAE;~~QACzB~~,YAAY,EAAE,IAAI,CAAC,YAAY;~~QAC~~/B,WAAW,EAAE,IAAI,CAAC,WAAW;~~KAC9B~~,CAAC,~~EACF~~,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,~~CACpD~~,CAAC;~~IAEF~~,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjE,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,CAAC;QACL,uEAAuE;QACvE,GAAG,EAAE,~~GAAkC~~;~~QACvC~~,cAAc;QACd,QAAQ,EAAE,qBAAqB;QAC/B,QAAQ,EAAE,gBAAgB;QAC1B,cAAc;KACf,CAAC,EACF,CAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAC1E,CAAC;IAEF,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,CACL,KAAC,GAAG,IACF,GAAG,EAAE,~~GAAG~~,~~EACR~~,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,IAAI,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAC,QAAQ,EACtB,SAAS,EAAC,QAAQ,EAClB,SAAS,EAAC,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,cAAc,YAOnC,KAAC,GAAG,~~IAAC~~,UAAU,EAAE,CAAC,~~EAAE~~,YAAY,EAAE,CAAC,~~EAAE~~,aAAa,EAAC,QAAQ,~~YACxD~~,QAAQ,GACL,GACF,CACP,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"Scrollable.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/shared/Scrollable.test.js CHANGED Viewed

@@ -6,19 +6,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { renderWithProviders } from '../../../test-utils/render.js';
 import { Scrollable } from './Scrollable.js';
-import { Text } from 'ink';
+import { Text, Box } from 'ink';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import * as ScrollProviderModule from '../../contexts/ScrollProvider.js';
 import { act } from 'react';
-vi.mock('ink', async (importOriginal) => {
-    const actual = await importOriginal();
-    return {
-        ...actual,
-        getInnerHeight: vi.fn(() => 5),
-        getScrollHeight: vi.fn(() => 10),
-        getBoundingBox: vi.fn(() => ({ x: 0, y: 0, width: 10, height: 5 })),
-    };
-});
+import { waitFor } from '../../../test-utils/async.js';
 vi.mock('../../hooks/useAnimatedScrollbar.js', () => ({
     useAnimatedScrollbar: (hasFocus, scrollBy) => ({
         scrollbarColor: 'white',
@@ -69,18 +61,24 @@ describe('<Scrollable />', () => {
         unmount();
         const { waitUntilReady: waitUntilReady2, unmount: unmount2 } = renderWithProviders(_jsxs(Scrollable, { hasFocus: true, height: 5, scrollToBottom: true, children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" }), _jsx(Text, { children: "Line 4" }), _jsx(Text, { children: "Line 5" }), _jsx(Text, { children: "Line 6" }), _jsx(Text, { children: "Line 7" }), _jsx(Text, { children: "Line 8" }), _jsx(Text, { children: "Line 9" }), _jsx(Text, { children: "Line 10" })] }));
         await waitUntilReady2();
-        expect(capturedEntry.getScrollState().scrollTop).toBe(5);
+        await waitFor(() => {
+            expect(capturedEntry?.getScrollState().scrollTop).toBe(5);
+        });
         // Call scrollBy multiple times (upwards) in the same tick
         await act(async () => {
-            capturedEntry.scrollBy(-1);
-            capturedEntry.scrollBy(-1);
+            capturedEntry?.scrollBy(-1);
+            capturedEntry?.scrollBy(-1);
         });
         // Should have moved up by 2 (5 -> 3)
-        expect(capturedEntry.getScrollState().scrollTop).toBe(3);
+        await waitFor(() => {
+            expect(capturedEntry?.getScrollState().scrollTop).toBe(3);
+        });
         await act(async () => {
-            capturedEntry.scrollBy(-2);
+            capturedEntry?.scrollBy(-2);
+        });
+        await waitFor(() => {
+            expect(capturedEntry?.getScrollState().scrollTop).toBe(1);
         });
-        expect(capturedEntry.getScrollState().scrollTop).toBe(1);
         unmount2();
     });
     describe('keypress handling', () => {
@@ -121,16 +119,13 @@ describe('<Scrollable />', () => {
                 expectedScrollTop: 0,
             },
         ])('$name', async ({ initialScrollTop, scrollHeight, keySequence, expectedScrollTop, }) => {
-            // Dynamically import ink to mock getScrollHeight
-            const ink = await import('ink');
-            vi.mocked(ink.getScrollHeight).mockReturnValue(scrollHeight);
             let capturedEntry;
             vi.spyOn(ScrollProviderModule, 'useScrollable').mockImplementation(async (entry, isActive) => {
                 if (isActive) {
                     capturedEntry = entry;
                 }
             });
-            const { stdin, waitUntilReady, unmount } = renderWithProviders(_jsx(Scrollable, { hasFocus: true, height: 5, children: _jsx(Text, { children: "Content" }) }));
+            const { stdin, waitUntilReady, unmount } = renderWithProviders(_jsx(Scrollable, { hasFocus: true, height: 5, children: _jsx(Box, { height: scrollHeight, children: _jsx(Text, { children: "Content" }) }) }));
             await waitUntilReady();
             // Ensure initial state using existing scrollBy method
             await act(async () => {

package/dist/src/ui/components/shared/Scrollable.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Scrollable.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;~~AAC3B~~,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,oBAAoB,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;~~AAE5B~~,~~EAAE~~,~~CAAC,IAAI,CAAC,KAAK,~~EAAE,~~KAAK,EAAE,cAAc,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,MAAM,cAAc,EAAwB,CAAC;IAC5D,~~OAAO~~;QACL~~,~~GAAG,MAAM;QACT,cAAc,~~EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAChC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,~~EAAE~~,CAAC~~,EAAE,CAAC,CAAC~~;~~KACpE~~,~~CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,~~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~~aAAa~~,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;~~QAEzD~~,0DAA0D;QAC1D,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,~~aAAc~~,~~CAAC~~,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,~~aAAc~~,~~CAAC~~,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,qCAAqC;QACrC,MAAM,CAAC,~~aAAa~~,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;~~QAEzD~~,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,~~aAAc~~,~~CAAC~~,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,~~aAAa~~,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;~~QACzD~~,QAAQ,EAAE,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,qDAAqD;gBAC3D,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,gDAAgD;gBACtD,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,WAAW;gBACvC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,yDAAyD;gBAC/D,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,WAAW;gBACvC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,8DAA8D;gBACpE,gBAAgB,EAAE,CAAC,EAAE,yBAAyB;gBAC9C,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,4DAA4D;gBAClE,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,CAAC,EAAE,0BAA0B;gBAC3C,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;SACF,CAAC,CACA,OAAO,EACP,KAAK,EAAE,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,EAAE,EAAE;YACH,~~iDAAiD;YACjD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;YAChC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YAE7D,~~IAAI,aAA+D,CAAC;YACpE,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,kBAAkB,CAChE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACxB,IAAI,QAAQ,EAAE,CAAC;oBACb,aAAa,GAAG,KAA6C,CAAC;gBAChE,CAAC;YACH,CAAC,CACF,CAAC;YAEF,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAC5D,KAAC,UAAU,IAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,YACnC,KAAC,IAAI,0BAAe,~~GACT~~,CACd,CAAC;YACF,MAAM,cAAc,EAAE,CAAC;YAEvB,sDAAsD;YACtD,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnB,4DAA4D;gBAC5D,aAAc,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9B,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;oBACzB,aAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,aAAc,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CACpD,gBAAgB,CACjB,CAAC;YAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnB,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,MAAM,cAAc,EAAE,CAAC;YAEvB,MAAM,CAAC,aAAc,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CACpD,iBAAiB,CAClB,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"Scrollable.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/shared/ScrollableList.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useRef, forwardRef, useImperativeHandle, useCallback, useMemo, useEffect, } from 'react';
+import { useRef, forwardRef, useImperativeHandle, useCallback, useMemo, useLayoutEffect, } from 'react';
 import { VirtualizedList, SCROLL_TO_ITEM_END, } from './VirtualizedList.js';
 import { useScrollable } from '../../contexts/ScrollProvider.js';
 import { Box } from 'ink';
@@ -46,7 +46,7 @@ function ScrollableList(props, ref) {
         }
         smoothScrollState.current.active = false;
     }, []);
-    useEffect(() => stopSmoothScroll, [stopSmoothScroll]);
+    useLayoutEffect(() => stopSmoothScroll, [stopSmoothScroll]);
     const smoothScrollTo = useCallback((targetScrollTop, duration = process.env['NODE_ENV'] === 'test' ? 0 : 200) => {
         stopSmoothScroll();
         const scrollState = virtualizedListRef.current?.getScrollState() ?? {
@@ -54,16 +54,19 @@ function ScrollableList(props, ref) {
             scrollHeight: 0,
             innerHeight: 0,
         };
-        const { scrollTop: startScrollTop, scrollHeight, innerHeight, } = scrollState;
+        const { scrollTop: rawStartScrollTop, scrollHeight, innerHeight, } = scrollState;
         const maxScrollTop = Math.max(0, scrollHeight - innerHeight);
+        const startScrollTop = Math.min(rawStartScrollTop, maxScrollTop);
         let effectiveTarget = targetScrollTop;
-        if (targetScrollTop === SCROLL_TO_ITEM_END) {
+        if (targetScrollTop === SCROLL_TO_ITEM_END ||
+            targetScrollTop >= maxScrollTop) {
             effectiveTarget = maxScrollTop;
         }
         const clampedTarget = Math.max(0, Math.min(maxScrollTop, effectiveTarget));
         if (duration === 0) {
-            if (targetScrollTop === SCROLL_TO_ITEM_END) {
-                virtualizedListRef.current?.scrollTo(SCROLL_TO_ITEM_END);
+            if (targetScrollTop === SCROLL_TO_ITEM_END ||
+                targetScrollTop >= maxScrollTop) {
+                virtualizedListRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
             }
             else {
                 virtualizedListRef.current?.scrollTo(Math.round(clampedTarget));
@@ -88,8 +91,9 @@ function ScrollableList(props, ref) {
                     (smoothScrollState.current.to - smoothScrollState.current.from) *
                         ease;
                 if (progress >= 1) {
-                    if (targetScrollTop === SCROLL_TO_ITEM_END) {
-                        virtualizedListRef.current?.scrollTo(SCROLL_TO_ITEM_END);
+                    if (targetScrollTop === SCROLL_TO_ITEM_END ||
+                        targetScrollTop >= maxScrollTop) {
+                        virtualizedListRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
                     }
                     else {
                         virtualizedListRef.current?.scrollTo(Math.round(current));
@@ -118,9 +122,10 @@ function ScrollableList(props, ref) {
             keyMatchers[Command.PAGE_DOWN](key)) {
             const direction = keyMatchers[Command.PAGE_UP](key) ? -1 : 1;
             const scrollState = getScrollState();
+            const maxScroll = Math.max(0, scrollState.scrollHeight - scrollState.innerHeight);
             const current = smoothScrollState.current.active
                 ? smoothScrollState.current.to
-                : scrollState.scrollTop;
+                : Math.min(scrollState.scrollTop, maxScroll);
             const innerHeight = scrollState.innerHeight;
             smoothScrollTo(current + direction * innerHeight);
             return true;

package/dist/src/ui/components/shared/ScrollableList.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ScrollableList.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/ScrollableList.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EACL,MAAM,EACN,UAAU,EACV,mBAAmB,EACnB,WAAW,EACX,OAAO,EACP,~~SAAS~~,~~GACV~~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~~SAAS~~,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;~~IAEtD~~,MAAM,cAAc,GAAG,WAAW,CAChC,CACE,eAAuB,EACvB,WAAmB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAC/D,EAAE;QACF,gBAAgB,EAAE,CAAC;QAEnB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI;YAClE,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;SACf,CAAC;QACF,MAAM,EACJ,SAAS,EAAE,~~cAAc~~,~~EACzB~~,YAAY,EACZ,WAAW,GACZ,GAAG,WAAW,CAAC;QAEhB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC,CAAC;~~QAE7D~~,IAAI,eAAe,GAAG,eAAe,CAAC;QACtC,~~IAAI~~,eAAe,KAAK,kBAAkB,~~EAAE~~,CAAC;~~YAC3C~~,eAAe,GAAG,YAAY,CAAC;QACjC,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAC5B,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CACxC,CAAC;QAEF,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,~~IAAI~~,eAAe,KAAK,kBAAkB,~~EAAE~~,CAAC;~~gBAC3C~~,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,~~kBAAkB~~,CAAC,CAAC;~~YAC3D~~,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YAClE,CAAC;YACD,cAAc,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,iBAAiB,CAAC,OAAO,GAAG;YAC1B,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,cAAc;YACpB,EAAE,EAAE,aAAa;YACjB,QAAQ;YACR,KAAK,EAAE,WAAW,CAAC,GAAG,EAAE;gBACtB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,OAAO,GAAG,GAAG,GAAG,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAEjD,cAAc;gBACd,MAAM,CAAC,GAAG,QAAQ,CAAC;gBACnB,MAAM,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAExD,MAAM,OAAO,GACX,iBAAiB,CAAC,OAAO,CAAC,IAAI;oBAC9B,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAC7D,IAAI,CAAC;gBAET,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;oBAClB,~~IAAI~~,eAAe,KAAK,kBAAkB,~~EAAE~~,CAAC;~~wBAC3C~~,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,~~kBAAkB~~,CAAC,CAAC;~~oBAC3D~~,CAAC;yBAAM,CAAC;wBACN,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC5D,CAAC;oBACD,gBAAgB,EAAE,CAAC;oBACnB,cAAc,EAAE,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACN,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC,EAAE,2BAA2B,CAAC;SAChC,CAAC;IACJ,CAAC,EACD,CAAC,gBAAgB,EAAE,cAAc,CAAC,CACnC,CAAC;IAEF,WAAW,CACT,CAAC,GAAQ,EAAE,EAAE;QACX,IAAI,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,gBAAgB,EAAE,CAAC;YACnB,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACjD,gBAAgB,EAAE,CAAC;YACnB,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IACL,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;YACjC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EACnC,CAAC;YACD,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM;gBAC9C,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;gBAC9B,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC;~~YAC1B~~,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;YAC5C,cAAc,CAAC,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACjD,cAAc,CAAC,CAAC,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAChD,cAAc,CAAC,kBAAkB,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjE,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,CAAC;QACL,uEAAuE;QACvE,GAAG,EAAE,YAA2C;QAChD,cAAc;QACd,QAAQ,EAAE,qBAAqB;QAC/B,QAAQ,EAAE,cAAc;QACxB,QAAQ,EAAE,gBAAgB;QAC1B,cAAc;KACf,CAAC,EACF;QACE,cAAc;QACd,gBAAgB;QAChB,cAAc;QACd,qBAAqB;QACrB,cAAc;KACf,CACF,CAAC;IAEF,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,CACL,KAAC,GAAG,IACF,GAAG,EAAE,YAAY,EACjB,QAAQ,EAAE,CAAC,EACX,aAAa,EAAC,QAAQ,EACtB,QAAQ,EAAC,QAAQ,EACjB,KAAK,EAAE,KAAK,YAEZ,KAAC,eAAe,IACd,GAAG,EAAE,kBAAkB,KACnB,KAAK,EACT,mBAAmB,EAAE,cAAc,GACnC,GACE,CACP,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,MAAM,4BAA4B,GAAG,UAAU,CAAC,cAAc,CAEvC,CAAC;AAExB,OAAO,EAAE,4BAA4B,IAAI,cAAc,EAAE,CAAC"}
1	+ {"version":3,"file":"ScrollableList.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/ScrollableList.tsx"],"names":[],"mappings":"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"}