@atlaskit/navigation-system 5.14.0 → 5.16.0

package/dist/es2019/ui/page-layout/side-nav/side-nav.js

@@ -1,9 +1,8 @@
 /* side-nav.tsx generated by @compiled/babel-plugin v0.38.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import "./side-nav.compiled.css";
-import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { bind } from 'bind-event-listener';
 import { flushSync } from 'react-dom';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
@@ -16,7 +15,7 @@ import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../../context/skip-links/skip-links-context';
 import { TopNavStartElement } from '../../../context/top-nav-start/top-nav-start-context';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-import { bannerMountedVar, contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar, topNavMountedVar, UNSAFE_sideNavLayoutVar } from '../constants';
+import { bannerMountedVar, contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, openLayerObserverSideNavNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar, topNavMountedVar, UNSAFE_sideNavLayoutVar } from '../constants';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../hoist-utils';
 import { useLayoutId } from '../id-utils';
@@ -49,7 +48,9 @@ function getResizeBounds() {
  * Avoiding nesting the `@supports` at-rule inside of `@media` means Compiled can remove duplicate styles from the generated CSS.
  */
 const isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
-const openLayerObserverSideNavNamespace = 'side-nav';
+const panelSplitterPortalTargetStyles = {
+  root: "_kqswstnw _rjxpidpf _u7coidpf _4t3i1osq _165t56xv"
+};
 const styles = {
   root: "_nd5l1b6c _191wglyw _t51zglyw _bfhk1bhr _16qs130s _vchhusvi _4t3ieqxy _152timx3 _kqsw1if8 _1bsb1ego _1pbycs5v _14b5hc79 _qilnk0mc _p5clia51 _4ap3vuon _scbpglyw",
   flyoutOpen: "_qiln1gzg _p5clglyw _4ap31bhr _scbp130s _139f8iot _1tpvfnf5 _sylc1a5r _oyeijq3t",
@@ -166,6 +167,7 @@ function SideNavInternal({
   const clampedWidth = `clamp(${widthResizeBounds.min}, ${width}px, ${widthResizeBounds.max})`;
   const dangerouslyHoistSlotSizes = useContext(DangerouslyHoistSlotSizes);
   const navRef = useRef(null);
+  const panelSplitterPortalTargetRef = useRef(null);
   /**
    * Used to share the side nav element with the `Panel`,
    * which observes the side nav to determine its maximum width.
@@ -758,7 +760,7 @@ function SideNavInternal({
     },
     ref: mergedRef,
     "data-testid": testId,
-    className: ax([styles.root, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop, isFhsEnabled && styles.animationRTLSupport, shouldShowSidebarToggleAnimation && styles.animationBaseStyles, isExpandedOnMobile && shouldShowSidebarToggleAnimation && styles.expandAnimationMobile, !isExpandedOnMobile && shouldShowSidebarToggleAnimation && styles.collapseAnimationMobile, isExpandedOnDesktop && shouldShowSidebarToggleAnimation && styles.expandAnimationDesktop, !isExpandedOnDesktop && shouldShowSidebarToggleAnimation && styles.collapseAnimationDesktop, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFhsEnabled && styles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFhsEnabled && styles.flyoutAnimateClosed, ((sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' || (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close') && !isFirefox && isFhsEnabled && styles.flyoutBaseStylesFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && styles.flyoutAnimateClosedFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFirefox && isFhsEnabled && styles.flyoutOpenFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && styles.flyoutAnimateClosedFullHeightSidebar, isFlyoutClosed && isFhsEnabled && styles.fullHeightSidebar])
+    className: ax([styles.root, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop, isFhsEnabled && styles.animationRTLSupport, shouldShowSidebarToggleAnimation && styles.animationBaseStyles, isExpandedOnMobile && shouldShowSidebarToggleAnimation && styles.expandAnimationMobile, !isExpandedOnMobile && shouldShowSidebarToggleAnimation && styles.collapseAnimationMobile, isExpandedOnDesktop && shouldShowSidebarToggleAnimation && styles.expandAnimationDesktop, !isExpandedOnDesktop && shouldShowSidebarToggleAnimation && styles.collapseAnimationDesktop, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFhsEnabled && styles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFhsEnabled && styles.flyoutAnimateClosed, ((sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' || (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close') && !isFirefox && isFhsEnabled && styles.flyoutBaseStylesFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && styles.flyoutAnimateClosedFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFirefox && isFhsEnabled && styles.flyoutOpenFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && styles.flyoutAnimateClosedFullHeightSidebar, isFlyoutClosed && isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebar])
   }), /*#__PURE__*/React.createElement(DangerouslyHoistCssVarToDocumentRoot, {
     variableName: sideNavLiveWidthVar,
     value: "0px",
@@ -777,15 +779,24 @@ function SideNavInternal({
   , /*#__PURE__*/React.createElement(PanelSplitterProvider, {
     panelId: sideNavPanelSplitterId,
     panelRef: navRef,
+    portalRef: isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') ? panelSplitterPortalTargetRef : undefined,
     panelWidth: width,
     onCompleteResize: setWidth,
     getResizeBounds: getResizeBounds,
-    resizingCssVar: panelSplitterResizingVar,
-    isEnabled: isExpandedOnDesktop && !isFlyoutVisible,
+    resizingCssVar: panelSplitterResizingVar
+    // Not resizable when in peek (flyout) mode.
+    ,
+    isEnabled: fg('platform-dst-side-nav-layering-fixes') ? !isFlyoutVisible :
+    // Old behaviour has a bug: the panel splitter would only be visible on sm screens (between 48rem and 64rem)
+    // if the side nav was expanded on desktop.
+    isExpandedOnDesktop && !isFlyoutVisible,
     shortcut: isShortcutEnabled ? sideNavToggleTooltipKeyboardShortcut : undefined
   }, /*#__PURE__*/React.createElement("div", {
     className: ax([styles.flexContainer])
-  }, children)));
+  }, children)), isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/React.createElement("div", {
+    ref: panelSplitterPortalTargetRef,
+    className: ax([panelSplitterPortalTargetStyles.root])
+  }));
 }
 
 /**

package/dist/es2019/ui/page-layout/top-nav/top-nav-end.js

@@ -16,7 +16,8 @@ import { IconButton } from '../../top-nav-items/themed/migration';
 const containerStyles = {
   root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15ri1mjv _1gs5usvi _ndwch9n0",
   jiraProductLogoUpdate: "_15rip2n4",
-  fullHeightSidebar: "_lcxv1wug _y4tiutpp"
+  fullHeightSidebar: "_y4tiutpp _lcxv1wug",
+  fullHeightSidebarWithLayeringFixes: "_y4tiutpp"
 };
 const listStyles = {
   root: "_zulp1b66 _4cvr1h6o _1e0c1txw",
@@ -56,7 +57,7 @@ export function TopNavEnd({
   }, [query]);
   return /*#__PURE__*/React.createElement("nav", {
     "aria-label": label,
-    className: ax([containerStyles.root, isFhsEnabled && containerStyles.fullHeightSidebar, fg('team25-eu-jira-logo-updates-csm-jsm') && containerStyles.jiraProductLogoUpdate])
+    className: ax([containerStyles.root, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebar, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebarWithLayeringFixes, fg('team25-eu-jira-logo-updates-csm-jsm') && containerStyles.jiraProductLogoUpdate])
   }, isMobile ? /*#__PURE__*/React.createElement(Popup, {
     isOpen: isOpen,
     onClose: () => setIsOpen(false),

package/dist/es2019/ui/page-layout/top-nav/top-nav-middle.js

@@ -2,6 +2,7 @@
 import "./top-nav-middle.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 const styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
@@ -21,6 +22,6 @@ export function TopNavMiddle({
 }) {
   const isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement("div", {
-    className: ax([styles.root, isFhsEnabled && styles.fullHeightSidebar])
+    className: ax([styles.root, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebar])
   }, children);
 }

package/dist/es2019/ui/page-layout/top-nav/top-nav-start.compiled.css

@@ -13,4 +13,5 @@
 ._vchhusvi{box-sizing:border-box}
 [dir=rtl] ._65m41mrw{--animation-direction:-1}
 @media (prefers-reduced-motion:no-preference){._10t81e03{transition-property:transform}._10t81rjc{transition-property:transform,opacity}._1xq51ytf{transition-timing-function:ease-in-out}._1xq55ucs{transition-timing-function:ease}._mjvc1efy{transform:translateX(calc(100%*var(--animation-direction)))}._bgpzidpf{opacity:0}._mjvc1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}._mjvco0k7{transform:translateX(calc((-2rem + var(--ds-space-050, 4px)*-1)*var(--animation-direction)))}._mjvcyrjp{transform:translateX(calc((2rem + var(--ds-space-050, 4px))*var(--animation-direction)))}._mjvcz12g{transform:translateX(0)}._xrrpfnf5{transition-duration:.2s}._bgpzkb7n{opacity:1}}
-@media (min-width:64rem){._15rin7od{min-width:unset}._glte1osq{width:100%}._15rip2n4{min-width:330px}._glte1ris{width:max-content}._15ri1mjv{min-width:300px}._1gs5usvi{box-sizing:border-box}._glte93mn{width:var(--n_sNvlw,100%)}._exxmpxbi{padding-inline-end:var(--ds-space-200,1pc)}}
+@media (min-width:64rem){._13wnh2mm{position:relative}._1l3vb3bt:after{content:""}._juxdstnw:after{position:absolute}._1vinidpf:after{inset-block-start:0}._1719idpf:after{inset-block-end:0}._e6znidpf:after{inset-inline-end:0}._1kyhe4h9:after{border-inline-end-width:var(--ds-border-width,1px)}._4cwynqa1:after{border-inline-end-style:solid}._435s1l7x:after{border-inline-end-color:var(--ds-border,#0b120e24)}._m7c3idpf:after{opacity:0}._15rin7od{min-width:unset}._glte1osq{width:100%}._15rip2n4{min-width:330px}@supports (scroll-timeline-axis:block){html:not(:has([data-private-side-nav-header])) ._1kilgc9s{animation-timeline:--sNcst}html:not(:has([data-private-side-nav-header])) ._1m3lsjnm{animation-name:k1rswljm}html:not(:has([data-private-side-nav-header])) ._12g81hrf{animation-fill-mode:both}}._4ap3vuon{background-color:var(--ds-surface,#fff)}._m7c3kb7n:after{opacity:1}._glte1ris{width:max-content}._15ri1mjv{min-width:300px}._1gs5usvi{box-sizing:border-box}._glte93mn{width:var(--n_sNvlw,100%)}._exxmpxbi{padding-inline-end:var(--ds-space-200,1pc)}@supports (scroll-timeline-axis:block){@keyframes k1rswljm{0%{box-shadow:inset 0 -1px 0 0 transparent}0.1%{box-shadow:inset 0 -1px 0 0 var(--ds-border,#0b120e24)}to{box-shadow:inset 0 -1px 0 0 var(--ds-border,#0b120e24)}}}}
+@media (prefers-reduced-motion:no-preference) and (min-width:64rem){._n8qabrmi:after{transition-property:opacity}._wc72fnf5:after{transition-duration:.2s}._j3mr1v42:after{transition-timing-function:ease-in}}

package/dist/es2019/ui/page-layout/top-nav/top-nav-start.js

@@ -7,6 +7,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { UNSAFE_useMediaQuery } from '@atlaskit/primitives/compiled';
 import { TopNavStartAttachRef } from '../../../context/top-nav-start/top-nav-start-context';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
+import { sideNavContentScrollTimelineVar } from '../constants';
 import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
 import { SideNavVisibilityState } from '../side-nav/visibility-context';
 
@@ -35,6 +36,12 @@ const innerStyles = {
   fullHeightSidebarExpanded: "_15rin7od _glte1osq"
 };
 
+/**
+ * The scroll indicator is usually applied in SideNavContent, but if there is no SideNavHeader it is
+ * applied in TopNavStart instead for layering reasons. See the comment in SideNavHeader for more details.
+ */
+const scrolledShadow = null;
+
 /**
  * Styles for the outer element, that does not have re-enabled pointer events and spans the entire
  * width of the TopNavStart area.
@@ -43,7 +50,10 @@ const innerStyles = {
  */
 const wrapperStyles = {
   root: "_vchhusvi _bozgutpp _4t3i1osq",
-  fullHeightSidebarExpanded: "_glte93mn _exxmpxbi"
+  fullHeightSidebarExpanded: "_glte93mn _exxmpxbi",
+  fullHeightSidebarWithLayeringFixes: "_13wnh2mm _1l3vb3bt _juxdstnw _1vinidpf _1719idpf _e6znidpf _1kyhe4h9 _4cwynqa1 _435s1l7x _m7c3idpf",
+  fullHeightSidebarExpandedWithLayeringFixes: "_4ap3vuon _1kilgc9s _1m3lsjnm _12g81hrf _m7c3kb7n",
+  fullHeightSidebarBorderTransition: "_n8qabrmi _wc72fnf5 _j3mr1v42"
 };
 
 /**
@@ -114,12 +124,29 @@ const TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS
   } = useSideNavVisibility({
     defaultCollapsed: true
   });
+  const sideNavState = useContext(SideNavVisibilityState);
+  const isFirstRenderRef = useRef(true);
+  useEffect(() => {
+    if (!fg('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+
+    // Ignore renders until the side nav state is initialized
+    // So that apps using the legacy API for setting side nav default state do not see
+    // animations when they shouldn't
+    if (sideNavState === null) {
+      return;
+    }
+    if (isFirstRenderRef.current) {
+      isFirstRenderRef.current = false;
+    }
+  }, [sideNavState]);
   return /*#__PURE__*/React.createElement("div", {
-    className: ax([wrapperStyles.root, isExpandedOnDesktop && wrapperStyles.fullHeightSidebarExpanded])
+    className: ax([wrapperStyles.root, isExpandedOnDesktop && wrapperStyles.fullHeightSidebarExpanded, fg('platform-dst-side-nav-layering-fixes') && wrapperStyles.fullHeightSidebarWithLayeringFixes, !isFirstRenderRef.current && isExpandedOnDesktop && fg('platform-dst-side-nav-layering-fixes') && wrapperStyles.fullHeightSidebarBorderTransition, isExpandedOnDesktop && fg('platform-dst-side-nav-layering-fixes') && wrapperStyles.fullHeightSidebarExpandedWithLayeringFixes])
   }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     "data-testid": testId,
-    className: ax([innerStyles.root, innerStyles.fullHeightSidebar, fg('team25-eu-jira-logo-updates-csm-jsm') && innerStyles.jiraProductLogoUpdate, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
+    className: ax([innerStyles.root, !fg('platform-dst-side-nav-layering-fixes') && innerStyles.fullHeightSidebar, fg('team25-eu-jira-logo-updates-csm-jsm') && innerStyles.jiraProductLogoUpdate, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
   }, children));
 });
 

package/dist/es2019/ui/page-layout/top-nav/top-nav.compiled.css

@@ -5,17 +5,28 @@
 ._18zrze3t{padding-inline:var(--ds-space-0,0)}
 ._179rglyw{border-block-end:none}
 ._179ria51{border-block-end:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._152t1nws{inset-block-start:var(--n_bnrM,0)}
+._18postnw:after{position:absolute}
+._1beue4h9:after{border-block-end-width:var(--ds-border-width,1px)}
 ._1bsb1osq{width:100%}
+._1cte1l7x:after{border-block-end-color:var(--ds-border,#0b120e24)}
+._1czdidpf:after{inset-inline-end:0}
 ._1e0c11p5{display:grid}
+._1gufidpf:after{inset-block-end:0}
+._1pby11wp{z-index:3}
+._1pbycs5v{z-index:2}
 ._1pbyegat{z-index:4}
 ._4cvr1h6o{align-items:center}
 ._4t3i1dgc{height:var(--n_tNvM)}
 ._4t3i1osq{height:100%}
+._aetrb3bt:after{content:""}
 ._bfhkglyw{background-color:none}
 ._bfhkvuon{background-color:var(--ds-surface,#fff)}
 ._d6vu1bgi >span[data-ep-placeholder-id=top_navigation_skeleton]{display:contents}
+._g0nf3tht:after{inset-inline-start:var(--n_sNvlw,0)}
 ._kqsw1if8{position:sticky}
+._lcxv1wug{pointer-events:auto}
 ._lcxvglyw{pointer-events:none}
+._uaeunqa1:after{border-block-end-style:solid}
 ._vchhusvi{box-sizing:border-box}
 ._yv0e1mfv{grid-template-columns:auto 1fr auto}
 @media (min-width:48rem){._1j8b18ax{grid-template-columns:1fr minmax(min-content,max-content) 1fr}}

package/dist/es2019/ui/page-layout/top-nav/top-nav.js

@@ -2,12 +2,14 @@
 import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useContext, useMemo } from 'react';
+import { useContext, useLayoutEffect, useMemo, useState } from 'react';
+import { OpenLayerObserverNamespaceProvider, useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useSkipLink } from '../../../context/skip-links/skip-links-context';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { useCustomTheme } from '../../top-nav-items/themed/use-custom-theme';
-import { bannerMountedVar, localSlotLayers, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
+import { bannerMountedVar, localSlotLayers, openLayerObserverTopNavNamespace, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { DangerouslyHoistCssVarToDocumentRoot, HoistCssVarToLocalGrid } from '../hoist-utils';
 import { useLayoutId } from '../id-utils';
@@ -23,7 +25,9 @@ import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
 const styles = {
   root: "_nd5l8cbt _zulpu2gc _18zrutpp _179ria51 _1e0c11p5 _yv0e1mfv _4cvr1h6o _bfhkvuon _vchhusvi _4t3i1dgc _152t1nws _kqsw1if8 _1pbyegat _d6vu1bgi _1j8b18ax",
   fullHeightSidebar: "_18zrze3t _179rglyw _bfhkglyw _lcxvglyw _pdlmutpp",
-  fullHeightSidebarExpanded: "_1rqt16a9 _jh1g18ax"
+  fullHeightSidebarExpanded: "_1rqt16a9 _jh1g18ax",
+  fullHeightSidebarWithLayeringFixes: "_1pbycs5v _lcxv1wug _bfhkvuon _aetrb3bt _18postnw _1gufidpf _1czdidpf _g0nf3tht _1beue4h9 _uaeunqa1 _1cte1l7x",
+  fullHeightSidebarWithLayeringFixesAndOpenLayer: "_1pby11wp"
 };
 
 /**
@@ -57,6 +61,8 @@ export function TopNav({
   const customTheme = useCustomTheme(UNSAFE_theme);
 
   /**
+   * Note: this is no longer the case when fg('platform-dst-side-nav-layering-fixes') is enabled.
+   *
    * With the full height sidebar we have a foreground and background element,
    * so we need to apply the custom theme styles to the correct element.
    *
@@ -87,9 +93,34 @@ export function TopNav({
   const {
     isExpandedOnDesktop
   } = useSideNavVisibility();
+  const openLayerObserver = useOpenLayerObserver();
+  // Setting the initial state to false, as it is unlikely that the top nav would have an open popup when the app starts.
+  const [hasOpenPopup, setHasOpenPopup] = useState(false);
+  useLayoutEffect(() => {
+    if (!openLayerObserver || !isFhsEnabled || !fg('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+    function checkAndSetState() {
+      if (!openLayerObserver) {
+        return;
+      }
+      setHasOpenPopup(openLayerObserver.getCount({
+        namespace: openLayerObserverTopNavNamespace,
+        type: 'popup'
+      }) > 0);
+    }
+
+    // Initial check
+    checkAndSetState();
+
+    // Check again whenever number of layers in the top nav change
+    return openLayerObserver.onChange(checkAndSetState, {
+      namespace: openLayerObserverTopNavNamespace
+    });
+  }, [isFhsEnabled, openLayerObserver]);
   return /*#__PURE__*/React.createElement(HasCustomThemeContext.Provider, {
     value: customTheme.isEnabled
-  }, isFhsEnabled && /*#__PURE__*/React.createElement("div", {
+  }, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/React.createElement("div", {
     "data-layout-slot": true,
     "aria-hidden": true
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
@@ -99,11 +130,13 @@ export function TopNav({
   }), /*#__PURE__*/React.createElement("header", {
     id: id,
     "data-layout-slot": true,
-    className: ax([styles.root, isFhsEnabled && styles.fullHeightSidebar, isExpandedOnDesktop && isFhsEnabled && styles.fullHeightSidebarExpanded, xcss]),
+    className: ax([styles.root, isFhsEnabled && styles.fullHeightSidebar, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixes, hasOpenPopup && isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixesAndOpenLayer, isExpandedOnDesktop && isFhsEnabled && styles.fullHeightSidebarExpanded, xcss]),
     "data-testid": testId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,
-    style: isFhsEnabled ? foregroundStyle : customTheme.isEnabled ? customTheme.style : undefined
+    style:
+    // When the layering fixes are enabled, we no longer have separate elements for the foreground and background.
+    isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') ? foregroundStyle : customTheme.isEnabled ? customTheme.style : undefined
   }, /*#__PURE__*/React.createElement(HoistCssVarToLocalGrid, {
     variableName: topNavMountedVar,
     value: height
@@ -117,5 +150,7 @@ export function TopNav({
     value: height
   })
   // ------ END UNSAFE STYLES ------
-  , children));
+  , fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavNamespace
+  }, children) : children));
 }

package/dist/esm/ui/menu-item/flyout-menu-item/close-button.js

@@ -20,7 +20,7 @@ export var CloseButton = function CloseButton(_ref) {
     testId: testId,
     appearance: "subtle",
     icon: CrossIcon,
-    label: label || 'Close Flyout Menu',
+    label: label,
     onClick: onClick
   });
 };

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-body.compiled.css

@@ -1,5 +1,9 @@
+._12l2x0bf{margin-inline-end:var(--ds-space-negative-100,-8px)}
 ._18m91wug{overflow-y:auto}
 ._1bahv2br{justify-content:start}
 ._1e0c1txw{display:flex}
 ._2lx21bp4{flex-direction:column}
-._4t3i1osq{height:100%}
+._4t3i1osq{height:100%}
+._ahbqx0bf{margin-inline-start:var(--ds-space-negative-100,-8px)}
+._bozgu2gc{padding-inline-start:var(--ds-space-100,8px)}
+._y4tiu2gc{padding-inline-end:var(--ds-space-100,8px)}

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-body.js

@@ -3,7 +3,7 @@ import "./flyout-body.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 var bodyStyles = {
-  root: "_1e0c1txw _2lx21bp4 _18m91wug _4t3i1osq _1bahv2br"
+  root: "_1e0c1txw _2lx21bp4 _18m91wug _4t3i1osq _1bahv2br _ahbqx0bf _12l2x0bf _bozgu2gc _y4tiu2gc"
 };
 /**
  * __Flyout menu item body__

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-footer.compiled.css

@@ -0,0 +1,4 @@
+._1q51u2gc{padding-block-start:var(--ds-space-100,8px)}
+._1sw7nqa1{border-block-start-style:solid}
+._7myae4h9{border-block-start-width:var(--ds-border-width,1px)}
+._qgnu1l7x{border-block-start-color:var(--ds-border,#0b120e24)}

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-footer.js

@@ -1,6 +1,10 @@
 /* flyout-footer.tsx generated by @compiled/babel-plugin v0.38.1 */
+import "./flyout-footer.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
+var footerStyles = {
+  root: "_7myae4h9 _1sw7nqa1 _qgnu1l7x _1q51u2gc"
+};
 /**
  * __Flyout menu item footer__
  *
@@ -12,6 +16,7 @@ export var FlyoutFooter = function FlyoutFooter(props) {
   var children = props.children,
     testId = props.testId;
   return /*#__PURE__*/React.createElement("div", {
-    "data-testid": testId
+    "data-testid": testId,
+    className: ax([footerStyles.root])
   }, children);
 };

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-header.compiled.css

@@ -7,4 +7,5 @@
 ._2lx21sbv{flex-direction:row-reverse}
 ._4cvr1h6o{align-items:center}
 ._85i512x7{padding-block-end:var(--ds-space-075,6px)}
-._bozg12x7{padding-inline-start:var(--ds-space-075,6px)}
+._bozg1b66{padding-inline-start:var(--ds-space-050,4px)}
+._bozgv77o{padding-inline-start:var(--ds-space-025,2px)}

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-header.js

@@ -7,8 +7,8 @@ import { Flex } from '@atlaskit/primitives/compiled';
 import { CloseButton } from './close-button';
 import { OnCloseContext, SetIsOpenContext } from './flyout-menu-item-context';
 var headerStyles = {
-  root: "_zulp12x7 _bozg12x7 _85i512x7 _1e0c1txw _2lx21bp4",
-  flex: "_zulppxbi _1bah1yb4 _2lx21sbv _4cvr1h6o _1bsb1osq"
+  root: "_zulp12x7 _bozg1b66 _85i512x7 _1e0c1txw _2lx21bp4",
+  flex: "_zulppxbi _1bah1yb4 _2lx21sbv _4cvr1h6o _1bsb1osq _bozgv77o"
 };
 /**
  * __FlyoutHeader__

package/dist/esm/ui/menu-item/flyout-menu-item/flyout-menu-item-context.js

@@ -31,6 +31,6 @@ export var OnCloseContext = /*#__PURE__*/createContext(null);
 /**
  * __On close provider__
  * 
- * A context provider for supplying the testId to the FlyoutHeader.
+ * A context provider for supplying the onClose function to the FlyoutHeader.
  */
 export var OnCloseProvider = OnCloseContext.Provider;

package/dist/esm/ui/page-layout/banner.compiled.css

@@ -1,6 +1,7 @@
 
 ._nd5ldkfm{grid-area:banner}._152tidpf{inset-block-start:0}
 ._18m915vq{overflow-y:hidden}
+._1pbycs5v{z-index:2}
 ._1pbyegat{z-index:4}
 ._1reo15vq{overflow-x:hidden}
 ._4t3iutvi{height:var(--n_bnrM)}

package/dist/esm/ui/page-layout/banner.js

@@ -3,13 +3,16 @@ import "./banner.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useContext } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useSkipLinkInternal } from '../../context/skip-links/skip-links-context';
+import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
 import { bannerMountedVar, localSlotLayers, UNSAFE_bannerVar } from './constants';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { DangerouslyHoistCssVarToDocumentRoot, HoistCssVarToLocalGrid } from './hoist-utils';
 import { useLayoutId } from './id-utils';
 var styles = {
-  root: "_nd5ldkfm _1reo15vq _18m915vq _4t3iutvi _152tidpf _kqsw1if8 _1pbyegat"
+  root: "_nd5ldkfm _1reo15vq _18m915vq _4t3iutvi _152tidpf _kqsw1if8 _1pbyegat",
+  fullHeightSidebarWithLayeringFixes: "_1pbycs5v"
 };
 
 /**
@@ -30,6 +33,7 @@ export function Banner(_ref) {
   var id = useLayoutId({
     providedId: providedId
   });
+  var isFhsEnabled = useIsFhsEnabled();
 
   /**
    * Don't show the skip link if the slot has 0 height.
@@ -42,7 +46,7 @@ export function Banner(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     id: id,
     "data-layout-slot": true,
-    className: ax([styles.root, xcss]),
+    className: ax([styles.root, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixes, xcss]),
     "data-testid": testId
   }, /*#__PURE__*/React.createElement(HoistCssVarToLocalGrid, {
     variableName: bannerMountedVar,

package/dist/esm/ui/page-layout/constants.js

@@ -50,6 +50,20 @@ export var UNSAFE_MAIN_INLINE_END_FOR_LEGACY_PAGES_ONLY = "calc(var(".concat(UNS
 export var localSlotLayers = {
   topBar: 4,
   banner: 4,
+  // With the FHS layering refactors, the banner and top nav have a lower z-index to allow layers from the side nav to overlay them.
+  // When they all have equal z-index values, the DOM order determines the layering - meaning the side nav will be layered above the rest.
+  // But, when the top bar contains an open layer, it needs to be layered above the side nav, so has a higher value.
+  topNavFHSWithOpenLayer: 3,
+  bannerFHS: 2,
+  topNavFHS: 2,
   sideNav: 2,
   panelSmallViewports: 1
-};
+};
+export var openLayerObserverSideNavNamespace = 'side-nav';
+export var openLayerObserverTopNavNamespace = 'top-nav';
+
+/**
+ * CSS scroll timeline variable for the side nav content scroll indicator.
+ * The scroll timeline is created in SideNavContent, and then used by TopNavStart to apply the scroll indicator line.
+ */
+export var sideNavContentScrollTimelineVar = '--sNcst';

package/dist/esm/ui/page-layout/panel-splitter/provider.js

@@ -1,4 +1,5 @@
 import React, { Fragment, useMemo, useRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { PanelSplitterContext } from './context';
 /**
  * Provides the context required for the panel splitter to work within a page layout slot.
@@ -12,6 +13,7 @@ export var PanelSplitterProvider = function PanelSplitterProvider(_ref) {
     getResizeBounds = _ref.getResizeBounds,
     resizingCssVar = _ref.resizingCssVar,
     panelRef = _ref.panelRef,
+    providedPortalRef = _ref.portalRef,
     _ref$position = _ref.position,
     position = _ref$position === void 0 ? 'end' : _ref$position,
     _ref$isEnabled = _ref.isEnabled,
@@ -29,13 +31,13 @@ export var PanelSplitterProvider = function PanelSplitterProvider(_ref) {
       position: position,
       panelRef: panelRef,
       isEnabled: isEnabled,
-      portalRef: portalRef,
+      portalRef: typeof providedPortalRef !== 'undefined' && fg('platform-dst-side-nav-layering-fixes') ? providedPortalRef : portalRef,
       shortcut: shortcut
     };
-  }, [panelId, panelWidth, onCompleteResize, getResizeBounds, resizingCssVar, position, portalRef, panelRef, isEnabled, shortcut]);
+  }, [panelId, panelWidth, onCompleteResize, getResizeBounds, resizingCssVar, position, panelRef, isEnabled, providedPortalRef, shortcut]);
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(PanelSplitterContext.Provider, {
     value: context
-  }, children), /*#__PURE__*/React.createElement("div", {
+  }, children), typeof providedPortalRef !== 'undefined' && fg('platform-dst-side-nav-layering-fixes') ? null : /*#__PURE__*/React.createElement("div", {
     ref: portalRef
   }));
 };

package/dist/esm/ui/page-layout/panel-splitter/side-nav-panel-splitter.js

@@ -1,6 +1,10 @@
-import React, { useContext } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useContext, useEffect, useState } from 'react';
 import invariant from 'tiny-invariant';
-import { sideNavPanelSplitterId } from '../constants';
+import { useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
+import { openLayerObserverSideNavNamespace, openLayerObserverTopNavNamespace, sideNavPanelSplitterId } from '../constants';
 import { useToggleSideNav } from '../side-nav/use-toggle-side-nav';
 import { OnDoubleClickContext, PanelSplitterContext } from './context';
 import { PanelSplitter } from './panel-splitter';
@@ -30,6 +34,61 @@ export var SideNavPanelSplitter = function SideNavPanelSplitter(_ref) {
   var toggleSideNav = useToggleSideNav({
     trigger: 'double-click'
   });
+  var isFhsEnabled = useIsFhsEnabled();
+
+  // The logic and state for disabling the panel splitter when there are open popups
+  // in the side nav or top nav is being placed here, instead of in `SideNav`, to prevent
+  // re-rendering the side nav anytime the number of open popups changes.
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    isEnabled = _useState2[0],
+    setIsEnabled = _useState2[1];
+  var openLayerObserver = useOpenLayerObserver();
+  useEffect(function () {
+    if (!openLayerObserver || !isFhsEnabled || !fg('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+    function checkAndSetState() {
+      if (!openLayerObserver) {
+        return;
+      }
+
+      // We don't technically need to check the side nav for open layers, as they wouldn't overlay the
+      // panel splitter, as it sits within the same stacking context as the side nav. For consistency however,
+      // we check it as well.
+      var openPopupsInSideNav = openLayerObserver.getCount({
+        namespace: openLayerObserverSideNavNamespace,
+        type: 'popup'
+      });
+
+      // When there is an open layer in the top nav, the top nav is given a higher z-index than the side nav.
+      // This means the part of the side nav panel splitter that was sitting above the top nav will no longer
+      // be interactive (as it is now behind the top nav). So, we need to disable the entire panel splitter.
+      var openPopupsInTopNav = openLayerObserver.getCount({
+        namespace: openLayerObserverTopNavNamespace,
+        type: 'popup'
+      });
+      setIsEnabled(openPopupsInSideNav + openPopupsInTopNav === 0);
+    }
+
+    // Initial check, in case the app has loaded with an open popup.
+    checkAndSetState();
+
+    // Creating separate listeners for each namespace, to avoid running them when layers in other parts of the app change.
+    var cleanupSideNavListener = openLayerObserver.onChange(checkAndSetState, {
+      namespace: openLayerObserverSideNavNamespace
+    });
+    var cleanupTopNavListener = openLayerObserver.onChange(checkAndSetState, {
+      namespace: openLayerObserverTopNavNamespace
+    });
+    return function cleanup() {
+      cleanupSideNavListener();
+      cleanupTopNavListener();
+    };
+  }, [isFhsEnabled, openLayerObserver]);
+  if (!isEnabled && isFhsEnabled && fg('platform-dst-side-nav-layering-fixes')) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(OnDoubleClickContext.Provider, {
     value: shouldCollapseOnDoubleClick ? toggleSideNav : undefined
   }, /*#__PURE__*/React.createElement(PanelSplitter, {

package/dist/esm/ui/page-layout/root.compiled.css

@@ -1,3 +1,4 @@
+._10iwgc9s{timeline-scope:--sNcst}
 ._1ciragmp >:not([data-layout-slot]){display:none!important}
 ._1e0c11p5{display:grid}
 ._1lmcq9em{grid-template-areas:"banner" "top-bar" "main" "aside"}

package/dist/esm/ui/page-layout/root.js

@@ -3,8 +3,11 @@ import "./root.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useRef } from 'react';
 import { OpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SkipLinksProvider } from '../../context/skip-links/skip-links-provider';
 import { TopNavStartProvider } from '../../context/top-nav-start/top-nav-start-context-provider';
+import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
+import { sideNavContentScrollTimelineVar } from './constants';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { SideNavElementProvider } from './side-nav/element-context';
 import { IsSideNavShortcutEnabledProvider } from './side-nav/is-side-nav-shortcut-enabled-context';
@@ -14,7 +17,8 @@ import { SideNavVisibilityProvider } from './side-nav/visibility-provider';
 // ID of the root element that the banner and top bar slots hoist their sizes to. Only internally exported.
 export var gridRootId = 'unsafe-design-system-page-layout-root';
 var styles = {
-  root: "_1e0c11p5 _1tke1kxc _1lmcq9em _yv0ei47z _2z0516ab _1ciragmp _12fkuz0r _12qzrxre _1rqt70if _xkmgbaui _jbc7rxre _tyve1jg8"
+  root: "_1e0c11p5 _1tke1kxc _1lmcq9em _yv0ei47z _2z0516ab _1ciragmp _12fkuz0r _12qzrxre _1rqt70if _xkmgbaui _jbc7rxre _tyve1jg8",
+  sideNavScrollTimeline: "_10iwgc9s"
 };
 
 /**
@@ -33,6 +37,7 @@ export function Root(_ref) {
     _ref$isSideNavShortcu = _ref.isSideNavShortcutEnabled,
     isSideNavShortcutEnabled = _ref$isSideNavShortcu === void 0 ? false : _ref$isSideNavShortcu;
   var ref = useRef(null);
+  var isFhsEnabled = useIsFhsEnabled();
   useEffect(function () {
     if (process.env.NODE_ENV !== 'production') {
       var IGNORED_ELEMENTS = ['SCRIPT', 'STYLE'];
@@ -57,7 +62,7 @@ export function Root(_ref) {
     testId: testId
   }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: ax([styles.root, xcss]),
+    className: ax([styles.root, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && styles.sideNavScrollTimeline, xcss]),
     id: gridRootId,
     "data-testid": testId
   }, children)))))))));

package/dist/esm/ui/page-layout/side-nav/side-nav-content.compiled.css

@@ -10,4 +10,5 @@
 ._i0dlf1ug{flex-basis:0%}
 ._j7hq4n8p{animation-name:k1gwhnxc}
 ._y4tiutpp{padding-inline-end:var(--ds-space-150,9pt)}
-@keyframes k1gwhnxc{0%{box-shadow:none}0.1%{box-shadow:0 -1px var(--ds-border,#0b120e24)}to{box-shadow:0 -1px var(--ds-border,#0b120e24)}}
+@keyframes k1gwhnxc{0%{box-shadow:none}0.1%{box-shadow:0 -1px var(--ds-border,#0b120e24)}to{box-shadow:0 -1px var(--ds-border,#0b120e24)}}
+@media (min-width:64rem){@supports (scroll-timeline-axis:block){._1sfqgc9s{scroll-timeline-name:--sNcst}._1q1x1ule{scroll-timeline-axis:block}html:has([data-private-side-nav-header]) ._8pm2gc9s{animation-timeline:--sNcst}html:has([data-private-side-nav-header]) ._1gd94n8p{animation-name:k1gwhnxc}}@supports (scroll-timeline-axis:block){@keyframes k1gwhnxc{0%{box-shadow:none}0.1%{box-shadow:0 -1px var(--ds-border,#0b120e24)}to{box-shadow:0 -1px var(--ds-border,#0b120e24)}}}}