@atlaskit/navigation-system 11.2.2 → 11.3.0

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

@@ -1,60 +1,10 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext } from 'react';
 import invariant from 'tiny-invariant';
-import { useOpenLayerObserver } from '@atlaskit/layering/use-open-layer-observer';
-import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-import { openLayerObserverSideNavNamespace, openLayerObserverTopNavEndNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavStartNamespace, sideNavPanelSplitterId } from '../constants';
+import { sideNavPanelSplitterId } from '../constants';
 import { useToggleSideNav } from '../side-nav/use-toggle-side-nav';
 import { OnDoubleClickContext } from './on-double-click-context';
 import { PanelSplitter } from './panel-splitter';
 import { PanelSplitterContext } from './panel-splitter-context';
-
-/**
- * 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.
- */
-const openLayerNamespacesToCheck = [
-// The side nav panel splitter is layered above the side nav, so needs to be disabled when there are open popups in the side nav.
-openLayerObserverSideNavNamespace,
-// The side nav panel splitter is layered above the top nav, so needs to be disabled when there are open popups in the top nav.
-openLayerObserverTopNavStartNamespace, openLayerObserverTopNavMiddleNamespace, openLayerObserverTopNavEndNamespace];
-
-/**
- * Returns whether there are any open popups in the side nav or top nav
- */
-function useHasOpenPopupsInSideNavOrTopNav() {
-  const isFhsEnabled = useIsFhsEnabled();
-  const openLayerObserver = useOpenLayerObserver();
-  // Setting the initial state to false, as it is unlikely that there would be any open popups when the app starts.
-  const [hasOpenPopups, setHasOpenPopups] = useState(false);
-  useEffect(() => {
-    if (!openLayerObserver || !isFhsEnabled) {
-      return;
-    }
-    function updateState() {
-      if (!openLayerObserver) {
-        return;
-      }
-      const hasAnyOpenLayers = openLayerNamespacesToCheck.some(namespace => openLayerObserver.getCount({
-        namespace,
-        type: 'popup'
-      }) > 0);
-      setHasOpenPopups(hasAnyOpenLayers);
-    }
-
-    // Initial check. We do this _in case_ a popup is already open when the component mounts.
-    updateState();
-
-    // Subscribe to each namespace
-    const cleanups = openLayerNamespacesToCheck.map(namespace => openLayerObserver.onChange(updateState, {
-      namespace
-    }));
-    return function cleanupHook() {
-      cleanups.forEach(cleanup => cleanup());
-    };
-  }, [isFhsEnabled, openLayerObserver]);
-  return hasOpenPopups;
-}
 /**
  * _SideNavPanelSplitter_
  *
@@ -81,15 +31,6 @@ export const SideNavPanelSplitter = ({
   const toggleSideNav = useToggleSideNav({
     trigger: 'double-click'
   });
-  const isFhsEnabled = useIsFhsEnabled();
-
-  // 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.
-  const hasOpenLayersInSideNavOrTopNav = useHasOpenPopupsInSideNavOrTopNav();
-  if (hasOpenLayersInSideNavOrTopNav && isFhsEnabled) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(OnDoubleClickContext.Provider, {
     value: shouldCollapseOnDoubleClick ? toggleSideNav : undefined
   }, /*#__PURE__*/React.createElement(PanelSplitter, {

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

@@ -10,15 +10,8 @@ import { useLayoutId } from './use-layout-id';
 const localSlotLayersStatic = {
   chatPanelOverlay: 5,
   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
 };

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

@@ -1,10 +1,7 @@
 /* side-nav-content.tsx generated by @compiled/babel-plugin v3.0.2 */
 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 { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-
+import React, { forwardRef } from 'react';
 /**
  * The main content of the side nav, filling up the middle section. It acts as a scroll container.
  *
@@ -22,11 +19,8 @@ function _SideNavContent({
   children,
   testId
 }, forwardedRef) {
-  const isFhsEnabled = useIsFhsEnabled();
-  const internalRef = useRef(null);
-  const mergedRef = useMemo(() => mergeRefs([internalRef, forwardedRef]), [forwardedRef]);
   return /*#__PURE__*/React.createElement("div", {
-    ref: isFhsEnabled ? mergedRef : forwardedRef,
+    ref: forwardedRef,
     "data-testid": testId,
     className: ax([styles.scrollContainer])
   }, /*#__PURE__*/React.createElement("div", {

package/dist/es2019/ui/page-layout/side-nav/side-nav.compiled.css

@@ -1,6 +1,5 @@
 ._191wglyw{border-inline-start:none}
 ._t51zglyw{border-inline-end:none}._152timx3{inset-block-start:calc(var(--n_bnrM, 0px) + var(--n_tNvM, 0px))}
-._15yekb7n{--animation-direction:1}
 ._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._1bah1yb4{justify-content:space-between}
 ._1bsb1ego{width:min(90%,20pc)}
@@ -9,24 +8,18 @@
 ._1e0cglyw{display:none}
 ._1p2s1vfh{--exit-animation:var(--ds-sidenav-exit-left,200ms cubic-bezier(0,0.4,0,1) SlideOut100PercentLeft)}
 ._1pbycs5v{z-index:2}
-._1pbyegat{z-index:4}
 ._2lx21bp4{flex-direction:column}
 ._4t3i1osq{height:100%}
 ._4t3ieqxy{height:calc(100vh - var(--n_bnrM, 0px) - var(--n_tNvM, 0px))}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._cjprp6j8{--enter-animation:var(--ds-sidenav-enter-left,250ms cubic-bezier(0,0.4,0,1) SlideIn100PercentLeft)}
 ._kqsw1if8{position:sticky}
-._kqsw1n9t{position:fixed}
-._t9ectl5p{transform:translateX(calc(var(--n_snvRsz, var(--n_snvW, 0px))))}
-._u7coidpf{inset-block-end:0}
 ._vchhusvi{box-sizing:border-box}
 [dir=rtl] ._1jq41dy6{--enter-animation:var(--ds-sidenav-enter-right,250ms cubic-bezier(0,0.4,0,1) SlideIn100PercentRight)}
 [dir=rtl] ._2qe0jwwr{--exit-animation:var(--ds-sidenav-exit-right,200ms cubic-bezier(0,0.4,0,1) SlideOut100PercentRight)}
-[dir=rtl] ._65m41mrw{--animation-direction:-1}
-@media (prefers-reduced-motion:no-preference){._10t81t0s{transition-property:display}._1vrh1a5r{transition-behavior:allow-discrete}._xrrpi9qs{transition-duration:var(--ds-duration-medium,.2s)}._10t88iot{transition-property:transform,display}._xrrpfnf5{transition-duration:.2s}._1lh81gzg{grid-area:main}._1xq51mm8{transition-timing-function:cubic-bezier(0,.4,0,1)}._k1affm5y{animation:var(--exit-animation)}@starting-style{._1nu51p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}._1xq51ku9{transition-timing-function:cubic-bezier(.6,0,0,1)}._k1af10ed{animation:var(--enter-animation)}}
+@media (prefers-reduced-motion:no-preference){._10t81t0s{transition-property:display}._1vrh1a5r{transition-behavior:allow-discrete}._xrrpi9qs{transition-duration:var(--ds-duration-medium,.2s)}._1lh81gzg{grid-area:main}._k1affm5y{animation:var(--exit-animation)}._k1af10ed{animation:var(--enter-animation)}}
 @media (min-width:48rem){._14b5hc79{width:var(--n_snvRsz,var(--n_sNvw))}}
-@media (min-width:64rem){._165t56xv{height:calc(100vh - var(--n_bnrM, 0px))}._p0az1elq{transform:translateX(calc(var(--n_snvRsz, var(--n_snvW, 0px)) - var(--ds-border-width, 1px)))}._cpcf1gzg._cpcf1gzg{grid-area:main}._6kttglyw._6kttglyw{border-inline-end:none}._w8v11bhr._w8v11bhr{background-color:var(--ds-surface-overlay,#fff)}._1jug130s._1jug130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._dm2518uv{display:initial}._dm25glyw{display:none}._qiln1gzg{grid-area:main}._p5clglyw{border-inline-end:none}._4ap31bhr{background-color:var(--ds-surface-overlay,#fff)}._scbp130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._qilnk0mc{grid-area:side-nav}._p5clia51{border-inline-end:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._4ap3vuon{background-color:var(--ds-surface,#fff)}._scbpglyw{box-shadow:none}}
-@media (prefers-reduced-motion:no-preference) and (min-width:64rem){._17ly8iot{transition-property:transform,display}._177m1a5r{transition-behavior:allow-discrete}._1sg81gzg{grid-area:main}._n2infm5y{animation:var(--exit-animation)}._17ly1wzp{transition-property:grid-area,display}._hjoi1wsm{transition-duration:var(--ds-duration-instant,0ms),var(--ds-duration-medium,.2s)}._1wxo1cio{transition-delay:19ms,var(--ds-duration-instant,0ms)}._vgub1mm8{transition-timing-function:cubic-bezier(0,.4,0,1)}._hh1u1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}@starting-style{._1xpz1gzg{grid-area:main}}._1sg8k0mc{grid-area:side-nav}._n2in10ed{animation:var(--enter-animation)}._17ly1q8v{transition-property:grid-area}._hjoi147i{transition-duration:var(--ds-duration-instant,0ms)}._1wxo4so3{transition-delay:24ms}@starting-style{._s2eg1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}._vgub1ku9{transition-timing-function:cubic-bezier(.6,0,0,1)}._hjoifnf5{transition-duration:.2s}._hjoi1mzy{transition-duration:var(--ds-duration-long,.25s)}._hjoii9qs{transition-duration:var(--ds-duration-medium,.2s)}}
-@media (prefers-reduced-motion:no-preference) and (not (min-width:64rem)){._aadi1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}}
+@media (min-width:64rem){._cpcf1gzg._cpcf1gzg{grid-area:main}._6kttglyw._6kttglyw{border-inline-end:none}._w8v11bhr._w8v11bhr{background-color:var(--ds-surface-overlay,#fff)}._1jug130s._1jug130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._dm2518uv{display:initial}._dm25glyw{display:none}._qiln1gzg{grid-area:main}._p5clglyw{border-inline-end:none}._4ap31bhr{background-color:var(--ds-surface-overlay,#fff)}._scbp130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}._qilnk0mc{grid-area:side-nav}._p5clia51{border-inline-end:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._4ap3vuon{background-color:var(--ds-surface,#fff)}._scbpglyw{box-shadow:none}}
+@media (prefers-reduced-motion:no-preference) and (min-width:64rem){._1sg81gzg{grid-area:main}._n2infm5y{animation:var(--exit-animation)}._17ly1wzp{transition-property:grid-area,display}._hjoi1wsm{transition-duration:var(--ds-duration-instant,0ms),var(--ds-duration-medium,.2s)}._1wxo1cio{transition-delay:19ms,var(--ds-duration-instant,0ms)}@starting-style{._1xpz1gzg{grid-area:main}}._1sg8k0mc{grid-area:side-nav}._n2in10ed{animation:var(--enter-animation)}._17ly1q8v{transition-property:grid-area}._hjoi147i{transition-duration:var(--ds-duration-instant,0ms)}._1wxo4so3{transition-delay:24ms}}
 @media not (min-width:64rem){._89fi1b6c{grid-area:main/aside/aside/aside}}
 @supports not (-moz-appearance:none){@media (prefers-reduced-motion:no-preference){._139f8iot{transition-property:transform,display}._1tpvfnf5{transition-duration:.2s}._sylc1a5r{transition-behavior:allow-discrete}._1uwsjq3t{transform:translateX(-100%)}}@media (prefers-reduced-motion:no-preference){@starting-style{._oyeijq3t{transform:translateX(-100%)}}._139f8iot{transition-property:transform,display}._1tpvfnf5{transition-duration:.2s}._sylc1a5r{transition-behavior:allow-discrete}}@media (prefers-reduced-motion:no-preference){._4xci10ed{animation:var(--enter-animation)}._1tpv1mzy{transition-duration:var(--ds-duration-long,.25s)}._sylc1a5r{transition-behavior:allow-discrete}}@media (prefers-reduced-motion:no-preference){._4xcifm5y{animation:var(--exit-animation)}._1tpvi9qs{transition-duration:var(--ds-duration-medium,.2s)}._sylc1a5r{transition-behavior:allow-discrete}}}

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

@@ -16,8 +16,7 @@ import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/el
 
 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 { UNSAFE_sideNavLayoutVar, mainMinimumWidthVar, openLayerObserverSideNavNamespace, openLayerObserverTopNavStartNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar } from '../constants';
+import { UNSAFE_sideNavLayoutVar, mainMinimumWidthVar, openLayerObserverSideNavNamespace, sideNavLiveWidthVar, sideNavPanelSplitterId, sideNavVar } from '../constants';
 import { DangerouslyHoistCssVarToDocumentRoot } from '../dangerously-hoist-css-var-to-document-root';
 import { DangerouslyHoistSlotSizes } from '../hoist-slot-sizes-context';
 import { convertResizeBoundToPixels } from '../panel-splitter/convert-resize-bound-to-pixels';
@@ -40,9 +39,6 @@ import { useSideNavVisibility } from './use-side-nav-visibility';
 import { useSideNavVisibilityCallbacks } from './use-side-nav-visibility-callbacks';
 import { useToggleSideNav } from './use-toggle-side-nav';
 const panelSplitterResizingVar = '--n_snvRsz';
-// Used to share the side nav width with the panel splitter, which is rendered outside the side nav element
-// but positioned to stay at its right edge.
-const sideNavClampedWidthVar = '--n_snvW';
 const fallbackMinWidth = '240px';
 function getPixelCustomProperty(element, propertyName, fallback) {
   const raw = getComputedStyle(element).getPropertyValue(propertyName).trim();
@@ -56,28 +52,16 @@ function getPixelCustomProperty(element, propertyName, fallback) {
  * Avoiding nesting the `@supports` at-rule inside of `@media` means Compiled can remove duplicate styles from the generated CSS.
  */
 const isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
-const panelSplitterPortalTargetStyles = {
-  root: "_kqsw1n9t _1pbyegat _u7coidpf _t9ectl5p _4t3ieqxy _165t56xv _p0az1elq"
-};
 const styles = {
   root: "_191wglyw _t51zglyw _bfhk1bhr _16qs130s _vchhusvi _4t3ieqxy _152timx3 _kqsw1if8 _1bsb1ego _1pbycs5v _14b5hc79 _qilnk0mc _p5clia51 _4ap3vuon _scbpglyw _89fi1b6c",
   chatPanelSizing: "_1bsbhc79",
   managedOverlay: "_cpcf1gzg _6kttglyw _w8v11bhr _1jug130s",
   flyoutOpen: "_qiln1gzg _p5clglyw _4ap31bhr _scbp130s _139f8iot _1tpvfnf5 _sylc1a5r _oyeijq3t",
   flyoutAnimateClosed: "_1e0cglyw _qiln1gzg _139f8iot _1tpvfnf5 _sylc1a5r _1uwsjq3t",
-  animationRTLSupport: "_15yekb7n _65m41mrw",
-  flyoutBaseStylesFullHeightSidebar: "_qiln1gzg _p5clglyw _4ap31bhr _scbp130s _17ly8iot _177m1a5r",
-  flyoutOpenFullHeightSidebar: "_hjoifnf5 _vgub1ku9 _s2eg1p9u",
-  flyoutAnimateClosedFullHeightSidebar: "_dm25glyw _hjoifnf5 _vgub1mm8 _hh1u1p9u",
   flexContainer: "_4t3i1osq _1e0c1txw _2lx21bp4 _1bah1yb4",
   hiddenMobileAndDesktop: "_1e0cglyw",
   hiddenMobileOnly: "_1e0cglyw _dm2518uv",
-  hiddenDesktopOnly: "_dm25glyw",
-  animationBaseStyles: "_10t88iot _1vrh1a5r _xrrpfnf5",
-  expandAnimationMobile: "_1xq51ku9 _1nu51p9u",
-  collapseAnimationMobile: "_1lh81gzg _1xq51mm8 _aadi1p9u",
-  expandAnimationDesktop: "_1sg8k0mc _vgub1ku9 _s2eg1p9u",
-  collapseAnimationDesktop: "_1sg81gzg _vgub1mm8 _hh1u1p9u"
+  hiddenDesktopOnly: "_dm25glyw"
 };
 
 /**
@@ -99,8 +83,6 @@ const motionUpliftStyles = {
   collapseAnimationMobile: "_1lh81gzg _k1affm5y",
   flyoutOpen: "_qiln1gzg _p5clglyw _4ap31bhr _scbp130s _4xci10ed _1tpv1mzy _sylc1a5r",
   flyoutAnimateClosed: "_1e0cglyw _qiln1gzg _4xcifm5y _1tpvi9qs _sylc1a5r",
-  flyoutOpenFullHeightSidebar: "_n2in10ed _hjoi1mzy",
-  flyoutAnimateClosedFullHeightSidebar: "_dm25glyw _n2infm5y _hjoii9qs",
   expandAnimationDesktop: "_1sg8k0mc _n2in10ed _1xpz1gzg _17ly1q8v _hjoi147i _1wxo4so3",
   collapseAnimationDesktop: "_1sg81gzg _n2infm5y _17ly1wzp _hjoi1wsm _1wxo1cio"
 };
@@ -129,7 +111,6 @@ function SideNavInternal({
 }) {
   var _managedSizing$mode, _managedSizing$width, _sideNavState$lastTri;
   const isChatPanelLayoutEnabled = fg('platform-dst-chat-panel-layout');
-  const isFhsEnabled = useIsFhsEnabled();
   const id = useLayoutId({
     providedId
   });
@@ -258,7 +239,6 @@ function SideNavInternal({
   const clampedWidth = !isChatPanelLayoutEnabled ? `clamp(240px, ${inlineWidth}px, 50vw)` : managedSizing ? `${renderedWidth}px` : `clamp(${minWidth}, ${renderedWidth}px, ${configuredMaxWidth})`;
   const dangerouslyHoistSlotSizes = useContext(DangerouslyHoistSlotSizes);
   const navRef = useRef(null);
-  const panelSplitterPortalTargetRef = useRef(null);
   const getResizeBounds = useCallback(() => {
     if (!isChatPanelLayoutEnabled) {
       return {
@@ -361,13 +341,6 @@ function SideNavInternal({
       }
     }
     function open() {
-      // Prevent the flyout from being opened if there are any open layers in the top nav start
-      if (openLayerObserver && openLayerObserver.getCount({
-        namespace: openLayerObserverTopNavStartNamespace,
-        type: 'popup'
-      }) > 0) {
-        return;
-      }
       const prevFlyoutState = flyoutStateRef.current;
       tryAbortPendingClose();
       flyoutStateRef.current = {
@@ -866,7 +839,7 @@ function SideNavInternal({
   const isMotionUpliftEnabled = fg('platform-dst-motion-uplift-sidenav');
 
   // This is only used for the regular expand and collapse animations, not the flyout animations.
-  const shouldShowSidebarToggleAnimation = (isMotionUpliftEnabled || isFhsEnabled) &&
+  const shouldShowSidebarToggleAnimation = isMotionUpliftEnabled &&
   // We do not apply the animation styles on the initial render, as the `@starting-style` rule will cause the sidebar to
   // slide in initially.
   hasExpandedStateChanged &&
@@ -900,7 +873,7 @@ function SideNavInternal({
     },
     ref: mergedRef,
     "data-testid": testId,
-    className: ax([styles.root, isChatPanelLayoutEnabled && styles.chatPanelSizing, isChatPanelLayoutEnabled && (managedSizing === null || managedSizing === void 0 ? void 0 : managedSizing.mode) === 'overlay' && styles.managedOverlay, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop, isMotionUpliftEnabled && motionUpliftStyles.animationRTLSupport, !isMotionUpliftEnabled && isFhsEnabled && styles.animationRTLSupport, shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.animationBaseStyles, shouldShowSidebarToggleAnimation && !isMotionUpliftEnabled && styles.animationBaseStyles, isExpandedOnMobile && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.expandAnimationMobile, isExpandedOnMobile && shouldShowSidebarToggleAnimation && !isMotionUpliftEnabled && styles.expandAnimationMobile, !isExpandedOnMobile && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.collapseAnimationMobile, !isExpandedOnMobile && shouldShowSidebarToggleAnimation && !isMotionUpliftEnabled && styles.collapseAnimationMobile, isExpandedOnDesktop && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.expandAnimationDesktop, isExpandedOnDesktop && shouldShowSidebarToggleAnimation && !isMotionUpliftEnabled && styles.expandAnimationDesktop, !isExpandedOnDesktop && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.collapseAnimationDesktop, !isExpandedOnDesktop && shouldShowSidebarToggleAnimation && !isMotionUpliftEnabled && styles.collapseAnimationDesktop, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFhsEnabled && isMotionUpliftEnabled && motionUpliftStyles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFhsEnabled && !isMotionUpliftEnabled && styles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFhsEnabled && isMotionUpliftEnabled && motionUpliftStyles.flyoutAnimateClosed, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFhsEnabled && !isMotionUpliftEnabled && styles.flyoutAnimateClosed, ((sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' || (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close') && !isFirefox && isFhsEnabled && styles.flyoutBaseStylesFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFirefox && isFhsEnabled && isMotionUpliftEnabled && motionUpliftStyles.flyoutOpenFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isFirefox && isFhsEnabled && !isMotionUpliftEnabled && styles.flyoutOpenFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && isMotionUpliftEnabled && motionUpliftStyles.flyoutAnimateClosedFullHeightSidebar, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isFirefox && isFhsEnabled && !isMotionUpliftEnabled && styles.flyoutAnimateClosedFullHeightSidebar])
+    className: ax([styles.root, isChatPanelLayoutEnabled && styles.chatPanelSizing, isChatPanelLayoutEnabled && (managedSizing === null || managedSizing === void 0 ? void 0 : managedSizing.mode) === 'overlay' && styles.managedOverlay, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop, isMotionUpliftEnabled && motionUpliftStyles.animationRTLSupport, shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.animationBaseStyles, isExpandedOnMobile && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.expandAnimationMobile, !isExpandedOnMobile && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.collapseAnimationMobile, isExpandedOnDesktop && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.expandAnimationDesktop, !isExpandedOnDesktop && shouldShowSidebarToggleAnimation && isMotionUpliftEnabled && motionUpliftStyles.collapseAnimationDesktop, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && isMotionUpliftEnabled && motionUpliftStyles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'open' && !isMotionUpliftEnabled && styles.flyoutOpen, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && isMotionUpliftEnabled && motionUpliftStyles.flyoutAnimateClosed, (sideNavState === null || sideNavState === void 0 ? void 0 : sideNavState.flyout) === 'triggered-animate-close' && !isMotionUpliftEnabled && styles.flyoutAnimateClosed])
   }), /*#__PURE__*/React.createElement(DangerouslyHoistCssVarToDocumentRoot, {
     variableName: sideNavLiveWidthVar,
     value: "0px",
@@ -919,7 +892,6 @@ function SideNavInternal({
   , /*#__PURE__*/React.createElement(PanelSplitterProvider, {
     panelId: sideNavPanelSplitterId,
     panelRef: navRef,
-    portalRef: isFhsEnabled ? panelSplitterPortalTargetRef : undefined,
     panelWidth: renderedWidth,
     onCompleteResize: onCompleteResize,
     onResizeStartInternal: isChatPanelLayoutEnabled && managedSizing ? onResizeStartInternal : undefined,
@@ -932,18 +904,7 @@ function SideNavInternal({
     shortcut: isShortcutEnabled ? sideNavToggleTooltipKeyboardShortcut : undefined
   }, /*#__PURE__*/React.createElement("div", {
     className: ax([styles.flexContainer])
-  }, children))), isFhsEnabled && /*#__PURE__*/React.createElement("div", {
-    ref: panelSplitterPortalTargetRef,
-    "data-layout-slot": true,
-    style: {
-      // We need to use an inline style here to share the side nav width to position the panel splitter.
-      // We can't use the existing --n_sNvlw variable (sideNavLiveWidthVar) because it is set to 0 when the side nav is collapsed on desktop,
-      // however the panel splitter is still visible and usable on small viewports until 48rem.
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      [sideNavClampedWidthVar]: clampedWidth
-    },
-    className: ax([panelSplitterPortalTargetStyles.root, isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileOnly, !isExpandedOnDesktop && isExpandedOnMobile && !isFlyoutVisible && styles.hiddenDesktopOnly, !isExpandedOnDesktop && !isExpandedOnMobile && !isFlyoutVisible && styles.hiddenMobileAndDesktop])
-  }));
+  }, children))));
 }
 
 /**

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

@@ -5,6 +5,5 @@
 ._1e0cglyw{display:none}
 ._1ul9zwfg{min-width:2pc}
 ._4cvr1h6o{align-items:center}
-._y4tiutpp{padding-inline-end:var(--ds-space-150,9pt)}
 @media (min-width:48rem){._181n1txw{display:flex}._1d2y1ris{min-width:max-content}}
 @media (min-width:64rem){._glte1ris{width:max-content}._15rip2n4{min-width:330px}._1gs5usvi{box-sizing:border-box}._ndwch9n0{justify-self:end}}

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

@@ -9,16 +9,14 @@ import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/open-layer-observer-namespace-provider';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Popup } from '@atlaskit/popup/popup';
-import { UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/compiled/responsive/index';
+import { UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/compiled/use-media-query';
 import { List } from '../../../components/list';
-import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
 import { HasCustomThemeContext } from '../../top-nav-items/themed/has-custom-theme-context';
 import { IconButton } from '../../top-nav-items/themed/icon-button';
 import { openLayerObserverTopNavEndNamespace } from '../constants';
 const containerStyles = {
   root: "_yyhy11wp _1e0c1txw _1bahh9n0 _1ul9zwfg _1d2y1ris _glte1ris _15rip2n4 _1gs5usvi _ndwch9n0",
-  withPersistentItems: "_zulp1b66 _4cvr1h6o",
-  fullHeightSidebar: "_y4tiutpp"
+  withPersistentItems: "_zulp1b66 _4cvr1h6o"
 };
 const listStyles = {
   root: "_zulp1b66 _4cvr1h6o _1e0c1txw",
@@ -41,7 +39,6 @@ export function TopNavEnd({
   showMoreButtonLabel = 'Show more'
 }) {
   const hasPersistentItems = fg('platform-dst-chat-panel-layout') && persistentItems != null;
-  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);
@@ -66,7 +63,7 @@ export function TopNavEnd({
   }, children);
   const content = /*#__PURE__*/React.createElement("nav", {
     "aria-label": label,
-    className: ax([containerStyles.root, hasPersistentItems && containerStyles.withPersistentItems, isFhsEnabled && containerStyles.fullHeightSidebar])
+    className: ax([containerStyles.root, hasPersistentItems && containerStyles.withPersistentItems])
   }, isMobile ? /*#__PURE__*/React.createElement(Popup, {
     isOpen: isOpen,
     onClose: () => setIsOpen(false)

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

@@ -1,15 +1,5 @@
 ._zulp1b66{gap:var(--ds-space-050,4px)}
-._zulp1kw7{gap:inherit}
-._yyhykb7n{grid-column:1}._15yekb7n{--animation-direction:1}
-._1e0c1kw7{display:inherit}
-._1e0c1txw{display:flex}
-._1ul9idpf{min-width:0}
+._yyhykb7n{grid-column:1}._1e0c1txw{display:flex}
 ._4cvr1h6o{align-items:center}
 ._4t3i1osq{height:100%}
-._ahbq1wug{margin-inline-start:auto}
-._bozgutpp{padding-inline-start:var(--ds-space-150,9pt)}
-._vchhusvi{box-sizing:border-box}
-[dir=rtl] ._65m41mrw{--animation-direction:-1}
-@media (prefers-reduced-motion:no-preference){._10t81e03{transition-property:transform}._10t81rjc{transition-property:transform,opacity}._1xq51ytf{transition-timing-function:ease-in-out}._1xq55ucs{transition-timing-function:ease}._mjvc1efy{transform:translateX(calc(100%*var(--animation-direction)))}._bgpzidpf{opacity:0}._mjvc1p9u{transform:translateX(calc(-100%*var(--animation-direction)))}._mjvco0k7{transform:translateX(calc((-2rem + var(--ds-space-050, 4px)*-1)*var(--animation-direction)))}._mjvcyrjp{transform:translateX(calc((2rem + var(--ds-space-050, 4px))*var(--animation-direction)))}._mjvcz12g{transform:translateX(0)}._xrrpfnf5{transition-duration:.2s}._bgpzkb7n{opacity:1}}
-@media (min-width:64rem){._13wnh2mm{position:relative}._1l3vb3bt:after{content:""}._juxdstnw:after{position:absolute}._1vinidpf:after{inset-block-start:0}._1719idpf:after{inset-block-end:0}._e6znidpf:after{inset-inline-end:0}._1kyhe4h9:after{border-inline-end-width:var(--ds-border-width,1px)}._4cwynqa1:after{border-inline-end-style:solid}._435s1l7x:after{border-inline-end-color:var(--ds-border,#0b120e24)}._m7c3idpf:after{opacity:0}._15rin7od{min-width:unset}._glte1osq{width:100%}._4ap319ly{background-color:revert}._1m5lglyw:after{display:none}._glte1ris{width:max-content}._15rip2n4{min-width:330px}._1gs5usvi{box-sizing:border-box}._glte93mn{width:var(--n_sNvlw,100%)}._exxmutpp{padding-inline-end:var(--ds-space-150,9pt)}._4ap3vuon{background-color:var(--ds-surface,#fff)}._m7c3kb7n:after{opacity:1}}
-@media (prefers-reduced-motion:no-preference) and (min-width:64rem){._n8qabrmi:after{transition-property:opacity}._wc72fnf5:after{transition-duration:.2s}._j3mr1v42:after{transition-timing-function:ease-in}}
+@media (min-width:64rem){._glte1ris{width:max-content}._15rip2n4{min-width:330px}._1gs5usvi{box-sizing:border-box}}

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

@@ -1,149 +1,15 @@
 /* top-nav-start.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./top-nav-start.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react';
-import useStableRef from '@atlaskit/ds-lib/use-stable-ref';
-import { OpenLayerObserverNamespaceProvider } from '@atlaskit/layering/open-layer-observer-namespace-provider';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { UNSAFE_useMediaQuery } from '@atlaskit/primitives/compiled';
+import React, { useContext, useEffect, useRef } from 'react';
 import { TopNavStartAttachRef } from '../../../context/top-nav-start/top-nav-start-attach-ref';
-import { useIsFhsEnabled } from '../../fhs-rollout/use-is-fhs-enabled';
-import { useHasCustomTheme } from '../../top-nav-items/themed/has-custom-theme-context';
-import { HasDefaultBackgroundColorContext } from '../../top-nav-items/themed/has-default-background-color-context';
-import { openLayerObserverTopNavStartNamespace } from '../constants';
-import { SideNavVisibilityState } from '../side-nav/side-nav-visibility-state';
-import { useSideNavVisibility } from '../side-nav/use-side-nav-visibility';
-
-/**
- * Firefox does support these reorder animations, but only partially enabling layout animations would look odd.
- *
- * We are using JS to detect Firefox and disable animations, instead of using CSS, as Compiled currently does not merge duplicate
- * CSS at-rules when at-rules are nested: https://github.com/atlassian-labs/compiled/blob/e04a325915e1d13010205089e4915de0e53bc2d4/packages/css/src/plugins/merge-duplicate-at-rules.ts#L5
- * Avoiding nesting the `@supports` at-rule inside of `@media` means Compiled can remove duplicate styles from the generated CSS.
- */
-let isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
-
-// Placed in a variable, as the value is used in the translateX value for the children wrapper animation.
-const flexGap = "var(--ds-space-050, 4px)";
 
 /**
  * Styles for the TopNavStart element.
- *
- * When `useIsFhsEnabled` is true this is the styling for the inner element,
- * which re-enables pointer events.
  */
 const innerStyles = {
-  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15rip2n4 _1gs5usvi",
-  fullHeightSidebarExpanded: "_15rin7od _glte1osq"
-};
-
-/**
- * Styles for the outer element, that does not have re-enabled pointer events and spans the entire
- * width of the TopNavStart area.
- *
- * This wrapper element is only rendered when `useIsFhsEnabled` is true.
- */
-const wrapperStyles = {
-  root: "_vchhusvi _bozgutpp _4t3i1osq _13wnh2mm _1l3vb3bt _juxdstnw _1vinidpf _1719idpf _e6znidpf _1kyhe4h9 _4cwynqa1 _435s1l7x _m7c3idpf",
-  fullHeightSidebarExpanded: "_glte93mn _exxmutpp _4ap3vuon _m7c3kb7n",
-  fullHeightSidebarBorderTransition: "_n8qabrmi _wc72fnf5 _j3mr1v42",
-  fullHeightSidebarCustomTheming: "_4ap319ly _1m5lglyw"
-};
-
-/**
- * We use a fixed translateX offset for the slide animation (used when the TopNavStart children elements are reordered).
- * This fixed offset makes the elements appear to animate smoothly from the old to the new position.
- * This offset is calculated based on:
- * - 32px (2rem) width of the side nav toggle button (IconButton)
- * - 4px gap ('space.050' token) of the flex container
- *
- * The benefit of hardcoding this offset is that we don't need to calculate it using JS each time the sidebar is toggled.
- * However, it could become out of sync if the width of IconButton changes.
- *
- * The alternative is using JS to store the previous position of the children wrapper element, and calculate the offset based on
- * the new position, and then transforming using that offset. This would prevent the animation from going out of sync.
- */
-const childrenWrapperAnimationOffset = `calc(2rem + ${flexGap})`;
-const childrenWrapperStyles = {
-  root: "_zulp1kw7 _1e0c1kw7 _4cvr1h6o _1ul9idpf _15yekb7n _65m41mrw",
-  animationBaseStyles: "_10t81e03",
-  finalPosition: "_mjvcz12g _xrrpfnf5",
-  expandAnimationStartPosition: "_mjvcyrjp",
-  collapseAnimationStartPosition: "_mjvco0k7"
-};
-
-/**
- * We use a fixed translateX offset for the toggle button slide animation (used when the TopNavStart children elements are reordered).
- * The specific value doesn't matter too much for the toggle button animation, so we are using `100%`, which will match the toggle button width.
- *
- * By combining the `translateX` animation with an `opacity` fade, the feel and experience is actually quite similar to animating the
- * element from the exact old position (offset), and it avoids the additional complexity of needing to track and calculate the exact offset.
- */
-const toggleButtonWrapperStyles = {
-  root: "_15yekb7n _65m41mrw _10t81rjc",
-  finalPosition: "_mjvcz12g _xrrpfnf5 _bgpzkb7n",
-  expandAnimationStartPosition: "_mjvc1p9u _bgpzidpf",
-  collapseAnimationStartPosition: "_mjvc1efy _bgpzidpf",
-  expandAnimationTimingFunction: "_1xq51ytf",
-  collapseAnimationTimingFunction: "_1xq55ucs",
-  alignEnd: "_ahbq1wug"
+  root: "_zulp1b66 _yyhykb7n _4t3i1osq _4cvr1h6o _1e0c1txw _glte1ris _15rip2n4 _1gs5usvi"
 };
-
-/**
- * The consistent key used for the side nav toggle button to ensure it does not get remounted
- * when it is reordered.
- *
- * This ensures we get focus restoration for free.
- */
-const sideNavToggleButtonKey = 'side-nav-toggle-button';
-const TopNavStartInnerOld = /*#__PURE__*/forwardRef(function TopNavStartInner({
-  children,
-  testId
-}, ref) {
-  return /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    "data-testid": testId,
-    className: ax([innerStyles.root])
-  }, children);
-});
-const TopNavStartInnerFHS = /*#__PURE__*/forwardRef(function TopNavStartInnerFHS({
-  children,
-  testId
-}, ref) {
-  // This needs the real `defaultCollapsed` state or will not SSR properly
-  // TODO: lift `defaultCollapsed` state to `Root` (DSP-23683)
-  // then context value will be correct in SSR / from initial render
-  const {
-    isExpandedOnDesktop
-  } = useSideNavVisibility({
-    defaultCollapsed: true
-  });
-  const sideNavState = useContext(SideNavVisibilityState);
-  const isFirstRenderRef = useRef(true);
-  useEffect(() => {
-    // Ignore renders until the side nav state is initialized
-    // So that apps using the legacy API for setting side nav default state do not see
-    // animations when they shouldn't
-    if (sideNavState === null) {
-      return;
-    }
-    if (isFirstRenderRef.current) {
-      isFirstRenderRef.current = false;
-    }
-  }, [sideNavState]);
-  const hasCustomTheme = useHasCustomTheme();
-  const hasDefaultBackgroundColor = useContext(HasDefaultBackgroundColorContext);
-  return /*#__PURE__*/React.createElement("div", {
-    className: ax([wrapperStyles.root, isExpandedOnDesktop && wrapperStyles.fullHeightSidebarExpanded, !isFirstRenderRef.current && isExpandedOnDesktop && wrapperStyles.fullHeightSidebarBorderTransition, hasCustomTheme && !hasDefaultBackgroundColor && fg('platform_dst_nav4_custom_theming_fhs_1') && wrapperStyles.fullHeightSidebarCustomTheming])
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    "data-testid": testId,
-    className: ax([innerStyles.root, isExpandedOnDesktop && innerStyles.fullHeightSidebarExpanded])
-  }, /*#__PURE__*/React.createElement(OpenLayerObserverNamespaceProvider, {
-    namespace: openLayerObserverTopNavStartNamespace
-  }, children)));
-});
-
 /**
  * __TopNavStart__
  *
@@ -154,7 +20,6 @@ export function TopNavStart({
   testId,
   sideNavToggleButton
 }) {
-  const isFhsEnabled = useIsFhsEnabled();
   const ref = useContext(TopNavStartAttachRef);
   const elementRef = useRef(null);
 
@@ -163,111 +28,9 @@ export function TopNavStart({
   useEffect(() => {
     ref(elementRef.current);
   }, [elementRef, ref]);
-
-  // This needs the real `defaultCollapsed` state or will not SSR properly
-  // TODO: lift `defaultCollapsed` state to `Root` (DSP-23683)
-  // then context value will be correct in SSR / from initial render
-  const {
-    isExpandedOnDesktop
-  } = useSideNavVisibility({
-    defaultCollapsed: true
-  });
-
-  // For SSR assume desktop
-  const [isDesktop, setIsDesktop] = useState(true);
-  // Set state to real value on client
-  // This could result in some visible shift on mobile when hydrating SSR
-  // TODO: review and improve SSR behavior as necessary (DSP-23817)
-  useLayoutEffect(() => {
-    // Checking this to avoid breaking tests when `matchMedia` is not mocked
-    // Ideally we wouldn't cater to test environments, but this avoids introducing unnecessary friction
-    if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
-      setIsDesktop(window.matchMedia('(min-width: 64rem)').matches);
-    }
-  }, []);
-  UNSAFE_useMediaQuery('above.md', event => {
-    setIsDesktop(event.matches);
-  });
-  const [animationState, setAnimationState] = useState({
-    type: 'idle'
-  });
-
-  // Used to prevent the reorder animations from running on the initial render.
-  const isFirstRenderRef = useRef(true);
-  const sideNavState = useContext(SideNavVisibilityState);
-  useEffect(() => {
-    if (!isFhsEnabled) {
-      return;
-    }
-
-    // Ignore renders until the side nav state is initialized
-    // So that apps using the legacy API for setting side nav default state do not see
-    // animations when they shouldn't
-    if (sideNavState === null) {
-      return;
-    }
-    if (isFirstRenderRef.current) {
-      isFirstRenderRef.current = false;
-    }
-  }, [isFhsEnabled, sideNavState]);
-
-  // Using a stable ref to avoid re-running the animation layout effect when the toggle button prop value changes, which
-  // can happen a lot (e.g. if the parent re-renders)
-  const sideNavToggleButtonStableRef = useStableRef(sideNavToggleButton);
-  useLayoutEffect(() => {
-    if (!isFhsEnabled) {
-      return;
-    }
-
-    /**
-     * This layout effect is used to animate the TopNavStart children elements to their new position after being reordered.
-     * It is called when the sidebar's desktop expansion state changes.
-     *
-     * It works by first setting a translateX offset on the elements, used as the start position of the slide animation.
-     * - For the toggle button, it's a fixed offset. It's combined with an opacity, so the exact offset doesn't matter too much.
-     * - For the children wrapper (wrapping everything except the toggle button), an offset was chosen to make the animation
-     * start position the exact same as the element's old position. See comments for `childrenWrapperStyles` for more details.
-     *
-     * On the next frame, the translateX offset is cleared, triggering the animation to the new position.
-     */
-
-    if (isFirstRenderRef.current) {
-      // No animations on initial render.
-      return;
-    }
-    if (!sideNavToggleButtonStableRef.current) {
-      // If there is no toggle button, there should be no re-order animations.
-      return;
-    }
-
-    // Set the translateX offsets so elements are ready to animate to their actual new position after being reordered
-    setAnimationState({
-      type: isExpandedOnDesktop ? 'expand' : 'collapse'
-    });
-    requestAnimationFrame(() => {
-      // Clear translateX offsets on next frame to trigger animation to new position in a re-render
-      setAnimationState({
-        type: 'idle'
-      });
-    });
-
-    // This layout effect is called when the sidebar's desktop expansion state changes.
-  }, [isExpandedOnDesktop, isFhsEnabled, sideNavToggleButtonStableRef]);
-  const TopNavStartInner = isFhsEnabled ? TopNavStartInnerFHS : TopNavStartInnerOld;
-  return /*#__PURE__*/React.createElement(TopNavStartInner, {
+  return /*#__PURE__*/React.createElement("div", {
     ref: elementRef,
-    testId: testId
-  }, !isFhsEnabled && sideNavToggleButton, sideNavToggleButton && (!isDesktop || !isExpandedOnDesktop) && isFhsEnabled && /*#__PURE__*/React.createElement("div", {
-    key: sideNavToggleButtonKey,
-    className: ax([!isFirefox && toggleButtonWrapperStyles.root, !isFirefox && animationState.type === 'idle' && toggleButtonWrapperStyles.finalPosition, !isFirefox &&
-    // Timing function is applied when the browser animates to the idle position.
-    animationState.type === 'idle' && toggleButtonWrapperStyles.collapseAnimationTimingFunction, !isFirefox && animationState.type === 'collapse' && toggleButtonWrapperStyles.collapseAnimationStartPosition])
-  }, sideNavToggleButton), isFhsEnabled ? /*#__PURE__*/React.createElement("div", {
-    className: ax([childrenWrapperStyles.root, !isFirefox && childrenWrapperStyles.animationBaseStyles, !isFirefox && animationState.type === 'idle' && childrenWrapperStyles.finalPosition, !isFirefox && animationState.type === 'expand' && childrenWrapperStyles.expandAnimationStartPosition, !isFirefox && animationState.type === 'collapse' && childrenWrapperStyles.collapseAnimationStartPosition])
-  }, children) : children, sideNavToggleButton && isDesktop && isExpandedOnDesktop && isFhsEnabled && /*#__PURE__*/React.createElement("div", {
-    key: sideNavToggleButtonKey,
-    className: ax([!isFirefox && toggleButtonWrapperStyles.root, toggleButtonWrapperStyles.alignEnd, !isFirefox && animationState.type === 'idle' && toggleButtonWrapperStyles.finalPosition, !isFirefox &&
-    // Timing function is applied when the browser animates to the idle position.
-    animationState.type === 'idle' && toggleButtonWrapperStyles.expandAnimationTimingFunction, !isFirefox && animationState.type === 'expand' && toggleButtonWrapperStyles.expandAnimationStartPosition])
-  }, sideNavToggleButton));
+    "data-testid": testId,
+    className: ax([innerStyles.root])
+  }, sideNavToggleButton, children);
 }