@nmakarov/cli-toolkit 0.81.0 → 0.84.0

package/dist/screen.js

@@ -591,23 +591,24 @@ function formatKeyBindings(bindings, mode = "long") {
   })));
   groups.sort((a, b) => a.order - b.order);
   const items = [];
-  groups.forEach((group) => {
+  groups.forEach((group, groupIndex) => {
     const bindingWithCustom = resolvedBindings.find(
-      (b) => group.keys.includes(b.key) && typeof b.resolvedCaption !== "string"
+      (b) => group.keys.includes(formatBindingKey(b)) && typeof b.resolvedCaption !== "string"
     );
     if (bindingWithCustom && bindingWithCustom.resolvedCaption) {
       items.push(bindingWithCustom.resolvedCaption);
     } else {
-      const keyStr = formatKeys(group.keys);
-      if (mode === "long") {
-        items.push(`${keyStr} to ${group.caption}`);
-      } else {
-        items.push(keyStr);
-      }
+      items.push(formatFooterHotkey(formatKeys(group.keys), group.caption, mode, `kb-${groupIndex}`));
     }
   });
   return items;
 }
+var FOOTER_HOTKEY_STYLE = { bold: true, color: "white", dimColor: false };
+function formatFooterHotkey(keyStr, caption = "", mode = "long", reactKey = "hotkey") {
+  const keyNode = h3(Text3, { key: `${reactKey}-key`, ...FOOTER_HOTKEY_STYLE }, keyStr);
+  if (mode !== "long" || !caption) return keyNode;
+  return h3(Text3, { key: reactKey, dimColor: true, color: "white" }, keyNode, ` to ${caption}`);
+}
 function formatKeys(keys) {
   const keyMap = {
     escape: "esc",
@@ -984,8 +985,45 @@ function nextScrollAfterContentChange({ following, scrollTop, maxScroll }) {
   return { scrollTop: next, following: isScrolledToBottom(next, max) };
 }
 
-// src/screen/scrollable-text.js
-var h5 = createElement2;
+// src/screen/visible-text.js
+var ANSI_RE = /\u001b(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+function stripAnsi(text) {
+  return String(text ?? "").replace(ANSI_RE, "");
+}
+function visibleWidth(text) {
+  return [...stripAnsi(text)].length;
+}
+function sliceVisible(text, cols) {
+  const w = Math.max(0, Math.floor(Number(cols) || 0));
+  const s = String(text ?? "");
+  if (w === 0) return "";
+  let vis = 0;
+  let out = "";
+  let i = 0;
+  while (i < s.length && vis < w) {
+    ANSI_RE.lastIndex = i;
+    const m = ANSI_RE.exec(s);
+    if (m && m.index === i) {
+      out += m[0];
+      i += m[0].length;
+      continue;
+    }
+    const cp = s.codePointAt(i);
+    const ch = String.fromCodePoint(cp);
+    out += ch;
+    i += ch.length;
+    vis += 1;
+  }
+  return out;
+}
+function padEndVisible(text, cols) {
+  const w = Math.max(0, Math.floor(Number(cols) || 0));
+  const s = String(text ?? "");
+  const vis = visibleWidth(s);
+  if (vis === w) return s;
+  if (vis > w) return sliceVisible(s, w);
+  return s + " ".repeat(w - vis);
+}
 function wrapTextLines(text, cols) {
   const w = Math.max(1, Math.floor(Number(cols) || 1));
   const out = [];
@@ -994,20 +1032,23 @@ function wrapTextLines(text, cols) {
       out.push("");
       continue;
     }
+    if (visibleWidth(raw) <= w) {
+      out.push(raw);
+      continue;
+    }
     let rest = raw;
-    while (rest.length > w) {
-      out.push(rest.slice(0, w));
-      rest = rest.slice(w);
+    while (visibleWidth(rest) > w) {
+      const head = sliceVisible(rest, w);
+      out.push(head);
+      rest = rest.slice(head.length);
     }
     if (rest.length > 0) out.push(rest);
   }
   return out;
 }
-function padEndVisible(s, w) {
-  const t = String(s ?? "");
-  if (t.length >= w) return t.slice(0, w);
-  return t + " ".repeat(w - t.length);
-}
+
+// src/screen/scrollable-text.js
+var h5 = createElement2;
 var SCROLL_KEYS = [
   { key: "upArrow", caption: "scroll", action: "scrollUp", order: 0 },
   { key: "downArrow", caption: "scroll", action: "scrollDown", order: 0 },
@@ -1080,14 +1121,17 @@ function ScrollableText({
   }, [ctx, bindKeys, followBottom]);
   const status = allLines.length === 0 ? "empty" : `lines ${clamped + 1}-${Math.min(clamped + visible.length, allLines.length)} of ${allLines.length}` + (needsBar ? " \xB7 \u2325\u2191/\u2193 or PgUp/Dn page" : "") + (followBottom && following ? " \xB7 follow" : followBottom ? " \xB7 follow off" : "");
   const rowNodes = visible.map((line, i) => {
-    const body = padEndVisible(line, textWidth);
     const glyph = bar ? bar[i] ?? BAR_TRACK : showScrollbar ? " " : "";
     const isThumb = glyph === BAR_THUMB;
     return h5(
-      Text5,
-      { key: `L${clamped + i}` },
-      body,
-      glyph ? h5(Text5, { color: isThumb ? "cyan" : "gray" }, glyph) : null
+      Box4,
+      { key: `L${clamped + i}`, flexDirection: "row", width: contentCols, flexShrink: 0 },
+      h5(
+        Box4,
+        { width: textWidth, flexShrink: 0 },
+        h5(Text5, { wrap: "truncate" }, padEndVisible(line, textWidth))
+      ),
+      showScrollbar ? h5(Box4, { width: 1, flexShrink: 0 }, h5(Text5, { color: isThumb ? "cyan" : "gray" }, glyph)) : null
     );
   });
   if (bar && visible.length < viewportRows) {
@@ -1095,10 +1139,10 @@ function ScrollableText({
       const glyph = bar[i] ?? BAR_TRACK;
       rowNodes.push(
         h5(
-          Text5,
-          { key: `pad${i}` },
-          padEndVisible("", textWidth),
-          h5(Text5, { color: glyph === BAR_THUMB ? "cyan" : "gray" }, glyph)
+          Box4,
+          { key: `pad${i}`, flexDirection: "row", width: contentCols, flexShrink: 0 },
+          h5(Box4, { width: textWidth, flexShrink: 0 }, h5(Text5, {}, padEndVisible("", textWidth))),
+          h5(Box4, { width: 1, flexShrink: 0 }, h5(Text5, { color: glyph === BAR_THUMB ? "cyan" : "gray" }, glyph))
         )
       );
     }
@@ -1251,6 +1295,7 @@ export {
   BAR_TRACK,
   Box5 as Box,
   Divider,
+  FOOTER_HOTKEY_STYLE,
   FooterPresets,
   GridCell,
   InputField,
@@ -1276,6 +1321,7 @@ export {
   buildFooter,
   clampScroll,
   formatBindingKey,
+  formatFooterHotkey,
   createElement3 as h,
   isScrolledToBottom,
   load,
@@ -1283,6 +1329,7 @@ export {
   nextScrollAfterContentChange,
   nextScrollAfterUserMove,
   organizeFooterMessages,
+  padEndVisible,
   scrollbarGlyphs,
   showListScreen,
   showMenuScreen,
@@ -1290,6 +1337,8 @@ export {
   showMultiColumnListWithPreviewScreen,
   showScreen,
   showWordGridScreen,
+  sliceVisible,
+  stripAnsi,
   useCallback,
   useEffect3 as useEffect,
   useInput2 as useInput,
@@ -1297,6 +1346,7 @@ export {
   useMemo2 as useMemo,
   useRef3 as useRef,
   useState4 as useState,
+  visibleWidth,
   wrapTextLines
 };
 //# sourceMappingURL=screen.js.map