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
91 changes: 49 additions & 42 deletions packages/lib/src/popover/Popover.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from "@emotion/styled";
import { useId, useRef, useState } from "react";
import { useEffect, useId, useRef, useState } from "react";
import * as Popover from "@radix-ui/react-popover";
import { PopoverPropsType } from "./types";

Expand Down Expand Up @@ -42,22 +42,50 @@ const DxcPopover = ({
const isControlled = useRef(isOpen !== undefined);

const [opened, setOpened] = useState(false);
const [portalContainer, setPortalContainer] = useState<HTMLElement | null>(null);
useEffect(() => {
setPortalContainer(document?.getElementById(`${popOverId}-portal`));
}, []);

return (
<>
<Popover.Root open={isControlled.current ? isOpen : opened}>
<Popover.Trigger aria-controls={undefined} asChild>
{asChild ? (
children
) : (
<div
role="button"
style={{ width: "fit-content" }}
onClick={
actionToOpen === "click"
? () => handleTrigger(isControlled.current, setOpened, true, onOpen)
: undefined
}
{portalContainer && (
<Popover.Root open={isControlled.current ? isOpen : opened}>
<Popover.Trigger aria-controls={undefined} asChild>
{asChild ? (
children
) : (
<div
role="button"
style={{ width: "fit-content" }}
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
}
>
{children}
</div>
)}
</Popover.Trigger>
<Popover.Portal container={portalContainer}>
<Popover.Content
aria-label="Popover content"
align={align}
side={side}
sideOffset={4}
onInteractOutside={() => handleTrigger(isControlled.current, setOpened, false, onClose)}
onEscapeKeyDown={() => handleTrigger(isControlled.current, setOpened, false, onClose)}
onMouseEnter={
actionToOpen === "hover"
? () => handleTrigger(isControlled.current, setOpened, true, onOpen)
Expand All @@ -69,34 +97,13 @@ const DxcPopover = ({
: undefined
}
>
{children}
</div>
)}
</Popover.Trigger>
<Popover.Portal container={document.getElementById(`${popOverId}-portal`)}>
<Popover.Content
aria-label="Popover content"
align={align}
side={side}
sideOffset={4}
style={{ zIndex: "var(--z-contextualMenu)" }}
onInteractOutside={() => handleTrigger(isControlled.current, setOpened, false, onClose)}
onEscapeKeyDown={() => handleTrigger(isControlled.current, setOpened, false, onClose)}
onMouseEnter={
actionToOpen === "hover" ? () => handleTrigger(isControlled.current, setOpened, true, onOpen) : undefined
}
onMouseLeave={
actionToOpen === "hover"
? () => handleTrigger(isControlled.current, setOpened, false, onClose)
: undefined
}
>
<PopoverContent id={popOverId}>{popoverContent}</PopoverContent>
{hasTip && <Popover.Arrow style={{ fill: "var(--color-bg-neutral-lightest)" }} />}
</Popover.Content>
</Popover.Portal>
</Popover.Root>
<div id={`${popOverId}-portal`} />
<PopoverContent id={popOverId}>{popoverContent}</PopoverContent>
{hasTip && <Popover.Arrow style={{ fill: "var(--color-bg-neutral-lightest)" }} />}
</Popover.Content>
</Popover.Portal>
</Popover.Root>
)}
<div id={`${popOverId}-portal`} style={{ zIndex: "var(--z-contextualmenu)" }} />
</>
);
};
Expand Down