Skip to content

Commit 591ba1a

Browse files
Fix tooltip portal
1 parent f5ef56c commit 591ba1a

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@undp/design-system-react",
3-
"version": "1.2.10",
3+
"version": "1.2.11",
44
"main": "./dist/index.cjs",
55
"module": "./dist/index.js",
66
"browser": "./dist/index.umd.js",

src/components/ui/tooltip.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ const Tooltip = TooltipPrimitive.Root;
99

1010
const TooltipTrigger = TooltipPrimitive.Trigger;
1111

12+
type TooltipContentProps = React.ComponentProps<typeof TooltipPrimitive.Content> & {
13+
inPortal?: boolean;
14+
};
1215
const TooltipContent = React.forwardRef<
1316
React.ComponentRef<typeof TooltipPrimitive.Content>,
14-
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
15-
>(({ className, sideOffset = 4, ...props }, ref) => (
16-
<TooltipPrimitive.Portal>
17+
TooltipContentProps
18+
>(({ className, inPortal = false, sideOffset = 4, ...props }, ref) => {
19+
const content = (
1720
<TooltipPrimitive.Content
1821
{...props}
1922
ref={ref}
@@ -23,8 +26,11 @@ const TooltipContent = React.forwardRef<
2326
className,
2427
)}
2528
/>
26-
</TooltipPrimitive.Portal>
27-
));
29+
);
30+
31+
return inPortal ? <TooltipPrimitive.Portal>{content}</TooltipPrimitive.Portal> : content;
32+
});
33+
2834
TooltipContent.displayName = TooltipPrimitive.Content.displayName;
2935

3036
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

0 commit comments

Comments
 (0)