@cplieger/web-terminal-ui 8.2.0 → 8.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/web-terminal-ui",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "type": "module",
   "description": "Reference touch-first browser UI for @cplieger/web-terminal-engine: a composable kernel + feature modules (tabs, activity monitor, mobile toolbar, context menu, IME, predictive echo, viewport handling) and CSS. One createTerminal() call.",
   "license": "MPL-2.0",

package/src/kernel/pane.ts

@@ -36,6 +36,8 @@ import type {
 
 const { mapKeyboardEvent, bracketTextForPaste, prepareTextForTerminal } = keyboard;
 
+type GridSize = ReturnType<TerminalEngine["renderer"]["computeSize"]>;
+
 const DEFAULT_WS_PATH = "/ws";
 // The family that carries the CELL METRICS, alone, never --font-mono's list:
 // WebKit settles load() over a list as soon as the FIRST family covering the
@@ -468,7 +470,7 @@ function buildPaneInto(
   function updateMousePointer(): void {
     termWrap.classList.toggle("wt-mouse-app", engine.modes.getMouseMode() !== 0);
   }
-  function measurableSize(): { cols: number; rows: number } | null {
+  function measurableSize(): GridSize | null {
     // A pane hidden by a closed split is `display: none`: the cell width it would
     // measure is 0, and the first render after a reveal would lay out on it.
     if (!fontsLoaded || hidden || viewport.isInTransition()) {
@@ -477,11 +479,25 @@ function buildPaneInto(
     engine.renderer.updateFontMetrics();
     return engine.renderer.computeSize();
   }
+  let announced: GridSize | null = null;
+  let heldGrow = false;
+  function announce(size: GridSize): void {
+    announced = size;
+    heldGrow = false;
+    engine.connection.sendResize();
+  }
+  function releaseHeldGrow(): void {
+    const size = measurableSize();
+    if (size !== null) {
+      announce(size);
+    }
+  }
   function maybeSendFirstResize(): void {
-    if (!wsOpen || measurableSize() === null) {
+    const size = wsOpen ? measurableSize() : null;
+    if (size === null) {
       return;
     }
-    engine.connection.sendResize();
+    announce(size);
   }
 
   const engine: TerminalEngine = createTerminalEngine({
@@ -496,6 +512,9 @@ function buildPaneInto(
     },
     onUserScrollChange: (scrolledUp) => {
       bus.emit("scroll:state", { scrolledUp });
+      if (heldGrow && !scrolledUp) {
+        releaseHeldGrow();
+      }
     },
     callbacks: {
       computeSize: () => engine.renderer.computeSize(),
@@ -513,6 +532,11 @@ function buildPaneInto(
           if (fontsLoaded) {
             markReady();
           }
+          // The engine applies a frame to the bound store before this callback,
+          // and the alternate screen has no scrollback to hold a size for.
+          if (heldGrow && engine.renderer.boundStore().isAlt()) {
+            releaseHeldGrow();
+          }
           bus.emit("wire:screen", msg);
         } else if (msg.type === "title") {
           // A shell clears its window title when it redraws its prompt after
@@ -971,11 +995,24 @@ function buildPaneInto(
     box: root,
     keyboard: services.keyboardInsets,
     scroll: engine.scroll,
-    onSettled() {
+    onSettled(wasAtBottom) {
       // The settle is the one resize a keyboard slide or rotation should cost;
       // sendResize deduplicates.
-      if (measurableSize() !== null) {
-        engine.connection.sendResize();
+      const size = measurableSize();
+      if (size !== null) {
+        // A program repaints on resize, and that repaint can erase or reflow the
+        // scrollback being read, so a taller box waits until the reader follows.
+        if (
+          !wasAtBottom &&
+          announced !== null &&
+          size.cols === announced.cols &&
+          size.rows > announced.rows &&
+          !engine.renderer.boundStore().isAlt()
+        ) {
+          heldGrow = true;
+        } else {
+          announce(size);
+        }
       }
       composition.positionCompositionView();
     },
@@ -1039,10 +1076,11 @@ function buildPaneInto(
       // The gate opened on fallback metrics and the swap period is infinite, so
       // one corrective announce once the bytes land; sendResize deduplicates.
       void doc.fonts.ready.then(() => {
-        if (destroyed || measurableSize() === null) {
+        const size = destroyed ? null : measurableSize();
+        if (size === null) {
           return;
         }
-        engine.connection.sendResize();
+        announce(size);
       });
     }, onFontSettled);
   } catch (err) {
@@ -1353,7 +1391,7 @@ function buildPaneInto(
     clearActiveSession,
     announceSize() {
       if (!destroyed && fontsLoaded) {
-        engine.connection.sendResize();
+        announce(engine.renderer.computeSize());
       }
     },
     focus: focusTerminal,