From b3321936c347744a759e0f36a9793bb78c9bca78 Mon Sep 17 00:00:00 2001
From: Rohan Unbeg <rohanunbeg0918@gmail.com>
Date: Wed, 9 Sep 2026 13:55:29 +0530
Subject: [PATCH] fix(ui): resolve React 19 ref deprecation warning in Tooltip
 (#30110) (#30111)

* fix(ui): resolve React 19 ref deprecation warning in Tooltip (#30110)

* fix(ui): preserve numeric tooltip content in Tooltip component guard
---
 packages/ui/components/tooltip/Tooltip.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/ui/components/tooltip/Tooltip.tsx b/packages/ui/components/tooltip/Tooltip.tsx
index 1612777537..7011567179 100644
--- a/packages/ui/components/tooltip/Tooltip.tsx
+++ b/packages/ui/components/tooltip/Tooltip.tsx
@@ -1,10 +1,9 @@
 "use client";
 
+import classNames from "@calcom/ui/classNames";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import React from "react";
 
-import classNames from "@calcom/ui/classNames";
-
 export function Tooltip({
   children,
   content,
@@ -40,13 +39,17 @@ export function Tooltip({
     </TooltipPrimitive.Content>
   );
 
+  if (content === undefined || content === null || content === "") return <>{children}</>;
+
+  const trigger = React.isValidElement(children) ? children : <span>{children}</span>;
+
   return (
     <TooltipPrimitive.Root
       delayDuration={delayDuration || 50}
       open={open}
       defaultOpen={defaultOpen}
       onOpenChange={onOpenChange}>
-      <TooltipPrimitive.Trigger asChild>{children}</TooltipPrimitive.Trigger>
+      <TooltipPrimitive.Trigger asChild>{trigger}</TooltipPrimitive.Trigger>
       <TooltipPrimitive.Portal>{Content}</TooltipPrimitive.Portal>
     </TooltipPrimitive.Root>
   );