From 4d0886a4feed7de8512e6d1428bddea290f3bcb0 Mon Sep 17 00:00:00 2001 From: Vasanthdev2004 Date: Thu, 2 Apr 2026 18:42:56 +0530 Subject: [PATCH] fix: keep slash highlight in sync in fullscreen --- .../PromptInputFooterSuggestions.tsx | 68 +++++++------------ src/context/promptOverlayContext.tsx | 44 ++++++++++-- 2 files changed, 63 insertions(+), 49 deletions(-) diff --git a/src/components/PromptInput/PromptInputFooterSuggestions.tsx b/src/components/PromptInput/PromptInputFooterSuggestions.tsx index 75c9d75b..de1e7c95 100644 --- a/src/components/PromptInput/PromptInputFooterSuggestions.tsx +++ b/src/components/PromptInput/PromptInputFooterSuggestions.tsx @@ -58,15 +58,13 @@ const SuggestionItemRow = memo(function SuggestionItemRow({ }): ReactNode { const columns = useTerminalSize().columns const selectionPrefix = isSelected ? SELECTED_PREFIX : UNSELECTED_PREFIX + const rowBackgroundColor: keyof Theme | undefined = isSelected + ? 'suggestion' + : undefined + const textColor: keyof Theme | undefined = isSelected ? 'inverseText' : undefined if (isUnifiedSuggestion(item.id)) { const icon = getIcon(item.id) - const textColor: keyof Theme | undefined = isSelected - ? 'inverseText' - : undefined - const backgroundColor: keyof Theme | undefined = isSelected - ? 'suggestion' - : undefined const dimColor = !isSelected const isFile = item.id.startsWith('file-') const isMcpResource = item.id.startsWith('mcp-resource-') @@ -113,15 +111,11 @@ const SuggestionItemRow = memo(function SuggestionItemRow({ } return ( - - {lineContent} - + + + {lineContent} + + ) } @@ -130,10 +124,7 @@ const SuggestionItemRow = memo(function SuggestionItemRow({ maxColumnWidth ?? stringWidth(item.displayText) + 5, maxNameWidth, ) - const textColor = isSelected ? 'inverseText' : item.color - const backgroundColor: keyof Theme | undefined = isSelected - ? 'suggestion' - : undefined + const displayTextColor = isSelected ? 'inverseText' : item.color const shouldDim = !isSelected let displayText = item.displayText @@ -156,32 +147,21 @@ const SuggestionItemRow = memo(function SuggestionItemRow({ : '' return ( - - - {paddedDisplayText} - - {tagText ? ( - - {tagText} + + + + {paddedDisplayText} + + {tagText ? ( + + {tagText} + + ) : null} + + {truncatedDescription} - ) : null} - - {truncatedDescription} - + ) }) @@ -226,7 +206,7 @@ export function PromptInputFooterSuggestions({ > {visibleItems.map(item => ( { if (!set) { return; } set(data); - return () => set(null); }; t1 = [set, data]; $[0] = data; @@ -91,7 +92,23 @@ export function useSetPromptOverlay(data) { t0 = $[2]; t1 = $[3]; } + if ($[4] !== set) { + t2 = () => { + if (!set) { + return; + } + return () => set(null); + }; + t3 = [set]; + $[4] = set; + $[5] = t2; + $[6] = t3; + } else { + t2 = $[5]; + t3 = $[6]; + } useEffect(t0, t1); + useEffect(t2, t3); } /** @@ -99,17 +116,18 @@ export function useSetPromptOverlay(data) { * No-op outside the provider (non-fullscreen renders inline instead). */ export function useSetPromptOverlayDialog(node) { - const $ = _c(4); + const $ = _c(8); const set = useContext(SetDialogContext); let t0; let t1; + let t2; + let t3; if ($[0] !== node || $[1] !== set) { t0 = () => { if (!set) { return; } set(node); - return () => set(null); }; t1 = [set, node]; $[0] = node; @@ -120,6 +138,22 @@ export function useSetPromptOverlayDialog(node) { t0 = $[2]; t1 = $[3]; } + if ($[4] !== set) { + t2 = () => { + if (!set) { + return; + } + return () => set(null); + }; + t3 = [set]; + $[4] = set; + $[5] = t2; + $[6] = t3; + } else { + t2 = $[5]; + t3 = $[6]; + } useEffect(t0, t1); + useEffect(t2, t3); } -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","createContext","ReactNode","useContext","useEffect","useState","SuggestionItem","PromptOverlayData","suggestions","selectedSuggestion","maxColumnWidth","Setter","d","T","DataContext","SetContext","DialogContext","SetDialogContext","PromptOverlayProvider","t0","$","_c","children","data","setData","dialog","setDialog","t1","t2","usePromptOverlay","usePromptOverlayDialog","useSetPromptOverlay","set","useSetPromptOverlayDialog","node"],"sources":["promptOverlayContext.tsx"],"sourcesContent":["/**\n * Portal for content that floats above the prompt so it escapes\n * FullscreenLayout's bottom-slot `overflowY:hidden` clip.\n *\n * The clip is load-bearing (CC-668: tall pastes squash the ScrollBox\n * without it), but floating overlays use `position:absolute\n * bottom=\"100%\"` to float above the prompt — and Ink's clip stack\n * intersects ALL descendants, so they were clipped to ~1 row.\n *\n * Two channels:\n * - `useSetPromptOverlay` — slash-command suggestion data (structured,\n *   written by PromptInputFooter)\n * - `useSetPromptOverlayDialog` — arbitrary dialog node (e.g.\n *   AutoModeOptInDialog, written by PromptInput)\n *\n * FullscreenLayout reads both and renders them outside the clipped slot.\n *\n * Split into data/setter context pairs so writers never re-render on\n * their own writes — the setter contexts are stable.\n */\nimport React, {\n  createContext,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useState,\n} from 'react'\nimport type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js'\n\nexport type PromptOverlayData = {\n  suggestions: SuggestionItem[]\n  selectedSuggestion: number\n  maxColumnWidth?: number\n}\n\ntype Setter<T> = (d: T | null) => void\n\nconst DataContext = createContext<PromptOverlayData | null>(null)\nconst SetContext = createContext<Setter<PromptOverlayData> | null>(null)\nconst DialogContext = createContext<ReactNode>(null)\nconst SetDialogContext = createContext<Setter<ReactNode> | null>(null)\n\nexport function PromptOverlayProvider({\n  children,\n}: {\n  children: ReactNode\n}): ReactNode {\n  const [data, setData] = useState<PromptOverlayData | null>(null)\n  const [dialog, setDialog] = useState<ReactNode>(null)\n  return (\n    <SetContext.Provider value={setData}>\n      <SetDialogContext.Provider value={setDialog}>\n        <DataContext.Provider value={data}>\n          <DialogContext.Provider value={dialog}>\n            {children}\n          </DialogContext.Provider>\n        </DataContext.Provider>\n      </SetDialogContext.Provider>\n    </SetContext.Provider>\n  )\n}\n\nexport function usePromptOverlay(): PromptOverlayData | null {\n  return useContext(DataContext)\n}\n\nexport function usePromptOverlayDialog(): ReactNode {\n  return useContext(DialogContext)\n}\n\n/**\n * Register suggestion data for the floating overlay. Clears on unmount.\n * No-op outside the provider (non-fullscreen renders inline instead).\n */\nexport function useSetPromptOverlay(data: PromptOverlayData | null): void {\n  const set = useContext(SetContext)\n  useEffect(() => {\n    if (!set) return\n    set(data)\n    return () => set(null)\n  }, [set, data])\n}\n\n/**\n * Register a dialog node to float above the prompt. Clears on unmount.\n * No-op outside the provider (non-fullscreen renders inline instead).\n */\nexport function useSetPromptOverlayDialog(node: ReactNode): void {\n  const set = useContext(SetDialogContext)\n  useEffect(() => {\n    if (!set) return\n    set(node)\n    return () => set(null)\n  }, [set, node])\n}\n"],"mappings":"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","ignoreList":[]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","createContext","ReactNode","useContext","useEffect","useState","SuggestionItem","PromptOverlayData","suggestions","selectedSuggestion","maxColumnWidth","Setter","d","T","DataContext","SetContext","DialogContext","SetDialogContext","PromptOverlayProvider","t0","$","_c","children","data","setData","dialog","setDialog","t1","t2","usePromptOverlay","usePromptOverlayDialog","useSetPromptOverlay","set","useSetPromptOverlayDialog","node"],"sources":["promptOverlayContext.tsx"],"sourcesContent":["/**\n * Portal for content that floats above the prompt so it escapes\n * FullscreenLayout's bottom-slot `overflowY:hidden` clip.\n *\n * The clip is load-bearing (CC-668: tall pastes squash the ScrollBox\n * without it), but floating overlays use `position:absolute\n * bottom=\"100%\"` to float above the prompt — and Ink's clip stack\n * intersects ALL descendants, so they were clipped to ~1 row.\n *\n * Two channels:\n * - `useSetPromptOverlay` — slash-command suggestion data (structured,\n *   written by PromptInputFooter)\n * - `useSetPromptOverlayDialog` — arbitrary dialog node (e.g.\n *   AutoModeOptInDialog, written by PromptInput)\n *\n * FullscreenLayout reads both and renders them outside the clipped slot.\n *\n * Split into data/setter context pairs so writers never re-render on\n * their own writes — the setter contexts are stable.\n */\nimport React, {\n  createContext,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useState,\n} from 'react'\nimport type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js'\n\nexport type PromptOverlayData = {\n  suggestions: SuggestionItem[]\n  selectedSuggestion: number\n  maxColumnWidth?: number\n}\n\ntype Setter<T> = (d: T | null) => void\n\nconst DataContext = createContext<PromptOverlayData | null>(null)\nconst SetContext = createContext<Setter<PromptOverlayData> | null>(null)\nconst DialogContext = createContext<ReactNode>(null)\nconst SetDialogContext = createContext<Setter<ReactNode> | null>(null)\n\nexport function PromptOverlayProvider({\n  children,\n}: {\n  children: ReactNode\n}): ReactNode {\n  const [data, setData] = useState<PromptOverlayData | null>(null)\n  const [dialog, setDialog] = useState<ReactNode>(null)\n  return (\n    <SetContext.Provider value={setData}>\n      <SetDialogContext.Provider value={setDialog}>\n        <DataContext.Provider value={data}>\n          <DialogContext.Provider value={dialog}>\n            {children}\n          </DialogContext.Provider>\n        </DataContext.Provider>\n      </SetDialogContext.Provider>\n    </SetContext.Provider>\n  )\n}\n\nexport function usePromptOverlay(): PromptOverlayData | null {\n  return useContext(DataContext)\n}\n\nexport function usePromptOverlayDialog(): ReactNode {\n  return useContext(DialogContext)\n}\n\n/**\n * Register suggestion data for the floating overlay. Clears on unmount.\n * No-op outside the provider (non-fullscreen renders inline instead).\n */\nexport function useSetPromptOverlay(data: PromptOverlayData | null): void {\n  const set = useContext(SetContext)\n  useEffect(() => {\n    if (!set) return\n    set(data)\n    return () => set(null)\n  }, [set, data])\n}\n\n/**\n * Register a dialog node to float above the prompt. Clears on unmount.\n * No-op outside the provider (non-fullscreen renders inline instead).\n */\nexport function useSetPromptOverlayDialog(node: ReactNode): void {\n  const set = useContext(SetDialogContext)\n  useEffect(() => {\n    if (!set) return\n    set(node)\n    return () => set(null)\n  }, [set, node])\n}\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,KAAK,IACVC,aAAa,EACb,KAAKC,SAAS,EACdC,UAAU,EACVC,SAAS,EACTC,QAAQ,QACH,OAAO;AACd,cAAcC,cAAc,QAAQ,2DAA2D;AAE/F,OAAO,KAAKC,iBAAiB,GAAG;EAC9BC,WAAW,EAAEF,cAAc,EAAE;EAC7BG,kBAAkB,EAAE,MAAM;EAC1BC,cAAc,CAAC,EAAE,MAAM;AACzB,CAAC;AAED,KAAKC,MAAM,CAAC,CAAC,CAAC,GAAG,CAACC,CAAC,EAAEC,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI;AAEtC,MAAMC,WAAW,GAAGb,aAAa,CAACM,iBAAiB,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;AACjE,MAAMQ,UAAU,GAAGd,aAAa,CAACU,MAAM,CAACJ,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;AACxE,MAAMS,aAAa,GAAGf,aAAa,CAACC,SAAS,CAAC,CAAC,IAAI,CAAC;AACpD,MAAMe,gBAAgB,GAAGhB,aAAa,CAACU,MAAM,CAACT,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;AAEtE,OAAO,SAAAgB,sBAAAC,EAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAA+B;IAAAC;EAAA,IAAAH,EAIrC;EACC,OAAAI,IAAA,EAAAC,OAAA,IAAwBnB,QAAQ,CAA2B,IAAI,CAAC;EAChE,OAAAoB,MAAA,EAAAC,SAAA,IAA4BrB,QAAQ,CAAY,IAAI,CAAC;EAAA,IAAAsB,EAAA;EAAA,IAAAP,CAAA,QAAAE,QAAA,IAAAF,CAAA,QAAAK,MAAA;IAK7CE,EAAA,2BAA+BF,KAAM,CAANA,OAAK,CAAC,CAClCH,SAAO,CACV,yBAAyB;IAAAF,CAAA,MAAAE,QAAA;IAAAF,CAAA,MAAAK,MAAA;IAAAL,CAAA,MAAAO,EAAA;EAAA;IAAAA,EAAA,GAAAP,CAAA;EAAA;EAAA,IAAAQ,EAAA;EAAA,IAAAR,CAAA,QAAAG,IAAA,IAAAH,CAAA,QAAAO,EAAA;IAL/BC,EAAA,wBAA4BJ,KAAO,CAAPA,QAAM,CAAC,CACjC,2BAAkCE,KAAS,CAATA,UAAQ,CAAC,CACzC,sBAA6BH,KAAI,CAAJA,KAAG,CAAC,CAC/B,CAAAI,EAEwB,CAC1B,uBACF,4BACF,sBAAsB;IAAAP,CAAA,MAAAG,IAAA;IAAAH,CAAA,MAAAO,EAAA;IAAAP,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EAAA,OARtBQ,EAQsB;AAAA;AAI1B,OAAO,SAAAC,iBAAA;EAAA,OACE1B,UAAU,CAACW,WAAW,CAAC;AAAA;AAGhC,OAAO,SAAAgB,uBAAA;EAAA,OACE3B,UAAU,CAACa,aAAa,CAAC;AAAA;;AAGlC;AACA;AACA;AACA;AACA,OAAO,SAAAe,oBAAAR,IAAA;EAAA,MAAAH,CAAA,GAAAC,EAAA;EACL,MAAAW,GAAA,GAAY7B,UAAU,CAACY,UAAU,CAAC;EAAA,IAAAI,EAAA;EAAA,IAAAQ,EAAA;EAAA,IAAAP,CAAA,QAAAG,IAAA,IAAAH,CAAA,QAAAY,GAAA;IACxBb,EAAA,GAAAA,CAAA;MACR,IAAI,CAACa,GAAG;QAAA;MAAA;MACRA,GAAG,CAACT,IAAI,CAAC;MAAA,OACF,MAAMS,GAAG,CAAC,IAAI,CAAC;IAAA,CACvB;IAAEL,EAAA,IAACK,GAAG,EAAET,IAAI,CAAC;IAAAH,CAAA,MAAAG,IAAA;IAAAH,CAAA,MAAAY,GAAA;IAAAZ,CAAA,MAAAD,EAAA;IAAAC,CAAA,MAAAO,EAAA;EAAA;IAAAR,EAAA,GAAAC,CAAA;IAAAO,EAAA,GAAAP,CAAA;EAAA;EAJdhB,SAAS,CAACe,EAIT,EAAEQ,EAAW,CAAC;AAAA;;AAGjB;AACA;AACA;AACA;AACA,OAAO,SAAAM,0BAAAC,IAAA;EAAA,MAAAd,CAAA,GAAAC,EAAA;EACL,MAAAW,GAAA,GAAY7B,UAAU,CAACc,gBAAgB,CAAC;EAAA,IAAAE,EAAA;EAAA,IAAAQ,EAAA;EAAA,IAAAP,CAAA,QAAAc,IAAA,IAAAd,CAAA,QAAAY,GAAA;IAC9Bb,EAAA,GAAAA,CAAA;MACR,IAAI,CAACa,GAAG;QAAA;MAAA;MACRA,GAAG,CAACE,IAAI,CAAC;MAAA,OACF,MAAMF,GAAG,CAAC,IAAI,CAAC;IAAA,CACvB;IAAEL,EAAA,IAACK,GAAG,EAAEE,IAAI,CAAC;IAAAd,CAAA,MAAAc,IAAA;IAAAd,CAAA,MAAAY,GAAA;IAAAZ,CAAA,MAAAD,EAAA;IAAAC,CAAA,MAAAO,EAAA;EAAA;IAAAR,EAAA,GAAAC,CAAA;IAAAO,EAAA,GAAAP,CAAA;EAAA;EAJdhB,SAAS,CAACe,EAIT,EAAEQ,EAAW,CAAC;AAAA","ignoreList":[]}