@atlaskit/navigation-system 5.17.0 → 5.18.1

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

@@ -6,6 +6,7 @@ import React, { useState } from 'react';
 import { cx } from '@compiled/react';
 import { useLayoutEffect } from '@atlaskit/ds-lib/use-layout-effect';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
+import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/experimental/open-layer-observer';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Popup from '@atlaskit/popup';
 import { UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/compiled';
@@ -13,9 +14,9 @@ import { List } from '../../../components/list';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { IconButton } from '../../top-nav-items/themed/migration';
+import { openLayerObserverTopNavEndNamespace } from '../constants';
 const containerStyles = {
-  root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15ri1mjv _1gs5usvi _ndwch9n0",
-  jiraProductLogoUpdate: "_15rip2n4",
+  root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15rip2n4 _1gs5usvi _ndwch9n0",
   fullHeightSidebar: "_y4tiutpp _lcxv1wug",
   fullHeightSidebarWithLayeringFixes: "_y4tiutpp"
 };
@@ -24,6 +25,13 @@ const listStyles = {
   hideOnSmallViewport: "_1e0cglyw _181n1txw",
   popupContainer: "_1yt4u2gc"
 };
+function OpenLayerObserverNamespaceProviderBehindFG({
+  children
+}) {
+  return fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavEndNamespace
+  }, children) : children;
+}
 
 /**
  * __TopNavEnd__
@@ -57,7 +65,7 @@ export function TopNavEnd({
   }, [query]);
   return /*#__PURE__*/React.createElement("nav", {
     "aria-label": label,
-    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])
+    className: ax([containerStyles.root, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebar, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebarWithLayeringFixes])
   }, isMobile ? /*#__PURE__*/React.createElement(Popup, {
     isOpen: isOpen,
     onClose: () => setIsOpen(false),
@@ -67,7 +75,7 @@ export function TopNavEnd({
       value: false
     }, /*#__PURE__*/React.createElement(List, {
       xcss: cx(listStyles.root, listStyles.popupContainer)
-    }, children)),
+    }, /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children))),
     trigger: triggerProps => /*#__PURE__*/React.createElement(IconButton, _extends({}, triggerProps, {
       label: showMoreButtonLabel,
       isSelected: isOpen,
@@ -77,5 +85,5 @@ export function TopNavEnd({
     }))
   }) : /*#__PURE__*/React.createElement(List, {
     xcss: cx(listStyles.root, listStyles.hideOnSmallViewport)
-  }, children));
+  }, /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children)));
 }

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

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

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

@@ -13,5 +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){._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 (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%}@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}._15rip2n4{min-width:330px}._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

@@ -3,11 +3,12 @@ import "./top-nav-start.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { forwardRef, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
+import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/experimental/open-layer-observer';
 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 { openLayerObserverTopNavStartNamespace, sideNavContentScrollTimelineVar } from '../constants';
 import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
 import { SideNavVisibilityState } from '../side-nav/visibility-context';
 
@@ -30,8 +31,7 @@ const flexGap = "var(--ds-space-050, 4px)";
  * which re-enables pointer events.
  */
 const innerStyles = {
-  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15ri1mjv _1gs5usvi",
-  jiraProductLogoUpdate: "_15rip2n4",
+  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15rip2n4 _1gs5usvi",
   fullHeightSidebar: "_lcxv1wug",
   fullHeightSidebarExpanded: "_15rin7od _glte1osq"
 };
