@czi-sds/data-viz 0.14.3 → 0.15.0

package/dist/index.cjs.js

@@ -989,15 +989,16 @@ const Shadows = {
 };
 
 const Spaces = {
+    xxxs: 2,
+    xxs: 4,
+    xs: 6,
+    s: 8,
+    m: 12,
     default: 12,
     l: 16,
-    m: 12,
-    s: 8,
     xl: 24,
-    xs: 6,
-    xxl: 40,
-    xxs: 4,
-    xxxs: 2
+    xxl: 32,
+    xxxl: 40
 };
 
 const SDSLightThemeColors = {
@@ -9170,9 +9171,9 @@ const StyledPaper = styled$2__default.default(material.Paper, {
         background-color: ${semanticColors?.base?.surface};
         background-image: none;
         box-shadow: ${shadows?.l};
-        max-height: calc(100vh - ${2 * (spaces?.xxl || 0)}px);
+        max-height: calc(100vh - ${2 * (spaces?.xxxl || 40)}px);
         border-radius: ${corners?.xl}px;
-        padding: ${isSmall ? spaces?.xl : spaces?.xxl}px;
+        padding: ${isSmall ? spaces?.xl : spaces?.xxxl}px;
         outline: 1px solid ${addOpacityToHex(semanticColors?.base?.borderSecondary || "#000000", 15)};
       `;
 }}
@@ -9222,7 +9223,7 @@ const StyledButton$1 = styled$2__default.default(Button) `
     const { sdsSize } = props;
     const isSmall = sdsSize === "small" || sdsSize === "medium";
     const spaces = getSpaces(props);
-    const right = isSmall ? spaces?.xl : spaces?.xxl;
+    const right = isSmall ? spaces?.xl : spaces?.xxxl;
     return `
       right: ${right}px;
     `;
@@ -9322,7 +9323,7 @@ const StyledDialogActions = styled$2__default.default(material.DialogActions, {
     return `
       justify-content: ${buttonPosition === "right" ? "flex-end" : "flex-start"};;
 
-      margin-top: ${isSmall ? spaces?.xl : spaces?.xxl}px;
+      margin-top: ${isSmall ? spaces?.xl : spaces?.xxxl}px;
 
       &.${material.dialogActionsClasses.spacing} > :not(:first-of-type) {
         margin-left: ${spaces?.m}px;
@@ -9429,16 +9430,16 @@ const getResponsivePadding = (props) => {
     const spaces = getSpaces(props);
     const breakpoints = getBreakpoints(props);
     return react.css `
-    padding: ${spaces?.xxl}px
+    padding: ${spaces?.xxxl}px
       ${overlayContainerMinMargin?.small || HeroMargins.SMALL};
 
     ${breakpoints?.up("md")} {
-      padding: ${spaces?.xxl}px
+      padding: ${spaces?.xxxl}px
         ${overlayContainerMinMargin?.medium || HeroMargins.MEDIUM};
     }
 
     ${breakpoints?.up("lg")} {
-      padding: ${spaces?.xxl}px
+      padding: ${spaces?.xxxl}px
         ${overlayContainerMinMargin?.large || HeroMargins.LARGE};
     }
   `;
@@ -10530,7 +10531,7 @@ const LegendContainer = styled$2__default.default("div") `
 `;
 const LegendItem = styled$2__default.default("div") `
   ${(props) => {
-    const { isSelected, disabled } = props;
+    const { isSelected, disabled, isHovered } = props;
     const spaces = getSpaces(props);
     const semanticColors = getSemanticColors(props);
     const corners = getCorners(props);
@@ -10541,7 +10542,7 @@ const LegendItem = styled$2__default.default("div") `
       transition: background-color 0.2s ease-in-out;
       padding: ${spaces?.xxxs}px ${spaces?.xxs}px;
       border-radius: ${corners?.s}px;
-      background-color: ${isSelected ? semanticColors?.base?.backgroundTertiary : "transparent"};
+      background-color: ${isSelected ? semanticColors?.base?.backgroundTertiary : isHovered ? semanticColors?.base?.backgroundSecondary : "transparent"};
       pointer-events: ${disabled ? "none" : "auto"};
 
       &:hover {
@@ -10640,7 +10641,7 @@ const Legend = (props) => {
                     : hasSelection && !isSelected;
             // Determine color: use colors prop, then item color, then fallback to gray
             const itemColor = colors?.[index] || item.color || fallbackColor;
-            return (jsxRuntime.jsxs(LegendItem, { onMouseEnter: () => handleMouseEnter(item, index), onMouseLeave: () => handleMouseLeave(item, index), onClick: () => handleClick(item, index), role: "button", tabIndex: item.disabled ? -1 : 0, "aria-label": `${item.name}${item.value ? `: ${item.value}` : ""}`, "aria-pressed": isSelected, "aria-disabled": item.disabled, isSelected: isSelected, disabled: item.disabled, children: [jsxRuntime.jsx(LegendIcon, { color: itemColor, isDimmed: isDimmed }), jsxRuntime.jsx(LegendLabel, { disabled: item.disabled, children: item.name }), showValues && item.value !== undefined && (jsxRuntime.jsx(LegendValue, { disabled: item.disabled, children: typeof item.value === "number"
+            return (jsxRuntime.jsxs(LegendItem, { onMouseEnter: () => handleMouseEnter(item, index), onMouseLeave: () => handleMouseLeave(item, index), onClick: () => handleClick(item, index), role: "button", tabIndex: item.disabled ? -1 : 0, "aria-label": `${item.name}${item.value ? `: ${item.value}` : ""}`, "aria-pressed": isSelected, "aria-disabled": item.disabled, isSelected: isSelected, disabled: item.disabled, isHovered: isHovered, children: [jsxRuntime.jsx(LegendIcon, { color: itemColor, isDimmed: isDimmed }), jsxRuntime.jsx(LegendLabel, { disabled: item.disabled, children: item.name }), showValues && item.value !== undefined && (jsxRuntime.jsx(LegendValue, { disabled: item.disabled, children: typeof item.value === "number"
                             ? item.value.toLocaleString()
                             : item.value }))] }, `${item.name}-${index}`));
         }) })));
@@ -17398,6 +17399,7 @@ React.memo(StyledDivider$1);
 
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable sonarjs/no-duplicate-string */
+const TOOLBAR_HEIGHT = 48;
 const doNotForwardProps$a = [
     "hasInvertedStyle",
     "isNarrow",
@@ -17413,7 +17415,7 @@ const doNotForwardProps$a = [
 const StyledTopComponentSlot = styled$2__default.default("div") `
   position: sticky;
   top: 0;
-  z-index: 1300;
+  z-index: 2100;
 `;
 const StyledAppBar = styled$2__default.default(material.AppBar, {
     shouldForwardProp: (prop) => ![...doNotForwardProps$a, "sdsStyle"].includes(prop)
@@ -17425,7 +17427,7 @@ const StyledAppBar = styled$2__default.default(material.AppBar, {
       background-image: none;
       max-width: 100%;
       overflow-x: auto;
-      z-index: ${props.theme?.zIndex?.drawer ? props.theme.zIndex.drawer + 10 : 1210};
+      z-index: 2100;
     `;
 }}
 `;
@@ -17454,8 +17456,8 @@ const StyledToolbar = styled$2__default.default(material.Toolbar, {
     const spaces = getSpaces(props);
     return material.css `
       &.MuiToolbar-root {
-        min-height: 48px;
-        max-height: 48px;
+        min-height: ${TOOLBAR_HEIGHT}px;
+        max-height: ${TOOLBAR_HEIGHT}px;
         padding: ${spaces?.s}px ${spaces?.l}px;
 
         ${isNarrow && NarrowToolbar(props)}
@@ -17618,7 +17620,7 @@ const StyledTitleContainer = styled$2__default.default("div", {
       color: ${props.hasInvertedStyle
         ? colors?.base.textPrimaryOnDark
         : colors?.base.textPrimary};
-      margin-right: ${spaces?.xxl}px;
+      margin-right: ${spaces?.xxxl}px;
       width: 100%;
 
       ${isNarrow && NarrowTitleContainer()}
@@ -17660,8 +17662,8 @@ const StyledPrimaryNavContainer = styled$2__default.default("div", {
     const primaryNavPositionWithoutSearch = primaryNavPosition === "left" ? "flex-start" : "flex-end";
     return material.css `
       flex-direction: ${isNarrow ? "column" : "row"};
-      gap: ${spaces?.xxl}px;
-      margin-right: ${spaces?.xxl}px;
+      gap: ${spaces?.xxxl}px;
+      margin-right: ${spaces?.xxxl}px;
       flex: 1;
       justify-content: ${showSearch
         ? primaryNavPositionWithSearch
@@ -17788,14 +17790,14 @@ const NarrowButtonStyles = (props) => {
     &::before {
       content: "";
       position: absolute;
-      height: ${spaces?.xxl}px;
+      height: ${spaces?.xxxl}px;
       width: 100%;
       background: linear-gradient(
         to top,
         ${backgroundColor} 0%,
         ${backgroundColor}00 100%
       );
-      top: -${spaces?.xxl}px;
+      top: -${spaces?.xxxl}px;
     }
 
     .MuiButton-icon .MuiSvgIcon-root {
@@ -17816,7 +17818,7 @@ const StyledButtonSection = styled$2__default.default("section", {
     const spaces = getSpaces(props);
     return material.css `
       gap: ${spaces?.m}px;
-      margin-left: ${spaces?.xxl}px;
+      margin-left: ${spaces?.xxxl}px;
 
       ${isNarrow && NarrowButtonStyles(props)}
     `;
@@ -17836,8 +17838,8 @@ const StyledDrawer$1 = styled$2__default.default(material.Drawer, {
         width: 100%;
         display: flex;
         flex-direction: column;
-        top: ${topOffset}px;
-        height: calc(100% - ${topOffset}px);
+        top: ${topOffset + TOOLBAR_HEIGHT}px;
+        height: calc(100% - ${topOffset + TOOLBAR_HEIGHT}px);
         justify-content: space-between;
       }
     `;
@@ -17887,7 +17889,7 @@ const DrawerAccordionStyles = (props) => {
     &[aria-expanded="true"] {
       position: sticky;
       border-radius: 0;
-      top: calc(48px + ${spaces?.s}px);
+      top: ${spaces?.s}px;
       z-index: 11;
       backdrop-filter: blur(0px);
       color: ${textOpenColor};
@@ -18072,6 +18074,7 @@ const StyledMegaMenuDrawer = styled$2__default.default(material.Drawer, {
     return material.css `
       pointer-events: none;
       top: ${topOffset}px;
+      z-index: 2000;
 
       .MuiDrawer-paper {
         background-color: ${hasInvertedStyle
@@ -18084,7 +18087,7 @@ const StyledMegaMenuDrawer = styled$2__default.default(material.Drawer, {
         box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.1);
         background-image: none;
         padding: ${spaces?.xl ? spaces?.xl + 48 : 48}px ${spaces?.xl}px
-          ${spaces?.xxl}px;
+          ${spaces?.xxxl}px;
         transform: translateY(48px);
         top: ${topOffset}px;
       }
@@ -18110,7 +18113,7 @@ const StyledMegaMenuContent = styled$2__default.default("div", {
         : semanticColors?.base.backgroundPrimary};
       display: flex;
       flex-wrap: wrap;
-      gap: ${spaces?.xxl}px;
+      gap: ${spaces?.xxxl}px;
       width: 100%;
       max-width: 1200px;
       margin: 0 auto;
@@ -18129,7 +18132,7 @@ const StyledHoverDrawerColumn = styled$2__default.default("div", {
     // Account for gaps between columns
     const columnsPerRow = totalColumns > 4 ? 4 : totalColumns;
     const gapCount = columnsPerRow - 1;
-    const columnWidth = `calc((100% - (${gapCount} * ${spaces?.xxl}px)) / ${columnsPerRow})`;
+    const columnWidth = `calc((100% - (${gapCount} * ${spaces?.xxxl}px)) / ${columnsPerRow})`;
     return material.css `
       display: flex;
       flex-direction: column;
@@ -18330,7 +18333,7 @@ const StyledHoverDrawerActions = styled$2__default.default("div", {
       margin-top: ${spaces?.l}px;
       padding-left: ${isNarrow
         ? `calc(${spaces?.l}px + ${spaces?.m}px)`
-        : `calc(${spaces?.xxl}px + ${spaces?.xs}px)`};
+        : `calc(${spaces?.xxxl}px + ${spaces?.xs}px)`};
       flex-wrap: wrap;
     `;
 }}
@@ -19216,6 +19219,7 @@ function useNavigationState() {
 function NavigationHeaderPrimaryNav({ menuProps, hasInvertedStyle, isNarrow, items, onChange, value, sdsStyle = "dropdown", expandedAccordion, setExpandedAccordion, accordionRefs, scrollToAccordion, onDrawerStateChange, topOffset = 0, onClose: onCloseProp, }) {
     const theme = material.useTheme();
     const { anchorEl, activeDropdownKey, activeDrawerKey, contentKey, isContentFading, open, drawerOpen, buttonRef, menuWidth, setAnchorEl, setActiveDropdownKey, setActiveDrawerKey, setContentKey, onClose: handleClose, onDrawerClose, onDrawerOpen, cancelDrawerClose, } = useNavigationState();
+    const [clickedDrawerKey, setClickedDrawerKey] = React.useState(null);
     // Helper function to wrap dropdown items' onClick handlers
     // This automatically sets the parent dropdown as active when an item is clicked
     const wrapDropdownItemsWithActiveKey = (dropdownItems, parentKey) => {
@@ -19254,8 +19258,22 @@ function NavigationHeaderPrimaryNav({ menuProps, hasInvertedStyle, isNarrow, ite
         const handleClick = (e) => {
             onChange(key);
             parentOnClick?.(e);
+            if (drawerOpen) {
+                setActiveDrawerKey(null);
+                setContentKey(null);
+                setClickedDrawerKey(key);
+            }
         };
-        return (jsxRuntime.jsx(StyledHoverDrawerContainer, { onMouseEnter: () => onDrawerOpen(key), onMouseLeave: onDrawerClose, children: jsxRuntime.jsx(UnifiedNavItem, __assign({}, rest, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, sdsStyle: "minimal", onClick: handleClick, innerSdsStyle: sdsStyle, navVariant: "primary", component: componentProp, href: defaultUrl, target: target, rel: rel, children: jsxRuntime.jsxs(StyledLabel, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, navVariant: "primary", children: [jsxRuntime.jsx(StyledLabelTextWrapper$1, { active: isActive, isNarrow: isNarrow, children: label }), jsxRuntime.jsx(StyledLabelTextWrapperShadow$1, { "aria-hidden": "true", isNarrow: isNarrow, children: label }), jsxRuntime.jsx(Icon, { sdsIcon: isDrawerOpen ? "ChevronUp" : "ChevronDown", sdsSize: "xs" })] }) })) }, key));
+        return (jsxRuntime.jsx(StyledHoverDrawerContainer, { onMouseEnter: () => {
+                if (clickedDrawerKey !== key) {
+                    onDrawerOpen(key);
+                }
+            }, onMouseLeave: () => {
+                if (clickedDrawerKey === key) {
+                    setClickedDrawerKey(null);
+                }
+                onDrawerClose();
+            }, children: jsxRuntime.jsx(UnifiedNavItem, __assign({}, rest, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, sdsStyle: "minimal", onClick: handleClick, innerSdsStyle: sdsStyle, navVariant: "primary", component: componentProp, href: defaultUrl, target: target, rel: rel, children: jsxRuntime.jsxs(StyledLabel, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, navVariant: "primary", children: [jsxRuntime.jsx(StyledLabelTextWrapper$1, { active: isActive, isNarrow: isNarrow, children: label }), jsxRuntime.jsx(StyledLabelTextWrapperShadow$1, { "aria-hidden": "true", isNarrow: isNarrow, children: label }), jsxRuntime.jsx(Icon, { sdsIcon: isDrawerOpen ? "ChevronUp" : "ChevronDown", sdsSize: "xs" })] }) })) }, key));
     };
     const renderDropdownItem = (item, key, label, parentOnClick, rest) => {
         const isDropdownOpen = open && activeDropdownKey === key;
@@ -19931,7 +19949,7 @@ React.forwardRef((props, ref) => {
     const position = sdsStyle === "drawer" ? "sticky" : isSticky ? "sticky" : "relative";
     // Disable elevation when drawer style is active and any drawer is open
     const effectiveScrollElevation = scrollElevation && !(sdsStyle === "drawer" && isAnyDrawerOpen);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [topComponentSlot && (jsxRuntime.jsx(StyledTopComponentSlot, { ref: topSlotRef, children: topComponentSlot })), jsxRuntime.jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsxRuntime.jsx(StyledAppBar, __assign({ elevation: 0, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: position, style: { top: topOffset } }, rest, { children: headerContent })) })), dimensions.isNarrow && drawerOpen && (jsxRuntime.jsxs(StyledDrawer$1, { anchor: "right", open: drawerOpen, onClose: () => setDrawerOpen(false), hasInvertedStyle: hasInvertedStyle, topOffset: topOffset, role: "dialog", "aria-label": "Navigation menu", children: [jsxRuntime.jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsxRuntime.jsx(StyledAppBar, __assign({ elevation: 10, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: "sticky" }, rest, { children: headerContent })) })), jsxRuntime.jsxs(StyledDrawerContent, { children: [jsxRuntime.jsxs("div", { children: [search, primaryNav, primaryNav && secondaryNav && (jsxRuntime.jsx(StyledSectionDivider, { hasInvertedStyle: hasInvertedStyle })), secondaryNav] }), buttonsNode] })] }))] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [topComponentSlot && (jsxRuntime.jsx(StyledTopComponentSlot, { ref: topSlotRef, children: topComponentSlot })), jsxRuntime.jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsxRuntime.jsx(StyledAppBar, __assign({ elevation: 0, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: position, style: { top: topOffset } }, rest, { children: headerContent })) })), dimensions.isNarrow && drawerOpen && (jsxRuntime.jsx(StyledDrawer$1, { anchor: "right", open: drawerOpen, onClose: () => setDrawerOpen(false), hasInvertedStyle: hasInvertedStyle, topOffset: topOffset, role: "dialog", "aria-label": "Navigation menu", disableScrollLock: false, children: jsxRuntime.jsxs(StyledDrawerContent, { children: [jsxRuntime.jsxs("div", { children: [search, primaryNav, primaryNav && secondaryNav && (jsxRuntime.jsx(StyledSectionDivider, { hasInvertedStyle: hasInvertedStyle })), secondaryNav] }), buttonsNode] }) }))] }));
 });
 
 /**

package/dist/index.esm.js

@@ -965,15 +965,16 @@ const Shadows = {
 };
 
 const Spaces = {
+    xxxs: 2,
+    xxs: 4,
+    xs: 6,
+    s: 8,
+    m: 12,
     default: 12,
     l: 16,
-    m: 12,
-    s: 8,
     xl: 24,
-    xs: 6,
-    xxl: 40,
-    xxs: 4,
-    xxxs: 2
+    xxl: 32,
+    xxxl: 40
 };
 
 const SDSLightThemeColors = {
@@ -9146,9 +9147,9 @@ const StyledPaper = styled$2(Paper, {
         background-color: ${semanticColors?.base?.surface};
         background-image: none;
         box-shadow: ${shadows?.l};
-        max-height: calc(100vh - ${2 * (spaces?.xxl || 0)}px);
+        max-height: calc(100vh - ${2 * (spaces?.xxxl || 40)}px);
         border-radius: ${corners?.xl}px;
-        padding: ${isSmall ? spaces?.xl : spaces?.xxl}px;
+        padding: ${isSmall ? spaces?.xl : spaces?.xxxl}px;
         outline: 1px solid ${addOpacityToHex(semanticColors?.base?.borderSecondary || "#000000", 15)};
       `;
 }}
@@ -9198,7 +9199,7 @@ const StyledButton$1 = styled$2(Button) `
     const { sdsSize } = props;
     const isSmall = sdsSize === "small" || sdsSize === "medium";
     const spaces = getSpaces(props);
-    const right = isSmall ? spaces?.xl : spaces?.xxl;
+    const right = isSmall ? spaces?.xl : spaces?.xxxl;
     return `
       right: ${right}px;
     `;
@@ -9298,7 +9299,7 @@ const StyledDialogActions = styled$2(DialogActions$1, {
     return `
       justify-content: ${buttonPosition === "right" ? "flex-end" : "flex-start"};;
 
-      margin-top: ${isSmall ? spaces?.xl : spaces?.xxl}px;
+      margin-top: ${isSmall ? spaces?.xl : spaces?.xxxl}px;
 
       &.${dialogActionsClasses.spacing} > :not(:first-of-type) {
         margin-left: ${spaces?.m}px;
@@ -9405,16 +9406,16 @@ const getResponsivePadding = (props) => {
     const spaces = getSpaces(props);
     const breakpoints = getBreakpoints(props);
     return css$1 `
-    padding: ${spaces?.xxl}px
+    padding: ${spaces?.xxxl}px
       ${overlayContainerMinMargin?.small || HeroMargins.SMALL};
 
     ${breakpoints?.up("md")} {
-      padding: ${spaces?.xxl}px
+      padding: ${spaces?.xxxl}px
         ${overlayContainerMinMargin?.medium || HeroMargins.MEDIUM};
     }
 
     ${breakpoints?.up("lg")} {
-      padding: ${spaces?.xxl}px
+      padding: ${spaces?.xxxl}px
         ${overlayContainerMinMargin?.large || HeroMargins.LARGE};
     }
   `;
@@ -10506,7 +10507,7 @@ const LegendContainer = styled$2("div") `
 `;
 const LegendItem = styled$2("div") `
   ${(props) => {
-    const { isSelected, disabled } = props;
+    const { isSelected, disabled, isHovered } = props;
     const spaces = getSpaces(props);
     const semanticColors = getSemanticColors(props);
     const corners = getCorners(props);
@@ -10517,7 +10518,7 @@ const LegendItem = styled$2("div") `
       transition: background-color 0.2s ease-in-out;
       padding: ${spaces?.xxxs}px ${spaces?.xxs}px;
       border-radius: ${corners?.s}px;
-      background-color: ${isSelected ? semanticColors?.base?.backgroundTertiary : "transparent"};
+      background-color: ${isSelected ? semanticColors?.base?.backgroundTertiary : isHovered ? semanticColors?.base?.backgroundSecondary : "transparent"};
       pointer-events: ${disabled ? "none" : "auto"};
 
       &:hover {
@@ -10616,7 +10617,7 @@ const Legend = (props) => {
                     : hasSelection && !isSelected;
             // Determine color: use colors prop, then item color, then fallback to gray
             const itemColor = colors?.[index] || item.color || fallbackColor;
-            return (jsxs(LegendItem, { onMouseEnter: () => handleMouseEnter(item, index), onMouseLeave: () => handleMouseLeave(item, index), onClick: () => handleClick(item, index), role: "button", tabIndex: item.disabled ? -1 : 0, "aria-label": `${item.name}${item.value ? `: ${item.value}` : ""}`, "aria-pressed": isSelected, "aria-disabled": item.disabled, isSelected: isSelected, disabled: item.disabled, children: [jsx(LegendIcon, { color: itemColor, isDimmed: isDimmed }), jsx(LegendLabel, { disabled: item.disabled, children: item.name }), showValues && item.value !== undefined && (jsx(LegendValue, { disabled: item.disabled, children: typeof item.value === "number"
+            return (jsxs(LegendItem, { onMouseEnter: () => handleMouseEnter(item, index), onMouseLeave: () => handleMouseLeave(item, index), onClick: () => handleClick(item, index), role: "button", tabIndex: item.disabled ? -1 : 0, "aria-label": `${item.name}${item.value ? `: ${item.value}` : ""}`, "aria-pressed": isSelected, "aria-disabled": item.disabled, isSelected: isSelected, disabled: item.disabled, isHovered: isHovered, children: [jsx(LegendIcon, { color: itemColor, isDimmed: isDimmed }), jsx(LegendLabel, { disabled: item.disabled, children: item.name }), showValues && item.value !== undefined && (jsx(LegendValue, { disabled: item.disabled, children: typeof item.value === "number"
                             ? item.value.toLocaleString()
                             : item.value }))] }, `${item.name}-${index}`));
         }) })));
@@ -17374,6 +17375,7 @@ memo(StyledDivider$1);
 
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable sonarjs/no-duplicate-string */
+const TOOLBAR_HEIGHT = 48;
 const doNotForwardProps$a = [
     "hasInvertedStyle",
     "isNarrow",
@@ -17389,7 +17391,7 @@ const doNotForwardProps$a = [
 const StyledTopComponentSlot = styled$2("div") `
   position: sticky;
   top: 0;
-  z-index: 1300;
+  z-index: 2100;
 `;
 const StyledAppBar = styled$2(AppBar, {
     shouldForwardProp: (prop) => ![...doNotForwardProps$a, "sdsStyle"].includes(prop)
@@ -17401,7 +17403,7 @@ const StyledAppBar = styled$2(AppBar, {
       background-image: none;
       max-width: 100%;
       overflow-x: auto;
-      z-index: ${props.theme?.zIndex?.drawer ? props.theme.zIndex.drawer + 10 : 1210};
+      z-index: 2100;
     `;
 }}
 `;
@@ -17430,8 +17432,8 @@ const StyledToolbar = styled$2(Toolbar, {
     const spaces = getSpaces(props);
     return css$2 `
       &.MuiToolbar-root {
-        min-height: 48px;
-        max-height: 48px;
+        min-height: ${TOOLBAR_HEIGHT}px;
+        max-height: ${TOOLBAR_HEIGHT}px;
         padding: ${spaces?.s}px ${spaces?.l}px;
 
         ${isNarrow && NarrowToolbar(props)}
@@ -17594,7 +17596,7 @@ const StyledTitleContainer = styled$2("div", {
       color: ${props.hasInvertedStyle
         ? colors?.base.textPrimaryOnDark
         : colors?.base.textPrimary};
-      margin-right: ${spaces?.xxl}px;
+      margin-right: ${spaces?.xxxl}px;
       width: 100%;
 
       ${isNarrow && NarrowTitleContainer()}
@@ -17636,8 +17638,8 @@ const StyledPrimaryNavContainer = styled$2("div", {
     const primaryNavPositionWithoutSearch = primaryNavPosition === "left" ? "flex-start" : "flex-end";
     return css$2 `
       flex-direction: ${isNarrow ? "column" : "row"};
-      gap: ${spaces?.xxl}px;
-      margin-right: ${spaces?.xxl}px;
+      gap: ${spaces?.xxxl}px;
+      margin-right: ${spaces?.xxxl}px;
       flex: 1;
       justify-content: ${showSearch
         ? primaryNavPositionWithSearch
@@ -17764,14 +17766,14 @@ const NarrowButtonStyles = (props) => {
     &::before {
       content: "";
       position: absolute;
-      height: ${spaces?.xxl}px;
+      height: ${spaces?.xxxl}px;
       width: 100%;
       background: linear-gradient(
         to top,
         ${backgroundColor} 0%,
         ${backgroundColor}00 100%
       );
-      top: -${spaces?.xxl}px;
+      top: -${spaces?.xxxl}px;
     }
 
     .MuiButton-icon .MuiSvgIcon-root {
@@ -17792,7 +17794,7 @@ const StyledButtonSection = styled$2("section", {
     const spaces = getSpaces(props);
     return css$2 `
       gap: ${spaces?.m}px;
-      margin-left: ${spaces?.xxl}px;
+      margin-left: ${spaces?.xxxl}px;
 
       ${isNarrow && NarrowButtonStyles(props)}
     `;
@@ -17812,8 +17814,8 @@ const StyledDrawer$1 = styled$2(Drawer, {
         width: 100%;
         display: flex;
         flex-direction: column;
-        top: ${topOffset}px;
-        height: calc(100% - ${topOffset}px);
+        top: ${topOffset + TOOLBAR_HEIGHT}px;
+        height: calc(100% - ${topOffset + TOOLBAR_HEIGHT}px);
         justify-content: space-between;
       }
     `;
@@ -17863,7 +17865,7 @@ const DrawerAccordionStyles = (props) => {
     &[aria-expanded="true"] {
       position: sticky;
       border-radius: 0;
-      top: calc(48px + ${spaces?.s}px);
+      top: ${spaces?.s}px;
       z-index: 11;
       backdrop-filter: blur(0px);
       color: ${textOpenColor};
@@ -18048,6 +18050,7 @@ const StyledMegaMenuDrawer = styled$2(Drawer, {
     return css$2 `
       pointer-events: none;
       top: ${topOffset}px;
+      z-index: 2000;
 
       .MuiDrawer-paper {
         background-color: ${hasInvertedStyle
@@ -18060,7 +18063,7 @@ const StyledMegaMenuDrawer = styled$2(Drawer, {
         box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.1);
         background-image: none;
         padding: ${spaces?.xl ? spaces?.xl + 48 : 48}px ${spaces?.xl}px
-          ${spaces?.xxl}px;
+          ${spaces?.xxxl}px;
         transform: translateY(48px);
         top: ${topOffset}px;
       }
@@ -18086,7 +18089,7 @@ const StyledMegaMenuContent = styled$2("div", {
         : semanticColors?.base.backgroundPrimary};
       display: flex;
       flex-wrap: wrap;
-      gap: ${spaces?.xxl}px;
+      gap: ${spaces?.xxxl}px;
       width: 100%;
       max-width: 1200px;
       margin: 0 auto;
@@ -18105,7 +18108,7 @@ const StyledHoverDrawerColumn = styled$2("div", {
     // Account for gaps between columns
     const columnsPerRow = totalColumns > 4 ? 4 : totalColumns;
     const gapCount = columnsPerRow - 1;
-    const columnWidth = `calc((100% - (${gapCount} * ${spaces?.xxl}px)) / ${columnsPerRow})`;
+    const columnWidth = `calc((100% - (${gapCount} * ${spaces?.xxxl}px)) / ${columnsPerRow})`;
     return css$2 `
       display: flex;
       flex-direction: column;
@@ -18306,7 +18309,7 @@ const StyledHoverDrawerActions = styled$2("div", {
       margin-top: ${spaces?.l}px;
       padding-left: ${isNarrow
         ? `calc(${spaces?.l}px + ${spaces?.m}px)`
-        : `calc(${spaces?.xxl}px + ${spaces?.xs}px)`};
+        : `calc(${spaces?.xxxl}px + ${spaces?.xs}px)`};
       flex-wrap: wrap;
     `;
 }}
@@ -19192,6 +19195,7 @@ function useNavigationState() {
 function NavigationHeaderPrimaryNav({ menuProps, hasInvertedStyle, isNarrow, items, onChange, value, sdsStyle = "dropdown", expandedAccordion, setExpandedAccordion, accordionRefs, scrollToAccordion, onDrawerStateChange, topOffset = 0, onClose: onCloseProp, }) {
     const theme = useTheme$4();
     const { anchorEl, activeDropdownKey, activeDrawerKey, contentKey, isContentFading, open, drawerOpen, buttonRef, menuWidth, setAnchorEl, setActiveDropdownKey, setActiveDrawerKey, setContentKey, onClose: handleClose, onDrawerClose, onDrawerOpen, cancelDrawerClose, } = useNavigationState();
+    const [clickedDrawerKey, setClickedDrawerKey] = useState(null);
     // Helper function to wrap dropdown items' onClick handlers
     // This automatically sets the parent dropdown as active when an item is clicked
     const wrapDropdownItemsWithActiveKey = (dropdownItems, parentKey) => {
@@ -19230,8 +19234,22 @@ function NavigationHeaderPrimaryNav({ menuProps, hasInvertedStyle, isNarrow, ite
         const handleClick = (e) => {
             onChange(key);
             parentOnClick?.(e);
+            if (drawerOpen) {
+                setActiveDrawerKey(null);
+                setContentKey(null);
+                setClickedDrawerKey(key);
+            }
         };
-        return (jsx(StyledHoverDrawerContainer, { onMouseEnter: () => onDrawerOpen(key), onMouseLeave: onDrawerClose, children: jsx(UnifiedNavItem, __assign({}, rest, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, sdsStyle: "minimal", onClick: handleClick, innerSdsStyle: sdsStyle, navVariant: "primary", component: componentProp, href: defaultUrl, target: target, rel: rel, children: jsxs(StyledLabel, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, navVariant: "primary", children: [jsx(StyledLabelTextWrapper$1, { active: isActive, isNarrow: isNarrow, children: label }), jsx(StyledLabelTextWrapperShadow$1, { "aria-hidden": "true", isNarrow: isNarrow, children: label }), jsx(Icon, { sdsIcon: isDrawerOpen ? "ChevronUp" : "ChevronDown", sdsSize: "xs" })] }) })) }, key));
+        return (jsx(StyledHoverDrawerContainer, { onMouseEnter: () => {
+                if (clickedDrawerKey !== key) {
+                    onDrawerOpen(key);
+                }
+            }, onMouseLeave: () => {
+                if (clickedDrawerKey === key) {
+                    setClickedDrawerKey(null);
+                }
+                onDrawerClose();
+            }, children: jsx(UnifiedNavItem, __assign({}, rest, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, sdsStyle: "minimal", onClick: handleClick, innerSdsStyle: sdsStyle, navVariant: "primary", component: componentProp, href: defaultUrl, target: target, rel: rel, children: jsxs(StyledLabel, { itemType: item.itemType, active: isActive, hasInvertedStyle: hasInvertedStyle, isNarrow: isNarrow, navVariant: "primary", children: [jsx(StyledLabelTextWrapper$1, { active: isActive, isNarrow: isNarrow, children: label }), jsx(StyledLabelTextWrapperShadow$1, { "aria-hidden": "true", isNarrow: isNarrow, children: label }), jsx(Icon, { sdsIcon: isDrawerOpen ? "ChevronUp" : "ChevronDown", sdsSize: "xs" })] }) })) }, key));
     };
     const renderDropdownItem = (item, key, label, parentOnClick, rest) => {
         const isDropdownOpen = open && activeDropdownKey === key;
@@ -19907,7 +19925,7 @@ forwardRef((props, ref) => {
     const position = sdsStyle === "drawer" ? "sticky" : isSticky ? "sticky" : "relative";
     // Disable elevation when drawer style is active and any drawer is open
     const effectiveScrollElevation = scrollElevation && !(sdsStyle === "drawer" && isAnyDrawerOpen);
-    return (jsxs(Fragment, { children: [topComponentSlot && (jsx(StyledTopComponentSlot, { ref: topSlotRef, children: topComponentSlot })), jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsx(StyledAppBar, __assign({ elevation: 0, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: position, style: { top: topOffset } }, rest, { children: headerContent })) })), dimensions.isNarrow && drawerOpen && (jsxs(StyledDrawer$1, { anchor: "right", open: drawerOpen, onClose: () => setDrawerOpen(false), hasInvertedStyle: hasInvertedStyle, topOffset: topOffset, role: "dialog", "aria-label": "Navigation menu", children: [jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsx(StyledAppBar, __assign({ elevation: 10, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: "sticky" }, rest, { children: headerContent })) })), jsxs(StyledDrawerContent, { children: [jsxs("div", { children: [search, primaryNav, primaryNav && secondaryNav && (jsx(StyledSectionDivider, { hasInvertedStyle: hasInvertedStyle })), secondaryNav] }), buttonsNode] })] }))] }));
+    return (jsxs(Fragment, { children: [topComponentSlot && (jsx(StyledTopComponentSlot, { ref: topSlotRef, children: topComponentSlot })), jsx(ElevationScroll, __assign({}, props, { shouldElevate: effectiveScrollElevation, children: jsx(StyledAppBar, __assign({ elevation: 0, hasInvertedStyle: hasInvertedStyle, ref: mergeRefs([ref, navRef]), "aria-label": "Main navigation", tabIndex: 0, position: position, style: { top: topOffset } }, rest, { children: headerContent })) })), dimensions.isNarrow && drawerOpen && (jsx(StyledDrawer$1, { anchor: "right", open: drawerOpen, onClose: () => setDrawerOpen(false), hasInvertedStyle: hasInvertedStyle, topOffset: topOffset, role: "dialog", "aria-label": "Navigation menu", disableScrollLock: false, children: jsxs(StyledDrawerContent, { children: [jsxs("div", { children: [search, primaryNav, primaryNav && secondaryNav && (jsx(StyledSectionDivider, { hasInvertedStyle: hasInvertedStyle })), secondaryNav] }), buttonsNode] }) }))] }));
 });
 
 /**