@atlaskit/navigation-system 5.32.2 → 5.33.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlassian/navigation-system
 
+## 5.33.1
+
+### Patch Changes
+
+- [`790a15b2d6cc0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/790a15b2d6cc0) -
+  Fixes a bug behind the `platform_dst_nav4_side_nav_resize_tooltip_feedback` gate, where the side
+  nav panel splitter tooltip could be mispositioned on scaled displays.
+- Updated dependencies
+
+## 5.33.0
+
+### Minor Changes
+
+- [`57838cec99f29`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/57838cec99f29) -
+  Layering refactors have been made to the top nav and full height sidebar, behind the feature gate
+  `platform-dst-side-nav-layering-fixes`.
+  - Layers inside the side nav that are rendered to parent (`shouldRenderToParent`) will be layered
+    below the top nav and banner.
+  - Refactors have been made to the positioning and render location of the side nav panel splitter.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.32.2
 
 ### Patch Changes

package/constellation/layout/diagram.tsx

@@ -91,7 +91,7 @@ const styles = cssMap({
 	},
 });
 
-export const PageLayoutDiagram = () => (
+export const PageLayoutDiagram: () => JSX.Element = () => (
 	<div css={styles.root}>
 		<div css={[styles.slot, styles.bannerSlot]}>
 			<div css={styles.placeholder}>Banner</div>

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

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

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

@@ -20,7 +20,7 @@ var _idUtils = require("./id-utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var styles = {
   root: "_nd5ldkfm _1reo15vq _18m915vq _4t3iutvi _152tidpf _kqsw1if8 _1pbyegat",
-  fullHeightSidebarWithLayeringFixes: "_1pbycs5v"
+  fullHeightSidebarWithLayeringFixes: "_1pby11wp"
 };
 
 /**

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

@@ -54,14 +54,15 @@ var UNSAFE_MAIN_INLINE_END_FOR_LEGACY_PAGES_ONLY = exports.UNSAFE_MAIN_INLINE_EN
  * rely on accessing them through global means.
  */
 var localSlotLayers = exports.localSlotLayers = {
+  // The side nav panel splitter is layered above the top nav when FHS and 'platform-dst-side-nav-layering-fixes' is enabled.
+  // It has the same z-index value, but is rendered after the top nav in the DOM so is stacked above.
+  sideNavPanelSplitterFHS: 4,
   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,
+  // When FHS and 'platform-dst-side-nav-layering-fixes' is enabled, the side nav is layered below the top nav,
+  // but above the panel
+  bannerFHS: 3,
+  topNavFHS: 3,
   sideNav: 2,
   panelSmallViewports: 1
 };

package/dist/cjs/ui/page-layout/panel-splitter/panel-splitter.compiled.css

@@ -2,6 +2,7 @@
 ._12y31o36{outline-width:medium}
 ._152tidpf{inset-block-start:0}
 ._1bsb1l7b{width:3px}
+._1bsb1ris{width:max-content}
 ._1bsbl52n{width:17px}
 ._1e021v6z{inset-inline-start:7px}
 ._1e02zeo2{inset-inline-start:-9px}

package/dist/cjs/ui/page-layout/panel-splitter/panel-splitter.js

@@ -58,7 +58,8 @@ var lineStyles = {
   root: "_kqswstnw _1e0c1ule _1bsb1l7b _4t3i1osq _syaz1kw7 _bfhk1r31 _1e021v6z"
 };
 var tooltipStyles = {
-  root: "_ahbq196n"
+  root: "_ahbq196n",
+  fullHeightSidebarWithLayeringFixes: "_1bsb1ris"
 };
 var panelSplitterDragDataSymbol = Symbol('panel-splitter-drag-data');
 function signPanelSplitterDragData(data) {
@@ -72,7 +73,11 @@ var PanelSplitterTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, r
     if (!props.style || !props.style.transform) {
       return props.style;
     }
-    var _props$style$transfor = props.style.transform.matchAll(/\d+px/g),
+
+    // We cannot just match against integers safely, as browsers may introduce non-integer values due to scaling
+    // In the future we can probably use `CSSStyleValue.parse()` to get the browser to handle parsing for us,
+    // but there's no Firefox support yet.
+    var _props$style$transfor = props.style.transform.matchAll(/(?:-|\+)?\d*\.?\d+px/g),
       _props$style$transfor2 = (0, _slicedToArray2.default)(_props$style$transfor, 2),
       translateX = _props$style$transfor2[0],
       translateY = _props$style$transfor2[1];
@@ -96,7 +101,7 @@ var PanelSplitterTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, r
     // Must be statically passed
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/design-system/no-unsafe-style-overrides
     ,
-    className: (0, _runtime.ax)([tooltipStyles.root, className])
+    className: (0, _runtime.ax)([tooltipStyles.root, (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && tooltipStyles.fullHeightSidebarWithLayeringFixes, className])
     // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
     ,
 
@@ -111,10 +116,12 @@ var PanelSplitterTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, r
 var MaybeTooltip = function MaybeTooltip(_ref2) {
   var tooltipContent = _ref2.tooltipContent,
     shortcut = _ref2.shortcut,
-    children = _ref2.children;
+    children = _ref2.children,
+    testId = _ref2.testId;
   var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   if (tooltipContent && isFhsEnabled) {
     return /*#__PURE__*/React.createElement(_tooltip.default, {
+      testId: testId,
       content: tooltipContent,
       shortcut: shortcut,
       position: (0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_resize_tooltip_feedback') ? 'mouse-y' : 'mouse',
@@ -399,7 +406,8 @@ var PortaledPanelSplitter = function PortaledPanelSplitter(_ref3) {
     className: (0, _runtime.ax)([containerStyles.root, position === 'start' && containerStyles.positionStart, position === 'end' && containerStyles.positionEnd])
   }, /*#__PURE__*/React.createElement(MaybeTooltip, {
     tooltipContent: tooltipContent,
-    shortcut: shortcut
+    shortcut: shortcut,
+    testId: testId && (0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_resize_tooltip_feedback') ? "".concat(testId, "-tooltip") : undefined
   }, /*#__PURE__*/React.createElement("div", {
     ref: splitterRef,
     "data-testid": testId,

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

@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SideNavPanelSplitter = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
+var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 var _constants = require("../constants");
 var _useToggleSideNav = require("../side-nav/use-toggle-side-nav");
-var _useOpenLayerCount = require("../use-open-layer-count");
 var _context = require("./context");
 var _panelSplitter = require("./panel-splitter");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -22,14 +23,56 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
  * 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.
+// The side nav panel splitter is layered above the side nav, so needs to be disabled when there are open popups in the side nav.
 _constants.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.
+// The side nav panel splitter is layered above the top nav, so needs to be disabled when there are open popups in the top nav.
 _constants.openLayerObserverTopNavStartNamespace, _constants.openLayerObserverTopNavMiddleNamespace, _constants.openLayerObserverTopNavEndNamespace];
+
+/**
+ * Returns whether there are any open popups in the side nav or top nav
+ */
+function useHasOpenPopupsInSideNavOrTopNav() {
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
+  var openLayerObserver = (0, _openLayerObserver.useOpenLayerObserver)();
+  // Setting the initial state to false, as it is unlikely that there would be any open popups when the app starts.
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hasOpenPopups = _useState2[0],
+    setHasOpenPopups = _useState2[1];
+  (0, _react.useEffect)(function () {
+    if (!openLayerObserver || !isFhsEnabled || !(0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+    function updateState() {
+      if (!openLayerObserver) {
+        return;
+      }
+      var hasAnyOpenLayers = openLayerNamespacesToCheck.some(function (namespace) {
+        return openLayerObserver.getCount({
+          namespace: namespace,
+          type: 'popup'
+        }) > 0;
+      });
+      setHasOpenPopups(hasAnyOpenLayers);
+    }
+
+    // Initial check. We do this _in case_ a popup is already open when the component mounts.
+    updateState();
+
+    // Subscribe to each namespace
+    var cleanups = openLayerNamespacesToCheck.map(function (namespace) {
+      return openLayerObserver.onChange(updateState, {
+        namespace: namespace
+      });
+    });
+    return function cleanupHook() {
+      cleanups.forEach(function (cleanup) {
+        return cleanup();
+      });
+    };
+  }, [isFhsEnabled, openLayerObserver]);
+  return hasOpenPopups;
+}
 /**
  * _SideNavPanelSplitter_
  *
@@ -61,11 +104,8 @@ var SideNavPanelSplitter = exports.SideNavPanelSplitter = function SideNavPanelS
   // 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 hasOpenLayers = (0, _useOpenLayerCount.useHasOpenLayers)({
-    namespaces: openLayerNamespacesToCheck,
-    type: 'popup'
-  });
-  if (hasOpenLayers && isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes')) {
+  var hasOpenLayersInSideNavOrTopNav = useHasOpenPopupsInSideNavOrTopNav();
+  if (hasOpenLayersInSideNavOrTopNav && isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes')) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_context.OnDoubleClickContext.Provider, {

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

@@ -9,19 +9,20 @@
 ._1e0c1txw{display:flex}
 ._1e0cglyw{display:none}
 ._1pbycs5v{z-index:2}
+._1pbyegat{z-index:4}
 ._2lx21bp4{flex-direction:column}
 ._4t3i1osq{height:100%}
 ._4t3ieqxy{height:calc(100vh - var(--n_bnrM, 0px) - var(--n_tNvM, 0px))}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._kqsw1if8{position:sticky}
-._kqswstnw{position:absolute}
-._rjxpidpf{inset-inline-end:0}
+._kqsw1n9t{position:fixed}
+._t9ectl5p{transform:translateX(calc(var(--n_snvRsz, var(--n_snvW, 0px))))}
 ._u7coidpf{inset-block-end:0}
 ._vchhusvi{box-sizing:border-box}
 [dir=rtl] ._65m41mrw{--animation-direction:-1}
 @media (prefers-reduced-motion:no-preference){._10t88iot{transition-property:transform,display}._1vrh1a5r{transition-behavior:allow-discrete}._xrrpfnf5{transition-duration:.2s}._1lh81gzg{grid-area:main}._1xq51mm8{transition-timing-function:cubic-bezier(0,.4,0,1)}@starting-style{._1nu51p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}._1xq51ku9{transition-timing-function:cubic-bezier(.6,0,0,1)}}
 @media (min-width:48rem){._14b5hc79{width:var(--n_snvRsz,var(--n_sNvw))}}
-@media (min-width:64rem){._165t56xv{height:calc(100vh - var(--n_bnrM, 0px))}._180k1wjm{inset-block-start:calc(var(--n_bnrM, 0px))}._26vxoned{padding-block-start:calc(var(--n_tNvM, 0px))}._1mt19dtb{margin-block-start:calc(var(--n_tNvM, 0px)*-1)}._dm2518uv{display:initial}._dm25glyw{display:none}._qiln1gzg{grid-area:main}._p5clglyw{border-inline-end:none}._4ap31bhr{background-color:var(--ds-surface-overlay,#fff)}._scbp130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._qilnk0mc{grid-area:side-nav}._p5clia51{border-inline-end:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._4ap3vuon{background-color:var(--ds-surface,#fff)}._scbpglyw{box-shadow:none}}
+@media (min-width:64rem){._165t56xv{height:calc(100vh - var(--n_bnrM, 0px))}._180k1wjm{inset-block-start:calc(var(--n_bnrM, 0px))}._26vxoned{padding-block-start:calc(var(--n_tNvM, 0px))}._1mt19dtb{margin-block-start:calc(var(--n_tNvM, 0px)*-1)}._p0az1elq{transform:translateX(calc(var(--n_snvRsz, var(--n_snvW, 0px)) - var(--ds-border-width, 1px)))}._dm2518uv{display:initial}._dm25glyw{display:none}._qiln1gzg{grid-area:main}._p5clglyw{border-inline-end:none}._4ap31bhr{background-color:var(--ds-surface-overlay,#fff)}._scbp130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._qilnk0mc{grid-area:side-nav}._p5clia51{border-inline-end:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._4ap3vuon{background-color:var(--ds-surface,#fff)}._scbpglyw{box-shadow:none}}
 @media (prefers-reduced-motion:no-preference) and (min-width:64rem){._17ly8iot{transition-property:transform,display}._177m1a5r{transition-behavior:allow-discrete}._1sg81gzg{grid-area:main}._vgub1mm8{transition-timing-function:cubic-bezier(0,.4,0,1)}._hh1u1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}@starting-style{._s2eg1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}._1sg8k0mc{grid-area:side-nav}._vgub1ku9{transition-timing-function:cubic-bezier(.6,0,0,1)}._hjoifnf5{transition-duration:.2s}}
 @media (prefers-reduced-motion:no-preference) and (not (min-width:64rem)){._aadi1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}
 @supports not (-moz-appearance:none){@media (prefers-reduced-motion:no-preference){._139f8iot{transition-property:transform,display}._1tpvfnf5{transition-duration:.2s}._sylc1a5r{transition-behavior:allow-discrete}._1uwsjq3t{transform:translateX(-100%)}}@media (prefers-reduced-motion:no-preference){@starting-style{._oyeijq3t{transform:translateX(-100%)}}._139f8iot{transition-property:transform,display}._1tpvfnf5{transition-duration:.2s}._sylc1a5r{transition-behavior:allow-discrete}}}

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

@@ -48,6 +48,9 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var panelSplitterResizingVar = '--n_snvRsz';
+// Used to share the side nav width with the panel splitter, which is rendered outside the side nav element
+// but positioned to stay at its right edge.
+var sideNavClampedWidthVar = '--n_snvW';
 var widthResizeBounds = {
   min: '240px',
   max: '50vw'
@@ -63,7 +66,7 @@ function getResizeBounds() {
  */
 var isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 var panelSplitterPortalTargetStyles = {
-  root: "_kqswstnw _rjxpidpf _u7coidpf _4t3i1osq _165t56xv"
+  root: "_kqsw1n9t _1pbyegat _u7coidpf _t9ectl5p _4t3ieqxy _165t56xv _p0az1elq"
 };
 var styles = {
   root: "_nd5l1b6c _191wglyw _t51zglyw _bfhk1bhr _16qs130s _vchhusvi _4t3ieqxy _152timx3 _kqsw1if8 _1bsb1ego _1pbycs5v _14b5hc79 _qilnk0mc _p5clia51 _4ap3vuon _scbpglyw",
@@ -222,7 +225,7 @@ 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',
+        namespace: _constants.openLayerObserverTopNavStartNamespace,
         type: 'popup'
       }) > 0 && (0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_resize_tooltip_feedback')) {
         return;
@@ -750,7 +753,7 @@ function SideNavInternal(_ref) {
    * Avoiding nesting the `@supports` at-rule inside of `@media` means Compiled can remove duplicate styles from the generated CSS.
    */
   !isFirefox;
-  return /*#__PURE__*/_react.default.createElement("nav", (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("nav", (0, _extends2.default)({
     id: id
   }, devTimeOnlyAttributes, {
     "data-layout-slot": true,
@@ -791,9 +794,11 @@ function SideNavInternal(_ref) {
     shortcut: isShortcutEnabled ? _sideNavToggleTooltipKeyboardShortcut.sideNavToggleTooltipKeyboardShortcut : undefined
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _runtime.ax)([styles.flexContainer])
-  }, children)), isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/_react.default.createElement("div", {
+  }, children))), isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/_react.default.createElement("div", {
     ref: panelSplitterPortalTargetRef,
-    className: (0, _runtime.ax)([panelSplitterPortalTargetStyles.root])
+    "data-layout-slot": true,
+    style: (0, _defineProperty2.default)({}, sideNavClampedWidthVar, clampedWidth),
+    className: (0, _runtime.ax)([panelSplitterPortalTargetStyles.root, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop])
   }));
 }
 
@@ -805,21 +810,21 @@ function SideNavInternal(_ref) {
  *
  * You can optionally render a `PanelSplitter` as a child to make the side navigation slot resizable.
  */
-function SideNav(_ref8) {
-  var children = _ref8.children,
-    defaultCollapsed = _ref8.defaultCollapsed,
-    _ref8$defaultWidth = _ref8.defaultWidth,
-    defaultWidth = _ref8$defaultWidth === void 0 ? 320 : _ref8$defaultWidth,
-    testId = _ref8.testId,
-    label = _ref8.label,
-    _ref8$skipLinkLabel = _ref8.skipLinkLabel,
-    skipLinkLabel = _ref8$skipLinkLabel === void 0 ? label : _ref8$skipLinkLabel,
-    onExpand = _ref8.onExpand,
-    onCollapse = _ref8.onCollapse,
-    onPeekStart = _ref8.onPeekStart,
-    onPeekEnd = _ref8.onPeekEnd,
-    canToggleWithShortcut = _ref8.canToggleWithShortcut,
-    id = _ref8.id;
+function SideNav(_ref9) {
+  var children = _ref9.children,
+    defaultCollapsed = _ref9.defaultCollapsed,
+    _ref9$defaultWidth = _ref9.defaultWidth,
+    defaultWidth = _ref9$defaultWidth === void 0 ? 320 : _ref9$defaultWidth,
+    testId = _ref9.testId,
+    label = _ref9.label,
+    _ref9$skipLinkLabel = _ref9.skipLinkLabel,
+    skipLinkLabel = _ref9$skipLinkLabel === void 0 ? label : _ref9$skipLinkLabel,
+    onExpand = _ref9.onExpand,
+    onCollapse = _ref9.onCollapse,
+    onPeekStart = _ref9.onPeekStart,
+    onPeekEnd = _ref9.onPeekEnd,
+    canToggleWithShortcut = _ref9.canToggleWithShortcut,
+    id = _ref9.id;
   return /*#__PURE__*/_react.default.createElement(_openLayerObserver.OpenLayerObserverNamespaceProvider, {
     namespace: _constants.openLayerObserverSideNavNamespace
   }, /*#__PURE__*/_react.default.createElement(SideNavInternal, {

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

@@ -13,7 +13,6 @@
 ._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)}

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

@@ -22,7 +22,6 @@ var _hoistSlotSizesContext = require("../hoist-slot-sizes-context");
 var _hoistUtils = require("../hoist-utils");
 var _idUtils = require("../id-utils");
 var _useSideNavVisibility2 = require("../side-nav/use-side-nav-visibility");
-var _useOpenLayerCount = require("../use-open-layer-count");
 var _excluded = ["backgroundColor"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
@@ -37,8 +36,7 @@ var 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",
-  fullHeightSidebarWithLayeringFixes: "_1pbycs5v _lcxv1wug _bfhkvuon _aetrb3bt _18postnw _1gufidpf _1czdidpf _g0nf3tht _1beue4h9 _uaeunqa1 _1cte1l7x",
-  fullHeightSidebarWithLayeringFixesAndOpenLayer: "_1pby11wp"
+  fullHeightSidebarWithLayeringFixes: "_1pby11wp _lcxv1wug _bfhkvuon _aetrb3bt _18postnw _1gufidpf _1czdidpf _g0nf3tht _1beue4h9 _uaeunqa1 _1cte1l7x"
 };
 
 /**
@@ -51,14 +49,6 @@ 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 = [_constants.openLayerObserverTopNavStartNamespace, _constants.openLayerObserverTopNavMiddleNamespace, _constants.openLayerObserverTopNavEndNamespace];
-
 /**
  * The top nav layout area. It will display at the top of the screen, below the banner if one is present.
  */
@@ -110,10 +100,6 @@ function TopNav(_ref) {
     foregroundStyle = _useMemo.foregroundStyle;
   var _useSideNavVisibility = (0, _useSideNavVisibility2.useSideNavVisibility)(),
     isExpandedOnDesktop = _useSideNavVisibility.isExpandedOnDesktop;
-  var hasOpenPopup = (0, _useOpenLayerCount.useHasOpenLayers)({
-    namespaces: topNavOpenLayerNamespaces,
-    type: 'popup'
-  });
   return /*#__PURE__*/React.createElement(_hasCustomThemeContext.HasCustomThemeContext.Provider, {
     value: customTheme.isEnabled
   }, isFhsEnabled && !(0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && /*#__PURE__*/React.createElement("div", {
@@ -126,7 +112,7 @@ function TopNav(_ref) {
   }), /*#__PURE__*/React.createElement("header", {
     id: id,
     "data-layout-slot": true,
-    className: (0, _runtime.ax)([styles.root, isFhsEnabled && styles.fullHeightSidebar, isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixes, hasOpenPopup && isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixesAndOpenLayer, isExpandedOnDesktop && isFhsEnabled && styles.fullHeightSidebarExpanded, xcss]),
+    className: (0, _runtime.ax)([styles.root, isFhsEnabled && styles.fullHeightSidebar, isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebarWithLayeringFixes, isExpandedOnDesktop && isFhsEnabled && styles.fullHeightSidebarExpanded, xcss]),
     "data-testid": testId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,

package/dist/cjs/ui/top-nav-items/search.js

@@ -25,7 +25,6 @@ var styles = {
   elemAfter: "_yyhy11wp _1ii7kb7n _1e0c1txw",
   fullHeightSidebar: "_p12fktbq"
 };
-
 /**
  * __Search__
  *

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

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

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

@@ -12,7 +12,7 @@ import { DangerouslyHoistCssVarToDocumentRoot, HoistCssVarToLocalGrid } from './
 import { useLayoutId } from './id-utils';
 const styles = {
   root: "_nd5ldkfm _1reo15vq _18m915vq _4t3iutvi _152tidpf _kqsw1if8 _1pbyegat",
-  fullHeightSidebarWithLayeringFixes: "_1pbycs5v"
+  fullHeightSidebarWithLayeringFixes: "_1pby11wp"
 };
 
 /**

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

@@ -48,14 +48,15 @@ export const UNSAFE_MAIN_INLINE_END_FOR_LEGACY_PAGES_ONLY = `calc(var(${UNSAFE_a
  * rely on accessing them through global means.
  */
 export const localSlotLayers = {
+  // The side nav panel splitter is layered above the top nav when FHS and 'platform-dst-side-nav-layering-fixes' is enabled.
+  // It has the same z-index value, but is rendered after the top nav in the DOM so is stacked above.
+  sideNavPanelSplitterFHS: 4,
   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,
+  // When FHS and 'platform-dst-side-nav-layering-fixes' is enabled, the side nav is layered below the top nav,
+  // but above the panel
+  bannerFHS: 3,
+  topNavFHS: 3,
   sideNav: 2,
   panelSmallViewports: 1
 };

package/dist/es2019/ui/page-layout/panel-splitter/panel-splitter.compiled.css

@@ -2,6 +2,7 @@
 ._12y31o36{outline-width:medium}
 ._152tidpf{inset-block-start:0}
 ._1bsb1l7b{width:3px}
+._1bsb1ris{width:max-content}
 ._1bsbl52n{width:17px}
 ._1e021v6z{inset-inline-start:7px}
 ._1e02zeo2{inset-inline-start:-9px}

package/dist/es2019/ui/page-layout/panel-splitter/panel-splitter.js

@@ -42,7 +42,8 @@ const lineStyles = {
   root: "_kqswstnw _1e0c1ule _1bsb1l7b _4t3i1osq _syaz1kw7 _bfhk1r31 _1e021v6z"
 };
 const tooltipStyles = {
-  root: "_ahbq196n"
+  root: "_ahbq196n",
+  fullHeightSidebarWithLayeringFixes: "_1bsb1ris"
 };
 const panelSplitterDragDataSymbol = Symbol('panel-splitter-drag-data');
 function signPanelSplitterDragData(data) {
@@ -60,7 +61,11 @@ const PanelSplitterTooltip = /*#__PURE__*/forwardRef(({
     if (!props.style || !props.style.transform) {
       return props.style;
     }
-    const [translateX, translateY] = props.style.transform.matchAll(/\d+px/g);
+
+    // We cannot just match against integers safely, as browsers may introduce non-integer values due to scaling
+    // In the future we can probably use `CSSStyleValue.parse()` to get the browser to handle parsing for us,
+    // but there's no Firefox support yet.
+    const [translateX, translateY] = props.style.transform.matchAll(/(?:-|\+)?\d*\.?\d+px/g);
     if (!translateY) {
       // If we can't extract the translateY value we bail out and return the original style
       return props.style;
@@ -82,7 +87,7 @@ const PanelSplitterTooltip = /*#__PURE__*/forwardRef(({
     // Must be statically passed
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/design-system/no-unsafe-style-overrides
     ,
-    className: ax([tooltipStyles.root, className])
+    className: ax([tooltipStyles.root, fg('platform-dst-side-nav-layering-fixes') && tooltipStyles.fullHeightSidebarWithLayeringFixes, className])
     // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
     ,
 
@@ -97,11 +102,13 @@ const PanelSplitterTooltip = /*#__PURE__*/forwardRef(({
 const MaybeTooltip = ({
   tooltipContent,
   shortcut,
-  children
+  children,
+  testId
 }) => {
   const isFhsEnabled = useIsFhsEnabled();
   if (tooltipContent && isFhsEnabled) {
     return /*#__PURE__*/React.createElement(Tooltip, {
+      testId: testId,
       content: tooltipContent,
       shortcut: shortcut,
       position: fg('platform_dst_nav4_side_nav_resize_tooltip_feedback') ? 'mouse-y' : 'mouse',
@@ -375,7 +382,8 @@ const PortaledPanelSplitter = ({
     className: ax([containerStyles.root, position === 'start' && containerStyles.positionStart, position === 'end' && containerStyles.positionEnd])
   }, /*#__PURE__*/React.createElement(MaybeTooltip, {
     tooltipContent: tooltipContent,
-    shortcut: shortcut
+    shortcut: shortcut,
+    testId: testId && fg('platform_dst_nav4_side_nav_resize_tooltip_feedback') ? `${testId}-tooltip` : undefined
   }, /*#__PURE__*/React.createElement("div", {
     ref: splitterRef,
     "data-testid": testId,

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

@@ -1,10 +1,10 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useState } 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, 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';
 
@@ -14,14 +14,47 @@ import { PanelSplitter } from './panel-splitter';
  * Placed outside the component for stability, as the list is used as an effect dependency.
  */
 const 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.
+// The side nav panel splitter is layered above the side nav, so needs to be disabled when there are open popups in the side nav.
 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.
+// The side nav panel splitter is layered above the top nav, so needs to be disabled when there are open popups in the top nav.
 openLayerObserverTopNavStartNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavEndNamespace];
+
+/**
+ * Returns whether there are any open popups in the side nav or top nav
+ */
+function useHasOpenPopupsInSideNavOrTopNav() {
+  const isFhsEnabled = useIsFhsEnabled();
+  const openLayerObserver = useOpenLayerObserver();
+  // Setting the initial state to false, as it is unlikely that there would be any open popups when the app starts.
+  const [hasOpenPopups, setHasOpenPopups] = useState(false);
+  useEffect(() => {
+    if (!openLayerObserver || !isFhsEnabled || !fg('platform-dst-side-nav-layering-fixes')) {
+      return;
+    }
+    function updateState() {
+      if (!openLayerObserver) {
+        return;
+      }
+      const hasAnyOpenLayers = openLayerNamespacesToCheck.some(namespace => openLayerObserver.getCount({
+        namespace,
+        type: 'popup'
+      }) > 0);
+      setHasOpenPopups(hasAnyOpenLayers);
+    }
+
+    // Initial check. We do this _in case_ a popup is already open when the component mounts.
+    updateState();
+
+    // Subscribe to each namespace
+    const cleanups = openLayerNamespacesToCheck.map(namespace => openLayerObserver.onChange(updateState, {
+      namespace
+    }));
+    return function cleanupHook() {
+      cleanups.forEach(cleanup => cleanup());
+    };
+  }, [isFhsEnabled, openLayerObserver]);
+  return hasOpenPopups;
+}
 /**
  * _SideNavPanelSplitter_
  *
@@ -53,11 +86,8 @@ export const SideNavPanelSplitter = ({
   // 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.
-  const hasOpenLayers = useHasOpenLayers({
-    namespaces: openLayerNamespacesToCheck,
-    type: 'popup'
-  });
-  if (hasOpenLayers && isFhsEnabled && fg('platform-dst-side-nav-layering-fixes')) {
+  const hasOpenLayersInSideNavOrTopNav = useHasOpenPopupsInSideNavOrTopNav();
+  if (hasOpenLayersInSideNavOrTopNav && isFhsEnabled && fg('platform-dst-side-nav-layering-fixes')) {
     return null;
   }
   return /*#__PURE__*/React.createElement(OnDoubleClickContext.Provider, {