From 2bb3dc585bf14887796686cd43472238ccef6526 Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Thu, 5 Mar 2026 06:44:11 -0600
Subject: [PATCH] fix(app): no delay on tooltip close

---
 packages/ui/src/components/message-nav.css |  2 +-
 packages/ui/src/components/message-nav.tsx | 25 +++++++++++++---------
 packages/ui/src/components/tooltip.tsx     |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/ui/src/components/message-nav.css b/packages/ui/src/components/message-nav.css
index cab16dfdc..130b1f0f7 100644
--- a/packages/ui/src/components/message-nav.css
+++ b/packages/ui/src/components/message-nav.css
@@ -95,7 +95,7 @@
   color: var(--text-base);
 }
 
-[data-slot="message-nav-tooltip"] {
+.message-nav-tooltip {
   z-index: 1000;
 }
 
diff --git a/packages/ui/src/components/message-nav.tsx b/packages/ui/src/components/message-nav.tsx
index d151633fa..5e2974631 100644
--- a/packages/ui/src/components/message-nav.tsx
+++ b/packages/ui/src/components/message-nav.tsx
@@ -1,7 +1,7 @@
 import { UserMessage } from "@opencode-ai/sdk/v2"
 import { ComponentProps, For, Match, Show, splitProps, Switch } from "solid-js"
 import { DiffChanges } from "./diff-changes"
-import { Tooltip } from "@kobalte/core/tooltip"
+import { Tooltip } from "./tooltip"
 import { useI18n } from "../context/i18n"
 
 export function MessageNav(
@@ -70,15 +70,20 @@ export function MessageNav(
   return (
     <Switch>
       <Match when={local.size === "compact"}>
-        <Tooltip openDelay={0} closeDelay={300} placement="right-start" gutter={-40} shift={-10} overlap>
-          <Tooltip.Trigger as="div">{content()}</Tooltip.Trigger>
-          <Tooltip.Portal>
-            <Tooltip.Content data-slot="message-nav-tooltip">
-              <div data-slot="message-nav-tooltip-content">
-                <MessageNav {...props} size="normal" class="" />
-              </div>
-            </Tooltip.Content>
-          </Tooltip.Portal>
+        <Tooltip
+          openDelay={0}
+          placement="right-start"
+          gutter={-40}
+          shift={-10}
+          overlap
+          contentClass="message-nav-tooltip"
+          value={
+            <div data-slot="message-nav-tooltip-content">
+              <MessageNav {...props} size="normal" class="" />
+            </div>
+          }
+        >
+          {content()}
         </Tooltip>
       </Match>
       <Match when={local.size === "normal"}>{content()}</Match>
diff --git a/packages/ui/src/components/tooltip.tsx b/packages/ui/src/components/tooltip.tsx
index 055e50465..63105d00f 100644
--- a/packages/ui/src/components/tooltip.tsx
+++ b/packages/ui/src/components/tooltip.tsx
@@ -47,7 +47,7 @@ export function Tooltip(props: TooltipProps) {
     <Switch>
       <Match when={local.inactive}>{local.children}</Match>
       <Match when={true}>
-        <KobalteTooltip gutter={4} {...others} open={local.forceOpen || open()} onOpenChange={setOpen}>
+        <KobalteTooltip gutter={4} {...others} closeDelay={0} open={local.forceOpen || open()} onOpenChange={setOpen}>
           <KobalteTooltip.Trigger as={"div"} data-component="tooltip-trigger" class={local.class}>
             {local.children}
           </KobalteTooltip.Trigger>