Skip to content

[major] Changing header and sidenav popover to our DxcPopover #2527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jialecl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[major] Changing header and sidenav popover to our DxcPopover #2527

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29b80d4
Changing header and sidenav popover to our DxcPopover
Jialecl Aug 18, 2026
5634bc3
Merge branch 'master' into jialecl/groupItem-popover
Jialecl Aug 20, 2026
f64563d
Merge branch 'master' into jialecl/groupItem-popover
PelayoFelgueroso Aug 21, 2026
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
130 changes: 49 additions & 81 deletions packages/lib/src/base-menu/GroupItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,76 @@
import { useContext, useEffect, useId, useState } from "react";
import { useContext, useId } from "react";
import DxcIcon from "../icon/Icon";
import SubMenu from "./SubMenu";
import ItemAction from "./ItemAction";
import MenuItem from "./MenuItem";
import { GroupItemProps } from "./types";
import * as Popover from "@radix-ui/react-popover";
import { useGroupItem } from "./useGroupItem";
import BaseMenuContext from "./BaseMenuContext";
import DxcPopover from "../popover/Popover";

const GroupItem = ({ items, ...props }: GroupItemProps) => {
const groupMenuId = `group-menu-${useId()}`;
const navigationTreeId = `sidenav-${useId()}`;
const contextValue = useContext(BaseMenuContext) ?? {};
const { groupSelected, isOpen, toggleOpen, hasPopOver, isHorizontal } = useGroupItem(
items,
contextValue,
props.defaultOpen
);
const [portalContainer, setPortalContainer] = useState<HTMLElement | null>(null);
useEffect(() => {
setPortalContainer(document?.getElementById(`${navigationTreeId}-portal`));
}, []);

return hasPopOver ? (
<>
<Popover.Root open={isOpen}>
<Popover.Trigger
aria-controls={undefined}
aria-expanded={undefined}
aria-haspopup={undefined}
asChild
type={undefined}
>
<ItemAction
aria-controls={isOpen ? groupMenuId : undefined}
aria-expanded={isOpen ? true : undefined}
collapseIcon={isOpen ? <DxcIcon icon="filled_expand_less" /> : <DxcIcon icon="filled_expand_more" />}
onClick={() => {
toggleOpen();
}}
selected={groupSelected && !isOpen}
{...props}
/>
</Popover.Trigger>
{portalContainer && (
<Popover.Portal container={portalContainer}>
<DxcPopover
offset={isHorizontal ? 16 : 0}
align={isHorizontal ? "start" : "end"}
side={isHorizontal ? "bottom" : "right"}
onClose={() => {
if (isOpen) {
toggleOpen();
}
}}
asChild
popoverContent={
<>
<BaseMenuContext.Provider
value={{ ...contextValue, displayGroupLines: false, hasPopOver: false, closePopOver: toggleOpen }}
>
<Popover.Content
aria-label="Group details"
onKeyDown={(event) => {
if (event.key === "Escape") {
toggleOpen();
}
}}
align="start"
side={isHorizontal ? "bottom" : "right"}
style={{
zIndex: "var(--z-contextualmenu)",
padding: "var(--spacing-padding-xs)",
boxShadow: "var(--shadow-100)",
backgroundColor: "var(--color-bg-neutral-lightest)",
borderRadius: "var(--border-radius-m)",
...(isHorizontal
? {}
: {
display: "flex",
flexDirection: "column",
gap: "var(--spacing-gap-xxs)",
}),
}}
sideOffset={isHorizontal ? 16 : 0}
onInteractOutside={() => toggleOpen()}
>
{!isHorizontal && props.depthLevel === 0 && (
<ItemAction
aria-controls={isOpen ? groupMenuId : undefined}
aria-expanded={isOpen ? true : undefined}
aria-pressed={groupSelected && !isOpen}
collapseIcon={
isOpen ? <DxcIcon icon="filled_expand_less" /> : <DxcIcon icon="filled_expand_more" />
}
onClick={() => toggleOpen()}
selected={groupSelected && !isOpen}
{...props}
icon={undefined}
{!isHorizontal && props.depthLevel === 0 && (
<ItemAction
aria-controls={isOpen ? groupMenuId : undefined}
aria-expanded={isOpen ? true : undefined}
aria-pressed={groupSelected && !isOpen}
collapseIcon={isOpen ? <DxcIcon icon="filled_expand_less" /> : <DxcIcon icon="filled_expand_more" />}
onClick={() => toggleOpen()}
selected={groupSelected && !isOpen}
{...props}
icon={undefined}
/>
)}
<SubMenu id={groupMenuId} depthLevel={props.depthLevel} isPopOver={true}>
{items.map((item, index) => (
<MenuItem
item={item}
depthLevel={isHorizontal ? props.depthLevel : props.depthLevel + 1}
key={`${item.label}-${index}`}
/>
)}
<SubMenu id={groupMenuId} depthLevel={props.depthLevel} isPopOver={true}>
{items.map((item, index) => (
<MenuItem
item={item}
depthLevel={isHorizontal ? props.depthLevel : props.depthLevel + 1}
key={`${item.label}-${index}`}
/>
))}
</SubMenu>
</Popover.Content>
))}
</SubMenu>
</BaseMenuContext.Provider>
</Popover.Portal>
)}
</Popover.Root>
<div id={`${navigationTreeId}-portal`} style={{ position: "absolute" }} />
</>
}
isOpen={isOpen}
>
<ItemAction
aria-controls={isOpen ? groupMenuId : undefined}
aria-expanded={isOpen ? true : undefined}
collapseIcon={isOpen ? <DxcIcon icon="filled_expand_less" /> : <DxcIcon icon="filled_expand_more" />}
onClick={() => {
toggleOpen();
}}
selected={groupSelected && !isOpen}
{...props}
/>
</DxcPopover>
</>
) : (
<>
Expand Down
Loading