Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TopBar] grid alignment and center search #9765

Merged
merged 1 commit into from
Jul 21, 2023
Merged

[TopBar] grid alignment and center search #9765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/spicy-elephants-clap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

[TopBar] convert to grid and center align search field
59 changes: 35 additions & 24 deletions polaris-react/src/components/TopBar/TopBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
@import '../../styles/common';
@import './variables';

$icon-size: 20px;
$navigation-column-width: 240px;
$search-column-width: 580px;
$search-column-width-se23: 480px;

$left-column: 1fr;
$left-column-md-up: minmax($navigation-column-width, 1fr);
$search-column: minmax(auto, $search-column-width);
$search-column-se23: minmax(auto, $search-column-width-se23);
$right-column: 1fr;

.TopBar {
position: relative;
display: flex;
display: grid;
grid-template-columns: $left-column $search-column $right-column;
align-items: center;
height: $top-bar-height;
box-shadow: var(--p-shadow-sm);
background-color: var(--p-color-bg);
gap: var(--p-space-1);

#{$se23} & {
background-color: var(--p-color-bg-inverse);
box-shadow: var(--p-shadow-xs);
grid-template-columns: $left-column $search-column-se23 $right-column;
}

@media #{$p-breakpoints-md-up} {
gap: var(--p-space-6);
grid-template-columns: $left-column-md-up $search-column $right-column;

#{$se23} & {
grid-template-columns: $left-column-md-up $search-column-se23 $right-column;
}
}

&::after {
Expand Down Expand Up @@ -132,40 +153,30 @@ $icon-size: 20px;
// stylelint-enable selector-max-specificity
}

.Contents {
.LeftContent {
display: flex;
}

.Search {
z-index: var(--p-z-index-1);
display: flex;
flex: 1 1 auto;
align-items: center;
justify-content: flex-end;
justify-content: center;
height: 100%;

@media #{$p-breakpoints-md-up} {
position: relative;
}
}

.SearchField {
// stylelint-disable-next-line -- generated by polaris-migrator DO NOT COPY
@include page-layout;
position: relative;
width: 100%;
margin: 0;
max-width: none;
margin-right: var(--p-space-1);

@media #{$p-breakpoints-xl-up} {
// stylelint-disable-next-line -- generated by polaris-migrator DO NOT COPY
margin-left: calc((100% - #{$page-max-width}) / 2);
}

#{$se23} & {
padding: 0;
.RightContent {
display: flex;
justify-content: flex-end;
}

@media #{$p-breakpoints-md-up} {
padding: 0 var(--p-space-6);
}
}
.SecondaryMenu {
margin-left: var(--p-space-2);
}

.SecondaryMenu svg {
Expand Down
10 changes: 6 additions & 4 deletions polaris-react/src/components/TopBar/TopBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,12 @@ export const TopBar: React.FunctionComponent<TopBarProps> & {

return (
<div className={styles.TopBar}>
{navigationButtonMarkup}
{contextMarkup}
<div className={styles.Contents}>
<div className={styles.SearchField}>{searchMarkup}</div>
<div className={styles.LeftContent}>
{navigationButtonMarkup}
{contextMarkup}
</div>
<div className={styles.Search}>{searchMarkup}</div>
<div className={styles.RightContent}>
<div className={styles.SecondaryMenu}>{secondaryMenu}</div>
{userMenu}
</div>
Expand Down
1 change: 0 additions & 1 deletion polaris-react/src/components/TopBar/components/SearchField/SearchField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ $search-icon-width-se23: calc(#{$icon-size-se23} + var(--p-space-3));
align-items: center;
border: var(--p-border-width-1) solid transparent;
width: 100%;
max-width: $search-max-width;
}
// We have both a focused class and a focus pseudo selector here
// because we allow "faked" focus for when the search is still
Expand Down