@@ -109,7 +109,7 @@ const TopNavStartInnerOld = /*#__PURE__*/forwardRef(function TopNavStartInner({
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     "data-testid": testId,
-    className: ax([innerStyles.root, fg('team25-eu-jira-logo-updates-csm-jsm') && innerStyles.jiraProductLogoUpdate])
+    className: ax([innerStyles.root])
   }, children);
 });
 const TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS({
@@ -146,8 +146,10 @@ const TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS
   }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     "data-testid": testId,
-    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));
+    className: ax([innerStyles.root, !fg('platform-dst-side-nav-layering-fixes') && innerStyles.fullHeightSidebar, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
+  }, fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavStartNamespace
+  }, children) : children));
 });
 
 /**

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

@@ -2,18 +2,19 @@
 import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useContext, useLayoutEffect, useMemo, useState } from 'react';
-import { OpenLayerObserverNamespaceProvider, useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
+import { useContext, useMemo } from 'react';
 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, openLayerObserverTopNavNamespace, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
+import { bannerMountedVar, localSlotLayers, openLayerObserverTopNavEndNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { DangerouslyHoistCssVarToDocumentRoot, HoistCssVarToLocalGrid } from '../hoist-utils';
 import { useLayoutId } from '../id-utils';
 import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
+import { useHasOpenLayers } from '../use-open-layer-count';
+
 /**
  * Styles for the container for the top nav items.
  *
@@ -40,6 +41,14 @@ const backgroundStyles = {
   sideNavExpanded: "_hyzqcs5v"
 };
 
+/**
+ * Namespaces to check for open layers within the top nav.
+ * When there is an open layer in the top nav, the top nav is given a higher z-index than the side nav.
+ *
+ * Placed outside the component for stability, as the list is used as an effect dependency.
+ */
+const topNavOpenLayerNamespaces = [openLayerObserverTopNavStartNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavEndNamespace];
+
 /**
  * The top nav layout area. It will display at the top of the screen, below the banner if one is present.
  */
@@ -93,31 +102,10 @@ 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]);
+  const hasOpenPopup = useHasOpenLayers({
+    namespaces: topNavOpenLayerNamespaces,
+    type: 'popup'
+  });
   return /*#__PURE__*/React.createElement(HasCustomThemeContext.Provider, {
     value: customTheme.isEnabled
   }, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/React.createElement("div", {
@@ -150,7 +138,5 @@ export function TopNav({
     value: height
   })
   // ------ END UNSAFE STYLES ------
-  , fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
-    namespace: openLayerObserverTopNavNamespace
-  }, children) : children));
+  , children));
 }

package/dist/es2019/ui/page-layout/use-open-layer-count.js

