Skip to content

Commit abea387

Browse files
Handle conflicts
1 parent b596c66 commit abea387

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

‎packages/lib/src/base-menu/GroupItem.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const GroupItem = ({ items, ...props }: GroupItemProps) => {
6060
}),
6161
}}
6262
sideOffset={isHorizontal ? 16 : 0}
63-
onInteractOutside={isHorizontal ? () => toggleOpen() : undefined}
63+
onInteractOutside={() => toggleOpen()}
6464
>
6565
{!isHorizontal && props.depthLevel === 0 && (
6666
<ItemAction

‎packages/lib/src/sidenav/Sidenav.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ const DxcSidenav = ({
203203
)}
204204
{navItems && (
205205
<DxcNavigationTree
206+
key={isExpanded ? "expanded" : "collapsed"}
206207
items={navItems}
207208
displayGroupLines={displayGroupLines}
208209
displayBorder={false}

0 commit comments

Comments
 (0)