Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Migrate Tooltip to Base UI (#2614)

Luke Vella9616bdf6a369
diff --git a/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx
index 38cb97f97..9dba83779 100644
--- a/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx
@@ -67,37 +67,39 @@ export function CalendarConnectionList() {
</div>
<div className="flex items-center gap-2">
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("syncCalendar", {
- defaultValue: "Sync calendar",
- })}
- loading={syncCalendar.isPending}
- variant="ghost"
- size="icon"
- onClick={() => {
- toast.promise(
- syncCalendar.mutateAsync({ id: calendar.id }),
- {
- loading: t("syncCalendarLoading", {
- defaultValue: "Syncing calendar…",
- }),
- success: t("syncCalendarSuccess", {
- defaultValue: "Calendar synced",
- }),
- error: t("syncCalendarError", {
- defaultValue:
- "There was an issue syncing your calendar",
- }),
- },
- );
- }}
- >
- <Icon>
- <RefreshCcwIcon />
- </Icon>
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("syncCalendar", {
+ defaultValue: "Sync calendar",
+ })}
+ loading={syncCalendar.isPending}
+ variant="ghost"
+ size="icon"
+ onClick={() => {
+ toast.promise(
+ syncCalendar.mutateAsync({ id: calendar.id }),
+ {
+ loading: t("syncCalendarLoading", {
+ defaultValue: "Syncing calendar…",
+ }),
+ success: t("syncCalendarSuccess", {
+ defaultValue: "Calendar synced",
+ }),
+ error: t("syncCalendarError", {
+ defaultValue:
+ "There was an issue syncing your calendar",
+ }),
+ },
+ );
+ }}
+ >
+ <Icon>
+ <RefreshCcwIcon />
+ </Icon>
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="syncCalendar" defaults="Sync calendar" />
</TooltipContent>
diff --git a/apps/web/src/components/copy-link-button.tsx b/apps/web/src/components/copy-link-button.tsx
index 2208048ad..1dd48e649 100644
--- a/apps/web/src/components/copy-link-button.tsx
+++ b/apps/web/src/components/copy-link-button.tsx
@@ -21,23 +21,25 @@ export function CopyLinkButton({
const { t } = useTranslation();
return (
<Tooltip open={didCopy ? true : undefined}>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("copyLink", { defaultValue: "Copy link" })}
- className={className}
- variant="ghost"
- size="icon"
- onClick={() => {
- copy(href);
- setDidCopy(true);
- setTimeout(() => setDidCopy(false), 1000);
- }}
- >
- <Icon>
- <CopyIcon />
- </Icon>
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("copyLink", { defaultValue: "Copy link" })}
+ className={className}
+ variant="ghost"
+ size="icon"
+ onClick={() => {
+ copy(href);
+ setDidCopy(true);
+ setTimeout(() => setDidCopy(false), 1000);
+ }}
+ >
+ <Icon>
+ <CopyIcon />
+ </Icon>
+ </Button>
+ }
+ />
<TooltipContent>
{didCopy ? (
<div className="flex items-center gap-2">
diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsx
index 1a864f3f0..a5ac99e8e 100644
--- a/apps/web/src/components/poll/desktop-poll.tsx
+++ b/apps/web/src/components/poll/desktop-poll.tsx
@@ -94,46 +94,52 @@ function TableControls({
{showScrollControls ? (
<>
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("scrollLeft", { defaultValue: "Scroll Left" })}
- variant="ghost"
- size="icon"
- disabled={!canScrollPrev}
- onClick={onGoToPreviousPage}
- >
- <Icon>
- <ArrowLeftIcon />
- </Icon>
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("scrollLeft", {
+ defaultValue: "Scroll Left",
+ })}
+ variant="ghost"
+ size="icon"
+ disabled={!canScrollPrev}
+ onClick={onGoToPreviousPage}
+ >
+ <Icon>
+ <ArrowLeftIcon />
+ </Icon>
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="scrollLeft" defaults="Scroll Left" />
</TooltipContent>
</Tooltip>
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("scrollRight", {
- defaultValue: "Scroll Right",
- })}
- className="relative"
- variant="ghost"
- size="icon"
- disabled={!canScrollNext}
- onClick={onGoToNextPage}
- >
- <Icon>
- <ArrowRightIcon />
- </Icon>
- {showScrollIndicator ? (
- <span className="absolute -top-0.5 -right-0.5 flex size-2">
- <span className="absolute top-0 right-0 inline-flex h-full w-full animate-ping rounded-full bg-rose-400 opacity-75" />
- <span className="relative inline-flex size-2 rounded-full bg-rose-500" />
- </span>
- ) : null}
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("scrollRight", {
+ defaultValue: "Scroll Right",
+ })}
+ className="relative"
+ variant="ghost"
+ size="icon"
+ disabled={!canScrollNext}
+ onClick={onGoToNextPage}
+ >
+ <Icon>
+ <ArrowRightIcon />
+ </Icon>
+ {showScrollIndicator ? (
+ <span className="absolute -top-0.5 -right-0.5 flex size-2">
+ <span className="absolute top-0 right-0 inline-flex h-full w-full animate-ping rounded-full bg-rose-400 opacity-75" />
+ <span className="relative inline-flex size-2 rounded-full bg-rose-500" />
+ </span>
+ ) : null}
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="scrollRight" defaults="Scroll Right" />
</TooltipContent>
@@ -142,36 +148,41 @@ function TableControls({
) : null}
{expanded ? (
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("shrink", { defaultValue: "Shrink" })}
- variant="ghost"
- size="icon"
- onClick={onCollapse}
- >
- <Icon>
- <ShrinkIcon />
- </Icon>
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("shrink", { defaultValue: "Shrink" })}
+ variant="ghost"
+ size="icon"
+ onClick={onCollapse}
+ >
+ <Icon>
+ <ShrinkIcon />
+ </Icon>
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="shrink" defaults="Shrink" />
</TooltipContent>
</Tooltip>
) : (
- <Tooltip delayDuration={0}>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("expand", { defaultValue: "Expand" })}
- variant="ghost"
- size="icon"
- onClick={onExpand}
- >
- <Icon>
- <ExpandIcon />
- </Icon>
- </Button>
- </TooltipTrigger>
+ <Tooltip>
+ <TooltipTrigger
+ delay={0}
+ render={
+ <Button
+ aria-label={t("expand", { defaultValue: "Expand" })}
+ variant="ghost"
+ size="icon"
+ onClick={onExpand}
+ >
+ <Icon>
+ <ExpandIcon />
+ </Icon>
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="expand" defaults="Expand" />
</TooltipContent>
diff --git a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
index d5677781b..0642fbc23 100644
--- a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
+++ b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
@@ -1,11 +1,6 @@
import { cn } from "@rallly/ui";
import { Button } from "@rallly/ui/button";
-import {
- Tooltip,
- TooltipContent,
- TooltipPortal,
- TooltipTrigger,
-} from "@rallly/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
import { UndoIcon } from "lucide-react";
import * as React from "react";
import { Controller } from "react-hook-form";
@@ -77,23 +72,23 @@ const ParticipantRowForm = ({
{!isNew ? (
<div className="flex items-center gap-1">
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- aria-label={t("cancel", { defaultValue: "Cancel" })}
- variant="ghost"
- onClick={() => {
- form.cancel();
- }}
- size="icon-sm"
- >
- <UndoIcon />
- </Button>
- </TooltipTrigger>
- <TooltipPortal>
- <TooltipContent>
- <Trans i18nKey="cancel" />
- </TooltipContent>
- </TooltipPortal>
+ <TooltipTrigger
+ render={
+ <Button
+ aria-label={t("cancel", { defaultValue: "Cancel" })}
+ variant="ghost"
+ onClick={() => {
+ form.cancel();
+ }}
+ size="icon-sm"
+ >
+ <UndoIcon />
+ </Button>
+ }
+ />
+ <TooltipContent>
+ <Trans i18nKey="cancel" />
+ </TooltipContent>
</Tooltip>
<Button
variant="primary"
diff --git a/apps/web/src/components/poll/desktop-poll/poll-header.tsx b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
index ece8a21d4..66c4ea23e 100644
--- a/apps/web/src/components/poll/desktop-poll/poll-header.tsx
+++ b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
@@ -1,10 +1,5 @@
import { cn } from "@rallly/ui";
-import {
- Tooltip,
- TooltipContent,
- TooltipPortal,
- TooltipTrigger,
-} from "@rallly/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
import { ClockIcon } from "lucide-react";
import type * as React from "react";
import { ConnectedScoreSummary } from "@/components/poll/score-summary";
@@ -25,16 +20,14 @@ const TimeRange: React.FunctionComponent<{
)}
>
<span data-testid="option-start-time">{start}</span>
- <Tooltip delayDuration={0}>
- <TooltipTrigger className="flex items-center gap-x-1">
+ <Tooltip>
+ <TooltipTrigger delay={0} className="flex items-center gap-x-1">
<ClockIcon className="size-3" />
{duration}
</TooltipTrigger>
- <TooltipPortal>
- <TooltipContent className="text-xs">
- {start} - {end}
- </TooltipContent>
- </TooltipPortal>
+ <TooltipContent className="text-xs">
+ {start} - {end}
+ </TooltipContent>
</Tooltip>
</div>
);
diff --git a/apps/web/src/components/poll/notification-toggle.tsx b/apps/web/src/components/poll/notification-toggle.tsx
index c43e1ad1b..8305cdb02 100644
--- a/apps/web/src/components/poll/notification-toggle.tsx
+++ b/apps/web/src/components/poll/notification-toggle.tsx
@@ -1,12 +1,7 @@
"use client";
import { Button } from "@rallly/ui/button";
-import {
- Tooltip,
- TooltipContent,
- TooltipPortal,
- TooltipTrigger,
-} from "@rallly/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
import { BellIcon, BellOffIcon } from "lucide-react";
import { useUser } from "@/components/user-provider";
@@ -37,43 +32,45 @@ export function NotificationToggle() {
return (
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- aria-pressed={poll.muted}
- aria-label={
- poll.muted
- ? t("unmuteNotifications", {
- defaultValue: "Unmute notifications",
- })
- : t("muteNotifications", { defaultValue: "Mute notifications" })
- }
- onClick={() => {
- toggleMuted.mutate({ pollId: poll.id, muted: !poll.muted });
- }}
- >
- {poll.muted ? <BellOffIcon /> : <BellIcon />}
- <span className="sr-only">
- {poll.muted
- ? t("unmuteNotifications", {
- defaultValue: "Unmute notifications",
- })
- : t("muteNotifications", { defaultValue: "Mute notifications" })}
- </span>
- </Button>
- </TooltipTrigger>
- <TooltipPortal>
- <TooltipContent>
- {poll.muted ? (
- <Trans
- i18nKey="unmuteNotifications"
- defaults="Unmute notifications"
- />
- ) : (
- <Trans i18nKey="muteNotifications" defaults="Mute notifications" />
- )}
- </TooltipContent>
- </TooltipPortal>
+ <TooltipTrigger
+ render={
+ <Button
+ variant="ghost"
+ aria-pressed={poll.muted}
+ aria-label={
+ poll.muted
+ ? t("unmuteNotifications", {
+ defaultValue: "Unmute notifications",
+ })
+ : t("muteNotifications", { defaultValue: "Mute notifications" })
+ }
+ onClick={() => {
+ toggleMuted.mutate({ pollId: poll.id, muted: !poll.muted });
+ }}
+ >
+ {poll.muted ? <BellOffIcon /> : <BellIcon />}
+ <span className="sr-only">
+ {poll.muted
+ ? t("unmuteNotifications", {
+ defaultValue: "Unmute notifications",
+ })
+ : t("muteNotifications", {
+ defaultValue: "Mute notifications",
+ })}
+ </span>
+ </Button>
+ }
+ />
+ <TooltipContent>
+ {poll.muted ? (
+ <Trans
+ i18nKey="unmuteNotifications"
+ defaults="Unmute notifications"
+ />
+ ) : (
+ <Trans i18nKey="muteNotifications" defaults="Mute notifications" />
+ )}
+ </TooltipContent>
</Tooltip>
);
}
diff --git a/apps/web/src/components/poll/truncated-linkify.tsx b/apps/web/src/components/poll/truncated-linkify.tsx
index defcdd35c..724bc4134 100644
--- a/apps/web/src/components/poll/truncated-linkify.tsx
+++ b/apps/web/src/components/poll/truncated-linkify.tsx
@@ -27,16 +27,18 @@ export const truncateLink = (href: string, text: string, key: number) => {
finalText += "…";
return (
<Tooltip>
- <TooltipTrigger asChild>
- <Link
- className="text-link"
- target="_blank"
- href={href}
- rel="nofollow noreferrer noopener"
- >
- {finalText}
- </Link>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Link
+ className="text-link"
+ target="_blank"
+ href={href}
+ rel="nofollow noreferrer noopener"
+ >
+ {finalText}
+ </Link>
+ }
+ />
<TooltipContent className="max-w-md break-all text-xs">
{href}
</TooltipContent>
diff --git a/apps/web/src/components/vote-summary-progress-bar.tsx b/apps/web/src/components/vote-summary-progress-bar.tsx
index 99e1df993..8583d8e75 100644
--- a/apps/web/src/components/vote-summary-progress-bar.tsx
+++ b/apps/web/src/components/vote-summary-progress-bar.tsx
@@ -29,40 +29,46 @@ export const VoteSummaryProgressBar = (props: {
return (
<div className="flex h-1.5 grow overflow-hidden rounded-sm bg-muted">
<Tooltip>
- <TooltipTrigger asChild>
- <div
- className="h-full bg-green-500 opacity-75 hover:opacity-100"
- style={{
- width: `${(props.yes.length / props.total) * 100}%`,
- }}
- />
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <div
+ className="h-full bg-green-500 opacity-75 hover:opacity-100"
+ style={{
+ width: `${(props.yes.length / props.total) * 100}%`,
+ }}
+ />
+ }
+ />
<TooltipContent side="bottom">
<ListNames participantIds={props.yes} />
</TooltipContent>
</Tooltip>
<Tooltip>
- <TooltipTrigger asChild>
- <div
- className="h-full bg-amber-400 opacity-75 hover:opacity-100"
- style={{
- width: `${(props.ifNeedBe.length / props.total) * 100}%`,
- }}
- />
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <div
+ className="h-full bg-amber-400 opacity-75 hover:opacity-100"
+ style={{
+ width: `${(props.ifNeedBe.length / props.total) * 100}%`,
+ }}
+ />
+ }
+ />
<TooltipContent side="bottom">
<ListNames participantIds={props.ifNeedBe} />
</TooltipContent>
</Tooltip>
<Tooltip>
- <TooltipTrigger asChild>
- <div
- className="h-full bg-transparent opacity-75 hover:opacity-100"
- style={{
- width: `${(props.no.length / props.total) * 100}%`,
- }}
- />
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <div
+ className="h-full bg-transparent opacity-75 hover:opacity-100"
+ style={{
+ width: `${(props.no.length / props.total) * 100}%`,
+ }}
+ />
+ }
+ />
<TooltipContent side="bottom">
<ListNames participantIds={props.no} />
</TooltipContent>
diff --git a/apps/web/src/features/licensing/components/refresh-license-button.tsx b/apps/web/src/features/licensing/components/refresh-license-button.tsx
index e5e1db43a..2c15e02a7 100644
--- a/apps/web/src/features/licensing/components/refresh-license-button.tsx
+++ b/apps/web/src/features/licensing/components/refresh-license-button.tsx
@@ -13,20 +13,22 @@ export function RefreshLicenseButton() {
return (
<Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- loading={refreshInstanceLicense.isExecuting}
- onClick={async () => await refreshInstanceLicense.executeAsync()}
- >
- <Icon>
- <RefreshCwIcon />
- </Icon>
- <span className="sr-only">
- <Trans i18nKey="refreshLicense" defaults="Refresh License" />
- </span>
- </Button>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <Button
+ variant="ghost"
+ loading={refreshInstanceLicense.isExecuting}
+ onClick={async () => await refreshInstanceLicense.executeAsync()}
+ >
+ <Icon>
+ <RefreshCwIcon />
+ </Icon>
+ <span className="sr-only">
+ <Trans i18nKey="refreshLicense" defaults="Refresh License" />
+ </span>
+ </Button>
+ }
+ />
<TooltipContent>
<Trans i18nKey="refreshLicense" defaults="Refresh License" />
</TooltipContent>
diff --git a/apps/web/src/features/licensing/components/remove-license-button.tsx b/apps/web/src/features/licensing/components/remove-license-button.tsx
index 58cd061fe..b2b9a924e 100644
--- a/apps/web/src/features/licensing/components/remove-license-button.tsx
+++ b/apps/web/src/features/licensing/components/remove-license-button.tsx
@@ -27,16 +27,20 @@ export function RemoveLicenseButton() {
return (
<Dialog {...dialog.dialogProps}>
<Tooltip>
- <TooltipTrigger asChild>
- <DialogTrigger
- render={<Button variant="ghost" onClick={() => dialog.trigger()} />}
- >
- <XIcon data-icon="inline-start" />
- <span className="sr-only">
- <Trans i18nKey="removeLicense" defaults="Remove License" />
- </span>
- </DialogTrigger>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <DialogTrigger
+ render={
+ <Button variant="ghost" onClick={() => dialog.trigger()} />
+ }
+ >
+ <XIcon data-icon="inline-start" />
+ <span className="sr-only">
+ <Trans i18nKey="removeLicense" defaults="Remove License" />
+ </span>
+ </DialogTrigger>
+ }
+ />
<TooltipContent>
<Trans i18nKey="removeLicense" defaults="Remove License" />
</TooltipContent>
diff --git a/apps/web/src/features/poll/components/poll-status-icon.tsx b/apps/web/src/features/poll/components/poll-status-icon.tsx
index 37b96b7fa..645516d3d 100644
--- a/apps/web/src/features/poll/components/poll-status-icon.tsx
+++ b/apps/web/src/features/poll/components/poll-status-icon.tsx
@@ -56,9 +56,11 @@ export function PollStatusIcon({
return (
<TooltipProvider>
<Tooltip>
- <TooltipTrigger asChild>
- <span className={cn("inline-flex", className)}>{icon}</span>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <span className={cn("inline-flex", className)}>{icon}</span>
+ }
+ />
<TooltipContent>
<p>{label}</p>
</TooltipContent>
diff --git a/apps/web/src/features/poll/components/polls-infinite-list.tsx b/apps/web/src/features/poll/components/polls-infinite-list.tsx
index 1a9dca7f3..68b28440e 100644
--- a/apps/web/src/features/poll/components/polls-infinite-list.tsx
+++ b/apps/web/src/features/poll/components/polls-infinite-list.tsx
@@ -80,15 +80,17 @@ function PollListItem({
<div className="hidden items-center justify-end gap-4 sm:flex">
{participants.length > 0 ? (
<Tooltip>
- <TooltipTrigger asChild>
- <span className="cursor-help text-muted-foreground text-sm">
- <Trans
- i18nKey="participantCount"
- defaults="{count, plural, =0 {No participants} =1 {1 participant} other {# participants}}"
- values={{ count: participants.length }}
- />
- </span>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <span className="cursor-help text-muted-foreground text-sm">
+ <Trans
+ i18nKey="participantCount"
+ defaults="{count, plural, =0 {No participants} =1 {1 participant} other {# participants}}"
+ values={{ count: participants.length }}
+ />
+ </span>
+ }
+ />
<TooltipContent>
<ul>
{participants.slice(0, 10).map((participant) => (
diff --git a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
index 48b600f8c..1c9a69811 100644
--- a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
+++ b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
@@ -82,15 +82,17 @@ export function ScheduledEventListItem({
<div className="text-muted-foreground text-sm">
{invites.length > 0 ? (
<Tooltip>
- <TooltipTrigger asChild>
- <span className="cursor-help">
- <Trans
- i18nKey="attendeeCount"
- defaults="{count, plural, =0 {No attendees} one {1 attendee} other {# attendees}}"
- values={{ count: invites.length }}
- />
- </span>
- </TooltipTrigger>
+ <TooltipTrigger
+ render={
+ <span className="cursor-help">
+ <Trans
+ i18nKey="attendeeCount"
+ defaults="{count, plural, =0 {No attendees} one {1 attendee} other {# attendees}}"
+ values={{ count: invites.length }}
+ />
+ </span>
+ }
+ />
<TooltipContent>
<ul>
{invites.slice(0, 10).map((invite) => (
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 028461fa5..086a9e822 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -23,7 +23,6 @@
"@radix-ui/react-popover": "^1.0.5",
"@radix-ui/react-portal": "^1.1.6",
"@radix-ui/react-slot": "^1.1.2",
- "@radix-ui/react-tooltip": "^1.1.8",
"@rallly/languages": "workspace:*",
"@rallly/tailwind-config": "workspace:*",
"@react-aria/color": "^3.1.5",
diff --git a/packages/ui/src/sidebar.tsx b/packages/ui/src/sidebar.tsx
index b02ff7ddf..1b1ee7226 100644
--- a/packages/ui/src/sidebar.tsx
+++ b/packages/ui/src/sidebar.tsx
@@ -123,7 +123,7 @@ const SidebarProvider = React.forwardRef<
return (
<SidebarContext.Provider value={contextValue}>
- <TooltipProvider delayDuration={0}>
+ <TooltipProvider delay={0}>
<div
style={
{
@@ -577,7 +577,7 @@ const SidebarMenuButton = React.forwardRef<
return (
<Tooltip>
- <TooltipTrigger asChild>{button}</TooltipTrigger>
+ <TooltipTrigger render={button} />
<TooltipContent
side="right"
align="center"
diff --git a/packages/ui/src/tooltip.tsx b/packages/ui/src/tooltip.tsx
index c1858f787..69ea5d9b9 100644
--- a/packages/ui/src/tooltip.tsx
+++ b/packages/ui/src/tooltip.tsx
@@ -1,41 +1,56 @@
"use client";
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import * as React from "react";
+import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
import { cn } from "./lib/utils";
-const TooltipProvider = TooltipPrimitive.Provider;
-
-const Tooltip = TooltipPrimitive.Root;
-
-const TooltipTrigger = TooltipPrimitive.Trigger;
-
-const TooltipPortal = TooltipPrimitive.Portal;
-
-const TooltipContent = React.forwardRef<
- React.ElementRef<typeof TooltipPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className, sideOffset = 4, side = "bottom", ...props }, ref) => (
- <TooltipPrimitive.Content
- ref={ref}
- sideOffset={sideOffset}
- side={side}
- className={cn(
- "z-50 overflow-hidden rounded-md bg-gray-800 px-2 py-1.5 text-gray-50 text-sm shadow-2xs",
- className,
- )}
- {...props}
- >
- {props.children}
- </TooltipPrimitive.Content>
-));
-TooltipContent.displayName = TooltipPrimitive.Content.displayName;
-
-export {
- Tooltip,
- TooltipContent,
- TooltipPortal,
- TooltipProvider,
- TooltipTrigger,
-};
+function TooltipProvider({ ...props }: TooltipPrimitive.Provider.Props) {
+ return <TooltipPrimitive.Provider data-slot="tooltip-provider" {...props} />;
+}
+
+function Tooltip({ ...props }: TooltipPrimitive.Root.Props) {
+ return <TooltipPrimitive.Root data-slot="tooltip" {...props} />;
+}
+
+function TooltipTrigger({ ...props }: TooltipPrimitive.Trigger.Props) {
+ return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
+}
+
+function TooltipContent({
+ className,
+ side = "bottom",
+ sideOffset = 4,
+ align,
+ alignOffset,
+ children,
+ ...props
+}: TooltipPrimitive.Popup.Props &
+ Pick<
+ TooltipPrimitive.Positioner.Props,
+ "side" | "sideOffset" | "align" | "alignOffset"
+ >) {
+ return (
+ <TooltipPrimitive.Portal>
+ <TooltipPrimitive.Positioner
+ side={side}
+ sideOffset={sideOffset}
+ align={align}
+ alignOffset={alignOffset}
+ className="isolate z-50"
+ >
+ <TooltipPrimitive.Popup
+ data-slot="tooltip-content"
+ className={cn(
+ "z-50 overflow-hidden rounded-md bg-gray-800 px-2 py-1.5 text-gray-50 text-sm shadow-2xs",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ </TooltipPrimitive.Popup>
+ </TooltipPrimitive.Positioner>
+ </TooltipPrimitive.Portal>
+ );
+}
+
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb2b1b029..83f13f2d8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -94,7 +94,7 @@ importers:
version: 8.1.0([email protected])
'@vercel/analytics':
specifier: ^1.5.0
dayjs:
specifier: ^1.11.13
version: 1.11.19
@@ -133,7 +133,7 @@ importers:
version: 6.0.0(@types/[email protected])([email protected])
next-seo:
specifier: ^6.1.0
pg:
specifier: ^8.17.1
version: 8.18.0
@@ -773,9 +773,6 @@ importers:
'@radix-ui/react-slot':
specifier: ^1.1.2
version: 1.2.4(@types/[email protected])([email protected])
- '@radix-ui/react-tooltip':
- specifier: ^1.1.8
'@rallly/languages':
specifier: workspace:*
version: link:../languages
@@ -3788,19 +3785,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==}
peerDependencies:
@@ -3882,19 +3866,6 @@ packages:
'@types/react':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
@@ -15078,26 +15049,6 @@ snapshots:
'@types/react': 19.2.13
'@types/react-dom': 19.2.3(@types/[email protected])
- dependencies:
- '@radix-ui/primitive': 1.1.3
- '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
- '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- react: 19.2.6
- react-dom: 19.2.6([email protected])
- optionalDependencies:
- '@types/react': 19.2.13
- '@types/react-dom': 19.2.3(@types/[email protected])
-
dependencies:
react: 19.2.6
@@ -15159,15 +15110,6 @@ snapshots:
optionalDependencies:
'@types/react': 19.2.13
- dependencies:
- react: 19.2.6
- react-dom: 19.2.6([email protected])
- optionalDependencies:
- '@types/react': 19.2.13
- '@types/react-dom': 19.2.3(@types/[email protected])
-
'@radix-ui/[email protected]': {}
@@ -17889,7 +17831,7 @@ snapshots:
dependencies:
uncrypto: 0.1.3
optionalDependencies:
react: 19.2.6
@@ -21649,7 +21591,7 @@ snapshots:
react: 19.2.6
react-dom: 19.2.6([email protected])
dependencies:
react: 19.2.6