@atlaskit/navigation-system 9.1.2 → 9.2.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlassian/navigation-system
 
+## 9.2.0
+
+### Minor Changes
+
+- [`b46825ac6c66c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b46825ac6c66c) -
+  Cleans up the `platform_dst_nav4_top_nav_increase_height` feature gate. The top nav height is now
+  always 56px when the full-height sidebar is enabled.
+
 ## 9.1.2
 
 ### Patch Changes

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

@@ -20,7 +20,6 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
 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 _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _responsive = require("@atlaskit/primitives/responsive");
 var _useSkipLinkInternal = require("../../../context/skip-links/use-skip-link-internal");
@@ -358,23 +357,14 @@ function SideNavInternal(_ref) {
 
     // Sync the visibility in context (provided in `<Root>`) with the local `defaultCollapsed` prop provided to `SideNav`
     // after SSR hydration. This should only run once, after the initial render on the client.
-    if ((0, _platformFeatureFlags.fg)('navx-4418-fix-effect-state-updates-in-gsn')) {
-      (0, _react.startTransition)(function () {
-        setSideNavState({
-          desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-          mobile: 'collapsed',
-          flyout: 'closed',
-          lastTrigger: null
-        });
-      });
-    } else {
+    (0, _react.startTransition)(function () {
       setSideNavState({
         desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
         mobile: 'collapsed',
         flyout: 'closed',
         lastTrigger: null
       });
-    }
+    });
   }, [initialDefaultCollapsed, setSideNavState, sideNavState]);
   var handleExpand = (0, _react.useCallback)(function (_ref2) {
     var screen = _ref2.screen,

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

@@ -61,8 +61,7 @@ function TopNavOld(_ref) {
     label: skipLinkLabel,
     isHidden: (0, _platformFeatureFlags.fg)('platform_dst_nav4_skip_link_a11y_1')
   });
-  var hasIncreasedDefaultHeight = isFhsEnabled && (0, _platformFeatureFlags.fg)('platform_dst_nav4_top_nav_increase_height');
-  var height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  var height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   var customTheme = (0, _useCustomTheme.useCustomTheme)(customThemeConfig);
   var _useSideNavVisibility = (0, _useSideNavVisibility3.useSideNavVisibility)(),
     isExpandedOnDesktop = _useSideNavVisibility.isExpandedOnDesktop;
@@ -114,8 +113,7 @@ function TopNavNew(_ref2) {
     label: skipLinkLabel,
     isHidden: (0, _platformFeatureFlags.fg)('platform_dst_nav4_skip_link_a11y_1')
   });
-  var hasIncreasedDefaultHeight = isFhsEnabled && (0, _platformFeatureFlags.fg)('platform_dst_nav4_top_nav_increase_height');
-  var height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  var height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   var customTheme = (0, _useCustomThemeNew.useCustomThemeNew)(customThemeConfig);
   var hasDefaultBackground = customTheme.isEnabled ? customTheme.hasDefaultBackground : true;
   var _useSideNavVisibility2 = (0, _useSideNavVisibility3.useSideNavVisibility)(),

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

@@ -9,7 +9,6 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 import { OpenLayerObserverNamespaceProvider, useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
@@ -339,23 +338,14 @@ function SideNavInternal({
 
     // Sync the visibility in context (provided in `<Root>`) with the local `defaultCollapsed` prop provided to `SideNav`
     // after SSR hydration. This should only run once, after the initial render on the client.
-    if (fg('navx-4418-fix-effect-state-updates-in-gsn')) {
-      startTransition(() => {
-        setSideNavState({
-          desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-          mobile: 'collapsed',
-          flyout: 'closed',
-          lastTrigger: null
-        });
-      });
-    } else {
+    startTransition(() => {
       setSideNavState({
         desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
         mobile: 'collapsed',
         flyout: 'closed',
         lastTrigger: null
       });
-    }
+    });
   }, [initialDefaultCollapsed, setSideNavState, sideNavState]);
   const handleExpand = useCallback(({
     screen,

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

@@ -54,8 +54,7 @@ function TopNavOld({
     label: skipLinkLabel,
     isHidden: fg('platform_dst_nav4_skip_link_a11y_1')
   });
-  const hasIncreasedDefaultHeight = isFhsEnabled && fg('platform_dst_nav4_top_nav_increase_height');
-  const height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  const height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   const customTheme = useCustomTheme(customThemeConfig);
   const {
     isExpandedOnDesktop
@@ -108,8 +107,7 @@ function TopNavNew({
     label: skipLinkLabel,
     isHidden: fg('platform_dst_nav4_skip_link_a11y_1')
   });
-  const hasIncreasedDefaultHeight = isFhsEnabled && fg('platform_dst_nav4_top_nav_increase_height');
-  const height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  const height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   const customTheme = useCustomThemeNew(customThemeConfig);
   const hasDefaultBackground = customTheme.isEnabled ? customTheme.hasDefaultBackground : true;
   const {

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

@@ -13,7 +13,6 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
 import { OpenLayerObserverNamespaceProvider, useOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { media } from '@atlaskit/primitives/responsive';
 import { useSkipLinkInternal } from '../../../context/skip-links/use-skip-link-internal';
@@ -348,23 +347,14 @@ function SideNavInternal(_ref) {
 
     // Sync the visibility in context (provided in `<Root>`) with the local `defaultCollapsed` prop provided to `SideNav`
     // after SSR hydration. This should only run once, after the initial render on the client.
-    if (fg('navx-4418-fix-effect-state-updates-in-gsn')) {
-      startTransition(function () {
-        setSideNavState({
-          desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-          mobile: 'collapsed',
-          flyout: 'closed',
-          lastTrigger: null
-        });
-      });
-    } else {
+    startTransition(function () {
       setSideNavState({
         desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
         mobile: 'collapsed',
         flyout: 'closed',
         lastTrigger: null
       });
-    }
+    });
   }, [initialDefaultCollapsed, setSideNavState, sideNavState]);
   var handleExpand = useCallback(function (_ref2) {
     var screen = _ref2.screen,

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

@@ -54,8 +54,7 @@ function TopNavOld(_ref) {
     label: skipLinkLabel,
     isHidden: fg('platform_dst_nav4_skip_link_a11y_1')
   });
-  var hasIncreasedDefaultHeight = isFhsEnabled && fg('platform_dst_nav4_top_nav_increase_height');
-  var height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  var height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   var customTheme = useCustomTheme(customThemeConfig);
   var _useSideNavVisibility = useSideNavVisibility(),
     isExpandedOnDesktop = _useSideNavVisibility.isExpandedOnDesktop;
@@ -107,8 +106,7 @@ function TopNavNew(_ref2) {
     label: skipLinkLabel,
     isHidden: fg('platform_dst_nav4_skip_link_a11y_1')
   });
-  var hasIncreasedDefaultHeight = isFhsEnabled && fg('platform_dst_nav4_top_nav_increase_height');
-  var height = heightProp !== null && heightProp !== void 0 ? heightProp : hasIncreasedDefaultHeight ? 56 : 48;
+  var height = heightProp !== null && heightProp !== void 0 ? heightProp : isFhsEnabled ? 56 : 48;
   var customTheme = useCustomThemeNew(customThemeConfig);
   var hasDefaultBackground = customTheme.isEnabled ? customTheme.hasDefaultBackground : true;
   var _useSideNavVisibility2 = useSideNavVisibility(),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "9.1.2",
+	"version": "9.2.0",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -153,9 +153,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_dst_nav4_top_nav_increase_height": {
-			"type": "boolean"
-		},
 		"platform-component-visual-refresh": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -172,9 +169,6 @@
 		"platform_dst_nav4_flyout_menu_slots_close_button": {
 			"type": "boolean"
 		},
-		"navx-4418-fix-effect-state-updates-in-gsn": {
-			"type": "boolean"
-		},
 		"platform_dst_nav4_custom_theming_fhs_1": {
 			"type": "boolean"
 		},