Skip to content

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

fix: prevent masking popover clicks selecting results (#20532)

p0ny0fab61ee8222
diff --git a/frontend/src/react/components/sql-editor/MaskingReasonPopover.test.tsx b/frontend/src/react/components/sql-editor/MaskingReasonPopover.test.tsx
index 5d7ba0aa1b..2f64106c08 100644
--- a/frontend/src/react/components/sql-editor/MaskingReasonPopover.test.tsx
+++ b/frontend/src/react/components/sql-editor/MaskingReasonPopover.test.tsx
@@ -80,8 +80,13 @@ vi.mock("@/react/components/ui/popover", () => ({
{renderProp}
</div>
),
- PopoverContent: ({ children }: { children: React.ReactNode }) => (
- <div data-testid="popover-content">{children}</div>
+ PopoverContent: ({
+ children,
+ ...props
+ }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div data-testid="popover-content" {...props}>
+ {children}
+ </div>
),
}));
@@ -203,6 +208,28 @@ describe("MaskingReasonPopover", () => {
unmount();
});
+ test("clicking popover content does not bubble to result table", () => {
+ const onTableClick = vi.fn();
+ const { container, render, unmount } = renderIntoContainer(
+ <div onClick={onTableClick}>
+ <MaskingReasonPopover reason={makeReason()} />
+ </div>
+ );
+ render();
+
+ const content = container.querySelector(
+ "[data-testid='popover-content']"
+ ) as HTMLDivElement;
+ expect(content).not.toBeNull();
+
+ act(() => {
+ content.click();
+ });
+
+ expect(onTableClick).not.toHaveBeenCalled();
+ unmount();
+ });
+
test("shows semantic type when provided", () => {
const { container, render, unmount } = renderIntoContainer(
<MaskingReasonPopover
diff --git a/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx b/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
index f3d2d98fad..6f18925c3a 100644
--- a/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
+++ b/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
@@ -1,4 +1,5 @@
import { EyeOff } from "lucide-react";
+import type { SyntheticEvent } from "react";
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/react/components/ui/button";
@@ -57,6 +58,10 @@ export function MaskingReasonPopover({
onClick?.();
};
+ const stopResultTableEvent = (event: SyntheticEvent) => {
+ event.stopPropagation();
+ };
+
return (
<>
<Popover>
@@ -67,7 +72,11 @@ export function MaskingReasonPopover({
// UI so it doesn't warn about missing native button semantics.
nativeButton={false}
render={
- <div className="inline-flex items-center gap-0.5 cursor-pointer">
+ <div
+ className="inline-flex items-center gap-0.5 cursor-pointer"
+ onClick={stopResultTableEvent}
+ onPointerDown={stopResultTableEvent}
+ >
{reason.semanticTypeIcon && (
<img
src={reason.semanticTypeIcon}
@@ -86,6 +95,8 @@ export function MaskingReasonPopover({
side="bottom"
align="start"
className="min-w-80 max-w-md"
+ onClick={stopResultTableEvent}
+ onPointerDown={stopResultTableEvent}
>
<div className="w-full flex flex-col gap-y-2">
<div className="font-medium flex items-center gap-2">