Simplify freebuff model navigation handling

Author: jahooma

cli/src/components/freebuff-model-selector.tsx

@@ -35,6 +35,9 @@ const FREEBUFF_MODEL_SELECTOR_MODELS: readonly FreebuffModelOption[] = [
   ...FREEBUFF_MODELS.filter((model) => model.id === DEFAULT_FREEBUFF_MODEL_ID),
   ...FREEBUFF_MODELS.filter((model) => model.id !== DEFAULT_FREEBUFF_MODEL_ID),
 ]
+const FREEBUFF_MODEL_SELECTOR_MODEL_IDS = FREEBUFF_MODEL_SELECTOR_MODELS.map(
+  (model) => model.id,
+)
 
 function formatSessionUnits(units: number): string {
   return Number.isInteger(units) ? String(units) : units.toFixed(1)
@@ -219,7 +222,6 @@ export const FreebuffModelSelector: React.FC = () => {
         const direction = freebuffModelNavigationDirectionForKey(key)
         const isCommit =
           name === 'return' || name === 'enter' || name === 'space'
-        if (!direction && !isCommit) return
         if (isCommit) {
           if (isJoinable(focusedId) && focusedId !== committedModelId) {
             key.preventDefault?.()
@@ -230,7 +232,7 @@ export const FreebuffModelSelector: React.FC = () => {
         }
         if (!direction) return
         const targetId = nextFreebuffModelId({
-          modelIds: FREEBUFF_MODEL_SELECTOR_MODELS.map((model) => model.id),
+          modelIds: FREEBUFF_MODEL_SELECTOR_MODEL_IDS,
           focusedId,
           direction,
         })

cli/src/utils/freebuff-model-navigation.ts

@@ -1,5 +1,14 @@
 export type FreebuffModelNavigationDirection = 'forward' | 'backward'
 
+const FORWARD_KEY_NAMES = new Set(['right', 'down'])
+const BACKWARD_KEY_NAMES = new Set(['left', 'up'])
+const FORWARD_TAB_SEQUENCES = new Set(['\t', '\x1b[9u'])
+const BACKWARD_TAB_SEQUENCES = new Set([
+  '\x1b[Z',
+  '\x1b[9;2u',
+  '\x1b[27;2;9~',
+])
+
 export function nextFreebuffModelId(params: {
   modelIds: readonly string[]
   focusedId: string
@@ -24,17 +33,16 @@ export function freebuffModelNavigationDirectionForKey(key: {
   const name = (key.name ?? '').toLowerCase()
   const sequence = key.sequence ?? key.raw ?? ''
 
-  if (name === 'right' || name === 'down') return 'forward'
-  if (name === 'left' || name === 'up') return 'backward'
+  if (FORWARD_KEY_NAMES.has(name)) return 'forward'
+  if (BACKWARD_KEY_NAMES.has(name)) return 'backward'
 
-  const isShiftTab =
+  if (
     (name === 'tab' && Boolean(key.shift)) ||
-    sequence === '\x1b[Z' ||
-    sequence === '\x1b[9;2u' ||
-    sequence === '\x1b[27;2;9~'
-  if (isShiftTab) return 'backward'
-
-  if (name === 'tab' || sequence === '\t' || sequence === '\x1b[9u') {
+    BACKWARD_TAB_SEQUENCES.has(sequence)
+  ) {
+    return 'backward'
+  }
+  if (name === 'tab' || FORWARD_TAB_SEQUENCES.has(sequence)) {
     return 'forward'
   }