From b887bf41d98ef8d3c7292aa92ec7883ac6c59abd Mon Sep 17 00:00:00 2001 From: Benjamin Swerdlow Date: Sat, 18 Jan 2020 12:41:21 -0800 Subject: [PATCH 01/15] [docs] Use button in backdrop demo (#19282) --- docs/src/pages/components/backdrop/SimpleBackdrop.js | 5 +++-- docs/src/pages/components/backdrop/SimpleBackdrop.tsx | 5 +++-- docs/src/pages/components/dialogs/CustomizedDialogs.js | 2 +- docs/src/pages/components/dialogs/CustomizedDialogs.tsx | 2 +- docs/src/pages/components/dialogs/SimpleDialog.js | 2 +- docs/src/pages/components/dialogs/SimpleDialog.tsx | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/src/pages/components/backdrop/SimpleBackdrop.js b/docs/src/pages/components/backdrop/SimpleBackdrop.js index 09cf917a94efd1..141b7f694616e2 100644 --- a/docs/src/pages/components/backdrop/SimpleBackdrop.js +++ b/docs/src/pages/components/backdrop/SimpleBackdrop.js @@ -1,6 +1,7 @@ import React from 'react'; import Backdrop from '@material-ui/core/Backdrop'; import CircularProgress from '@material-ui/core/CircularProgress'; +import Button from '@material-ui/core/Button'; import { makeStyles } from '@material-ui/core/styles'; const useStyles = makeStyles(theme => ({ @@ -22,9 +23,9 @@ export default function SimpleBackdrop() { return (
- + diff --git a/docs/src/pages/components/backdrop/SimpleBackdrop.tsx b/docs/src/pages/components/backdrop/SimpleBackdrop.tsx index 494f7d48e4921d..8ed9d7ad81dc40 100644 --- a/docs/src/pages/components/backdrop/SimpleBackdrop.tsx +++ b/docs/src/pages/components/backdrop/SimpleBackdrop.tsx @@ -1,6 +1,7 @@ import React from 'react'; import Backdrop from '@material-ui/core/Backdrop'; import CircularProgress from '@material-ui/core/CircularProgress'; +import Button from '@material-ui/core/Button'; import { makeStyles, createStyles, Theme } from '@material-ui/core/styles'; const useStyles = makeStyles((theme: Theme) => @@ -24,9 +25,9 @@ export default function SimpleBackdrop() { return (
- + diff --git a/docs/src/pages/components/dialogs/CustomizedDialogs.js b/docs/src/pages/components/dialogs/CustomizedDialogs.js index 2af60d5a52bb7b..8037bfeace6245 100644 --- a/docs/src/pages/components/dialogs/CustomizedDialogs.js +++ b/docs/src/pages/components/dialogs/CustomizedDialogs.js @@ -61,7 +61,7 @@ export default function CustomizedDialogs() { return (
- diff --git a/docs/src/pages/components/dialogs/CustomizedDialogs.tsx b/docs/src/pages/components/dialogs/CustomizedDialogs.tsx index 02fd8488a8465e..258111f52ff536 100644 --- a/docs/src/pages/components/dialogs/CustomizedDialogs.tsx +++ b/docs/src/pages/components/dialogs/CustomizedDialogs.tsx @@ -68,7 +68,7 @@ export default function CustomizedDialogs() { return (
- diff --git a/docs/src/pages/components/dialogs/SimpleDialog.js b/docs/src/pages/components/dialogs/SimpleDialog.js index 0234d572a6a939..9c7d185eaf3815 100644 --- a/docs/src/pages/components/dialogs/SimpleDialog.js +++ b/docs/src/pages/components/dialogs/SimpleDialog.js @@ -55,7 +55,7 @@ function SimpleDialog(props) { - + diff --git a/docs/src/pages/components/dialogs/SimpleDialog.tsx b/docs/src/pages/components/dialogs/SimpleDialog.tsx index 0cea07d32f2a20..4386c8e3459535 100644 --- a/docs/src/pages/components/dialogs/SimpleDialog.tsx +++ b/docs/src/pages/components/dialogs/SimpleDialog.tsx @@ -59,7 +59,7 @@ function SimpleDialog(props: SimpleDialogProps) { - +
From 18dc9f7f49bac6e61bc9694a7ead3cafc2023ce2 Mon Sep 17 00:00:00 2001 From: Benjamin Swerdlow Date: Sat, 18 Jan 2020 12:42:28 -0800 Subject: [PATCH 02/15] [Alert] Improve Transition demo (#19283) --- docs/src/pages/components/alert/TransitionAlerts.js | 3 ++- docs/src/pages/components/alert/TransitionAlerts.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/src/pages/components/alert/TransitionAlerts.js b/docs/src/pages/components/alert/TransitionAlerts.js index adf5397b3160c4..746ebeaf748790 100644 --- a/docs/src/pages/components/alert/TransitionAlerts.js +++ b/docs/src/pages/components/alert/TransitionAlerts.js @@ -15,7 +15,7 @@ const useStyles = makeStyles(theme => ({ }, })); -export default function ActionAlerts() { +export default function TransitionAlerts() { const classes = useStyles(); const [open, setOpen] = React.useState(true); @@ -40,6 +40,7 @@ export default function ActionAlerts() {