@valyrianjs/terminal 0.2.0 → 0.2.2

package/src/mouse.ts

@@ -2,7 +2,7 @@ import { parseTerminalKey } from "./events.js";
 
 import type { ParsedTerminalInput, TerminalHitbox } from "./types.js";
 
-const nestedParentTags = new Set(["terminal-box", "terminal-view"]);
+const nestedParentTags = new Set(["terminal-box", "terminal-view", "terminal-list"]);
 
 function containsHitbox(parent: TerminalHitbox, child: TerminalHitbox) {
   return child.x1 >= parent.x1 && child.x2 <= parent.x2 && child.y1 >= parent.y1 && child.y2 <= parent.y2;
@@ -12,24 +12,40 @@ function samePointerLayer(left: TerminalHitbox, right: TerminalHitbox) {
   return (left.pointerLayer ?? 0) === (right.pointerLayer ?? 0);
 }
 
+function parseMouseMatch(match: RegExpExecArray): Extract<ParsedTerminalInput, { type: "mouse" }> {
+  const code = Number(match[1]);
+  let action: "press" | "release" | "drag" | "wheel-up" | "wheel-down" = match[4] === "M" ? "press" : "release";
+  if (code >= 64) {
+    action = code === 64 ? "wheel-up" : "wheel-down";
+  } else if (code >= 32 && match[4] === "M") {
+    action = "drag";
+  }
+  return {
+    type: "mouse",
+    button: code,
+    x: Number(match[2]),
+    y: Number(match[3]),
+    action
+  };
+}
+
+export function parseTerminalMousePrefix(chunk: string | Uint8Array): { input: Extract<ParsedTerminalInput, { type: "mouse" }>; rest: string } | null {
+  const value = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+  const match = /^\u001b\[<(\d+);(\d+);(\d+)([Mm])/.exec(value);
+  if (!match) {
+    return null;
+  }
+  return {
+    input: parseMouseMatch(match),
+    rest: value.slice(match[0].length)
+  };
+}
+
 export function parseTerminalInput(chunk: string | Uint8Array): ParsedTerminalInput {
   const value = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
   const match = /^\u001b\[<(\d+);(\d+);(\d+)([Mm])$/.exec(value);
   if (match) {
-    const code = Number(match[1]);
-    let action: "press" | "release" | "drag" | "wheel-up" | "wheel-down" = match[4] === "M" ? "press" : "release";
-    if (code >= 64) {
-      action = code === 64 ? "wheel-up" : "wheel-down";
-    } else if (code >= 32 && match[4] === "M") {
-      action = "drag";
-    }
-    return {
-      type: "mouse",
-      button: code,
-      x: Number(match[2]),
-      y: Number(match[3]),
-      action
-    };
+    return parseMouseMatch(match);
   }
   return { type: "key", key: parseTerminalKey(value) };
 }
@@ -63,6 +79,15 @@ export function cursorFromHitbox(hitbox: TerminalHitbox, x: number) {
   if (typeof hitbox.textStartX !== "number") {
     return 0;
   }
+
   const textLength = Number(hitbox.textLength || 0);
-  return Math.max(0, Math.min(textLength, x - hitbox.textStartX));
+  const cellOffset = Math.max(0, x - hitbox.textStartX);
+  if (Array.isArray(hitbox.textCellToStringIndex) && hitbox.textCellToStringIndex.length > 0) {
+    const index = hitbox.textCellToStringIndex[Math.min(cellOffset, hitbox.textCellToStringIndex.length - 1)];
+    if (typeof index === "number" && Number.isFinite(index)) {
+      return Math.max(0, Math.min(textLength, index));
+    }
+  }
+
+  return Math.max(0, Math.min(textLength, cellOffset));
 }

package/src/primitives.ts

@@ -49,7 +49,14 @@ export const Editor = primitive<TerminalEditorProps>("terminal-editor");
 export const Button = primitive<TerminalButtonProps>("terminal-button");
 export const ScrollView = primitive<TerminalScrollViewProps>("terminal-scroll");
 export const LogView = primitive<TerminalLogViewProps>("terminal-log-view");
-export const List = primitive("terminal-list") as TerminalListComponent;
+export const List = function TerminalList(props: TerminalPrimitiveComponentProps<TerminalListProps<any>> | null | undefined, children: any[]) {
+  const nextProps = { ...(props || {}) } as Record<string, any>;
+  if (children.length === 1 && typeof children[0] === "function") {
+    nextProps.__childrenRenderer = children[0];
+    return v("terminal-list", nextProps);
+  }
+  return v("terminal-list", nextProps, ...children);
+} as TerminalListComponent;
 export const Table = primitive<TerminalTableProps>("terminal-table");
 export const Row = primitive<TerminalRowProps>("terminal-row");
 export const Td = primitive<TerminalTdProps>("terminal-td");