[Frame] Reframe polish: sticky manager and offset #11945
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@shopify/polaris': patch | ||
| --- | ||
|
|
||
| Added offset width to reframe `Frame` and passed reframe scroll container to sticky manager in `AppProvider` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import {EventListener} from '../EventListener'; | |
| import {Backdrop} from '../Backdrop'; | ||
| import {Text} from '../Text'; | ||
| import {TrapFocus} from '../TrapFocus'; | ||
| import {Scrollable} from '../Scrollable'; | ||
| import {dataPolarisTopBar, layer} from '../shared'; | ||
| import {setRootProperty} from '../../utilities/set-root-property'; | ||
| import {FrameContext} from '../../utilities/frame'; | ||
|
|
@@ -74,6 +75,8 @@ interface State { | |
| } | ||
|
|
||
| const APP_FRAME_MAIN = 'AppFrameMain'; | ||
| const APP_FRAME_SCROLLABLE = 'AppFrameScrollable'; | ||
| const APP_FRAME_BEVEL = 'AppFrameBevel'; | ||
| const APP_FRAME_NAV = 'AppFrameNav'; | ||
| const APP_FRAME_TOP_BAR = 'AppFrameTopBar'; | ||
| const APP_FRAME_LOADING_BAR = 'AppFrameLoadingBar'; | ||
|
|
@@ -305,7 +308,7 @@ class FrameInner extends PureComponent<CombinedProps, State> { | |
| {loadingMarkup} | ||
| {navigationOverlayMarkup} | ||
| {hasDynamicTopBar ? ( | ||
| <div className={styles.ShadowBevel} id={APP_FRAME_BEVEL}> | ||
| {navigationMarkup} | ||
| <main | ||
| className={classNames( | ||
|
|
@@ -315,22 +318,29 @@ class FrameInner extends PureComponent<CombinedProps, State> { | |
| id={APP_FRAME_MAIN} | ||
| data-has-global-ribbon={Boolean(globalRibbon)} | ||
| > | ||
| {hasDynamicTopBar ? ( | ||
| <Scrollable | ||
| scrollbarWidth="thin" | ||
|
There was a problem hiding this comment. The scrollbar is currently cut off by the rounded corners of the frame, but I will take a look at that in https://github.com/Shopify/polaris-backlog/issues/1379 when I restyle the scrollbar |
||
| horizontal={false} | ||
| className={styles.Scrollable} | ||
| id={APP_FRAME_SCROLLABLE} | ||
| > | ||
| <div | ||
| className={classNames( | ||
| styles.Content, | ||
| styles['Content-TopBarAndReframe'], | ||
| )} | ||
| > | ||
| <div | ||
| className={styles['ScrollbarSafeArea-TopBarAndReframe']} | ||
| > | ||
| {children} | ||
| </div> | ||
| </div> | ||
| </Scrollable> | ||
| ) : ( | ||
| <div className={styles.Content}>{children}</div> | ||
| )} | ||
| </main> | ||
| </div> | ||
| ) : ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,6 +115,7 @@ | |
|
|
||
| @media (--p-breakpoints-md-up) { | ||
| border-top-right-radius: 0; | ||
| padding-top: var(--p-space-400); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have an issue https://github.com/Shopify/polaris-backlog/issues/1606 to update these to transforms for performance