From 2755c00de1c0836ab4f6c23af0449392ac12623a Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 1 Apr 2019 09:59:59 +0200 Subject: [PATCH] Josh & Matt reviews --- docs/src/modules/components/Demo.js | 6 ++++++ docs/src/pages/demos/app-bar/app-bar.md | 2 +- .../pages/demos/snackbars/FabIntegrationSnackbar.js | 1 + .../pages/demos/snackbars/FabIntegrationSnackbar.tsx | 1 + docs/src/pages/demos/snackbars/TransitionsSnackbar.js | 10 ++++++++-- docs/src/pages/demos/snackbars/TransitionsSnackbar.tsx | 10 ++++++++-- docs/src/pages/demos/snackbars/snackbars.md | 2 +- packages/material-ui/src/Slide/Slide.js | 2 +- pages/api/slide.md | 2 +- 9 files changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/src/modules/components/Demo.js b/docs/src/modules/components/Demo.js index c49a82d29b2653..89dfce8cac887f 100644 --- a/docs/src/modules/components/Demo.js +++ b/docs/src/modules/components/Demo.js @@ -50,6 +50,7 @@ const styles = theme => ({ }, }, demo: { + margin: 'auto', borderRadius: theme.shape.borderRadius, backgroundColor: theme.palette.type === 'light' ? theme.palette.grey[200] : theme.palette.grey[900], @@ -233,6 +234,8 @@ class Demo extends React.Component { const sourceLanguage = demoData.codeVariant === CODE_VARIANTS.TS ? 'tsx' : 'jsx'; const Frame = demoOptions.iframe ? DemoFrame : React.Fragment; + console.log('demoOptions', demoOptions) + return (
{demoOptions.hideHeader ? null : ( @@ -349,6 +352,9 @@ class Demo extends React.Component { })} onMouseEnter={this.handleDemoHover} onMouseLeave={this.handleDemoHover} + style={{ + maxWidth: demoOptions.maxWidth, + }} > diff --git a/docs/src/pages/demos/app-bar/app-bar.md b/docs/src/pages/demos/app-bar/app-bar.md index b7da82d67e4599..fc93a2f8bb860e 100644 --- a/docs/src/pages/demos/app-bar/app-bar.md +++ b/docs/src/pages/demos/app-bar/app-bar.md @@ -41,4 +41,4 @@ A side searchbar. ## Bottom App Bar -{{"demo": "pages/demos/app-bar/BottomAppBar.js", "iframe": true}} +{{"demo": "pages/demos/app-bar/BottomAppBar.js", "iframe": true, "maxWidth": 600}} diff --git a/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.js b/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.js index 8e31705fba52eb..a9dac96f675076 100644 --- a/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.js +++ b/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.js @@ -18,6 +18,7 @@ const useStyles = makeStyles(theme => ({ }, appFrame: { height: 356, + background: theme.palette.background.paper, }, menuButton: { marginRight: theme.spacing(2), diff --git a/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.tsx b/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.tsx index 9112a450218bf5..63bc8b1ab81f75 100644 --- a/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.tsx +++ b/docs/src/pages/demos/snackbars/FabIntegrationSnackbar.tsx @@ -18,6 +18,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, appFrame: { height: 356, + background: theme.palette.background.paper, }, menuButton: { marginRight: theme.spacing(2), diff --git a/docs/src/pages/demos/snackbars/TransitionsSnackbar.js b/docs/src/pages/demos/snackbars/TransitionsSnackbar.js index 75b04f38d62c47..6d6dbc7b9bfbc2 100644 --- a/docs/src/pages/demos/snackbars/TransitionsSnackbar.js +++ b/docs/src/pages/demos/snackbars/TransitionsSnackbar.js @@ -3,11 +3,16 @@ import Button from '@material-ui/core/Button'; import Snackbar from '@material-ui/core/Snackbar'; import Fade from '@material-ui/core/Fade'; import Slide from '@material-ui/core/Slide'; +import Grow from '@material-ui/core/Grow'; -function TransitionSlide(props) { +function SlideTransition(props) { return ; } +function GrowTransition(props) { + return ; +} + function TransitionsSnackbar() { const [state, setState] = React.useState({ open: false, @@ -31,7 +36,8 @@ function TransitionsSnackbar() { return (
- + + ; } +function GrowTransition(props: TransitionProps) { + return ; +} + function TransitionsSnackbar() { const [state, setState] = React.useState({ open: false, @@ -32,7 +37,8 @@ function TransitionsSnackbar() { return (
- + +