@ondrej-svec/hog 1.6.1 → 1.6.2

package/dist/cli.js

@@ -1957,6 +1957,31 @@ function findFallback(items, oldSection) {
   }
   return items.find((i) => i.type === "header") ?? items[0];
 }
+function relocateOnToggle(state, section) {
+  if (!state.selectedId) return { selectedId: null, selectedSection: null };
+  const selected = state.allItems.find((i) => i.id === state.selectedId);
+  if (!selected) return { selectedId: state.selectedId, selectedSection: state.selectedSection };
+  const insideCollapsedSubSection = selected.subSection === section;
+  const insideCollapsedSection = !insideCollapsedSubSection && selected.section === section && selected.type !== "header";
+  if (insideCollapsedSubSection) {
+    const subHeader = state.allItems.find((i) => i.id === section && i.type === "subHeader");
+    if (subHeader) return { selectedId: subHeader.id, selectedSection: subHeader.section };
+  } else if (insideCollapsedSection) {
+    const header = state.allItems.find((i) => i.section === section && i.type === "header");
+    if (header) return { selectedId: header.id, selectedSection: header.section };
+  }
+  return { selectedId: state.selectedId, selectedSection: state.selectedSection };
+}
+function relocateOnCollapseAll(state) {
+  if (!state.selectedId) return { selectedId: null, selectedSection: null };
+  const selected = state.allItems.find((i) => i.id === state.selectedId);
+  if (!selected || selected.type === "header") {
+    return { selectedId: state.selectedId, selectedSection: state.selectedSection };
+  }
+  const header = state.allItems.find((i) => i.section === selected.section && i.type === "header");
+  if (header) return { selectedId: header.id, selectedSection: header.section };
+  return { selectedId: state.selectedId, selectedSection: state.selectedSection };
+}
 function navReducer(state, action) {
   switch (action.type) {
     case "SET_ITEMS": {
@@ -1973,7 +1998,8 @@ function navReducer(state, action) {
           ...state,
           selectedSection: selected?.section ?? state.selectedSection,
           sections,
-          collapsedSections
+          collapsedSections,
+          allItems: action.items
         };
       }
       const fallback = findFallback(action.items, state.selectedSection);
@@ -1981,7 +2007,8 @@ function navReducer(state, action) {
         selectedId: fallback?.id ?? null,
         selectedSection: fallback?.section ?? null,
         sections,
-        collapsedSections
+        collapsedSections,
+        allItems: action.items
       };
     }
     case "SELECT": {
@@ -1993,15 +2020,19 @@ function navReducer(state, action) {
     }
     case "TOGGLE_SECTION": {
       const next = new Set(state.collapsedSections);
-      if (next.has(action.section)) {
-        next.delete(action.section);
-      } else {
+      const isCollapsing = !next.has(action.section);
+      if (isCollapsing) {
         next.add(action.section);
+        const cursor = relocateOnToggle(state, action.section);
+        return { ...state, collapsedSections: next, ...cursor };
       }
+      next.delete(action.section);
       return { ...state, collapsedSections: next };
     }
     case "COLLAPSE_ALL": {
-      return { ...state, collapsedSections: new Set(state.sections) };
+      const next = new Set(state.sections);
+      const cursor = relocateOnCollapseAll(state);
+      return { ...state, collapsedSections: next, ...cursor };
     }
     default:
       return state;
@@ -2021,7 +2052,8 @@ function useNavigation(allItems) {
     selectedId: null,
     selectedSection: null,
     sections: [],
-    collapsedSections: /* @__PURE__ */ new Set()
+    collapsedSections: /* @__PURE__ */ new Set(),
+    allItems: []
   });
   const prevItemsRef = useRef4(null);
   if (allItems !== prevItemsRef.current) {
@@ -2068,6 +2100,7 @@ function useNavigation(allItems) {
   const toggleSection = useCallback5(() => {
     const currentItem = visibleItems[selectedIndex];
     if (!currentItem) return;
+    if (currentItem.type === "item") return;
     const key = currentItem.type === "subHeader" ? currentItem.id : currentItem.section;
     dispatch({ type: "TOGGLE_SECTION", section: key });
   }, [selectedIndex, visibleItems]);
@@ -2231,6 +2264,11 @@ var init_use_toast = __esm({
 
 // src/board/hooks/use-ui-state.ts
 import { useCallback as useCallback7, useReducer as useReducer2 } from "react";
+function enterStatusMode(state) {
+  if (state.mode !== "normal" && state.mode !== "overlay:bulkAction") return state;
+  const previousMode = state.mode === "overlay:bulkAction" ? "multiSelect" : "normal";
+  return { ...state, mode: "overlay:status", previousMode };
+}
 function uiReducer(state, action) {
   switch (action.type) {
     case "ENTER_SEARCH":
@@ -2240,12 +2278,7 @@ function uiReducer(state, action) {
       if (state.mode !== "normal") return state;
       return { ...state, mode: "overlay:comment", previousMode: "normal" };
     case "ENTER_STATUS":
-      if (state.mode !== "normal" && state.mode !== "overlay:bulkAction") return state;
-      return {
-        ...state,
-        mode: "overlay:status",
-        previousMode: state.mode === "overlay:bulkAction" ? "multiSelect" : "normal"
-      };
+      return enterStatusMode(state);
     case "ENTER_CREATE":
       if (state.mode !== "normal") return state;
       return { ...state, mode: "overlay:create", previousMode: "normal" };
@@ -2565,16 +2598,16 @@ var init_bulk_action_menu = __esm({
 
 // src/board/ink-instance.ts
 function setInkInstance(instance) {
-  _instance = instance;
+  inkInstance = instance;
 }
 function getInkInstance() {
-  return _instance;
+  return inkInstance;
 }
-var _instance;
+var inkInstance;
 var init_ink_instance = __esm({
   "src/board/ink-instance.ts"() {
     "use strict";
-    _instance = null;
+    inkInstance = null;
   }
 });
 
@@ -2630,8 +2663,8 @@ function CommentInput({
       tmpDir = mkdtempSync(join3(tmpdir(), "hog-comment-"));
       tmpFile = join3(tmpDir, "comment.md");
       writeFileSync3(tmpFile, value);
-      const inkInstance = getInkInstance();
-      inkInstance?.clear();
+      const inkInstance2 = getInkInstance();
+      inkInstance2?.clear();
       setRawMode(false);
       spawnSync(cmd, [...extraArgs, tmpFile], { stdio: "inherit" });
       const content = readFileSync3(tmpFile, "utf-8").trim();
@@ -2643,7 +2676,7 @@ function CommentInput({
       }
     } finally {
       onResumeRef.current?.();
-      if (tmpFile) {
+      if (tmpDir) {
         try {
           rmSync(tmpDir, { recursive: true, force: true });
         } catch {
@@ -3202,8 +3235,8 @@ function NlCreateOverlay({
       tmpDir = mkdtempSync2(join4(tmpdir2(), "hog-body-"));
       tmpFile = join4(tmpDir, "body.md");
       writeFileSync4(tmpFile, body);
-      const inkInstance = getInkInstance();
-      inkInstance?.clear();
+      const inkInstance2 = getInkInstance();
+      inkInstance2?.clear();
       setRawMode(false);
       spawnSync2(cmd, [...extraArgs, tmpFile], { stdio: "inherit" });
       const content = readFileSync4(tmpFile, "utf-8");
@@ -3392,6 +3425,42 @@ import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 function isTerminal(name) {
   return TERMINAL_STATUS_RE2.test(name);
 }
+function handlePickerInput(input2, key, state) {
+  if (key.escape) {
+    state.onCancel();
+    return;
+  }
+  if (key.return) {
+    if (state.submittedRef.current) return;
+    const opt = state.options[state.selectedIdx];
+    if (!opt) return;
+    if (isTerminal(opt.name) && state.showTerminalStatuses) {
+      state.onConfirmTerminal();
+      return;
+    }
+    state.submittedRef.current = true;
+    state.onSelect(opt.id);
+    return;
+  }
+  if (input2 === "j" || key.downArrow) {
+    state.onNavigate((i) => Math.min(i + 1, state.options.length - 1));
+  }
+  if (input2 === "k" || key.upArrow) {
+    state.onNavigate((i) => Math.max(i - 1, 0));
+  }
+}
+function handleConfirmInput(input2, key, state) {
+  if (input2 === "y" || input2 === "Y") {
+    if (!state.submittedRef.current) {
+      state.submittedRef.current = true;
+      if (state.opt) state.onSelect(state.opt.id);
+    }
+    return;
+  }
+  if (input2 === "n" || input2 === "N" || key.escape) {
+    state.onExitConfirm();
+  }
+}
 function StatusPicker({
   options,
   currentStatus,
@@ -3407,38 +3476,24 @@ function StatusPicker({
   const submittedRef = useRef10(false);
   useInput10((input2, key) => {
     if (confirmingTerminal) {
-      if (input2 === "y" || input2 === "Y") {
-        if (submittedRef.current) return;
-        submittedRef.current = true;
-        const opt = options[selectedIdx];
-        if (opt) onSelect(opt.id);
-        return;
-      }
-      if (input2 === "n" || input2 === "N" || key.escape) {
-        setConfirmingTerminal(false);
-        return;
-      }
-      return;
-    }
-    if (key.escape) return onCancel();
-    if (key.return) {
-      if (submittedRef.current) return;
-      const opt = options[selectedIdx];
-      if (!opt) return;
-      if (isTerminal(opt.name) && showTerminalStatuses) {
-        setConfirmingTerminal(true);
-        return;
-      }
-      submittedRef.current = true;
-      onSelect(opt.id);
+      handleConfirmInput(input2, key, {
+        opt: options[selectedIdx],
+        submittedRef,
+        onSelect,
+        onExitConfirm: () => setConfirmingTerminal(false)
+      });
       return;
     }
-    if (input2 === "j" || key.downArrow) {
-      setSelectedIdx((i) => Math.min(i + 1, options.length - 1));
-    }
-    if (input2 === "k" || key.upArrow) {
-      setSelectedIdx((i) => Math.max(i - 1, 0));
-    }
+    handlePickerInput(input2, key, {
+      options,
+      selectedIdx,
+      showTerminalStatuses,
+      submittedRef,
+      onSelect,
+      onCancel,
+      onConfirmTerminal: () => setConfirmingTerminal(true),
+      onNavigate: setSelectedIdx
+    });
   });
   if (confirmingTerminal) {
     const opt = options[selectedIdx];
@@ -5804,7 +5859,7 @@ function resolveProjectId(projectId) {
   process.exit(1);
 }
 var program = new Command();
-program.name("hog").description("Personal command deck \u2014 unified task dashboard for GitHub Projects + TickTick").version("1.6.1").option("--json", "Force JSON output").option("--human", "Force human-readable output").hook("preAction", (thisCommand) => {
+program.name("hog").description("Personal command deck \u2014 unified task dashboard for GitHub Projects + TickTick").version("1.6.2").option("--json", "Force JSON output").option("--human", "Force human-readable output").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.json) setFormat("json");
   if (opts.human) setFormat("human");