@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react';
+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';
+
+/**
+ * Returns whether there are any open layers across the specified namespaces, optionally filtered by type.
+ */
+export function useHasOpenLayers({
+  namespaces,
+  type
+}) {
+  const isFhsEnabled = useIsFhsEnabled();
+  const openLayerObserver = useOpenLayerObserver();
+  // Setting the initial state to false, as it is unlikely that there would be any open layers when the app starts.
+  const [hasOpenLayers, setHasOpenLayers] = useState(false);
+  useEffect(() => {
+    if (!openLayerObserver || !isFhsEnabled || !fg('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+    function updateState() {
+      if (!openLayerObserver) {
+        return;
+      }
+      const hasAnyOpenLayers = namespaces.some(namespace => openLayerObserver.getCount({
+        namespace,
+        type
+      }) > 0);
+      setHasOpenLayers(hasAnyOpenLayers);
+    }
+
+    // Initial check
+    updateState();
+
+    // Subscribe to each namespace
+    const cleanups = namespaces.map(namespace => openLayerObserver.onChange(updateState, {
+      namespace
+    }));
+    return function cleanupHook() {
+      cleanups.forEach(cleanup => cleanup());
+    };
+  }, [isFhsEnabled, openLayerObserver, namespaces, type]);
+  return hasOpenLayers;
+}

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

@@ -60,7 +60,13 @@ export var localSlotLayers = {
   panelSmallViewports: 1
 };
 export var openLayerObserverSideNavNamespace = 'side-nav';
-export var openLayerObserverTopNavNamespace = 'top-nav';
+// We have separate OpenLayerObserver namespaces for each top nav layout area, instead of a single namespace for the entire top nav,
+// as we need to know if there are open layers in TopNavStart specifically to prevent the side nav from peeking.
+// The OpenLayerObserver doesn't support nested namespaces. We could update it, but for now it's simple enough to just have separate
+// namespaces.
+export var openLayerObserverTopNavStartNamespace = 'top-nav-start';
+export var openLayerObserverTopNavMiddleNamespace = 'top-nav-middle';
+export var openLayerObserverTopNavEndNamespace = 'top-nav-end';
 
 /**
  * CSS scroll timeline variable for the side nav content scroll indicator.

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

@@ -1,13 +1,27 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext } from 'react';
 import invariant from 'tiny-invariant';
-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 { openLayerObserverSideNavNamespace, openLayerObserverTopNavEndNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavStartNamespace, sideNavPanelSplitterId } from '../constants';
 import { useToggleSideNav } from '../side-nav/use-toggle-side-nav';
+import { useHasOpenLayers } from '../use-open-layer-count';
 import { OnDoubleClickContext, PanelSplitterContext } from './context';
 import { PanelSplitter } from './panel-splitter';
+
+/**
+ * Namespaces to check for open layers that would interfere with the panel splitter.
+ *
+ * Placed outside the component for stability, as the list is used as an effect dependency.
+ */
+var openLayerNamespacesToCheck = [
+// 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.
+openLayerObserverSideNavNamespace,
+// 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.
+openLayerObserverTopNavStartNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavEndNamespace];
 /**
  * _SideNavPanelSplitter_
  *
@@ -39,54 +53,11 @@ export var SideNavPanelSplitter = function SideNavPanelSplitter(_ref) {
   // 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')) {
+  var hasOpenLayers = useHasOpenLayers({
+    namespaces: openLayerNamespacesToCheck,
+    type: 'popup'
+  });
+  if (hasOpenLayers && isFhsEnabled && fg('platform-dst-side-nav-layering-fixes')) {
     return null;
   }
   return /*#__PURE__*/React.createElement(OnDoubleClickContext.Provider, {

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

@@ -210,6 +210,13 @@ function SideNavInternal(_ref) {
       }
     }
     function open() {
+      // Prevent the flyout from being opened if there are any open layers in the top nav start
+      if (openLayerObserver && openLayerObserver.getCount({
+        namespace: 'top-nav-start',
+        type: 'popup'
+      }) > 0 && fg('platform_dst_nav4_side_nav_resize_tooltip_feedback')) {
+        return;
+      }
       var prevFlyoutState = flyoutStateRef.current;
       tryAbortPendingClose();
       flyoutStateRef.current = {

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

@@ -9,4 +9,4 @@
 ._lcxv1wug{pointer-events:auto}
 ._y4tiutpp{padding-inline-end:var(--ds-space-150,9pt)}
 @media (min-width:48rem){._181n1txw{display:flex}._1d2y1ris{min-width:max-content}}
-@media (min-width:64rem){._15rip2n4{min-width:330px}._glte1ris{width:max-content}._15ri1mjv{min-width:300px}._1gs5usvi{box-sizing:border-box}._ndwch9n0{justify-self:end}}
+@media (min-width:64rem){._glte1ris{width:max-content}._15rip2n4{min-width:330px}._1gs5usvi{box-sizing:border-box}._ndwch9n0{justify-self:end}}

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

@@ -7,6 +7,7 @@ import React, { useState } from 'react';
 import { cx } from '@compiled/react';
 import { useLayoutEffect } from '@atlaskit/ds-lib/use-layout-effect';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
+import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/experimental/open-layer-observer';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Popup from '@atlaskit/popup';
 import { UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/compiled';
@@ -14,9 +15,9 @@ import { List } from '../../../components/list';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { IconButton } from '../../top-nav-items/themed/migration';
+import { openLayerObserverTopNavEndNamespace } from '../constants';
 var containerStyles = {
-  root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15ri1mjv _1gs5usvi _ndwch9n0",
-  jiraProductLogoUpdate: "_15rip2n4",
+  root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15rip2n4 _1gs5usvi _ndwch9n0",
   fullHeightSidebar: "_y4tiutpp _lcxv1wug",
   fullHeightSidebarWithLayeringFixes: "_y4tiutpp"
 };
@@ -25,6 +26,12 @@ var listStyles = {
   hideOnSmallViewport: "_1e0cglyw _181n1txw",
   popupContainer: "_1yt4u2gc"
 };
+function OpenLayerObserverNamespaceProviderBehindFG(_ref) {
+  var children = _ref.children;
+  return fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavEndNamespace
+  }, children) : children;
+}
 
 /**
  * __TopNavEnd__
@@ -34,12 +41,12 @@ var listStyles = {
  * On small viewports, the children will be placed inside a popup, and a button will be rendered to open the popup.
  * This is to prevent the actions from overflowing the top navigation.
  */
-export function TopNavEnd(_ref) {
-  var children = _ref.children,
-    _ref$label = _ref.label,
-    label = _ref$label === void 0 ? 'Actions' : _ref$label,
-    _ref$showMoreButtonLa = _ref.showMoreButtonLabel,
-    showMoreButtonLabel = _ref$showMoreButtonLa === void 0 ? 'Show more' : _ref$showMoreButtonLa;
+export function TopNavEnd(_ref2) {
+  var children = _ref2.children,
+    _ref2$label = _ref2.label,
+    label = _ref2$label === void 0 ? 'Actions' : _ref2$label,
+    _ref2$showMoreButtonL = _ref2.showMoreButtonLabel,
+    showMoreButtonLabel = _ref2$showMoreButtonL === void 0 ? 'Show more' : _ref2$showMoreButtonL;
   var isFhsEnabled = useIsFhsEnabled();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -65,7 +72,7 @@ export function TopNavEnd(_ref) {
   }, [query]);
   return /*#__PURE__*/React.createElement("nav", {
     "aria-label": label,
-    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])
+    className: ax([containerStyles.root, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebar, isFhsEnabled && fg('platform-dst-side-nav-layering-fixes') && containerStyles.fullHeightSidebarWithLayeringFixes])
   }, isMobile ? /*#__PURE__*/React.createElement(Popup, {
     isOpen: isOpen,
     onClose: function onClose() {
@@ -78,7 +85,7 @@ export function TopNavEnd(_ref) {
         value: false
       }, /*#__PURE__*/React.createElement(List, {
         xcss: cx(listStyles.root, listStyles.popupContainer)
-      }, children));
+      }, /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children)));
     },
     trigger: function trigger(triggerProps) {
       return /*#__PURE__*/React.createElement(IconButton, _extends({}, triggerProps, {
@@ -93,5 +100,5 @@ export function TopNavEnd(_ref) {
     }
   }) : /*#__PURE__*/React.createElement(List, {
     xcss: cx(listStyles.root, listStyles.hideOnSmallViewport)
-  }, children));
+  }, /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children)));
 }

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

