@atlaskit/navigation-system 5.9.1 → 5.9.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlassian/navigation-system
 
+## 5.9.3
+
+### Patch Changes
+
+- [`c17bb4f3e9cb0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c17bb4f3e9cb0) -
+  A feature gate has been removed. The FHS rollout has fully transitioned from a feature gate to a
+  context value instead.
+
+## 5.9.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.9.1
 
 ### Patch Changes

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

@@ -20,7 +20,6 @@ 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 _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _blockDraggingToIframes = require("@atlaskit/pragmatic-drag-and-drop/element/block-dragging-to-iframes");
@@ -60,9 +59,7 @@ var MaybeTooltip = function MaybeTooltip(_ref) {
   var tooltipContent = _ref.tooltipContent,
     shortcut = _ref.shortcut,
     children = _ref.children;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   if (tooltipContent && isFhsEnabled) {
     return /*#__PURE__*/React.createElement(_tooltip.default, {
       content: tooltipContent,
@@ -97,9 +94,7 @@ var PortaledPanelSplitter = function PortaledPanelSplitter(_ref2) {
     position = _ref2.position,
     tooltipContent = _ref2.tooltipContent,
     shortcut = _ref2.shortcut;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var splitterRef = (0, _react.useRef)(null);
   var labelId = (0, _useId.useId)();
   // Separate state used for the input range width to remove the UI's dependency on the "persisted" layout state value being updated

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

@@ -11,7 +11,6 @@ require("./side-nav-content.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 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); }
 /**
@@ -45,9 +44,7 @@ var fullHeightSidebarStyles = {
 function _SideNavContent(_ref, forwardedRef) {
   var children = _ref.children,
     testId = _ref.testId;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var internalRef = (0, _react.useRef)(null);
   var mergedRef = (0, _react.useMemo)(function () {
     return (0, _mergeRefs.default)([internalRef, forwardedRef]);

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

@@ -107,9 +107,7 @@ function SideNavInternal(_ref) {
     onPeekEnd = _ref.onPeekEnd,
     providedId = _ref.id,
     canToggleWithShortcut = _ref.canToggleWithShortcut;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var id = (0, _idUtils.useLayoutId)({
     providedId: providedId
   });

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

@@ -51,9 +51,7 @@ var SideNavToggleButton = exports.SideNavToggleButton = function SideNavToggleBu
     testId = _ref.testId,
     interactionName = _ref.interactionName,
     onClick = _ref.onClick;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var _useSideNavVisibility = (0, _useSideNavVisibility2.useSideNavVisibility)({
       defaultCollapsed: defaultCollapsed
     }),

package/dist/cjs/ui/page-layout/side-nav/use-side-nav-toggle-keyboard-shortcut.js

@@ -9,7 +9,6 @@ var _react = require("react");
 var _bindEventListener = require("bind-event-listener");
 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 _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 var _isSideNavShortcutEnabledContext = require("./is-side-nav-shortcut-enabled-context");
 var _useToggleSideNav = require("./use-toggle-side-nav");
@@ -18,9 +17,7 @@ var _useToggleSideNav = require("./use-toggle-side-nav");
  */
 function useSideNavToggleKeyboardShortcut(_ref) {
   var canToggleWithShortcut = _ref.canToggleWithShortcut;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var openLayerObserver = (0, _openLayerObserver.useOpenLayerObserver)();
   var toggleVisibilityByShortcut = (0, _useToggleSideNav.useToggleSideNav)({
     trigger: 'keyboard'

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

@@ -48,9 +48,7 @@ function TopNavEnd(_ref) {
     label = _ref$label === void 0 ? 'Actions' : _ref$label,
     _ref$showMoreButtonLa = _ref.showMoreButtonLabel,
     showMoreButtonLabel = _ref$showMoreButtonLa === void 0 ? 'Show more' : _ref$showMoreButtonLa;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpen = _useState2[0],

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

@@ -9,7 +9,6 @@ exports.TopNavMiddle = TopNavMiddle;
 require("./top-nav-middle.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
 var styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
@@ -26,9 +25,7 @@ var styles = {
  */
 function TopNavMiddle(_ref) {
   var children = _ref.children;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _runtime.ax)([styles.root, isFhsEnabled && styles.fullHeightSidebar])
   }, children);

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

@@ -138,9 +138,7 @@ function TopNavStart(_ref3) {
   var children = _ref3.children,
     testId = _ref3.testId,
     sideNavToggleButton = _ref3.sideNavToggleButton;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var ref = (0, _react.useContext)(_topNavStartContext.TopNavStartAttachRef);
   var elementRef = (0, _react.useRef)(null);
 

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

@@ -12,7 +12,6 @@ var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-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");
 var _hasCustomThemeContext = require("../../top-nav-items/themed/has-custom-theme-context");
@@ -61,9 +60,7 @@ function TopNav(_ref) {
     testId = _ref.testId,
     providedId = _ref.id,
     UNSAFE_theme = _ref.UNSAFE_theme;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var dangerouslyHoistSlotSizes = (0, _react.useContext)(_hoistSlotSizesContext.DangerouslyHoistSlotSizes);
   var id = (0, _idUtils.useLayoutId)({
     providedId: providedId

package/dist/cjs/ui/top-nav-items/nav-logo/app-logo.js

@@ -11,7 +11,6 @@ require("./app-logo.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@compiled/react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _useIsFhsEnabled = require("../../fhs-rollout/use-is-fhs-enabled");
@@ -54,9 +53,7 @@ var AppLogo = exports.AppLogo = function AppLogo(_ref) {
     href = _ref.href,
     icon = _ref.icon,
     onClick = _ref.onClick;
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   var ref = (0, _react.useRef)(null);
   var nameRef = (0, _react.useRef)(null);
   var hasCustomTheme = (0, _hasCustomThemeContext.useHasCustomTheme)();

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

@@ -12,7 +12,6 @@ var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _css = require("@atlaskit/css");
 var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _useIsFhsEnabled = require("../fhs-rollout/use-is-fhs-enabled");
 var _migration = require("./themed/migration");
@@ -38,9 +37,7 @@ var Search = exports.Search = function Search(_ref) {
     elemAfter = _ref.elemAfter,
     interactionName = _ref.interactionName,
     ariaHaspopup = _ref['aria-haspopup'];
-  var isFhsEnabled = (0, _platformFeatureFlags.fg)('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _useIsFhsEnabled.useIsFhsEnabled)() : (0, _platformFeatureFlags.fg)('navx-full-height-sidebar');
+  var isFhsEnabled = (0, _useIsFhsEnabled.useIsFhsEnabled)();
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
     style: {
       // To win the specificity war against Emotion we move this into inline styles

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

@@ -9,7 +9,6 @@ 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/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { blockDraggingToIFrames } from '@atlaskit/pragmatic-drag-and-drop/element/block-dragging-to-iframes';
@@ -50,9 +49,7 @@ const MaybeTooltip = ({
   shortcut,
   children
 }) => {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   if (tooltipContent && isFhsEnabled) {
     return /*#__PURE__*/React.createElement(Tooltip, {
       content: tooltipContent,
@@ -89,9 +86,7 @@ const PortaledPanelSplitter = ({
   tooltipContent,
   shortcut
 }) => {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const splitterRef = useRef(null);
   const labelId = useId();
   // Separate state used for the input range width to remove the UI's dependency on the "persisted" layout state value being updated

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

@@ -3,7 +3,6 @@ import "./side-nav-content.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { forwardRef, useMemo, useRef } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 
 /**
@@ -38,9 +37,7 @@ function _SideNavContent({
   children,
   testId
 }, forwardedRef) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const internalRef = useRef(null);
   const mergedRef = useMemo(() => mergeRefs([internalRef, forwardedRef]), [forwardedRef]);
   return /*#__PURE__*/React.createElement("div", {

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

@@ -91,9 +91,7 @@ function SideNavInternal({
   canToggleWithShortcut
 }) {
   var _sideNavState$lastTri;
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const id = useLayoutId({
     providedId
   });

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

@@ -38,9 +38,7 @@ export const SideNavToggleButton = ({
   interactionName,
   onClick
 }) => {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const {
     isExpandedOnDesktop: isSideNavExpandedOnDesktop,
     isExpandedOnMobile: isSideNavExpandedOnMobile

package/dist/es2019/ui/page-layout/side-nav/use-side-nav-toggle-keyboard-shortcut.js

@@ -2,7 +2,6 @@ import { useEffect } from 'react';
 import { bind } from 'bind-event-listener';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 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 { useIsSideNavShortcutEnabled } from './is-side-nav-shortcut-enabled-context';
 import { useToggleSideNav } from './use-toggle-side-nav';
@@ -13,9 +12,7 @@ import { useToggleSideNav } from './use-toggle-side-nav';
 export function useSideNavToggleKeyboardShortcut({
   canToggleWithShortcut
 }) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const openLayerObserver = useOpenLayerObserver();
   const toggleVisibilityByShortcut = useToggleSideNav({
     trigger: 'keyboard'

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

@@ -37,9 +37,7 @@ export function TopNavEnd({
   label = 'Actions',
   showMoreButtonLabel = 'Show more'
 }) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const [isOpen, setIsOpen] = useState(false);
   // Always setting to `false` for the initial render (will flip in an effect for mobile)
   const [isMobile, setIsMobile] = useState(false);

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

@@ -2,7 +2,6 @@
 import "./top-nav-middle.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 const styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
@@ -20,9 +19,7 @@ const styles = {
 export function TopNavMiddle({
   children
 }) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement("div", {
     className: ax([styles.root, isFhsEnabled && styles.fullHeightSidebar])
   }, children);

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

@@ -133,9 +133,7 @@ export function TopNavStart({
   testId,
   sideNavToggleButton
 }) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const ref = useContext(TopNavStartAttachRef);
   const elementRef = useRef(null);
 

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

@@ -3,7 +3,6 @@ import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useContext, useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useSkipLink } from '../../../context/skip-links/skip-links-context';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
@@ -49,9 +48,7 @@ export function TopNav({
   id: providedId,
   UNSAFE_theme
 }) {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const dangerouslyHoistSlotSizes = useContext(DangerouslyHoistSlotSizes);
   const id = useLayoutId({
     providedId

package/dist/es2019/ui/top-nav-items/nav-logo/app-logo.js

@@ -3,7 +3,6 @@ import "./app-logo.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useRef } from 'react';
 import { cx } from '@compiled/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Anchor, Inline, Text } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
@@ -46,9 +45,7 @@ export const AppLogo = ({
   icon,
   onClick
 }) => {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   const ref = useRef(null);
   const nameRef = useRef(null);
   const hasCustomTheme = useHasCustomTheme();

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

@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { Fragment } from 'react';
 import { cx } from '@atlaskit/css';
 import SearchIcon from '@atlaskit/icon/core/search';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Pressable, Show, Text } from '@atlaskit/primitives/compiled';
 import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
 import { IconButton } from './themed/migration';
@@ -29,9 +28,7 @@ export const Search = ({
   interactionName,
   'aria-haspopup': ariaHaspopup
 }) => {
-  const isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  const isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Pressable, {
     style: {
       // To win the specificity war against Emotion we move this into inline styles

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

@@ -13,7 +13,6 @@ 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/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { blockDraggingToIFrames } from '@atlaskit/pragmatic-drag-and-drop/element/block-dragging-to-iframes';
@@ -50,9 +49,7 @@ var MaybeTooltip = function MaybeTooltip(_ref) {
   var tooltipContent = _ref.tooltipContent,
     shortcut = _ref.shortcut,
     children = _ref.children;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   if (tooltipContent && isFhsEnabled) {
     return /*#__PURE__*/React.createElement(Tooltip, {
       content: tooltipContent,
@@ -87,9 +84,7 @@ var PortaledPanelSplitter = function PortaledPanelSplitter(_ref2) {
     position = _ref2.position,
     tooltipContent = _ref2.tooltipContent,
     shortcut = _ref2.shortcut;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var splitterRef = useRef(null);
   var labelId = useId();
   // Separate state used for the input range width to remove the UI's dependency on the "persisted" layout state value being updated

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

@@ -3,7 +3,6 @@ import "./side-nav-content.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { forwardRef, useMemo, useRef } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 
 /**
@@ -37,9 +36,7 @@ var fullHeightSidebarStyles = {
 function _SideNavContent(_ref, forwardedRef) {
   var children = _ref.children,
     testId = _ref.testId;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var internalRef = useRef(null);
   var mergedRef = useMemo(function () {
     return mergeRefs([internalRef, forwardedRef]);

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

@@ -97,9 +97,7 @@ function SideNavInternal(_ref) {
     onPeekEnd = _ref.onPeekEnd,
     providedId = _ref.id,
     canToggleWithShortcut = _ref.canToggleWithShortcut;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var id = useLayoutId({
     providedId: providedId
   });

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

@@ -42,9 +42,7 @@ export var SideNavToggleButton = function SideNavToggleButton(_ref) {
     testId = _ref.testId,
     interactionName = _ref.interactionName,
     onClick = _ref.onClick;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var _useSideNavVisibility = useSideNavVisibility({
       defaultCollapsed: defaultCollapsed
     }),

package/dist/esm/ui/page-layout/side-nav/use-side-nav-toggle-keyboard-shortcut.js

@@ -2,7 +2,6 @@ import { useEffect } from 'react';
 import { bind } from 'bind-event-listener';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 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 { useIsSideNavShortcutEnabled } from './is-side-nav-shortcut-enabled-context';
 import { useToggleSideNav } from './use-toggle-side-nav';
@@ -12,9 +11,7 @@ import { useToggleSideNav } from './use-toggle-side-nav';
  */
 export function useSideNavToggleKeyboardShortcut(_ref) {
   var canToggleWithShortcut = _ref.canToggleWithShortcut;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var openLayerObserver = useOpenLayerObserver();
   var toggleVisibilityByShortcut = useToggleSideNav({
     trigger: 'keyboard'

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

@@ -39,9 +39,7 @@ export function TopNavEnd(_ref) {
     label = _ref$label === void 0 ? 'Actions' : _ref$label,
     _ref$showMoreButtonLa = _ref.showMoreButtonLabel,
     showMoreButtonLabel = _ref$showMoreButtonLa === void 0 ? 'Show more' : _ref$showMoreButtonLa;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],

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

@@ -2,7 +2,6 @@
 import "./top-nav-middle.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 var styles = {
   root: "_zulpu2gc _yyhycs5v _1bsb1osq _4cvr1h6o _1e0c1txw _1bahh9n0 _181n11p5 _1j8b15b0 _lagd1bp4 _1t4c1ris _12e8h9n0",
@@ -19,9 +18,7 @@ var styles = {
  */
 export function TopNavMiddle(_ref) {
   var children = _ref.children;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement("div", {
     className: ax([styles.root, isFhsEnabled && styles.fullHeightSidebar])
   }, children);

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

@@ -130,9 +130,7 @@ export function TopNavStart(_ref3) {
   var children = _ref3.children,
     testId = _ref3.testId,
     sideNavToggleButton = _ref3.sideNavToggleButton;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var ref = useContext(TopNavStartAttachRef);
   var elementRef = useRef(null);
 

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

@@ -5,7 +5,6 @@ import "./top-nav.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useContext, useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useSkipLink } from '../../../context/skip-links/skip-links-context';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
@@ -52,9 +51,7 @@ export function TopNav(_ref) {
     testId = _ref.testId,
     providedId = _ref.id,
     UNSAFE_theme = _ref.UNSAFE_theme;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var dangerouslyHoistSlotSizes = useContext(DangerouslyHoistSlotSizes);
   var id = useLayoutId({
     providedId: providedId

package/dist/esm/ui/top-nav-items/nav-logo/app-logo.js

@@ -3,7 +3,6 @@ import "./app-logo.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useRef } from 'react';
 import { cx } from '@compiled/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Anchor, Inline, Text } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip';
 import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
@@ -45,9 +44,7 @@ export var AppLogo = function AppLogo(_ref) {
     href = _ref.href,
     icon = _ref.icon,
     onClick = _ref.onClick;
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   var ref = useRef(null);
   var nameRef = useRef(null);
   var hasCustomTheme = useHasCustomTheme();

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

@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { Fragment } from 'react';
 import { cx } from '@atlaskit/css';
 import SearchIcon from '@atlaskit/icon/core/search';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Pressable, Show, Text } from '@atlaskit/primitives/compiled';
 import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
 import { IconButton } from './themed/migration';
@@ -29,9 +28,7 @@ export var Search = function Search(_ref) {
     elemAfter = _ref.elemAfter,
     interactionName = _ref.interactionName,
     ariaHaspopup = _ref['aria-haspopup'];
-  var isFhsEnabled = fg('navx-2566-implement-fhs-rollout') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useIsFhsEnabled() : fg('navx-full-height-sidebar');
+  var isFhsEnabled = useIsFhsEnabled();
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Pressable, {
     style: {
       // To win the specificity war against Emotion we move this into inline styles

package/dist/types/context/top-nav-start/top-nav-start-context-provider.d.ts

@@ -12,6 +12,6 @@ import React from 'react';
  * State is required as opposed to just a ref so that the effects in the side nav can react to the element actually being mounted,
  * as ref values cannot be added as effect dependencies.
  */
-export declare const TopNavStartProvider: ({ children }: {
+export declare const TopNavStartProvider: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/dist/types/ui/page-layout/side-nav/toggle-button-provider.d.ts

@@ -12,6 +12,6 @@ import React from 'react';
  * State is required as opposed to just a ref so that the effects in the side nav can react the element actually being mounted,
  * as ref values cannot be added as effect dependencies.
  */
-export declare const SideNavToggleButtonProvider: ({ children }: {
+export declare const SideNavToggleButtonProvider: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/dist/types-ts4.5/context/top-nav-start/top-nav-start-context-provider.d.ts

@@ -12,6 +12,6 @@ import React from 'react';
  * State is required as opposed to just a ref so that the effects in the side nav can react to the element actually being mounted,
  * as ref values cannot be added as effect dependencies.
  */
-export declare const TopNavStartProvider: ({ children }: {
+export declare const TopNavStartProvider: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/dist/types-ts4.5/ui/page-layout/side-nav/toggle-button-provider.d.ts

@@ -12,6 +12,6 @@ import React from 'react';
  * State is required as opposed to just a ref so that the effects in the side nav can react the element actually being mounted,
  * as ref values cannot be added as effect dependencies.
  */
-export declare const SideNavToggleButtonProvider: ({ children }: {
+export declare const SideNavToggleButtonProvider: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "5.9.1",
+	"version": "5.9.3",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -69,7 +69,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/avatar": "^25.5.0",
 		"@atlaskit/button": "^23.6.0",
-		"@atlaskit/css": "^0.16.0",
+		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/ds-lib": "^5.3.0",
 		"@atlaskit/icon": "^29.0.0",
 		"@atlaskit/layering": "^3.4.0",
@@ -79,8 +79,8 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^16.2.0",
-		"@atlaskit/tokens": "^8.2.0",
+		"@atlaskit/primitives": "^16.3.0",
+		"@atlaskit/tokens": "^8.3.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -176,9 +176,6 @@
 		"navx-full-height-sidebar": {
 			"type": "boolean"
 		},
-		"navx-2566-implement-fhs-rollout": {
-			"type": "boolean"
-		},
 		"team25-eu-jira-logo-updates-csm-jsm": {
 			"type": "boolean"
 		},