refactor(app): Standardize modals and pages #1705
Conversation
| } | ||
| export default function PageWrapper (props: Props) { | ||
| return ( | ||
| <main className={styles.relative}> |
There was a problem hiding this comment.
Should probably only have one <main>
There was a problem hiding this comment.
sorry, oversight on my part
app/src/components/Page/styles.css
Outdated
| } | ||
|
|
||
| .task { | ||
| flex: 1 1; |
There was a problem hiding this comment.
Is this flex rule necessary now that the parent of the <Page> is not display: flex?
There was a problem hiding this comment.
needed for the splash
app/src/pages/Calibrate/Labware.js
Outdated
| {!deckPopulated && ( | ||
| <ReviewDeckModal slot={slot} /> | ||
| )} | ||
| <PageWrapper> |
There was a problem hiding this comment.
Rather than import <PageWrapper> into every single page, we should import it into App.js and wrap the <Switch> there with it. We can replace these PageWrappers with React.Fragments
Codecov Report
@@ Coverage Diff @@
## edge #1705 +/- ##
==========================================
- Coverage 34.91% 33.65% -1.27%
==========================================
Files 339 349 +10
Lines 5553 5782 +229
==========================================
+ Hits 1939 1946 +7
- Misses 3614 3836 +222
Continue to review full report at Codecov.
|
| } | ||
|
|
||
| type Props = ContextRouter & StateProps | ||
| type DispatchProps = {onBackClick: () => void} |
There was a problem hiding this comment.
Use () => mixed and you don't need curly braces below
| return { | ||
| deckPopulated: !!robotSelectors.getDeckPopulated(state) | ||
| onBackClick: () => { dispatch(push(url)) } |
There was a problem hiding this comment.
See comment above about () => mixed
overview
This PR is a much more sane attempt at streamlining pages, modals and scroll behavior. Modals are now siblings of the page within a PageWrapper component (position relative).
changelog
review requests
Pleas make sure everything renders and behaves as expected.
This was another crazy one, so please keep an eye out for anything that slipped through the cracks or could be better.