@@ -2,8 +2,10 @@
 import "./top-nav-middle.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
+import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/experimental/open-layer-observer';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
+import { openLayerObserverTopNavMiddleNamespace } from '../constants';
 var styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
   fullHeightSidebar: "_lcxv1wug"
@@ -22,5 +24,7 @@ export function TopNavMiddle(_ref) {
   var isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement("div", {
     className: ax([styles.root, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebar])
-  }, children);
+  }, fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavMiddleNamespace
+  }, children) : children);
 }

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

@@ -13,5 +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){._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])) ._1m3l1ybg{animation-name:khj1qz3}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 khj1qz3{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 (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%}@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])) ._1m3l1ybg{animation-name:khj1qz3}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}._15rip2n4{min-width:330px}._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 khj1qz3{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/esm/ui/page-layout/top-nav/top-nav-start.js

@@ -4,11 +4,12 @@ import "./top-nav-start.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { forwardRef, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
+import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/experimental/open-layer-observer';
 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 { openLayerObserverTopNavStartNamespace, sideNavContentScrollTimelineVar } from '../constants';
 import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
 import { SideNavVisibilityState } from '../side-nav/visibility-context';
 
@@ -31,8 +32,7 @@ var flexGap = "var(--ds-space-050, 4px)";
  * which re-enables pointer events.
  */
 var innerStyles = {
-  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15ri1mjv _1gs5usvi",
-  jiraProductLogoUpdate: "_15rip2n4",
+  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15rip2n4 _1gs5usvi",
   fullHeightSidebar: "_lcxv1wug",
   fullHeightSidebarExpanded: "_15rin7od _glte1osq"
 };
@@ -109,7 +109,7 @@ var TopNavStartInnerOld = /*#__PURE__*/forwardRef(function TopNavStartInner(_ref
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     "data-testid": testId,
-    className: ax([innerStyles.root, fg('team25-eu-jira-logo-updates-csm-jsm') && innerStyles.jiraProductLogoUpdate])
+    className: ax([innerStyles.root])
   }, children);
 });
 var TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS(_ref2, ref) {
@@ -144,8 +144,10 @@ var TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS(_
   }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     "data-testid": testId,
-    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));
+    className: ax([innerStyles.root, !fg('platform-dst-side-nav-layering-fixes') && innerStyles.fullHeightSidebar, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
+  }, fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
+    namespace: openLayerObserverTopNavStartNamespace
+  }, children) : children));
 });
 
 /**

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

@@ -1,22 +1,22 @@
 /* top-nav.tsx generated by @compiled/babel-plugin v0.38.1 */
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["backgroundColor"];
 import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useContext, useLayoutEffect, useMemo, useState } from 'react';
