@@ -186,66 +186,57 @@ describe("cel end-to-end", () => {
186186 expect(receivedKey).toBe("ctrl+s");
187187 });
188188
189- test("onScroll fires on mouse wheel", async () => {
190- const term = setup(20, 5);
189+ test("onScroll fires on mouse wheel using the adaptive default step", async () => {
190+ const term = setup(20, 12);
191191 let scrollOffset = 0;
192192 cel.viewport(() =>
193193 VStack(
194194 {
195195 width: 20,
196- height: 5,
196+ height: 12,
197197 overflow: "scroll",
198198 scrollOffset: scrollOffset,
199199 onScroll: (offset) => {
200200 scrollOffset = offset;
201201 },
202202 },
203- // Enough content to exceed viewport (5 rows)
204- Array.from({ length: 10 }, (_, i) => Text(`line ${i + 1}`)),
203+ // 12-row viewport → adaptive wheel step = floor(12 / 3) = 4
204+ Array.from({ length: 20 }, (_, i) => Text(`line ${i + 1}`)),
205205 ),
206206 );
207207 await waitForRender();
208208
209- // SGR scroll down at (3, 2): ESC [ < 65 ; 4 ; 3 M
210209 term.sendInput("\x1b[<65;4;3M");
211210 await waitForRender();
212211
213- expect(scrollOffset).toBe(1);
212+ expect(scrollOffset).toBe(4);
214213 });
215214
216215 test("batched mouse scroll events are all processed", async () => {
217- const term = setup(20, 5);
216+ const term = setup(20, 12);
218217 let scrollOffset = 0;
219218 cel.viewport(() =>
220219 VStack(
221220 {
222221 width: 20,
223- height: 5,
222+ height: 12,
224223 overflow: "scroll",
225224 scrollOffset: scrollOffset,
226225 onScroll: (offset) => {
227226 scrollOffset = offset;
228227 },
229228 },
230- [
231- Text("line1"),
232- Text("line2"),
233- Text("line3"),
234- Text("line4"),
235- Text("line5"),
236- Text("line6"),
237- Text("line7"),
238- Text("line8"),
239- ],
229+ Array.from({ length: 30 }, (_, i) => Text(`line${i + 1}`)),
240230 ),
241231 );
242232 await waitForRender();
243233
244234 // 3 scroll-down events batched in one data chunk (as real terminals do)
235+ // 12-row viewport → adaptive wheel step = 4, so total = 12
245236 term.sendInput("\x1b[<65;4;3M\x1b[<65;4;3M\x1b[<65;4;3M");
246237 await waitForRender();
247238
248- expect(scrollOffset).toBe(3);
239+ expect(scrollOffset).toBe(12);
249240 });
250241
251242 test("scroll clamps at max offset (no blank space past content)", async () => {
@@ -278,14 +269,14 @@ describe("cel end-to-end", () => {
278269 });
279270
280271 test("onScroll receives maxOffset", async () => {
281- const term = setup(20, 5);
272+ const term = setup(20, 12);
282273 let scrollOffset = 0;
283274 let receivedMax = -1;
284275 cel.viewport(() =>
285276 VStack(
286277 {
287278 width: 20,
288- height: 5,
279+ height: 12,
289280 overflow: "scroll",
290281 scrollOffset: scrollOffset,
291282 onScroll: (offset, maxOffset) => {
@@ -293,8 +284,35 @@ describe("cel end-to-end", () => {
293284 receivedMax = maxOffset;
294285 },
295286 },
296- // 8 items in 5-row viewport → max offset = 3
297- Array.from({ length: 8 }, (_, i) => Text(`item ${i + 1}`)),
287+ // 20 items in 12-row viewport → max offset = 8
288+ Array.from({ length: 20 }, (_, i) => Text(`item ${i + 1}`)),
289+ ),
290+ );
291+ await waitForRender();
292+
293+ term.sendInput("\x1b[<65;4;3M");
294+ await waitForRender();
295+
296+ expect(scrollOffset).toBe(4);
297+ expect(receivedMax).toBe(8);
298+ });
299+
300+ test("scrollStep overrides the adaptive default", async () => {
301+ const term = setup(20, 12);
302+ let scrollOffset = 0;
303+ cel.viewport(() =>
304+ VStack(
305+ {
306+ width: 20,
307+ height: 12,
308+ overflow: "scroll",
309+ scrollStep: 6,
310+ scrollOffset: scrollOffset,
311+ onScroll: (offset) => {
312+ scrollOffset = offset;
313+ },
314+ },
315+ Array.from({ length: 30 }, (_, i) => Text(`line ${i + 1}`)),
298316 ),
299317 );
300318 await waitForRender();
@@ -302,20 +320,19 @@ describe("cel end-to-end", () => {
302320 term.sendInput("\x1b[<65;4;3M");
303321 await waitForRender();
304322
305- expect(scrollOffset).toBe(1);
306- expect(receivedMax).toBe(3);
323+ expect(scrollOffset).toBe(6);
307324 });
308325
309326 test("uncontrolled scroll works without onScroll", async () => {
310- const term = setup(20, 5);
327+ const term = setup(20, 12);
311328 cel.viewport(() =>
312329 VStack(
313330 {
314331 width: 20,
315- height: 5,
332+ height: 12,
316333 overflow: "scroll",
317334 },
318- Array.from({ length: 10 }, (_, i) => Text(`line ${i + 1}`)),
335+ Array.from({ length: 20 }, (_, i) => Text(`line ${i + 1}`)),
319336 ),
320337 );
321338 await waitForRender();
@@ -324,16 +341,14 @@ describe("cel end-to-end", () => {
324341 const buf1 = cel._getBuffer()!;
325342 expect(buf1.get(0, 0).char).toBe("l"); // "line 1"
326343
327- // SGR scroll down at (3, 2): ESC [ < 65 ; 4 ; 3 M
328344 term.sendInput("\x1b[<65;4;3M");
329345 await waitForRender();
330346
331- // After scroll by 1, line 2 should now be at row 0
347+ // After scrolling by the adaptive step (4), line 5 should now be at row 0
332348 const buf2 = cel._getBuffer()!;
333- // Read first 6 chars of row 0
334349 let row0 = "";
335350 for (let x = 0; x < 6; x++) row0 += buf2.get(x, 0).char;
336- expect(row0).toBe("line 2");
351+ expect(row0).toBe("line 5");
337352 });
338353
339354 test("uncontrolled scroll clamps at max offset", async () => {
@@ -397,6 +412,42 @@ describe("cel end-to-end", () => {
397412
398413 expect(scrollOffset).toBe(2);
399414 });
415+
416+ test("scroll up unsticks from Infinity scrollOffset (sticky-bottom pattern)", async () => {
417+ const term = setup(20, 5);
418+ let scrollOffset = 0;
419+ let stickToBottom = true;
420+
421+ cel.viewport(() =>
422+ VStack(
423+ {
424+ width: 20,
425+ height: 5,
426+ overflow: "scroll",
427+ scrollbar: true,
428+ scrollOffset: stickToBottom ? Infinity : scrollOffset,
429+ onScroll: (offset, maxOffset) => {
430+ scrollOffset = offset;
431+ stickToBottom = offset >= maxOffset;
432+ cel.render();
433+ },
434+ },
435+ // 10 items in 5-row viewport → max offset = 5, adaptive wheel step = 3
436+ Array.from({ length: 10 }, (_, i) => Text(`line ${i + 1}`)),
437+ ),
438+ );
439+ await waitForRender();
440+
441+ // Initially stuck to bottom (Infinity → clamped to maxOffset=5)
442+ expect(stickToBottom).toBe(true);
443+
444+ // Scroll up — should unstick from bottom
445+ term.sendInput("\x1b[<64;4;3M");
446+ await waitForRender();
447+
448+ expect(stickToBottom).toBe(false);
449+ expect(scrollOffset).toBe(2); // maxOffset(5) - 3 = 2
450+ });
400451 });
401452
402453 describe("focus system", () => {
@@ -916,6 +967,90 @@ describe("cel end-to-end", () => {
916967 expect(value).toBe("hello\t");
917968 });
918969
970+ test("Shift+Enter inserts newline in TextInput", async () => {
971+ const term = setup(20, 5);
972+ let value = "hello";
973+ cel.viewport(() =>
974+ VStack({ width: 20, height: 5 }, [
975+ TextInput({
976+ value,
977+ focused: true,
978+ onChange: (v) => {
979+ value = v;
980+ },
981+ }),
982+ ]),
983+ );
984+ await waitForRender();
985+
986+ // Shift+Enter should insert a newline at cursor position
987+ term.sendInput(kittyEncode("shift+enter"));
988+ await waitForRender();
989+ expect(value).toBe("hello\n");
990+ });
991+
992+ test("Shift+Enter inserts newline at cursor, not just at end", async () => {
993+ const term = setup(20, 5);
994+ let value = "hello";
995+ // Stable onChange ref so cursor state persists across re-renders
996+ const onChange = (v: string) => {
997+ value = v;
998+ };
999+ cel.viewport(() =>
1000+ VStack({ width: 20, height: 5 }, [
1001+ TextInput({
1002+ value,
1003+ focused: true,
1004+ onChange,
1005+ }),
1006+ ]),
1007+ );
1008+ await waitForRender();
1009+
1010+ // Move cursor left 3 times (to position 2: "he|llo")
1011+ term.sendInput(kittyEncode("left"));
1012+ await waitForRender();
1013+ term.sendInput(kittyEncode("left"));
1014+ await waitForRender();
1015+ term.sendInput(kittyEncode("left"));
1016+ await waitForRender();
1017+
1018+ // Shift+Enter should insert newline at cursor
1019+ term.sendInput(kittyEncode("shift+enter"));
1020+ await waitForRender();
1021+ expect(value).toBe("he\nllo");
1022+ });
1023+
1024+ test("Shift+Enter inserts newline even when onKeyPress intercepts Enter", async () => {
1025+ const term = setup(20, 5);
1026+ let value = "hello";
1027+ let submitted = false;
1028+ cel.viewport(() =>
1029+ VStack({ width: 20, height: 5 }, [
1030+ TextInput({
1031+ value,
1032+ focused: true,
1033+ onChange: (v) => {
1034+ value = v;
1035+ },
1036+ onKeyPress: (key) => {
1037+ if (key === "enter") {
1038+ submitted = true;
1039+ return false;
1040+ }
1041+ },
1042+ }),
1043+ ]),
1044+ );
1045+ await waitForRender();
1046+
1047+ // Shift+Enter is a different key — should insert newline, not trigger onKeyPress for "enter"
1048+ term.sendInput(kittyEncode("shift+enter"));
1049+ await waitForRender();
1050+ expect(submitted).toBe(false);
1051+ expect(value).toBe("hello\n");
1052+ });
1053+
9191054 test("Shift+Tab does not traverse focus when TextInput is focused", async () => {
9201055 const term = setup(20, 5);
9211056 let value = "hello";
@@ -1131,18 +1266,20 @@ describe("cel end-to-end", () => {
11311266
11321267 describe("TextInput mouse wheel scroll", () => {
11331268 test("mouse wheel scrolls TextInput content", async () => {
1134- const term = setup(20, 3);
1135- let value = "line1\nline2\nline3\nline4\nline5";
1269+ const term = setup(20, 12);
1270+ let value = Array.from({ length: 20 }, (_, i) => `line${i + 1}`).join(
1271+ "\n",
1272+ );
11361273 // Stable onChange ref so TextInput scroll state persists across re-renders
11371274 const onChange = (v: string) => {
11381275 value = v;
11391276 };
Cut short: this commit's diff is over 1000 lines.