Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: mount one tooltip provider at app root (#21522)

ecmadao8203c0535699
diff --git a/frontend/src/app/AppRoot.tsx b/frontend/src/app/AppRoot.tsx
index a157dae609..651be516fb 100644
--- a/frontend/src/app/AppRoot.tsx
+++ b/frontend/src/app/AppRoot.tsx
@@ -1,3 +1,4 @@
+import { Tooltip as BaseTooltip } from "@base-ui/react/tooltip";
import {
createBrowserRouter,
type LoaderFunctionArgs,
@@ -43,5 +44,9 @@ export const appRouter = createBrowserRouter(routes);
setAppRouter(appRouter);
export function AppRoot() {
- return <RouterProvider router={appRouter} />;
+ return (
+ <BaseTooltip.Provider>
+ <RouterProvider router={appRouter} />
+ </BaseTooltip.Provider>
+ );
}
diff --git a/frontend/src/apps/explain-visualizer/main.tsx b/frontend/src/apps/explain-visualizer/main.tsx
index e1a44a1c3d..d1e70d68f7 100644
--- a/frontend/src/apps/explain-visualizer/main.tsx
+++ b/frontend/src/apps/explain-visualizer/main.tsx
@@ -1,5 +1,6 @@
import "@/assets/css/tailwind.css";
import "./explain-visualizer.css";
+import { Tooltip as BaseTooltip } from "@base-ui/react/tooltip";
import { createRoot } from "react-dom/client";
import { ExplainVisualizerApp } from "./ExplainVisualizerApp";
@@ -8,5 +9,9 @@ import { ExplainVisualizerApp } from "./ExplainVisualizerApp";
const container = document.getElementById("app");
if (container) {
- createRoot(container).render(<ExplainVisualizerApp />);
+ createRoot(container).render(
+ <BaseTooltip.Provider>
+ <ExplainVisualizerApp />
+ </BaseTooltip.Provider>
+ );
}
diff --git a/frontend/src/components/ui/ellipsis-text.tsx b/frontend/src/components/ui/ellipsis-text.tsx
index d49f47c476..d3588ac948 100644
--- a/frontend/src/components/ui/ellipsis-text.tsx
+++ b/frontend/src/components/ui/ellipsis-text.tsx
@@ -1,8 +1,7 @@
-import { Tooltip as BaseTooltip } from "@base-ui/react/tooltip";
import type { ReactNode } from "react";
import { useEffect, useRef, useState } from "react";
+import { BlockTooltip } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
-import { getLayerRoot, LAYER_SURFACE_CLASS } from "./layer";
interface EllipsisTextProps {
readonly text: string;
@@ -36,28 +35,15 @@ export function EllipsisText({ text, className, children }: EllipsisTextProps) {
}, [text, children]);
return (
- <BaseTooltip.Provider delay={300}>
- <BaseTooltip.Root open={isTruncated && open} onOpenChange={setOpen}>
- <BaseTooltip.Trigger
- render={
- <span ref={ref} className={cn("block truncate", className)} />
- }
- >
- {children ?? text}
- </BaseTooltip.Trigger>
- <BaseTooltip.Portal container={getLayerRoot("overlay")}>
- <BaseTooltip.Positioner
- side="top"
- sideOffset={4}
- className={LAYER_SURFACE_CLASS}
- >
- <BaseTooltip.Popup className="rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md whitespace-nowrap">
- {text}
- <BaseTooltip.Arrow className="fill-main" />
- </BaseTooltip.Popup>
- </BaseTooltip.Positioner>
- </BaseTooltip.Portal>
- </BaseTooltip.Root>
- </BaseTooltip.Provider>
+ <BlockTooltip
+ content={text}
+ delayDuration={300}
+ open={isTruncated && open}
+ onOpenChange={setOpen}
+ popupClassName="max-w-none whitespace-nowrap"
+ render={<span ref={ref} className={cn("block truncate", className)} />}
+ >
+ {children ?? text}
+ </BlockTooltip>
);
}
diff --git a/frontend/src/components/ui/tooltip.test.tsx b/frontend/src/components/ui/tooltip.test.tsx
index d80785727a..2ce9083dc8 100644
--- a/frontend/src/components/ui/tooltip.test.tsx
+++ b/frontend/src/components/ui/tooltip.test.tsx
@@ -1,7 +1,31 @@
+import { Tooltip as BaseTooltip } from "@base-ui/react/tooltip";
import { act } from "react";
import { createRoot } from "react-dom/client";
import { afterEach, describe, expect, test, vi } from "vitest";
-import { Tooltip } from "./tooltip";
+import { BlockTooltip, Tooltip } from "./tooltip";
+
+const { recordTooltipProvider } = vi.hoisted(() => ({
+ recordTooltipProvider: vi.fn(),
+}));
+
+vi.mock("@base-ui/react/tooltip", async (importOriginal) => {
+ const actual = await importOriginal<typeof import("@base-ui/react/tooltip")>();
+ const { createElement } = await import("react");
+
+ function Provider(
+ props: Parameters<typeof actual.Tooltip.Provider>[0]
+ ) {
+ recordTooltipProvider(props);
+ return createElement(actual.Tooltip.Provider, props);
+ }
+
+ return {
+ Tooltip: {
+ ...actual.Tooltip,
+ Provider,
+ },
+ };
+});
(
globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -9,6 +33,7 @@ import { Tooltip } from "./tooltip";
describe("Tooltip", () => {
afterEach(() => {
+ recordTooltipProvider.mockClear();
vi.useRealTimers();
document.body.innerHTML = "";
});
@@ -46,4 +71,78 @@ describe("Tooltip", () => {
root.unmount();
});
});
+
+ test("does not mount providers for individual tooltips", () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ act(() => {
+ root.render(
+ <BaseTooltip.Provider>
+ <Tooltip content="First tooltip">
+ <button type="button">First trigger</button>
+ </Tooltip>
+ <Tooltip content="Second tooltip">
+ <button type="button">Second trigger</button>
+ </Tooltip>
+ </BaseTooltip.Provider>
+ );
+ });
+
+ expect(recordTooltipProvider).toHaveBeenCalledTimes(1);
+
+ act(() => {
+ root.unmount();
+ });
+ });
+
+ test("keeps a block tooltip closed until its controlled state opens", async () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+ const onOpenChange = vi.fn();
+
+ act(() => {
+ root.render(
+ <BlockTooltip
+ content="Truncated query"
+ open={false}
+ onOpenChange={onOpenChange}
+ render={<span className="block truncate" />}
+ >
+ <button type="button">Query</button>
+ </BlockTooltip>
+ );
+ });
+
+ const trigger = container.querySelector("button");
+ expect(trigger).toBeInstanceOf(HTMLButtonElement);
+
+ await act(async () => {
+ trigger?.dispatchEvent(new FocusEvent("focusin", { bubbles: true }));
+ });
+
+ expect(onOpenChange).toHaveBeenCalledWith(true, expect.anything());
+ expect(document.body.textContent).not.toContain("Truncated query");
+
+ act(() => {
+ root.render(
+ <BlockTooltip
+ content="Truncated query"
+ open
+ onOpenChange={onOpenChange}
+ render={<span className="block truncate" />}
+ >
+ <button type="button">Query</button>
+ </BlockTooltip>
+ );
+ });
+
+ expect(document.body.textContent).toContain("Truncated query");
+
+ act(() => {
+ root.unmount();
+ });
+ });
});
diff --git a/frontend/src/components/ui/tooltip.tsx b/frontend/src/components/ui/tooltip.tsx
index c7f1686b8f..3d8879ec6e 100644
--- a/frontend/src/components/ui/tooltip.tsx
+++ b/frontend/src/components/ui/tooltip.tsx
@@ -9,6 +9,10 @@ interface TooltipProps {
readonly side?: "top" | "bottom" | "left" | "right";
readonly delayDuration?: number;
readonly popupClassName?: string;
+ readonly open?: boolean;
+ readonly onOpenChange?: ComponentProps<
+ typeof BaseTooltip.Root
+ >["onOpenChange"];
}
export function Tooltip({
@@ -17,36 +21,39 @@ export function Tooltip({
side = "top",
delayDuration = 100,
popupClassName,
+ open,
+ onOpenChange,
}: TooltipProps) {
if (!content) {
return <>{children}</>;
}
return (
- <BaseTooltip.Provider delay={delayDuration}>
- <BaseTooltip.Root>
- <BaseTooltip.Trigger render={<span className="inline-flex" />}>
- {children}
- </BaseTooltip.Trigger>
- <BaseTooltip.Portal container={getLayerRoot("overlay")}>
- <BaseTooltip.Positioner
- side={side}
- sideOffset={4}
- className={LAYER_SURFACE_CLASS}
+ <BaseTooltip.Root open={open} onOpenChange={onOpenChange}>
+ <BaseTooltip.Trigger
+ delay={delayDuration}
+ render={<span className="inline-flex" />}
+ >
+ {children}
+ </BaseTooltip.Trigger>
+ <BaseTooltip.Portal container={getLayerRoot("overlay")}>
+ <BaseTooltip.Positioner
+ side={side}
+ sideOffset={4}
+ className={LAYER_SURFACE_CLASS}
+ >
+ <BaseTooltip.Popup
+ className={cn(
+ "max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md",
+ popupClassName
+ )}
>
- <BaseTooltip.Popup
- className={cn(
- "max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md",
- popupClassName
- )}
- >
- {content}
- <BaseTooltip.Arrow className="fill-main" />
- </BaseTooltip.Popup>
- </BaseTooltip.Positioner>
- </BaseTooltip.Portal>
- </BaseTooltip.Root>
- </BaseTooltip.Provider>
+ {content}
+ <BaseTooltip.Arrow className="fill-main" />
+ </BaseTooltip.Popup>
+ </BaseTooltip.Positioner>
+ </BaseTooltip.Portal>
+ </BaseTooltip.Root>
);
}
@@ -62,6 +69,8 @@ export function BlockTooltip({
delayDuration = 100,
popupClassName,
render,
+ open,
+ onOpenChange,
}: TooltipProps & {
readonly render?: ComponentProps<typeof BaseTooltip.Trigger>["render"];
}) {
@@ -70,31 +79,30 @@ export function BlockTooltip({
}
return (
- <BaseTooltip.Provider delay={delayDuration}>
- <BaseTooltip.Root>
- <BaseTooltip.Trigger
- render={render ?? <div className="flex-1 min-w-0" />}
+ <BaseTooltip.Root open={open} onOpenChange={onOpenChange}>
+ <BaseTooltip.Trigger
+ delay={delayDuration}
+ render={render ?? <div className="flex-1 min-w-0" />}
+ >
+ {children}
+ </BaseTooltip.Trigger>
+ <BaseTooltip.Portal container={getLayerRoot("overlay")}>
+ <BaseTooltip.Positioner
+ side={side}
+ sideOffset={4}
+ className={LAYER_SURFACE_CLASS}
>
- {children}
- </BaseTooltip.Trigger>
- <BaseTooltip.Portal container={getLayerRoot("overlay")}>
- <BaseTooltip.Positioner
- side={side}
- sideOffset={4}
- className={LAYER_SURFACE_CLASS}
+ <BaseTooltip.Popup
+ className={cn(
+ "max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md",
+ popupClassName
+ )}
>
- <BaseTooltip.Popup
- className={cn(
- "max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md",
- popupClassName
- )}
- >
- {content}
- <BaseTooltip.Arrow className="fill-main" />
- </BaseTooltip.Popup>
- </BaseTooltip.Positioner>
- </BaseTooltip.Portal>
- </BaseTooltip.Root>
- </BaseTooltip.Provider>
+ {content}
+ <BaseTooltip.Arrow className="fill-main" />
+ </BaseTooltip.Popup>
+ </BaseTooltip.Positioner>
+ </BaseTooltip.Portal>
+ </BaseTooltip.Root>
);
}
diff --git a/frontend/src/modules/agent/components/ui/AgentTooltip.tsx b/frontend/src/modules/agent/components/ui/AgentTooltip.tsx
index 35df9743a0..1d75f08481 100644
--- a/frontend/src/modules/agent/components/ui/AgentTooltip.tsx
+++ b/frontend/src/modules/agent/components/ui/AgentTooltip.tsx
@@ -20,27 +20,28 @@ export function AgentTooltip({
}
return (
- <BaseTooltip.Provider delay={delayDuration}>
- <BaseTooltip.Root>
- <BaseTooltip.Trigger render={<span className="inline-flex" />}>
- {children}
- </BaseTooltip.Trigger>
- <BaseTooltip.Portal container={getLayerRoot("agent")}>
- <BaseTooltip.Positioner
- side={side}
- sideOffset={4}
- className={LAYER_SURFACE_CLASS}
+ <BaseTooltip.Root>
+ <BaseTooltip.Trigger
+ delay={delayDuration}
+ render={<span className="inline-flex" />}
+ >
+ {children}
+ </BaseTooltip.Trigger>
+ <BaseTooltip.Portal container={getLayerRoot("agent")}>
+ <BaseTooltip.Positioner
+ side={side}
+ sideOffset={4}
+ className={LAYER_SURFACE_CLASS}
+ >
+ <BaseTooltip.Popup
+ data-agent-tooltip-content
+ className="max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md"
>
- <BaseTooltip.Popup
- data-agent-tooltip-content
- className="max-w-56 rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md"
- >
- {content}
- <BaseTooltip.Arrow className="fill-main" />
- </BaseTooltip.Popup>
- </BaseTooltip.Positioner>
- </BaseTooltip.Portal>
- </BaseTooltip.Root>
- </BaseTooltip.Provider>
+ {content}
+ <BaseTooltip.Arrow className="fill-main" />
+ </BaseTooltip.Popup>
+ </BaseTooltip.Positioner>
+ </BaseTooltip.Portal>
+ </BaseTooltip.Root>
);
}
diff --git a/frontend/src/modules/sql-editor/components/ResultView/ResultStatusBar.test.tsx b/frontend/src/modules/sql-editor/components/ResultView/ResultStatusBar.test.tsx
index d5dfa92a02..953c91c51d 100644
--- a/frontend/src/modules/sql-editor/components/ResultView/ResultStatusBar.test.tsx
+++ b/frontend/src/modules/sql-editor/components/ResultView/ResultStatusBar.test.tsx
@@ -36,6 +36,13 @@ vi.mock("@/components/ui/tooltip", () => ({
children: React.ReactElement<{ title?: string }>;
content?: string;
}) => (content ? cloneElement(children, { title: content }) : children),
+ BlockTooltip: ({
+ children,
+ render,
+ }: {
+ children: React.ReactNode;
+ render?: React.ReactElement;
+ }) => (render ? cloneElement(render, undefined, children) : <>{children}</>),
}));
vi.mock("@/stores/app", () => ({
diff --git a/frontend/src/routes/project/ProjectAccessGrantsPage.tsx b/frontend/src/routes/project/ProjectAccessGrantsPage.tsx
index 8a2e4bf945..da5b8d577f 100644
--- a/frontend/src/routes/project/ProjectAccessGrantsPage.tsx
+++ b/frontend/src/routes/project/ProjectAccessGrantsPage.tsx
@@ -1,4 +1,3 @@
-import { Tooltip as BaseTooltip } from "@base-ui/react/tooltip";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import {
@@ -23,7 +22,6 @@ import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import { EllipsisText } from "@/components/ui/ellipsis-text";
-import { getLayerRoot, LAYER_SURFACE_CLASS } from "@/components/ui/layer";
import {
Table,
TableBody,
@@ -32,7 +30,7 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
-import { Tooltip } from "@/components/ui/tooltip";
+import { BlockTooltip, Tooltip } from "@/components/ui/tooltip";
import { useCurrentUser } from "@/hooks/useAppState";
import {
distributeColumnWidths,
@@ -848,34 +846,23 @@ function TruncatedQuery({ query }: { query: string }) {
}, [query]);
return (
- <BaseTooltip.Provider delay={300}>
- <BaseTooltip.Root open={isTruncated && open} onOpenChange={setOpen}>
- <BaseTooltip.Trigger
- render={
- <span
- ref={ref}
- className="block font-mono text-xs truncate min-w-0 flex-1"
- />
- }
- >
- {query}
- </BaseTooltip.Trigger>
- <BaseTooltip.Portal container={getLayerRoot("overlay")}>
- <BaseTooltip.Positioner
- side="top"
- sideOffset={4}
- className={LAYER_SURFACE_CLASS}
- >
- <BaseTooltip.Popup className="rounded-sm bg-main px-2.5 py-1.5 text-xs text-main-text shadow-md">
- <pre className="max-w-lg whitespace-pre-wrap font-mono">
- {query}
- </pre>
- <BaseTooltip.Arrow className="fill-main" />
- </BaseTooltip.Popup>
- </BaseTooltip.Positioner>
- </BaseTooltip.Portal>
- </BaseTooltip.Root>
- </BaseTooltip.Provider>
+ <BlockTooltip
+ content={
+ <pre className="max-w-lg whitespace-pre-wrap font-mono">{query}</pre>
+ }
+ delayDuration={300}
+ open={isTruncated && open}
+ onOpenChange={setOpen}
+ popupClassName="max-w-lg"
+ render={
+ <span
+ ref={ref}
+ className="block font-mono text-xs truncate min-w-0 flex-1"
+ />
+ }
+ >
+ {query}
+ </BlockTooltip>
);
}
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
index 1a5b850e68..7ff2a41c10 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
@@ -198,6 +198,7 @@ vi.mock("@/components/ui/switch", () => ({
vi.mock("@/components/ui/tooltip", () => ({
Tooltip: mocks.Tooltip,
+ BlockTooltip: mocks.Tooltip,
}));
vi.mock("@/lib/utils", () => ({
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.test.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
index 49fd211310..37fb359976 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
@@ -227,6 +227,7 @@ vi.mock("@/components/ui/switch", () => ({
vi.mock("@/components/ui/tooltip", () => ({
Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
+ BlockTooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
}));
vi.mock("@/components/ui/popover", () => ({