@atlaskit/navigation-system 5.16.0 → 5.18.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlassian/navigation-system
 
+## 5.18.0
+
+### Minor Changes
+
+- [`67509a09876ad`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/67509a09876ad) -
+  The side nav will no longer peek when a popup is open in `TopNavStart`, such as the app switcher.
+
+  This change is behind the `platform_dst_nav4_side_nav_resize_tooltip_feedback` and
+  `platform-dst-side-nav-layering-fixes` feature flags, when full height sidebar is enabled.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.17.0
+
+### Minor Changes
+
+- [`6f95ec25daa67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f95ec25daa67) -
+  Fixes to accessibility issues for the flyout menu.
+
+  This includes changing the `aria-haspopup` value from `"true"` to `"dialog"`, setting the `role`
+  of the popup container to `"dialog"`, adding an `aria-labelledby` to the popup container to
+  reference the `id` of the title in the header slot, and ensuring that escape dismisses the dialog
+  and places focus back on the trigger.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.16.0
 
 ### Minor Changes

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

@@ -31,6 +31,7 @@ var FlyoutHeader = exports.FlyoutHeader = function FlyoutHeader(props) {
     testId = props.testId,
     title = props.title,
     closeButtonLabel = props.closeButtonLabel;
+  var id = (0, _flyoutMenuItemContext.useTitleId)();
   var setIsOpen = (0, _react.useContext)(_flyoutMenuItemContext.SetIsOpenContext);
   var onClose = (0, _react.useContext)(_flyoutMenuItemContext.OnCloseContext);
   var handleClose = (0, _react.useCallback)(function () {
@@ -48,6 +49,7 @@ var FlyoutHeader = exports.FlyoutHeader = function FlyoutHeader(props) {
     testId: testId && "".concat(testId, "--close-button")
   }), /*#__PURE__*/_react.default.createElement(_heading.default, {
     size: "xsmall",
-    as: "span"
+    as: "span",
+    id: id
   }, title)), children);
 };

package/dist/cjs/ui/menu-item/flyout-menu-item/flyout-menu-item-content.js

@@ -50,6 +50,7 @@ var FlyoutMenuItemContent = exports.FlyoutMenuItemContent = /*#__PURE__*/(0, _re
     onClose === null || onClose === void 0 || onClose();
     setIsOpen(false);
   }, [setIsOpen, onClose]);
+  var titleId = (0, _react.useId)();
   return /*#__PURE__*/_react.default.createElement(_experimental.PopupContent, {
     appearance: "UNSAFE_modal-below-sm",
     onClose: handleClose,
@@ -62,7 +63,9 @@ var FlyoutMenuItemContent = exports.FlyoutMenuItemContent = /*#__PURE__*/(0, _re
     shouldFitViewport: true,
     testId: containerTestId,
     xcss: flyoutMenuItemContentStyles.root,
-    autoFocus: autoFocus
+    autoFocus: autoFocus,
+    role: (0, _platformFeatureFlags.fg)("platform_dst_nav4_flyout_menu_slots_close_button") ? "dialog" : undefined,
+    titleId: (0, _platformFeatureFlags.fg)("platform_dst_nav4_flyout_menu_slots_close_button") ? titleId : undefined
     /**
      * Disabling GPU acceleration removes the use of `transform` by popper.js for this popup.
      *
@@ -83,13 +86,15 @@ var FlyoutMenuItemContent = exports.FlyoutMenuItemContent = /*#__PURE__*/(0, _re
     return /*#__PURE__*/_react.default.createElement(UpdatePopperOnContentResize, {
       ref: forwardedRef,
       update: update
-    }, (0, _platformFeatureFlags.fg)("platform_dst_nav4_flyout_menu_slots_close_button") ? /*#__PURE__*/_react.default.createElement(_flyoutMenuItemContext.OnCloseProvider, {
+    }, (0, _platformFeatureFlags.fg)("platform_dst_nav4_flyout_menu_slots_close_button") ? /*#__PURE__*/_react.default.createElement(_flyoutMenuItemContext.TitleIdContextProvider, {
+      value: titleId
+    }, /*#__PURE__*/_react.default.createElement(_flyoutMenuItemContext.OnCloseProvider, {
       value: function value() {
         return onClose;
       }
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _runtime.ax)([flyoutMenuItemContentContainerStyles.container])
-    }, children)) : children);
+    }, children))) : children);
   });
 });
 function createResizeObserver(update) {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSetFlyoutMenuOpen = exports.useFlyoutMenuOpen = exports.SetIsOpenContext = exports.OnCloseProvider = exports.OnCloseContext = exports.IsOpenContext = void 0;
+exports.useTitleId = exports.useSetFlyoutMenuOpen = exports.useFlyoutMenuOpen = exports.TitleIdContextProvider = exports.TitleIdContext = exports.SetIsOpenContext = exports.OnCloseProvider = exports.OnCloseContext = exports.IsOpenContext = void 0;
 var _react = require("react");
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
 /**
@@ -39,4 +39,23 @@ var OnCloseContext = exports.OnCloseContext = /*#__PURE__*/(0, _react.createCont
  * 
  * A context provider for supplying the onClose function to the FlyoutHeader.
  */
-var OnCloseProvider = exports.OnCloseProvider = OnCloseContext.Provider;
+var OnCloseProvider = exports.OnCloseProvider = OnCloseContext.Provider;
+
+/**
+ * __Title id context__
+ * 
+ * A context for storing the title id of the FlyoutMenuItem that is displayed in
+ * FlyoutHeader, and used as the aria-labelledby on the FlyoutMenuItemContent
+ * container.
+ */
+var TitleIdContext = exports.TitleIdContext = /*#__PURE__*/(0, _react.createContext)(undefined);
+var useTitleId = exports.useTitleId = function useTitleId() {
+  return (0, _react.useContext)(TitleIdContext);
+};
+
+/**
+ * __Title id provider__
+ * 
+ * A context provider for supplying the title id to the FlyoutHeader.
+ */
+var TitleIdContextProvider = exports.TitleIdContextProvider = TitleIdContext.Provider;

package/dist/cjs/ui/menu-item/flyout-menu-item/flyout-menu-item.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _useControlled3 = _interopRequireDefault(require("@atlaskit/ds-lib/use-controlled"));
 var _usePreviousValue = _interopRequireDefault(require("@atlaskit/ds-lib/use-previous-value"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experimental = require("@atlaskit/popup/experimental");
 var _menuListItem = require("../menu-list-item");
 var _flyoutMenuItemContext = require("./flyout-menu-item-context");
@@ -69,6 +70,7 @@ var FlyoutMenuItem = exports.FlyoutMenuItem = /*#__PURE__*/(0, _react.forwardRef
     ref: forwardedRef
   }, /*#__PURE__*/_react.default.createElement(_experimental.Popup, {
     id: id,
-    isOpen: isOpen
+    isOpen: isOpen,
+    role: (0, _platformFeatureFlags.fg)('platform_dst_nav4_flyout_menu_slots_close_button') ? 'dialog' : undefined
   }, children))));
 });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.topNavMountedVar = exports.sideNavVar = exports.sideNavPanelSplitterId = exports.sideNavLiveWidthVar = exports.sideNavContentScrollTimelineVar = exports.panelVar = exports.panelPanelSplitterId = exports.openLayerObserverTopNavNamespace = exports.openLayerObserverSideNavNamespace = exports.localSlotLayers = exports.contentInsetBlockStart = exports.contentHeightWhenFixed = exports.bannerMountedVar = exports.asideVar = exports.asidePanelSplitterId = exports.UNSAFE_topNavVar = exports.UNSAFE_sideNavLayoutVar = exports.UNSAFE_panelLayoutVar = exports.UNSAFE_bannerVar = exports.UNSAFE_asideLayoutVar = exports.UNSAFE_MAIN_INLINE_START_FOR_LEGACY_PAGES_ONLY = exports.UNSAFE_MAIN_INLINE_END_FOR_LEGACY_PAGES_ONLY = exports.UNSAFE_MAIN_BLOCK_START_FOR_LEGACY_PAGES_ONLY = void 0;
+exports.topNavMountedVar = exports.sideNavVar = exports.sideNavPanelSplitterId = exports.sideNavLiveWidthVar = exports.sideNavContentScrollTimelineVar = exports.panelVar = exports.panelPanelSplitterId = exports.openLayerObserverTopNavStartNamespace = exports.openLayerObserverTopNavMiddleNamespace = exports.openLayerObserverTopNavEndNamespace = exports.openLayerObserverSideNavNamespace = exports.localSlotLayers = exports.contentInsetBlockStart = exports.contentHeightWhenFixed = exports.bannerMountedVar = exports.asideVar = exports.asidePanelSplitterId = exports.UNSAFE_topNavVar = exports.UNSAFE_sideNavLayoutVar = exports.UNSAFE_panelLayoutVar = exports.UNSAFE_bannerVar = exports.UNSAFE_asideLayoutVar = exports.UNSAFE_MAIN_INLINE_START_FOR_LEGACY_PAGES_ONLY = exports.UNSAFE_MAIN_INLINE_END_FOR_LEGACY_PAGES_ONLY = exports.UNSAFE_MAIN_BLOCK_START_FOR_LEGACY_PAGES_ONLY = void 0;
 /**
  * These variables are shared across the different page layout slots.
  * This violates the [UI styling standard](https://atlassian.design/components/eslint-plugin-ui-styling-standard/no-imported-style-values/usage).
@@ -66,7 +66,13 @@ var localSlotLayers = exports.localSlotLayers = {
   panelSmallViewports: 1
 };
 var openLayerObserverSideNavNamespace = exports.openLayerObserverSideNavNamespace = 'side-nav';
-var openLayerObserverTopNavNamespace = exports.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.
+var openLayerObserverTopNavStartNamespace = exports.openLayerObserverTopNavStartNamespace = 'top-nav-start';
+var openLayerObserverTopNavMiddleNamespace = exports.openLayerObserverTopNavMiddleNamespace = 'top-nav-middle';
+var openLayerObserverTopNavEndNamespace = exports.openLayerObserverTopNavEndNamespace = 'top-nav-end';
 
 /**
  * CSS scroll timeline variable for the side nav content scroll indicator.

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

@@ -6,17 +6,30 @@ 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); }
+/**
+ * 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.
+_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.
+_constants.openLayerObserverTopNavStartNamespace, _constants.openLayerObserverTopNavMiddleNamespace, _constants.openLayerObserverTopNavEndNamespace];
 /**
  * _SideNavPanelSplitter_
  *
@@ -48,54 +61,11 @@ 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 _useState = (0, _react.useState)(true),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    isEnabled = _useState2[0],
-    setIsEnabled = _useState2[1];
-  var openLayerObserver = (0, _openLayerObserver.useOpenLayerObserver)();
-  (0, _react.useEffect)(function () {
-    if (!openLayerObserver || !isFhsEnabled || !(0, _platformFeatureFlags.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: _constants.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: _constants.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: _constants.openLayerObserverSideNavNamespace
-    });
-    var cleanupTopNavListener = openLayerObserver.onChange(checkAndSetState, {
-      namespace: _constants.openLayerObserverTopNavNamespace
-    });
-    return function cleanup() {
-      cleanupSideNavListener();
-      cleanupTopNavListener();
-    };
-  }, [isFhsEnabled, openLayerObserver]);
-  if (!isEnabled && isFhsEnabled && (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes')) {
+  var hasOpenLayers = (0, _useOpenLayerCount.useHasOpenLayers)({
+    namespaces: openLayerNamespacesToCheck,
+    type: 'popup'
+  });
+  if (hasOpenLayers && 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.js

@@ -220,6 +220,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 && (0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_resize_tooltip_feedback')) {
+        return;
+      }
       var prevFlyoutState = flyoutStateRef.current;
       tryAbortPendingClose();
       flyoutStateRef.current = {

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

@@ -15,6 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@compiled/react");
 var _useLayoutEffect = require("@atlaskit/ds-lib/use-layout-effect");
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
+var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _popup = _interopRequireDefault(require("@atlaskit/popup"));
 var _compiled = require("@atlaskit/primitives/compiled");
@@ -22,6 +23,7 @@ var _list = require("../../../components/list");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 var _hasCustomThemeContext = require("../../top-nav-items/themed/has-custom-theme-context");
 var _migration = require("../../top-nav-items/themed/migration");
+var _constants = require("../constants");
 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 containerStyles = {
   root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15ri1mjv _1gs5usvi _ndwch9n0",
@@ -34,6 +36,12 @@ var listStyles = {
   hideOnSmallViewport: "_1e0cglyw _181n1txw",
   popupContainer: "_1yt4u2gc"
 };
+function OpenLayerObserverNamespaceProviderBehindFG(_ref) {
+  var children = _ref.children;
+  return (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/_react.default.createElement(_openLayerObserver.OpenLayerObserverNamespaceProvider, {
+    namespace: _constants.openLayerObserverTopNavEndNamespace
+  }, children) : children;
+}
 
 /**
  * __TopNavEnd__
@@ -43,12 +51,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.
  */
-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;
+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 = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -87,7 +95,7 @@ function TopNavEnd(_ref) {
         value: false
       }, /*#__PURE__*/_react.default.createElement(_list.List, {
         xcss: (0, _react2.cx)(listStyles.root, listStyles.popupContainer)
-      }, children));
+      }, /*#__PURE__*/_react.default.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children)));
     },
     trigger: function trigger(triggerProps) {
       return /*#__PURE__*/_react.default.createElement(_migration.IconButton, (0, _extends2.default)({}, triggerProps, {
@@ -102,5 +110,5 @@ function TopNavEnd(_ref) {
     }
   }) : /*#__PURE__*/_react.default.createElement(_list.List, {
     xcss: (0, _react2.cx)(listStyles.root, listStyles.hideOnSmallViewport)
-  }, children));
+  }, /*#__PURE__*/_react.default.createElement(OpenLayerObserverNamespaceProviderBehindFG, null, children)));
 }

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

@@ -9,8 +9,10 @@ exports.TopNavMiddle = TopNavMiddle;
 require("./top-nav-middle.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
+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 styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
   fullHeightSidebar: "_lcxv1wug"
@@ -29,5 +31,7 @@ function TopNavMiddle(_ref) {
   var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _runtime.ax)([styles.root, isFhsEnabled && !(0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && styles.fullHeightSidebar])
-  }, children);
+  }, (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/_react.default.createElement(_openLayerObserver.OpenLayerObserverNamespaceProvider, {
+    namespace: _constants.openLayerObserverTopNavMiddleNamespace
+  }, children) : children);
 }

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

@@ -12,6 +12,7 @@ var _runtime = require("@compiled/react/runtime");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _useStableRef = _interopRequireDefault(require("@atlaskit/ds-lib/use-stable-ref"));
+var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _topNavStartContext = require("../../../context/top-nav-start/top-nav-start-context");
@@ -153,7 +154,9 @@ var TopNavStartInnerFHS = /*#__PURE__*/(0, _react.forwardRef)(function TopNavSta
     ref: ref,
     "data-testid": testId,
     className: (0, _runtime.ax)([innerStyles.root, !(0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') && innerStyles.fullHeightSidebar, (0, _platformFeatureFlags.fg)('team25-eu-jira-logo-updates-csm-jsm') && innerStyles.jiraProductLogoUpdate, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
-  }, children));
+  }, (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/_react.default.createElement(_openLayerObserver.OpenLayerObserverNamespaceProvider, {
+    namespace: _constants.openLayerObserverTopNavStartNamespace
+  }, children) : children));
 });
 
 /**

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

@@ -11,9 +11,7 @@ require("./top-nav.compiled.css");
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _skipLinksContext = require("../../../context/skip-links/skip-links-context");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
@@ -24,6 +22,7 @@ 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); }
 /**
@@ -52,6 +51,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 = [_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.
  */
@@ -103,34 +110,10 @@ function TopNav(_ref) {
     foregroundStyle = _useMemo.foregroundStyle;
   var _useSideNavVisibility = (0, _useSideNavVisibility2.useSideNavVisibility)(),
     isExpandedOnDesktop = _useSideNavVisibility.isExpandedOnDesktop;
-  var openLayerObserver = (0, _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 = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    hasOpenPopup = _useState2[0],
-    setHasOpenPopup = _useState2[1];
-  (0, _react.useLayoutEffect)(function () {
-    if (!openLayerObserver || !isFhsEnabled || !(0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes')) {
-      return;
-    }
-    function checkAndSetState() {
-      if (!openLayerObserver) {
-        return;
-      }
-      setHasOpenPopup(openLayerObserver.getCount({
-        namespace: _constants.openLayerObserverTopNavNamespace,
-        type: 'popup'
-      }) > 0);
-    }
-
-    // Initial check
-    checkAndSetState();
-
-    // Check again whenever number of layers in the top nav change
-    return openLayerObserver.onChange(checkAndSetState, {
-      namespace: _constants.openLayerObserverTopNavNamespace
-    });
-  }, [isFhsEnabled, openLayerObserver]);
+  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", {
@@ -163,7 +146,5 @@ function TopNav(_ref) {
     value: height
   })
   // ------ END UNSAFE STYLES ------
-  , (0, _platformFeatureFlags.fg)('platform-dst-side-nav-layering-fixes') ? /*#__PURE__*/React.createElement(_openLayerObserver.OpenLayerObserverNamespaceProvider, {
-    namespace: _constants.openLayerObserverTopNavNamespace
-  }, children) : children));
+  , children));
 }

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

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useHasOpenLayers = useHasOpenLayers;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+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");
+/**
+ * Returns whether there are any open layers across the specified namespaces, optionally filtered by type.
+ */
+function useHasOpenLayers(_ref) {
+  var namespaces = _ref.namespaces,
+    type = _ref.type;
+  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 layers when the app starts.
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hasOpenLayers = _useState2[0],
+    setHasOpenLayers = _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 = namespaces.some(function (namespace) {
+        return openLayerObserver.getCount({
+          namespace: namespace,
+          type: type
+        }) > 0;
+      });
+      setHasOpenLayers(hasAnyOpenLayers);
+    }
+
+    // Initial check
+    updateState();
+
+    // Subscribe to each namespace
+    var cleanups = namespaces.map(function (namespace) {
+      return openLayerObserver.onChange(updateState, {
+        namespace: namespace
+      });
+    });
+    return function cleanupHook() {
+      cleanups.forEach(function (cleanup) {
+        return cleanup();
+      });
+    };
+  }, [isFhsEnabled, openLayerObserver, namespaces, type]);
+  return hasOpenLayers;
+}

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

@@ -5,7 +5,7 @@ import React, { useCallback, useContext } from 'react';
 import Heading from '@atlaskit/heading';
 import { Flex } from '@atlaskit/primitives/compiled';
 import { CloseButton } from './close-button';
-import { OnCloseContext, SetIsOpenContext } from './flyout-menu-item-context';
+import { OnCloseContext, SetIsOpenContext, useTitleId } from './flyout-menu-item-context';
 const headerStyles = {
   root: "_zulp12x7 _bozg1b66 _85i512x7 _1e0c1txw _2lx21bp4",
   flex: "_zulppxbi _1bah1yb4 _2lx21sbv _4cvr1h6o _1bsb1osq _bozgv77o"
@@ -24,6 +24,7 @@ export const FlyoutHeader = props => {
     title,
     closeButtonLabel
   } = props;
+  const id = useTitleId();
   const setIsOpen = useContext(SetIsOpenContext);
   const onClose = useContext(OnCloseContext);
   const handleClose = useCallback(() => {
@@ -41,6 +42,7 @@ export const FlyoutHeader = props => {
     testId: testId && `${testId}--close-button`
   }), /*#__PURE__*/React.createElement(Heading, {
     size: "xsmall",
-    as: "span"
+    as: "span",
+    id: id
   }, title)), children);
 };

package/dist/es2019/ui/menu-item/flyout-menu-item/flyout-menu-item-content.js

@@ -1,11 +1,11 @@
 /* flyout-menu-item-content.tsx generated by @compiled/babel-plugin v0.38.1 */
 import "./flyout-menu-item-content.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { forwardRef, useCallback, useContext, useEffect, useId, useMemo, useRef, useState } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { PopupContent } from '@atlaskit/popup/experimental';
-import { OnCloseProvider, SetIsOpenContext } from './flyout-menu-item-context';
+import { OnCloseProvider, SetIsOpenContext, TitleIdContextProvider } from './flyout-menu-item-context';
 
 /**
  * The vertical offset in px to ensure the flyout container does not exceed the bounds of
@@ -42,6 +42,7 @@ export const FlyoutMenuItemContent = /*#__PURE__*/forwardRef(({
     onClose === null || onClose === void 0 ? void 0 : onClose();
     setIsOpen(false);
   }, [setIsOpen, onClose]);
+  const titleId = useId();
   return /*#__PURE__*/React.createElement(PopupContent, {
     appearance: "UNSAFE_modal-below-sm",
     onClose: handleClose,
@@ -54,7 +55,9 @@ export const FlyoutMenuItemContent = /*#__PURE__*/forwardRef(({
     shouldFitViewport: true,
     testId: containerTestId,
     xcss: flyoutMenuItemContentStyles.root,
-    autoFocus: autoFocus
+    autoFocus: autoFocus,
+    role: fg("platform_dst_nav4_flyout_menu_slots_close_button") ? "dialog" : undefined,
+    titleId: fg("platform_dst_nav4_flyout_menu_slots_close_button") ? titleId : undefined
     /**
      * Disabling GPU acceleration removes the use of `transform` by popper.js for this popup.
      *
@@ -75,11 +78,13 @@ export const FlyoutMenuItemContent = /*#__PURE__*/forwardRef(({
   }) => /*#__PURE__*/React.createElement(UpdatePopperOnContentResize, {
     ref: forwardedRef,
     update: update
-  }, fg("platform_dst_nav4_flyout_menu_slots_close_button") ? /*#__PURE__*/React.createElement(OnCloseProvider, {
+  }, fg("platform_dst_nav4_flyout_menu_slots_close_button") ? /*#__PURE__*/React.createElement(TitleIdContextProvider, {
+    value: titleId
+  }, /*#__PURE__*/React.createElement(OnCloseProvider, {
     value: () => onClose
   }, /*#__PURE__*/React.createElement("div", {
     className: ax([flyoutMenuItemContentContainerStyles.container])
-  }, children)) : children));
+  }, children))) : children));
 });
 function createResizeObserver(update) {
   return new ResizeObserver(update);

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

@@ -29,4 +29,21 @@ export const OnCloseContext = /*#__PURE__*/createContext(null);
  * 
  * A context provider for supplying the onClose function to the FlyoutHeader.
  */
-export const OnCloseProvider = OnCloseContext.Provider;
+export const OnCloseProvider = OnCloseContext.Provider;
+
+/**
+ * __Title id context__
+ * 
+ * A context for storing the title id of the FlyoutMenuItem that is displayed in
+ * FlyoutHeader, and used as the aria-labelledby on the FlyoutMenuItemContent
+ * container.
+ */
+export const TitleIdContext = /*#__PURE__*/createContext(undefined);
+export const useTitleId = () => useContext(TitleIdContext);
+
+/**
+ * __Title id provider__
+ * 
+ * A context provider for supplying the title id to the FlyoutHeader.
+ */
+export const TitleIdContextProvider = TitleIdContext.Provider;

package/dist/es2019/ui/menu-item/flyout-menu-item/flyout-menu-item.js

@@ -1,6 +1,7 @@
 import React, { forwardRef, useEffect } from 'react';
 import useControlled from '@atlaskit/ds-lib/use-controlled';
 import usePreviousValue from '@atlaskit/ds-lib/use-previous-value';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Popup } from '@atlaskit/popup/experimental';
 import { MenuListItem } from '../menu-list-item';
 import { IsOpenContext, SetIsOpenContext } from './flyout-menu-item-context';
@@ -54,6 +55,7 @@ export const FlyoutMenuItem = /*#__PURE__*/forwardRef(({
     ref: forwardedRef
   }, /*#__PURE__*/React.createElement(Popup, {
     id: id,
-    isOpen: isOpen
+    isOpen: isOpen,
+    role: fg('platform_dst_nav4_flyout_menu_slots_close_button') ? 'dialog' : undefined
   }, children))));
 });