Skip to content

Commit bee8a25

Browse files
sidebar tooltips
1 parent 90ea9c6 commit bee8a25

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

packages/web/src/app/(app)/@sidebar/components/defaultSidebar/nav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export function Nav({ isSettingsNotificationVisible, isSignedIn, homeView }: Nav
103103
(item.key === "settings" && isSettingsNotificationVisible);
104104
return (
105105
<SidebarMenuItem key={item.title}>
106-
<SidebarMenuButton asChild isActive={isActive(item.href)}>
106+
<SidebarMenuButton asChild isActive={isActive(item.href)} tooltip={item.title}>
107107
<Link
108108
href={item.href}
109109
>

packages/web/src/app/(app)/@sidebar/components/sidebarBase.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,14 @@ export function SidebarBase({ session, collapsible = "icon", headerContent, chil
101101

102102
function CollapseSidebarButton() {
103103
const { toggleSidebar, state } = useSidebar();
104+
const [tooltipOpen, setTooltipOpen] = useState(false);
104105
return (
105106
<SidebarMenu>
106107
<SidebarMenuItem>
107-
<Tooltip open={state === "expanded" ? false : undefined}>
108+
<Tooltip
109+
open={state === "expanded" ? false : tooltipOpen}
110+
onOpenChange={setTooltipOpen}
111+
>
108112
<TooltipTrigger asChild>
109113
<SidebarMenuButton onClick={toggleSidebar}>
110114
{state === "expanded" ? (

packages/web/src/app/(app)/@sidebar/components/whatsNewSidebarButton.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const setReadItems = (readItems: string[]) => {
6060
export function WhatsNewSidebarButton() {
6161
const { state } = useSidebar()
6262
const [isOpen, setIsOpen] = useState(false)
63+
const [tooltipOpen, setTooltipOpen] = useState(false)
6364
const [readItems, setReadItemsState] = useState<string[]>([])
6465
const [isInitialized, setIsInitialized] = useState(false)
6566

@@ -114,7 +115,10 @@ export function WhatsNewSidebarButton() {
114115
<SidebarMenu>
115116
<SidebarMenuItem>
116117
<Popover open={isOpen} onOpenChange={setIsOpen}>
117-
<Tooltip open={state === "expanded" ? false : undefined}>
118+
<Tooltip
119+
open={state === "expanded" ? false : tooltipOpen}
120+
onOpenChange={setTooltipOpen}
121+
>
118122
<TooltipTrigger asChild>
119123
<PopoverTrigger asChild>
120124
<SidebarMenuButton>

0 commit comments

Comments
 (0)