@atlaskit/navigation-system 10.17.2 → 10.17.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlassian/navigation-system
 
+## 10.17.4
+
+### Patch Changes
+
+- [`c2ade13e4c9d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c2ade13e4c9d9) -
+  Cleaned up `platform-dst-main-print-styles` feature gate, `Main` print styles are now default.
+- Updated dependencies
+
+## 10.17.3
+
+### Patch Changes
+
+- [`14307d3138fd3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/14307d3138fd3) -
+  Refactor styles to use statically analyzable values and type-checked inline constants for Compiled
+  and Atlaspack incremental builds, preserving existing styling behavior.
+- Updated dependencies
+
 ## 10.17.2
 
 ### Patch Changes

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

@@ -12,12 +12,12 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _useSkipLink = require("../../../context/skip-links/use-skip-link");
-var _constants = require("../constants");
 var _useLayoutId = require("../use-layout-id");
 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 contentInsetBlockStartStatic = "calc(var(--n_bnrM, 0px) + var(--n_tNvM, 0px))";
+var contentHeightWhenFixedStatic = "calc(100vh - var(--n_bnrM, 0px) - var(--n_tNvM, 0px))";
 var mainElementStyles = {
-  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _qwfh1wug _13wn1if8",
-  print: "_8rrs1wug"
+  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _8rrs1wug _qwfh1wug _13wn1if8"
 };
 
 /**
@@ -37,7 +37,7 @@ function Main(_ref) {
   return /*#__PURE__*/React.createElement(_react.Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: id,
     "data-layout-slot": true,
-    className: (0, _runtime.ax)([mainElementStyles.root, (0, _fg.fg)('platform-dst-main-print-styles') && mainElementStyles.print, xcss]),
+    className: (0, _runtime.ax)([mainElementStyles.root, xcss]),
     role: "main",
     "data-testid": testId
   }, children));

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

@@ -15,16 +15,16 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _bindEventListener = require("bind-event-listener");
 var _reactDom = require("react-dom");
+var _bindEventListener = require("bind-event-listener");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _useId = require("@atlaskit/ds-lib/use-id");
 var _useStableRef = _interopRequireDefault(require("@atlaskit/ds-lib/use-stable-ref"));
 var _useOpenLayerObserver = require("@atlaskit/layering/use-open-layer-observer");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _combine = require("@atlaskit/pragmatic-drag-and-drop/utils/combine");
 var _elementAdapter = require("@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter");
 var _blockDraggingToIframes = require("@atlaskit/pragmatic-drag-and-drop/utils/block-dragging-to-iframes");
+var _combine = require("@atlaskit/pragmatic-drag-and-drop/utils/combine");
 var _disableNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/utils/disable-native-drag-preview");
 var _preventUnhandled = require("@atlaskit/pragmatic-drag-and-drop/utils/prevent-unhandled");
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));

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

@@ -14,8 +14,8 @@ var _runtime = require("@compiled/react/runtime");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
-var _exitingPersistence = _interopRequireDefault(require("@atlaskit/motion/exiting-persistence"));
 var _useMotion3 = require("@atlaskit/motion/entering/use-motion");
+var _exitingPersistence = _interopRequireDefault(require("@atlaskit/motion/exiting-persistence"));
 var _reanimate = require("@atlaskit/motion/reanimate");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _responsive = require("@atlaskit/primitives/responsive");

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

@@ -17,6 +17,20 @@ var _hoistSlotSizesContext = require("./hoist-slot-sizes-context");
 var _useLayoutId = require("./use-layout-id");
 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); }
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
+var localSlotLayersStatic = {
+  ribbon: 4,
+  // The side nav panel splitter is layered above the top nav when FHS 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,
+  // When FHS is enabled, the side nav is layered below the top nav,
+  // but above the panel
+  bannerFHS: 3,
+  topNavFHS: 3,
+  sideNav: 2,
+  panelSmallViewports: 1
+};
 var styles = {
   root: "_nd5l1c99 _1reo15vq _18m915vq _4t3i1osq _152tidpf _kqsw1if8 _vchhusvi _1pbyegat _1e0cglyw _dm2518uv"
 };

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

@@ -14,8 +14,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _bindEventListener = require("bind-event-listener");
 var _reactDom = require("react-dom");
+var _bindEventListener = require("bind-event-listener");
 var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
 var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
 var _useStableRef = _interopRequireDefault(require("@atlaskit/ds-lib/use-stable-ref"));

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useExpandSideNav = useExpandSideNav;
 var _react = require("react");
-var _bindEventListener = require("bind-event-listener");
 var _reactDom = require("react-dom");
+var _bindEventListener = require("bind-event-listener");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _setSideNavVisibilityState = require("./set-side-nav-visibility-state");
 var _useSideNavRef = require("./use-side-nav-ref");

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

