Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/legacy/containers/Navigation/index.amp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const AmpNavigationContainer = ({
menuAnnouncedText,
scrollableListItems,
dropdownListItems,
children,
}) => (
<Navigation
script={script}
Expand All @@ -47,6 +48,7 @@ const AmpNavigationContainer = ({
dir={dir}
script={script}
/>
{children}
{/* Hidden attribute allows us to toggle visibility on the dropdown
using AMP actions. */}
<AmpDropdown id={DROPDOWN_ID} data-e2e="dropdown-nav" hidden>
Expand Down
2 changes: 2 additions & 0 deletions src/app/legacy/containers/Navigation/index.canonical.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const CanonicalNavigationContainer = ({
scrollableListItems,
dropdownListItems,
blocks,
children,
}) => {
const { isLite } = use(RequestContext);
const { enabled } = useToggle('topBarOJs');
Expand Down Expand Up @@ -70,6 +71,7 @@ const CanonicalNavigationContainer = ({
</ScrollableNavigation>
)}
</ScrollableWrapper>
{children}
<CanonicalDropdown isOpen={isOpen}>{dropdownListItems}</CanonicalDropdown>
<Divider />
{enabled && <TopBarOJs blocks={blocks} />}
Expand Down
23 changes: 21 additions & 2 deletions src/app/legacy/containers/Navigation/index.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { use } from 'react';
import useToggle from '#app/hooks/useToggle';
import { NavigationUl, NavigationLi } from '#psammead/psammead-navigation/src';
import {
DropdownUl,
DropdownLi,
} from '#psammead/psammead-navigation/src/DropdownNavigation';
import useHydrationDetection from '#app/hooks/useHydrationDetection';
import useClickTrackerHandler from '#app/hooks/useClickTrackerHandler';
import useViewTracker from '#app/hooks/useViewTracker';
import { RequestContext } from '#contexts/RequestContext';
import { AccountContext } from '#contexts/AccountContext';
import AccountPromotionalBanner from '#app/components/Account/AccountPromotionalBanner';
import LanguageNavigation from './LanguageNavigation/lazy';
import { ServiceContext } from '../../../contexts/ServiceContext';
import Canonical from './index.canonical';
Expand Down Expand Up @@ -49,8 +53,20 @@ const renderListItems = (
return [...listAcc, listItem];
}, []);

const NavigationContainer = ({ navItems, propsForTopBarOJComponent }) => {
const NavigationContainer = ({
navItems,
propsForTopBarOJComponent,
children,
}) => {
const { isAmp, isLite } = use(RequestContext);

const { enabled: accountEnabled } = useToggle('account');
const { isSignedIn, isIdctaAvailable } = use(AccountContext);
const isHydrated = useHydrationDetection();

const showAccountPromoBanner =
isHydrated && accountEnabled && !isSignedIn && isIdctaAvailable;

const { blocks = [] } = propsForTopBarOJComponent || {};
const {
script,
Expand Down Expand Up @@ -148,7 +164,10 @@ const NavigationContainer = ({ navItems, propsForTopBarOJComponent }) => {
script={script}
service={service}
blocks={blocks}
/>
>
{showAccountPromoBanner && <AccountPromotionalBanner />}
{children}
</Navigation>
);
};

Expand Down
Loading