Skip to content

Adds tooltip and spans to icons for better accessiblity. #6156

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adds tooltip and spans to icons for better accessiblity. #6156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions clients/apps/web/src/components/Layout/Dashboard/DashboardSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ import {
SidebarTrigger,
useSidebar,
} from '@polar-sh/ui/components/atoms/Sidebar'
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from '@polar-sh/ui/components/ui/tooltip'
import { AnimatePresence, motion } from 'framer-motion'
import { ChevronDown } from 'lucide-react'
import Link from 'next/link'
Expand Down Expand Up @@ -70,8 +76,17 @@ export const DashboardSidebar = ({
animate={{ opacity: 1 }}
transition={{ duration: 1 }}
>
<NotificationsPopover />
<SidebarTrigger />
<NotificationsPopover isCollapsed={isCollapsed} />
<TooltipProvider>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have only one tooltip provider in the layout.

<Tooltip>
<TooltipTrigger asChild>
<SidebarTrigger />
</TooltipTrigger>
<TooltipContent side="right">
{isCollapsed ? 'Expand Sidebar' : 'Collapse Sidebar'}
</TooltipContent>
</Tooltip>
</TooltipProvider>
</motion.div>
</SidebarHeader>

Expand Down
51 changes: 33 additions & 18 deletions clients/apps/web/src/components/Notifications/NotificationsPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ import {
PopoverContent,
PopoverTrigger,
} from '@polar-sh/ui/components/ui/popover'
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from '@polar-sh/ui/components/ui/tooltip'
import { getCentsInDollarString } from '@polar-sh/ui/lib/money'
import Link from 'next/link'
import { useEffect, useRef, useState } from 'react'
Expand All @@ -22,7 +28,7 @@ import Icon from '../Icons/Icon'

type NotificationSchema = schemas['NotificationsList']['notifications'][number]

export const NotificationsPopover = () => {
export const NotificationsPopover = ({ isCollapsed }: { isCollapsed: boolean }) => {
const [show, setShow] = useState(false)
const [showBadge, setShowBadge] = useState(false)

Expand Down Expand Up @@ -83,23 +89,32 @@ export const NotificationsPopover = () => {

return (
<Popover>
<Button
className="relative h-8 w-8"
variant="ghost"
onMouseDown={clickBell}
asChild
>
<PopoverTrigger>
<BoltOutlined
className="!h-5 !w-5"
fontSize="medium"
aria-hidden="true"
/>
{showBadge && (
<div className="dark:border-polar-700 absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-blue-500" />
)}
</PopoverTrigger>
</Button>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button
className="relative h-8 w-8"
variant="ghost"
onMouseDown={clickBell}
asChild
aria-label="Notifications"
>
<PopoverTrigger>
<span className="sr-only">Notifications</span>
<BoltOutlined
className="!h-5 !w-5"
fontSize="medium"
aria-hidden="true"
/>
{showBadge && (
<div className="dark:border-polar-700 absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-blue-500" />
)}
</PopoverTrigger>
</Button>
</TooltipTrigger>
{isCollapsed && <TooltipContent side="right">Notifications</TooltipContent>}
</Tooltip>
</TooltipProvider>
<PopoverContent sideOffset={12} align="start">
<List
notifications={notifs.data?.notifications ?? []}
Expand Down