From cda1be46625abd8f44962cceeded04c8c47d9f65 Mon Sep 17 00:00:00 2001 From: Nate Sesti <sestinj@gmail.com> Date: Sun, 27 Aug 2023 16:52:04 -0700 Subject: fix: :bug: fix /edit in ssh, pinyin input in combobox --- extension/react-app/src/components/ComboBox.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (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 31cb4371..7314ed91 100644 --- a/extension/react-app/src/components/ComboBox.tsx +++ b/extension/react-app/src/components/ComboBox.tsx @@ -357,6 +357,8 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { dispatch(setShowDialog(true)); }; + const [isComposing, setIsComposing] = useState(false); + return ( <> <div @@ -448,6 +450,8 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { disabled={props.disabled} placeholder={`Ask a question, give instructions, type '/' for slash commands, or '@' to add context`} {...getInputProps({ + onCompositionStart: () => setIsComposing(true), + onCompositionEnd: () => setIsComposing(false), onChange: (e) => { const target = e.target as HTMLTextAreaElement; // Update the height of the textarea to match the content, up to a max of 200px. @@ -472,7 +476,8 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { setCurrentlyInContextQuery(false); } else if ( event.key === "Enter" && - (!downshiftProps.isOpen || items.length === 0) + (!downshiftProps.isOpen || items.length === 0) && + !isComposing ) { const value = downshiftProps.inputValue; if (value !== "") { -- cgit v1.2.3-70-g09d2