@@ -10,8 +10,8 @@ require("./top-nav.compiled.css");
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _componentWithFg = require("@atlaskit/platform-feature-flags-react/component-with-fg");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _useSkipLinkInternal = require("../../../context/skip-links/use-skip-link-internal");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 var _hasCustomThemeContext = require("../../top-nav-items/themed/has-custom-theme-context");

package/dist/cjs/ui/page-layout/use-resizing-width-css-var-on-root-element.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useResizingWidthCssVarOnRootElement = useResizingWidthCssVarOnRootElement;
 var _react = require("react");
-var _combine = require("@atlaskit/pragmatic-drag-and-drop/utils/combine");
 var _elementAdapter = require("@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter");
+var _combine = require("@atlaskit/pragmatic-drag-and-drop/utils/combine");
 var _isPanelSplitterDragData = require("./panel-splitter/is-panel-splitter-drag-data");
 /**
  * Monitors resizing on the panel splitter with the provided `panelId`

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

@@ -8,7 +8,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
-import { asidePanelSplitterId, asideVar, contentHeightWhenFixed, contentInsetBlockStart, UNSAFE_asideLayoutVar } from './constants';
+import { UNSAFE_asideLayoutVar, asidePanelSplitterId, asideVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { PanelSplitterProvider } from './panel-splitter/provider';

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

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
 import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
-import { bannerMountedVar, localSlotLayers, UNSAFE_bannerVar } from './constants';
+import { bannerMountedVar, UNSAFE_bannerVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { HoistCssVarToLocalGrid } from './hoist-css-var-to-local-grid';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';

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

@@ -5,11 +5,11 @@ import { ax, ix } from "@compiled/react/runtime";
 import { Fragment } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLink } from '../../../context/skip-links/use-skip-link';
-import { contentHeightWhenFixed, contentInsetBlockStart } from '../constants';
 import { useLayoutId } from '../use-layout-id';
+const contentInsetBlockStartStatic = `calc(var(--n_bnrM, 0px) + var(--n_tNvM, 0px))`;
+const contentHeightWhenFixedStatic = `calc(100vh - var(--n_bnrM, 0px) - var(--n_tNvM, 0px))`;
 const mainElementStyles = {
-  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _qwfh1wug _13wn1if8",
-  print: "_8rrs1wug"
+  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _8rrs1wug _qwfh1wug _13wn1if8"
 };
 
 /**
@@ -29,7 +29,7 @@ export function Main({
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: id,
     "data-layout-slot": true,
-    className: ax([mainElementStyles.root, fg('platform-dst-main-print-styles') && mainElementStyles.print, xcss]),
+    className: ax([mainElementStyles.root, xcss]),
     role: "main",
     "data-testid": testId
   }, children));

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

@@ -4,16 +4,16 @@ import "./panel-splitter.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { forwardRef, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { bind } from 'bind-event-listener';
 import { createPortal } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import invariant from 'tiny-invariant';
 import { useId } from '@atlaskit/ds-lib/use-id';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 import { useOpenLayerObserver } from '@atlaskit/layering/use-open-layer-observer';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter';
 import { blockDraggingToIFrames } from '@atlaskit/pragmatic-drag-and-drop/utils/block-dragging-to-iframes';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/utils/disable-native-drag-preview';
 import { preventUnhandled } from '@atlaskit/pragmatic-drag-and-drop/utils/prevent-unhandled';
 import Tooltip from '@atlaskit/tooltip/Tooltip';

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

@@ -4,14 +4,14 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
-import ExitingPersistence from '@atlaskit/motion/exiting-persistence';
 import { useMotion } from '@atlaskit/motion/entering/use-motion';
+import ExitingPersistence from '@atlaskit/motion/exiting-persistence';
 import { Reanimate } from '@atlaskit/motion/reanimate';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
-import { contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, panelPanelSplitterId, panelVar, sideNavLiveWidthVar, UNSAFE_panelLayoutVar } from './constants';
+import { UNSAFE_panelLayoutVar, panelPanelSplitterId, panelVar, sideNavLiveWidthVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { PanelSplitterProvider } from './panel-splitter/provider';

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

@@ -5,10 +5,24 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useContext } from 'react';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
-import { localSlotLayers, UNSAFE_ribbonVar } from './constants';
+import { UNSAFE_ribbonVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { useLayoutId } from './use-layout-id';
+const localSlotLayersStatic = {
+  ribbon: 4,
+  // The side nav panel splitter is layered above the top nav when FHS 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,
+  // When FHS is enabled, the side nav is layered below the top nav,
+  // but above the panel
+  bannerFHS: 3,
+  topNavFHS: 3,
+  sideNav: 2,
+  panelSmallViewports: 1
+};
 const styles = {
   root: "_nd5l1c99 _1reo15vq _18m915vq _4t3i1osq _152tidpf _kqsw1if8 _vchhusvi _1pbyegat _1e0cglyw _dm2518uv"
 };

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

@@ -3,8 +3,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import "./side-nav.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { startTransition, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { bind } from 'bind-event-listener';
 import { flushSync } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
@@ -17,7 +17,7 @@ import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
 import { TopNavStartElement } from '../../../context/top-nav-start/top-nav-start-element';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-import { bannerMountedVar, contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, openLayerObserverSideNavNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar, UNSAFE_sideNavLayoutVar } from '../constants';
+import { UNSAFE_sideNavLayoutVar, openLayerObserverSideNavNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar } from '../constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { PanelSplitterProvider } from '../panel-splitter/provider';

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

@@ -1,6 +1,6 @@
 import { useCallback, useContext } from 'react';
-import { bind } from 'bind-event-listener';
 import { flushSync } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SetSideNavVisibilityState } from './set-side-nav-visibility-state';
 import { useSideNavRef } from './use-side-nav-ref';

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

@@ -3,15 +3,15 @@ import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useContext } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { componentWithFG } from '@atlaskit/platform-feature-flags-react/component-with-fg';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { HasDefaultBackgroundColorContext } from '../../top-nav-items/themed/has-default-background-color-context';
 import { useCustomTheme } from '../../top-nav-items/themed/use-custom-theme';
 import { useCustomThemeNew } from '../../top-nav-items/themed/use-custom-theme-new';
-import { bannerMountedVar, localSlotLayers, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
+import { UNSAFE_topNavVar, topNavMountedVar } from '../constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../dangerously-hoist-css-var-to-document-root';
 import { HoistCssVarToLocalGrid } from '../hoist-css-var-to-local-grid';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';

package/dist/es2019/ui/page-layout/use-resizing-width-css-var-on-root-element.js

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { isPanelSplitterDragData } from './panel-splitter/is-panel-splitter-drag-data';
 
 /**

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

@@ -10,7 +10,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
-import { asidePanelSplitterId, asideVar, contentHeightWhenFixed, contentInsetBlockStart, UNSAFE_asideLayoutVar } from './constants';
+import { UNSAFE_asideLayoutVar, asidePanelSplitterId, asideVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { PanelSplitterProvider } from './panel-splitter/provider';

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

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
 import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
-import { bannerMountedVar, localSlotLayers, UNSAFE_bannerVar } from './constants';
+import { bannerMountedVar, UNSAFE_bannerVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { HoistCssVarToLocalGrid } from './hoist-css-var-to-local-grid';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';

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

@@ -5,11 +5,11 @@ import { ax, ix } from "@compiled/react/runtime";
 import { Fragment } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLink } from '../../../context/skip-links/use-skip-link';
-import { contentHeightWhenFixed, contentInsetBlockStart } from '../constants';
 import { useLayoutId } from '../use-layout-id';
+var contentInsetBlockStartStatic = "calc(var(--n_bnrM, 0px) + var(--n_tNvM, 0px))";
+var contentHeightWhenFixedStatic = "calc(100vh - var(--n_bnrM, 0px) - var(--n_tNvM, 0px))";
 var mainElementStyles = {
-  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _qwfh1wug _13wn1if8",
-  print: "_8rrs1wug"
+  root: "_nd5l1gzg _1reo1wug _18m91wug _19121cl4 _152timx3 _4t3ieqxy _8rrs1wug _qwfh1wug _13wn1if8"
 };
 
 /**
@@ -29,7 +29,7 @@ export function Main(_ref) {
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: id,
     "data-layout-slot": true,
-    className: ax([mainElementStyles.root, fg('platform-dst-main-print-styles') && mainElementStyles.print, xcss]),
+    className: ax([mainElementStyles.root, xcss]),
     role: "main",
     "data-testid": testId
   }, children));

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

@@ -10,16 +10,16 @@ import { ax, ix } from "@compiled/react/runtime";
 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) { _defineProperty(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; }
 import { forwardRef, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { bind } from 'bind-event-listener';
 import { createPortal } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import invariant from 'tiny-invariant';
 import { useId } from '@atlaskit/ds-lib/use-id';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 import { useOpenLayerObserver } from '@atlaskit/layering/use-open-layer-observer';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter';
 import { blockDraggingToIFrames } from '@atlaskit/pragmatic-drag-and-drop/utils/block-dragging-to-iframes';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/utils/disable-native-drag-preview';
 import { preventUnhandled } from '@atlaskit/pragmatic-drag-and-drop/utils/prevent-unhandled';
 import Tooltip from '@atlaskit/tooltip/Tooltip';

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

@@ -6,14 +6,14 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
-import ExitingPersistence from '@atlaskit/motion/exiting-persistence';
 import { useMotion } from '@atlaskit/motion/entering/use-motion';
+import ExitingPersistence from '@atlaskit/motion/exiting-persistence';
 import { Reanimate } from '@atlaskit/motion/reanimate';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../context/skip-links/use-skip-link-internal';
-import { contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, panelPanelSplitterId, panelVar, sideNavLiveWidthVar, UNSAFE_panelLayoutVar } from './constants';
+import { UNSAFE_panelLayoutVar, panelPanelSplitterId, panelVar, sideNavLiveWidthVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { PanelSplitterProvider } from './panel-splitter/provider';

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

@@ -5,10 +5,24 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useContext } from 'react';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 import { media } from '@atlaskit/primitives/responsive';
-import { localSlotLayers, UNSAFE_ribbonVar } from './constants';
+import { UNSAFE_ribbonVar } from './constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from './dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
 import { useLayoutId } from './use-layout-id';
+var localSlotLayersStatic = {
+  ribbon: 4,
+  // The side nav panel splitter is layered above the top nav when FHS 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,
+  // When FHS is enabled, the side nav is layered below the top nav,
+  // but above the panel
+  bannerFHS: 3,
+  topNavFHS: 3,
+  sideNav: 2,
+  panelSmallViewports: 1
+};
 var styles = {
   root: "_nd5l1c99 _1reo15vq _18m915vq _4t3i1osq _152tidpf _kqsw1if8 _vchhusvi _1pbyegat _1e0cglyw _dm2518uv"
 };

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

@@ -7,8 +7,8 @@ import { ax, ix } from "@compiled/react/runtime";
 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) { _defineProperty(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; }
 import React, { startTransition, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { bind } from 'bind-event-listener';
 import { flushSync } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
@@ -21,7 +21,7 @@ import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
 import { TopNavStartElement } from '../../../context/top-nav-start/top-nav-start-element';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-import { bannerMountedVar, contentHeightWhenFixed, contentInsetBlockStart, localSlotLayers, openLayerObserverSideNavNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar, UNSAFE_sideNavLayoutVar } from '../constants';
+import { UNSAFE_sideNavLayoutVar, openLayerObserverSideNavNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar } from '../constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { PanelSplitterProvider } from '../panel-splitter/provider';

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

@@ -1,6 +1,6 @@
 import { useCallback, useContext } from 'react';
-import { bind } from 'bind-event-listener';
 import { flushSync } from 'react-dom';
+import { bind } from 'bind-event-listener';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { SetSideNavVisibilityState } from './set-side-nav-visibility-state';
 import { useSideNavRef } from './use-side-nav-ref';

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

@@ -3,15 +3,15 @@ import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useContext } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { componentWithFG } from '@atlaskit/platform-feature-flags-react/component-with-fg';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { HasDefaultBackgroundColorContext } from '../../top-nav-items/themed/has-default-background-color-context';
 import { useCustomTheme } from '../../top-nav-items/themed/use-custom-theme';
 import { useCustomThemeNew } from '../../top-nav-items/themed/use-custom-theme-new';
-import { bannerMountedVar, localSlotLayers, sideNavLiveWidthVar, topNavMountedVar, UNSAFE_topNavVar } from '../constants';
+import { UNSAFE_topNavVar, topNavMountedVar } from '../constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../dangerously-hoist-css-var-to-document-root';
 import { HoistCssVarToLocalGrid } from '../hoist-css-var-to-local-grid';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';

package/dist/esm/ui/page-layout/use-resizing-width-css-var-on-root-element.js

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/utils/combine';
 import { isPanelSplitterDragData } from './panel-splitter/is-panel-splitter-drag-data';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "10.17.2",
+	"version": "10.17.4",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -59,12 +59,12 @@
 		"@atlaskit/analytics-next": "^12.5.0",
 		"@atlaskit/app-provider": "^7.0.0",
 		"@atlaskit/avatar": "^28.0.0",
-		"@atlaskit/button": "^25.3.0",
+		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/ds-lib": "^8.0.0",
 		"@atlaskit/icon": "^37.7.0",
 		"@atlaskit/layering": "^5.2.0",
-		"@atlaskit/logo": "^23.0.0",
+		"@atlaskit/logo": "^23.1.0",
 		"@atlaskit/motion": "^8.8.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/platform-feature-flags-react": "^1.2.0",
@@ -132,9 +132,6 @@
 		"platform-dst-tokens-finesse": {
 			"type": "boolean"
 		},
-		"platform-dst-main-print-styles": {
-			"type": "boolean"
-		},
 		"platform-dst-top-layer": {
 			"type": "boolean",
 			"referenceOnly": true