Skip to content

[Frame] Add scrollbar width buffer onto Content #11891

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

Merged
merged 2 commits into from
Apr 17, 2024
Merged

[Frame] Add scrollbar width buffer onto Content #11891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b6cfa8
[Frame] Change content overflow from scroll to auto
sophschneider Apr 15, 2024
335ccae
Add back in scrollbar padding onto content
sophschneider Apr 16, 2024
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/unlucky-coats-add.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Moved `Frame` scrollbar from main to content and set overflow-y from scroll to auto behind a feature flag
13 changes: 12 additions & 1 deletion polaris-react/src/components/Frame/Frame.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
}

.Content-TopBarAndReframe {
overflow-y: scroll;
overflow-y: auto;
/* stylelint-disable-next-line polaris/conventions/polaris/custom-property-allowed-list -- top bar global space */
margin-bottom: var(--pg-top-bar-height);
margin-right: var(--p-space-050);
Expand All @@ -293,6 +293,17 @@
}
}

.ScrollbarSafeArea-TopBarAndReframe {
@media (--p-breakpoints-md-up) {
/* stylelint-disable -- polaris/conventions/polaris/custom-property-allowed-list -- Polaris component custom properties */
width: calc(
100vw - var(--pg-navigation-width) -
var(--pc-app-provider-scrollbar-width) - var(--p-space-150)
);
/* stylelint-enable -- polaris/conventions/polaris/custom-property-allowed-list */
}
}

.GlobalRibbonContainer {
position: fixed;
z-index: var(--p-z-index-3);
Expand Down
12 changes: 11 additions & 1 deletion polaris-react/src/components/Frame/Frame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,17 @@ class FrameInner extends PureComponent<CombinedProps, State> {
styles['Content-TopBarAndReframe'],
)}
>
{children}
{features?.dynamicTopBarAndReframe ? (
<div
className={
styles['ScrollbarSafeArea-TopBarAndReframe']
}
>
{children}
</div>
) : (
children
)}
</div>
</main>
</div>
Expand Down