Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 37 additions & 24 deletions packages/lib/src/popover/Popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,45 @@ const DxcPopover = ({
return (
<>
<Popover.Root open={isControlled.current ? isOpen : opened}>
<Popover.Trigger aria-controls={undefined} asChild>
{asChild ? (
children
) : (
<PopoverWrapper
role="button"
onClick={
actionToOpen === "click"
? () => handleTrigger(isControlled.current, setOpened, true, onOpen)
: undefined
}
onMouseEnter={
actionToOpen === "hover"
? () => handleTrigger(isControlled.current, setOpened, true, onOpen)
: undefined
}
onMouseLeave={
actionToOpen === "hover"
? () => handleTrigger(isControlled.current, setOpened, false, onClose)
: undefined
}
>
{asChild ? (
<Popover.Trigger
aria-controls={undefined}
aria-expanded={undefined}
aria-haspopup={undefined}
type={undefined}
asChild
>
{children}
</Popover.Trigger>
) : (
<Popover.Trigger
style={{
backgroundColor: "transparent",
border: "none",
margin: 0,
padding: 0,
textAlign: "inherit",
font: "inherit",
borderRadius: 0,
appearance: "none",
}}
onClick={
actionToOpen === "click" ? () => handleTrigger(isControlled.current, setOpened, true, onOpen) : undefined
}
onMouseEnter={
actionToOpen === "hover" ? () => handleTrigger(isControlled.current, setOpened, true, onOpen) : undefined
}
onMouseLeave={
actionToOpen === "hover"
? () => handleTrigger(isControlled.current, setOpened, false, onClose)
: undefined
}
>
<PopoverWrapper role="button" aria-controls={popOverId} aria-expanded={opened} aria-haspopup={true}>
{children}
</PopoverWrapper>
)}
</Popover.Trigger>
</Popover.Trigger>
)}
{portalContainer && (
<Popover.Portal container={portalContainer}>
<Popover.Content
Expand Down
Loading