From 3c24af2e70e2a4ad22d9aa7dcf245711806890ee Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Sat, 17 Jun 2023 10:46:54 -0700 Subject: ui details --- extension/react-app/src/components/ComboBox.tsx | 4 ++-- .../react-app/src/components/StepContainer.tsx | 23 +++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'extension/react-app/src/components') diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx index 29f8a53b..e855ebe5 100644 --- a/extension/react-app/src/components/ComboBox.tsx +++ b/extension/react-app/src/components/ComboBox.tsx @@ -124,11 +124,11 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { } else if (event.key === "Tab" && items.length > 0) { setInputValue(items[0].name); event.preventDefault(); - } else if (event.key === "ArrowUp" && !isOpen) { + } else if (event.key === "ArrowUp") { if (positionInHistory == 0) return; setInputValue(history[positionInHistory - 1]); setPositionInHistory((prev) => prev - 1); - } else if (event.key === "ArrowDown" && !isOpen) { + } else if (event.key === "ArrowDown") { if (positionInHistory >= history.length - 1) { setInputValue(""); } else { diff --git a/extension/react-app/src/components/StepContainer.tsx b/extension/react-app/src/components/StepContainer.tsx index 7adbd7c2..4c98b04d 100644 --- a/extension/react-app/src/components/StepContainer.tsx +++ b/extension/react-app/src/components/StepContainer.tsx @@ -31,7 +31,9 @@ interface StepContainerProps { onUserInput: (input: string) => void; onRetry: () => void; onDelete: () => void; - open?: boolean; + open: boolean; + onToggleAll: () => void; + onToggle: () => void; } const MainDiv = styled.div<{ stepDepth: number; inFuture: boolean }>` @@ -81,9 +83,6 @@ const MarkdownPre = styled.pre` const MarkdownCode = styled.code``; function StepContainer(props: StepContainerProps) { - const [open, setOpen] = useState( - typeof props.open === "undefined" ? true : props.open - ); const [isHovered, setIsHovered] = useState(false); const naturalLanguageInputRef = useRef(null); const userInputRef = useRef(null); @@ -119,19 +118,25 @@ function StepContainer(props: StepContainerProps) { }} hidden={props.historyNode.step.hide as any} > - + setOpen((prev) => !prev)} + onClick={(e) => { + if (props.open && e.metaKey) { + props.onToggleAll(); + } else { + props.onToggle(); + } + }} >

- {open ? ( + {props.open ? ( ) : ( @@ -174,8 +179,8 @@ function StepContainer(props: StepContainerProps) { -