From e4e674df8fbf017f5ff47b3bad2df0e4f35b1750 Mon Sep 17 00:00:00 2001 From: James Gatz Date: Mon, 1 Aug 2022 17:02:46 +0200 Subject: [PATCH] move keyboard shortcuts to global listener in url-bar (#5030) Co-authored-by: Dimitri Mitropoulos Co-authored-by: Mark Kim <103070941+marckong@users.noreply.github.com> Co-authored-by: Dimitri Mitropoulos Co-authored-by: Mark Kim <103070941+marckong@users.noreply.github.com> --- .../src/ui/components/request-url-bar.tsx | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/insomnia/src/ui/components/request-url-bar.tsx b/packages/insomnia/src/ui/components/request-url-bar.tsx index e902a8b4c9..81bd5f1536 100644 --- a/packages/insomnia/src/ui/components/request-url-bar.tsx +++ b/packages/insomnia/src/ui/components/request-url-bar.tsx @@ -281,25 +281,27 @@ export const RequestUrlBar = forwardRef(({ send(); return; } - if (!inputRef.current) { - return; - } - executeHotKey(event.nativeEvent, hotKeyRefs.REQUEST_FOCUS_URL, () => { - inputRef.current?.focus(); - inputRef.current?.selectAll(); - }); - executeHotKey(event.nativeEvent, hotKeyRefs.REQUEST_TOGGLE_HTTP_METHOD_MENU, () => { - methodDropdownRef.current?.toggle(); - }); - executeHotKey(event.nativeEvent, hotKeyRefs.REQUEST_SHOW_OPTIONS, () => { - dropdownRef.current?.toggle(true); - }); }, [request.url, send]); const handleGlobalKeyDown = useCallback(async (event: KeyboardEvent) => { + if (!inputRef.current) { + return; + } + executeHotKey(event, hotKeyRefs.REQUEST_SEND, () => { send(); }); + + executeHotKey(event, hotKeyRefs.REQUEST_FOCUS_URL, () => { + inputRef.current?.focus(); + inputRef.current?.selectAll(); + }); + executeHotKey(event, hotKeyRefs.REQUEST_TOGGLE_HTTP_METHOD_MENU, () => { + methodDropdownRef.current?.toggle(); + }); + executeHotKey(event, hotKeyRefs.REQUEST_SHOW_OPTIONS, () => { + dropdownRef.current?.toggle(true); + }); }, [send]); const [lastPastedText, setLastPastedText] = useState();