-import { OpenLayerObserverNamespaceProvider, useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
+import { useContext, useMemo } from 'react';
 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, openLayerObserverTopNavNamespace, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
+import { bannerMountedVar, localSlotLayers, openLayerObserverTopNavEndNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { DangerouslyHoistCssVarToDocumentRoot, HoistCssVarToLocalGrid } from '../hoist-utils';
 import { useLayoutId } from '../id-utils';
 import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
+import { useHasOpenLayers } from '../use-open-layer-count';
+
 /**
  * Styles for the container for the top nav items.
  *
@@ -43,6 +43,14 @@ var backgroundStyles = {
   sideNavExpanded: "_hyzqcs5v"
 };
 
+/**
+ * Namespaces to check for open layers within the top nav.
+ * When there is an open layer in the top nav, the top nav is given a higher z-index than the side nav.
+ *
+ * Placed outside the component for stability, as the list is used as an effect dependency.
+ */
+var topNavOpenLayerNamespaces = [openLayerObserverTopNavStartNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavEndNamespace];
+
 /**
  * The top nav layout area. It will display at the top of the screen, below the banner if one is present.
  */
@@ -94,34 +102,10 @@ export function TopNav(_ref) {
     foregroundStyle = _useMemo.foregroundStyle;
   var _useSideNavVisibility = useSideNavVisibility(),
     isExpandedOnDesktop = _useSideNavVisibility.isExpandedOnDesktop;
-  var 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.
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    hasOpenPopup = _useState2[0],
-    setHasOpenPopup = _useState2[1];
-  useLayoutEffect(function () {
-    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]);
+  var hasOpenPopup = useHasOpenLayers({
+    namespaces: topNavOpenLayerNamespaces,
+    type: 'popup'
+  });
   return /*#__PURE__*/React.createElement(HasCustomThemeContext.Provider, {
     value: customTheme.isEnabled
   }, isFhsEnabled && !fg('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/React.createElement("div", {
@@ -154,7 +138,5 @@ export function TopNav(_ref) {
     value: height
   })
   // ------ END UNSAFE STYLES ------
-  , fg('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
-    namespace: openLayerObserverTopNavNamespace
-  }, children) : children));
+  , children));
 }