Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the accessibility issue by adding DialogTitle to DialogContent and making the facility title responsive #10106

Merged
merged 10 commits into from
Jan 30, 2025
1 change: 1 addition & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@
"external_identifier": "External Identifier",
"facilities": "Facilities",
"facility": "Facility",
"facility_actions_menu": "Facility action menu",
"facility_added_successfully": "Facility created successfully",
"facility_consent_requests_page_title": "Patient Consent List",
"facility_district_name": "Facility/District Name",
Expand Down
42 changes: 30 additions & 12 deletions src/components/Facility/FacilityHome.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import careConfig from "@careConfig";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@radix-ui/react-tooltip";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { Hospital, MapPin, MoreVertical, Settings } from "lucide-react";
import { navigate } from "raviger";
Expand Down Expand Up @@ -219,32 +225,44 @@ export const FacilityHome = ({ facilityId }: Props) => {
)}

<div className="absolute inset-x-0 bottom-0 p-6 text-white">
<div className="flex items-center gap-6">
<div className="flex-1">
<div className="flex items-center gap-4">
<div className="flex flex-wrap items-center gap-4 md:gap-6">
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2 md:gap-4">
<Avatar
name={facilityData.name}
className="h-12 w-12 shrink-0 rounded-xl border-2 border-white/10 shadow-xl"
className="h-9 w-9 md:h-12 md:w-12 shrink-0 rounded-xl border-2 border-white/10 shadow-xl"
/>
<div>
<h1 className="text-3xl font-bold text-white">
{facilityData?.name}
</h1>
<div className="min-w-0">
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<h1 className="text-sm md:text-3xl text-white md:font-bold">
{facilityData?.name}
</h1>
</TooltipTrigger>
<TooltipContent>
<p className="text-sm text-white bg-black rounded-md p-2">
{facilityData?.name}
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
</div>
</div>
<div className="flex-shrink-0">
<DropdownMenu modal={false}>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
variant="secondary"
size="icon"
className="bg-white/20 hover:bg-white/40"
aria-label={t("facility_actions_menu")}
className="bg-white/20 hover:bg-white/40 w-8 h-8"
>
<MoreVertical className="h-4 w-4 text-white" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-56">
<DropdownMenuContent align="end" className="w-48 md:w-56">
{hasPermissionToEditCoverImage && (
<DropdownMenuItem
className="cursor-pointer"
Expand Down Expand Up @@ -293,7 +311,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
<div className="mt-2 space-y-2">
<Card>
<CardContent>
<div className="flex flex-col gap-4 items-start mt-4">
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:gap-12 mt-4">
<div className="flex items-start gap-3">
<MapPin className="mt-2 h-5 w-5 flex-shrink-0 text-muted-foreground" />
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Resource/ResourceBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function BoardView() {
cacheBlacklist: ["title"],
});
const [boardFilter, setBoardFilter] = useState(ACTIVE);
// eslint-disable-next-line

const appliedFilters = formatFilter(qParams);
const { t } = useTranslation();

Expand Down
6 changes: 5 additions & 1 deletion src/components/ui/sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Slot } from "@radix-ui/react-slot";
import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
import { VariantProps, cva } from "class-variance-authority";
import { PanelLeftClose, PanelRightClose } from "lucide-react";
import * as React from "react";
Expand All @@ -9,7 +10,7 @@ import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Separator } from "@/components/ui/separator";
import { Sheet, SheetContent } from "@/components/ui/sheet";
import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet";
import { Skeleton } from "@/components/ui/skeleton";
import {
Tooltip,
Expand Down Expand Up @@ -207,6 +208,9 @@ const Sidebar = React.forwardRef<
}
side={side}
>
<VisuallyHidden>
<SheetTitle>Sidebar</SheetTitle>
</VisuallyHidden>
<div className="flex h-full w-full flex-col">{children}</div>
</SheetContent>
</Sheet>
Expand Down
Loading