From 4dee7d8a8013c3762cedd0ddeca7536e20f02fa0 Mon Sep 17 00:00:00 2001
From: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date: Mon, 20 Jun 2022 11:29:48 -0400
Subject: [PATCH] Fix ux (#3113)

---
 apps/web/components/Shell.tsx                   | 14 ++++++++++----
 apps/web/ee/components/support/HelpMenuItem.tsx | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apps/web/components/Shell.tsx b/apps/web/components/Shell.tsx
index 5dfbe64ab5..13ed8dcc37 100644
--- a/apps/web/components/Shell.tsx
+++ b/apps/web/components/Shell.tsx
@@ -462,10 +462,16 @@ function UserDropdown({ small }: { small?: boolean }) {
   });
   const utils = trpc.useContext();
   const [helpOpen, setHelpOpen] = useState(false);
+  const [menuOpen, setMenuOpen] = useState(false);
+
+  const onHelpItemSelect = () => {
+    setHelpOpen(false);
+    setMenuOpen(false);
+  };
 
   return (
-    <Dropdown onOpenChange={() => setHelpOpen(false)}>
-      <DropdownMenuTrigger asChild>
+    <Dropdown open={menuOpen} onOpenChange={() => setHelpOpen(false)}>
+      <DropdownMenuTrigger asChild onClick={() => setMenuOpen(true)}>
         <button className="group flex w-full cursor-pointer appearance-none items-center text-left">
           <span
             className={classNames(
@@ -505,9 +511,9 @@ function UserDropdown({ small }: { small?: boolean }) {
           )}
         </button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent portalled={true}>
+      <DropdownMenuContent portalled={true} onInteractOutside={() => setMenuOpen(false)}>
         {helpOpen ? (
-          <HelpMenuItem closeHelp={() => setHelpOpen(false)} />
+          <HelpMenuItem onHelpItemSelect={() => onHelpItemSelect()} />
         ) : (
           <>
             <DropdownMenuItem>
diff --git a/apps/web/ee/components/support/HelpMenuItem.tsx b/apps/web/ee/components/support/HelpMenuItem.tsx
index 5bc696fe70..1f6aac4d73 100644
--- a/apps/web/ee/components/support/HelpMenuItem.tsx
+++ b/apps/web/ee/components/support/HelpMenuItem.tsx
@@ -12,10 +12,10 @@ import { trpc } from "@lib/trpc";
 import ContactMenuItem from "./ContactMenuItem";
 
 interface HelpMenuItemProps {
-  closeHelp: () => void;
+  onHelpItemSelect: () => void;
 }
 
-export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
+export default function HelpMenuItem({ onHelpItemSelect }: HelpMenuItemProps) {
   const [rating, setRating] = useState<null | string>(null);
   const [comment, setComment] = useState("");
   const [disableSubmit, setDisableSubmit] = useState(true);
@@ -27,7 +27,7 @@ export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
     onSuccess: () => {
       setDisableSubmit(true);
       showToast("Thank you, feedback submitted", "success");
-      closeHelp();
+      onHelpItemSelect();
     },
   });
 
@@ -45,6 +45,7 @@ export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
       <div className=" w-full p-5">
         <p className="mb-1 text-neutral-500">{t("resources").toUpperCase()}</p>
         <a
+          onClick={() => onHelpItemSelect()}
           href="https://docs.cal.com/"
           target="_blank"
           className="flex w-full py-2 pr-4 text-sm font-medium text-gray-700 hover:bg-gray-100 hover:text-gray-900"
@@ -58,6 +59,7 @@ export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
           />
         </a>
         <a
+          onClick={() => onHelpItemSelect()}
           href="https://developer.cal.com/"
           target="_blank"
           className="flex w-full py-2 pr-4 text-sm font-medium text-gray-700 hover:bg-gray-100 hover:text-gray-900"
@@ -70,7 +72,9 @@ export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
             )}
           />
         </a>
-        <ContactMenuItem />
+        <div onClick={() => onHelpItemSelect()}>
+          <ContactMenuItem />
+        </div>
       </div>
 
       <hr className=" bg-gray-200" />
@@ -200,11 +204,13 @@ export default function HelpMenuItem({ closeHelp }: HelpMenuItemProps) {
           onClick={() => {
             setActive(true);
             loadChat({ open: true });
+            onHelpItemSelect();
           }}>
           {t("contact_support")}
         </span>
         <span className="text-neutral-500"> {t("or").toLowerCase()} </span>
         <a
+          onClick={() => onHelpItemSelect()}
           className="font-medium text-neutral-500 underline hover:text-neutral-700"
           href="https://docs.cal.com/"
           target="_blank"