Skip to content
This repository was archived by the owner on Sep 30, 2025. It is now read-only.
Merged
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
5 changes: 5 additions & 0 deletions .changeset/famous-ghosts-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Rounded `Navigation` at `mdDown` behind a feature flag
18 changes: 18 additions & 0 deletions polaris-react/src/components/Navigation/Navigation.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@

.NavigationFrame-TopBarAndReframe {
border-top-left-radius: var(--p-border-radius-300);
border-top-right-radius: var(--p-border-radius-300);
/* stylelint-disable-next-line -- polaris custom global property */
margin-top: var(--pg-top-bar-height);

@media (--p-breakpoints-md-up) {
border-top-right-radius: 0;
margin-top: 0;
}
}

.PrimaryNavigation {
Expand Down Expand Up @@ -100,6 +108,16 @@
}
}

.PrimaryNavigation-TopBarAndReframe {
padding-top: var(--p-space-500);
border-top-left-radius: var(--p-border-radius-300);
border-top-right-radius: var(--p-border-radius-300);

@media (--p-breakpoints-md-up) {
border-top-right-radius: 0;
}
}

.LogoContainer {
display: none;

Expand Down
9 changes: 5 additions & 4 deletions polaris-react/src/components/Navigation/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {classNames} from '../../utilities/css';
import {getWidth} from '../../utilities/get-width';
import {useFrame} from '../../utilities/frame';
import {useFeatures} from '../../utilities/features';
import {useBreakpoints} from '../../utilities/breakpoints';

import {NavigationContext} from './context';
import {Section, Item} from './components';
Expand Down Expand Up @@ -37,6 +38,8 @@ export const Navigation: React.FunctionComponent<NavigationProps> & {
}: NavigationProps) {
const {logo} = useFrame();
const width = getWidth(logo, 104);
const features = useFeatures();
const {mdUp} = useBreakpoints();

const logoMarkup = logo ? (
<div
Expand Down Expand Up @@ -72,8 +75,6 @@ export const Navigation: React.FunctionComponent<NavigationProps> & {
[location, onDismiss],
);

const features = useFeatures();

return (
<NavigationContext.Provider value={context}>
<WithinContentContext.Provider value>
Expand All @@ -85,12 +86,12 @@ export const Navigation: React.FunctionComponent<NavigationProps> & {
)}
aria-labelledby={ariaLabelledBy}
>
{mediaMarkup}
{mdUp || !features?.dynamicTopBarAndReframe ? mediaMarkup : null}
<Scrollable
className={classNames(
styles.PrimaryNavigation,
features?.dynamicTopBarAndReframe &&
styles['NavigationFrame-TopBarAndReframe'],
styles['PrimaryNavigation-TopBarAndReframe'],
)}
>
{children}
Expand Down