@atlaskit/navigation-system 5.1.0 → 5.2.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlassian/navigation-system
 
+## 5.2.0
+
+### Minor Changes
+
+- [`fef4ccb6af01f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fef4ccb6af01f) -
+  Cleans up the `platform_dst_nav4_side_nav_default_collapsed_api` feature gate. Default side nav
+  collapsed state can now be passed into the `Root` component via the `defaultSideNavCollapsed`
+  prop. This is the preferred API, and the legacy API will be removed at some point in the future.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.1.0
 
 ### Minor Changes

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

@@ -304,29 +304,10 @@ function SideNavInternal(_ref) {
   var toggleVisibilityByClickOutsideOnMobile = (0, _useToggleSideNav.useToggleSideNav)({
     trigger: 'click-outside-on-mobile'
   });
-  (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the old version of the hook, so we skip it when the flag is enabled
-      return;
-    }
-
-    // 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.
-    setSideNavState({
-      desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-      mobile: 'collapsed',
-      flyout: 'closed',
-      lastTrigger: null
-    });
-  }, [initialDefaultCollapsed, setSideNavState]);
 
   // Moving to `useLayoutEffect` so that there's no visual shift in non-SSR environments when using legacy API
   // For SSR the new API is still necessary
   (0, _react.useLayoutEffect)(function () {
-    if (!(0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the new version of the hook, so we skip it when the flag is disabled
-      return;
-    }
     if (sideNavState !== null) {
       // Only need to do an initial sync if it hasn't been initialized from Root
       return;

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

@@ -57,7 +57,7 @@ var SideNavToggleButton = exports.SideNavToggleButton = function SideNavToggleBu
 
   // When default state is provided to `Root` the state in context will already be
   // initialized in SSR
-  var _useState = (0, _react.useState)(sideNavState === null || !(0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_default_collapsed_api') ? !defaultCollapsed : isSideNavExpandedOnDesktop),
+  var _useState = (0, _react.useState)(sideNavState === null ? !defaultCollapsed : isSideNavExpandedOnDesktop),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isSideNavExpanded = _useState2[0],
     setIsSideNavExpanded = _useState2[1];

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.SideNavVisibilityProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _visibilityContext = require("./visibility-context");
 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); }
 /**
@@ -17,7 +16,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var SideNavVisibilityProvider = exports.SideNavVisibilityProvider = function SideNavVisibilityProvider(_ref) {
   var children = _ref.children,
     defaultCollapsed = _ref.defaultCollapsed;
-  var initialState = typeof defaultCollapsed === 'boolean' && (0, _platformFeatureFlags.fg)('platform_dst_nav4_side_nav_default_collapsed_api') ? {
+  var initialState = typeof defaultCollapsed === 'boolean' ? {
     desktop: defaultCollapsed ? 'collapsed' : 'expanded',
     mobile: 'collapsed',
     flyout: 'closed',

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

@@ -286,29 +286,10 @@ function SideNavInternal({
   const toggleVisibilityByClickOutsideOnMobile = useToggleSideNav({
     trigger: 'click-outside-on-mobile'
   });
-  useEffect(() => {
-    if (fg('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the old version of the hook, so we skip it when the flag is enabled
-      return;
-    }
-
-    // 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.
-    setSideNavState({
-      desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-      mobile: 'collapsed',
-      flyout: 'closed',
-      lastTrigger: null
-    });
-  }, [initialDefaultCollapsed, setSideNavState]);
 
   // Moving to `useLayoutEffect` so that there's no visual shift in non-SSR environments when using legacy API
   // For SSR the new API is still necessary
   useLayoutEffect(() => {
-    if (!fg('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the new version of the hook, so we skip it when the flag is disabled
-      return;
-    }
     if (sideNavState !== null) {
       // Only need to do an initial sync if it hasn't been initialized from Root
       return;

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

@@ -45,7 +45,7 @@ export const SideNavToggleButton = ({
 
   // When default state is provided to `Root` the state in context will already be
   // initialized in SSR
-  const [isSideNavExpanded, setIsSideNavExpanded] = useState(sideNavState === null || !fg('platform_dst_nav4_side_nav_default_collapsed_api') ? !defaultCollapsed : isSideNavExpandedOnDesktop);
+  const [isSideNavExpanded, setIsSideNavExpanded] = useState(sideNavState === null ? !defaultCollapsed : isSideNavExpandedOnDesktop);
   const ref = useContext(SideNavToggleButtonAttachRef);
   const elementRef = useRef(null);
 

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

@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SetSideNavVisibilityState, SideNavVisibilityState } from './visibility-context';
 
 /**
@@ -9,7 +8,7 @@ export const SideNavVisibilityProvider = ({
   children,
   defaultCollapsed
 }) => {
-  const initialState = typeof defaultCollapsed === 'boolean' && fg('platform_dst_nav4_side_nav_default_collapsed_api') ? {
+  const initialState = typeof defaultCollapsed === 'boolean' ? {
     desktop: defaultCollapsed ? 'collapsed' : 'expanded',
     mobile: 'collapsed',
     flyout: 'closed',

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

@@ -294,29 +294,10 @@ function SideNavInternal(_ref) {
   var toggleVisibilityByClickOutsideOnMobile = useToggleSideNav({
     trigger: 'click-outside-on-mobile'
   });
-  useEffect(function () {
-    if (fg('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the old version of the hook, so we skip it when the flag is enabled
-      return;
-    }
-
-    // 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.
-    setSideNavState({
-      desktop: initialDefaultCollapsed ? 'collapsed' : 'expanded',
-      mobile: 'collapsed',
-      flyout: 'closed',
-      lastTrigger: null
-    });
-  }, [initialDefaultCollapsed, setSideNavState]);
 
   // Moving to `useLayoutEffect` so that there's no visual shift in non-SSR environments when using legacy API
   // For SSR the new API is still necessary
   useLayoutEffect(function () {
-    if (!fg('platform_dst_nav4_side_nav_default_collapsed_api')) {
-      // This is the new version of the hook, so we skip it when the flag is disabled
-      return;
-    }
     if (sideNavState !== null) {
       // Only need to do an initial sync if it hasn't been initialized from Root
       return;

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

@@ -48,7 +48,7 @@ export var SideNavToggleButton = function SideNavToggleButton(_ref) {
 
   // When default state is provided to `Root` the state in context will already be
   // initialized in SSR
-  var _useState = useState(sideNavState === null || !fg('platform_dst_nav4_side_nav_default_collapsed_api') ? !defaultCollapsed : isSideNavExpandedOnDesktop),
+  var _useState = useState(sideNavState === null ? !defaultCollapsed : isSideNavExpandedOnDesktop),
     _useState2 = _slicedToArray(_useState, 2),
     isSideNavExpanded = _useState2[0],
     setIsSideNavExpanded = _useState2[1];

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

@@ -1,6 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SetSideNavVisibilityState, SideNavVisibilityState } from './visibility-context';
 
 /**
@@ -9,7 +8,7 @@ import { SetSideNavVisibilityState, SideNavVisibilityState } from './visibility-
 export var SideNavVisibilityProvider = function SideNavVisibilityProvider(_ref) {
   var children = _ref.children,
     defaultCollapsed = _ref.defaultCollapsed;
-  var initialState = typeof defaultCollapsed === 'boolean' && fg('platform_dst_nav4_side_nav_default_collapsed_api') ? {
+  var initialState = typeof defaultCollapsed === 'boolean' ? {
     desktop: defaultCollapsed ? 'collapsed' : 'expanded',
     mobile: 'collapsed',
     flyout: 'closed',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "5.1.0",
+	"version": "5.2.0",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -147,9 +147,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_dst_nav4_side_nav_default_collapsed_api": {
-			"type": "boolean"
-		},
 		"platform_dst_nav4_side_nav_toggle_ref_fix": {
 			"type": "boolean"
 		},