From d2d5f2b957fcd80f3bce03a8353cd753507fbaf3 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 20 Mar 2024 15:56:39 -0700
Subject: [PATCH] Remove openOnHotKeyAction in favor of putting hotkey on the
 trigger button=

---
 src-web/components/CreateDropdown.tsx         | 9 ++-------
 src-web/components/RecentRequestsDropdown.tsx | 5 +----
 src-web/components/SidebarActions.tsx         | 9 +++++++--
 src-web/components/core/Dropdown.tsx          | 8 +-------
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src-web/components/CreateDropdown.tsx b/src-web/components/CreateDropdown.tsx
index 4a41931c..e4773150 100644
--- a/src-web/components/CreateDropdown.tsx
+++ b/src-web/components/CreateDropdown.tsx
@@ -5,14 +5,9 @@ import { Dropdown } from './core/Dropdown';
 interface Props {
   hideFolder?: boolean;
   children: DropdownProps['children'];
-  openOnHotKeyAction?: DropdownProps['openOnHotKeyAction'];
 }
 
-export function CreateDropdown({ hideFolder, children, openOnHotKeyAction }: Props) {
+export function CreateDropdown({ hideFolder, children }: Props) {
   const items = useCreateDropdownItems({ hideFolder, hideIcons: true });
-  return (
-    <Dropdown openOnHotKeyAction={openOnHotKeyAction} items={items}>
-      {children}
-    </Dropdown>
-  );
+  return <Dropdown items={items}>{children}</Dropdown>;
 }
diff --git a/src-web/components/RecentRequestsDropdown.tsx b/src-web/components/RecentRequestsDropdown.tsx
index 4d7663f9..4446a037 100644
--- a/src-web/components/RecentRequestsDropdown.tsx
+++ b/src-web/components/RecentRequestsDropdown.tsx
@@ -41,10 +41,6 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa
     dropdownRef.current?.prev?.();
   });
 
-  useHotKey('request_switcher.toggle', () => {
-    dropdownRef.current?.toggle();
-  });
-
   const items = useMemo<DropdownItem[]>(() => {
     if (activeWorkspaceId === null) return [];
 
@@ -87,6 +83,7 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa
       <Button
         data-tauri-drag-region
         size="sm"
+        hotkeyAction="request_switcher.toggle"
         className={classNames(
           className,
           'text-gray-800 text-sm truncate pointer-events-auto',
diff --git a/src-web/components/SidebarActions.tsx b/src-web/components/SidebarActions.tsx
index d6c43f91..8ff42c08 100644
--- a/src-web/components/SidebarActions.tsx
+++ b/src-web/components/SidebarActions.tsx
@@ -25,8 +25,13 @@ export const SidebarActions = memo(function SidebarActions() {
         hotkeyAction="sidebar.toggle"
         icon={hidden ? 'leftPanelHidden' : 'leftPanelVisible'}
       />
-      <CreateDropdown openOnHotKeyAction="http_request.create">
-        <IconButton size="sm" icon="plusCircle" title="Add Resource" />
+      <CreateDropdown>
+        <IconButton
+          size="sm"
+          icon="plusCircle"
+          title="Add Resource"
+          hotkeyAction="http_request.create"
+        />
       </CreateDropdown>
     </HStack>
   );
diff --git a/src-web/components/core/Dropdown.tsx b/src-web/components/core/Dropdown.tsx
index a0e6142c..5069d701 100644
--- a/src-web/components/core/Dropdown.tsx
+++ b/src-web/components/core/Dropdown.tsx
@@ -55,7 +55,6 @@ export type DropdownItem = DropdownItemDefault | DropdownItemSeparator;
 export interface DropdownProps {
   children: ReactElement<HTMLAttributes<HTMLButtonElement>>;
   items: DropdownItem[];
-  openOnHotKeyAction?: HotkeyAction;
   onOpen?: () => void;
   onClose?: () => void;
 }
@@ -71,7 +70,7 @@ export interface DropdownRef {
 }
 
 export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown(
-  { children, items, openOnHotKeyAction, onOpen, onClose }: DropdownProps,
+  { children, items, onOpen, onClose }: DropdownProps,
   ref,
 ) {
   const [isOpen, _setIsOpen] = useState<boolean>(false);
@@ -88,11 +87,6 @@ export const Dropdown = forwardRef<DropdownRef, DropdownProps>(function Dropdown
     [onClose, onOpen],
   );
 
-  useHotKey(openOnHotKeyAction ?? null, () => {
-    setIsOpen(true);
-    menuRef.current?.next?.();
-  });
-
   useImperativeHandle(ref, () => ({
     ...menuRef.current,
     isOpen: isOpen,