@kud/gh-ink 0.3.0 → 0.3.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import React2, { useState, useRef, useEffect } from 'react';
 import { useWindowSize, useInput, Text, Box } from 'ink';
-import { colors, ScrollView, TextInput, LoadingScreen, Switch, Tabs, FooterHints } from '@kud/ink-ui';
+import { colors, ScrollView, TextInput, LoadingScreen, Switch, useListCursor, Tabs, FooterHints } from '@kud/ink-ui';
 import { isPassCheck, isFailCheck, resolveThread, unresolveThread, replyToThread, rerunFailedRun, mergePr, reRequestReviewer } from '@kud/gh';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { $ } from 'zx';
@@ -847,6 +847,12 @@ var maxViewStart = (items, budget) => {
     start++;
   return start;
 };
+var firstSelectable = (section) => Math.max(
+  0,
+  section.items.findIndex(
+    (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header"
+  )
+);
 var withHeaders = (items, idx) => {
   let start = idx;
   while (start > 0 && (items[start - 1].kind === "repo-header" || items[start - 1].kind === "subgroup-header"))
@@ -1679,25 +1685,17 @@ var BrowseScreen = ({
   const [localSections, setLocalSections] = useState(initialSections);
   const [tabIdx, setTabIdx] = useState(0);
   const [cursors, setCursors] = useState(
-    initialSections.map(
-      (s) => Math.max(
-        0,
-        s.items.findIndex(
-          (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header"
-        )
-      )
-    )
-  );
-  const [viewStarts, setViewStarts] = useState(
-    initialSections.map(() => 0)
+    () => Object.fromEntries(initialSections.map((s) => [s.id, firstSelectable(s)]))
   );
+  const [viewStarts, setViewStarts] = useState({});
+  const safeTabIdx = Math.min(tabIdx, Math.max(0, localSections.length - 1));
+  const activeId = localSections[safeTabIdx]?.id ?? "";
   const [flash, setFlash] = useState(null);
   const menu = useActionMenu();
   const [search, setSearch] = useState(null);
   const [searchInput, setSearchInput] = useState(false);
   const [repoFilter, setRepoFilter] = useState(/* @__PURE__ */ new Set());
   const [repoPicker, setRepoPicker] = useState(false);
-  const [repoCursor, setRepoCursor] = useState(0);
   const [help, setHelp] = useState(false);
   const [explain, setExplain] = useState(false);
   const filterActive = search != null || repoFilter.size > 0;
@@ -1710,8 +1708,8 @@ var BrowseScreen = ({
     rows - 10 - (filterActive ? 2 : 0) - (reserveCiRow ? 2 : 0)
   );
   useEffect(() => {
-    setCursors((p) => p.map((c, i) => i === tabIdx ? 0 : c));
-    setViewStarts((p) => p.map((v, i) => i === tabIdx ? 0 : v));
+    setCursors((p) => ({ ...p, [activeId]: 0 }));
+    setViewStarts((p) => ({ ...p, [activeId]: 0 }));
   }, [search]);
   useEffect(() => {
     setLocalSections(applyWork(sections, includeWork));
@@ -1719,20 +1717,30 @@ var BrowseScreen = ({
   useEffect(() => {
     setTabIdx((prev) => Math.min(prev, Math.max(0, localSections.length - 1)));
     setCursors(
-      (prev) => localSections.map((s, i) => {
-        const c = Math.min(prev[i] ?? 0, s.items.length - 1);
-        if (c < 0) return 0;
-        return s.items[c]?.kind === "repo-header" || s.items[c]?.kind === "subgroup-header" ? moveCursor(s.items, c, 1) : c;
-      })
+      (prev) => Object.fromEntries(
+        localSections.map((s) => {
+          const c = Math.min(
+            prev[s.id] ?? firstSelectable(s),
+            s.items.length - 1
+          );
+          if (c < 0) return [s.id, 0];
+          return [
+            s.id,
+            s.items[c]?.kind === "repo-header" || s.items[c]?.kind === "subgroup-header" ? moveCursor(s.items, c, 1) : c
+          ];
+        })
+      )
     );
     setViewStarts(
-      (prev) => localSections.map(
-        (s, i) => Math.min(prev[i] ?? 0, maxViewStart(s.items, listHeight))
+      (prev) => Object.fromEntries(
+        localSections.map((s) => [
+          s.id,
+          Math.min(prev[s.id] ?? 0, maxViewStart(s.items, listHeight))
+        ])
       )
     );
   }, [localSections, listHeight]);
   const removeItemFromSections = (target) => setLocalSections((prev) => withoutItem(prev, target));
-  const safeTabIdx = Math.min(tabIdx, Math.max(0, localSections.length - 1));
   const rawSection = localSections[safeTabIdx] ?? {
     id: "empty",
     label: "",
@@ -1742,8 +1750,12 @@ var BrowseScreen = ({
   const filtered = repoFilter.size > 0 ? filterByRepos(searched, repoFilter) : searched;
   const section = filterActive ? { ...rawSection, items: filtered[0]?.items ?? [] } : rawSection;
   const allRepos = reposInSections(localSections);
-  const cursor = cursors[safeTabIdx] ?? 0;
-  const viewStart = viewStarts[safeTabIdx] ?? 0;
+  const { cursor: repoCursor, setCursor: setRepoCursor } = useListCursor(
+    allRepos.length,
+    { vimKeys: false, isActive: repoPicker }
+  );
+  const cursor = cursors[activeId] ?? 0;
+  const viewStart = viewStarts[activeId] ?? 0;
   const visibleCount = windowCount(section.items, viewStart, listHeight);
   const visibleItems = section.items.slice(viewStart, viewStart + visibleCount);
   const hasMore = viewStart + visibleCount < section.items.length;
@@ -1798,9 +1810,6 @@ var BrowseScreen = ({
     }
     if (repoPicker) {
       if (key.escape || key.return) return setRepoPicker(false);
-      if (key.upArrow) return setRepoCursor((c) => Math.max(0, c - 1));
-      if (key.downArrow)
-        return setRepoCursor((c) => Math.min(allRepos.length - 1, c + 1));
       if (input === "a") return setRepoFilter(/* @__PURE__ */ new Set());
       if (input === " ") {
         const repo = allRepos[repoCursor];
@@ -1848,16 +1857,16 @@ var BrowseScreen = ({
     if (key.upArrow) {
       const next = moveCursor(section.items, cursor, -1);
       const newVs = Math.min(viewStart, withHeaders(section.items, next));
-      setCursors((p) => p.map((c, i) => i === tabIdx ? next : c));
-      setViewStarts((p) => p.map((v, i) => i === tabIdx ? newVs : v));
+      setCursors((p) => ({ ...p, [activeId]: next }));
+      setViewStarts((p) => ({ ...p, [activeId]: newVs }));
     }
     if (key.downArrow) {
       const next = moveCursor(section.items, cursor, 1);
       let newVs = viewStart;
       while (next >= newVs + windowCount(section.items, newVs, listHeight))
         newVs++;
-      setCursors((p) => p.map((c, i) => i === tabIdx ? next : c));
-      setViewStarts((p) => p.map((v, i) => i === tabIdx ? newVs : v));
+      setCursors((p) => ({ ...p, [activeId]: next }));
+      setViewStarts((p) => ({ ...p, [activeId]: newVs }));
     }
     if (key.leftArrow) setTabIdx((i) => Math.max(0, i - 1));
     if (key.rightArrow)
@@ -1873,8 +1882,11 @@ var BrowseScreen = ({
     }
     if (workToggle && input === "w") {
       const next = !includeWork;
+      const nextSections = applyWork(sections, next);
+      const keptIdx = nextSections.findIndex((s) => s.id === activeId);
       setIncludeWork(next);
-      setLocalSections(applyWork(sections, next));
+      setLocalSections(nextSections);
+      if (keptIdx >= 0) setTabIdx(keptIdx);
       return;
     }
     if (input === "J" && ciStatus) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Ink components for rendering GitHub PR review comments and health — controlled, presentation-only, built on @kud/ink-ui and fed by @kud/gh.",
   "type": "module",
   "main": "dist/index.js",