Fix Auto hide without hook (#9780)

ohcnetwork · Jan 6, 2025 · c77a633 · c77a633
1 parent ef4d63b
commit c77a633
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/components/ui/sidebar/facility-switcher.tsx b/src/components/ui/sidebar/facility-switcher.tsx
@@ -26,7 +26,7 @@ export function FacilitySwitcher({
   facilities: UserFacilityModel[];
   selectedFacility: UserFacilityModel | null;
 }) {
-  const { isMobile } = useSidebar();
+  const { isMobile, setOpenMobile } = useSidebar();
 
   return (
     <SidebarMenu>
@@ -64,7 +64,12 @@ export function FacilitySwitcher({
             {facilities.map((facility, index) => (
               <DropdownMenuItem
                 key={index}
-                onClick={() => navigate(`/facility/${facility.id}`)}
+                onClick={() => {
+                  navigate(`/facility/${facility.id}`);
+                  if (isMobile) {
+                    setOpenMobile(false);
+                  }
+                }}
                 className="gap-2 p-2"
               >
                 <div className="flex size-6 items-center justify-center rounded-sm border">

diff --git a/src/components/ui/sidebar/nav-user.tsx b/src/components/ui/sidebar/nav-user.tsx
@@ -31,7 +31,7 @@ import { AppointmentPatient } from "@/pages/Patient/Utils";
 export function FacilityNavUser() {
   const { t } = useTranslation();
   const user = useAuthUser();
-  const { isMobile, open } = useSidebar();
+  const { isMobile, open, setOpenMobile } = useSidebar();
   const { signOut } = useAuthContext();
 
   return (
@@ -94,7 +94,12 @@ export function FacilityNavUser() {
             <DropdownMenuSeparator />
             <DropdownMenuGroup>
               <DropdownMenuItem
-                onClick={() => navigate(`/users/${user.username}`)}
+                onClick={() => {
+                  navigate(`/users/${user.username}`);
+                  if (isMobile) {
+                    setOpenMobile(false);
+                  }
+                }}
               >
                 <BadgeCheck />
                 {t("profile")}

diff --git a/src/components/ui/sidebar/organization-switcher.tsx b/src/components/ui/sidebar/organization-switcher.tsx
@@ -28,7 +28,7 @@ export function OrganizationSwitcher({
   organizations,
   selectedOrganization,
 }: Props) {
-  const { isMobile } = useSidebar();
+  const { isMobile, setOpenMobile } = useSidebar();
 
   return (
     <DropdownMenu>
@@ -69,7 +69,12 @@ export function OrganizationSwitcher({
         {organizations.map((org) => (
           <DropdownMenuItem
             key={org.id}
-            onClick={() => navigate(`/organization/${org.id}`)}
+            onClick={() => {
+              navigate(`/organization/${org.id}`);
+              if (isMobile) {
+                setOpenMobile(false);
+              }
+            }}
           >
             {org.name}
           </DropdownMenuItem>