p-sw/pswui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(Popover): apply asChild effect on PopoverContent

Browse Source
This commit is contained in:
p-sw 2024-07-12 01:40:33 +09:00
parent 80c7542803
commit 2e441ff1e5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/react/components/Popover.tsx
View File

@ -200,7 +200,7 @@ const PopoverContent = React.forwardRef<HTMLDivElement, PopoverContentProps>(
(props, ref) => { (props, ref) => {
const [variantProps, otherPropsCompressed] = const [variantProps, otherPropsCompressed] =
resolvePopoverContentVariantProps(props); resolvePopoverContentVariantProps(props);
const { children, ...otherPropsExtracted } = otherPropsCompressed; const { children, asChild, ...otherPropsExtracted } = otherPropsCompressed;
const [state, setState] = useContext(PopoverContext); const [state, setState] = useContext(PopoverContext);
const internalRef = useRef<HTMLDivElement | null>(null); const internalRef = useRef<HTMLDivElement | null>(null);
@ -221,8 +221,10 @@ const PopoverContent = React.forwardRef<HTMLDivElement, PopoverContentProps>(
}; };
}, [state.controlled, setState]); }, [state.controlled, setState]);
const Comp = asChild ? Slot : "div";
return ( return (
<div <Comp
{...otherPropsExtracted} {...otherPropsExtracted}
className={popoverContentVariant({ className={popoverContentVariant({
...variantProps, ...variantProps,
@ -238,7 +240,7 @@ const PopoverContent = React.forwardRef<HTMLDivElement, PopoverContentProps>(
}} }}
> >
{children} {children}
</div> </Comp>
); );
}, },
); );