diff --git a/docs/src/pages/demos/tables/CustomPaginationActionsTable.js b/docs/src/pages/demos/tables/CustomPaginationActionsTable.js index 83c79fa8dd069f..bc179b7e3244e8 100644 --- a/docs/src/pages/demos/tables/CustomPaginationActionsTable.js +++ b/docs/src/pages/demos/tables/CustomPaginationActionsTable.js @@ -180,7 +180,7 @@ class CustomPaginationActionsTable extends React.Component { page={page} onChangePage={this.handleChangePage} onChangeRowsPerPage={this.handleChangeRowsPerPage} - Actions={TablePaginationActionsWrapped} + ActionsComponent={TablePaginationActionsWrapped} /> diff --git a/packages/material-ui-lab/src/SpeedDial/SpeedDial.js b/packages/material-ui-lab/src/SpeedDial/SpeedDial.js index fe62e8cd3b8c4f..b47eee41def068 100644 --- a/packages/material-ui-lab/src/SpeedDial/SpeedDial.js +++ b/packages/material-ui-lab/src/SpeedDial/SpeedDial.js @@ -98,7 +98,7 @@ class SpeedDial extends React.Component { onKeyDown, open, openIcon, - transition: Transition, + TransitionComponent, transitionDuration, TransitionProps, ...other @@ -137,7 +137,12 @@ class SpeedDial extends React.Component { return (
- + - +
; - transition?: React.ReactType; + TransitionComponent?: React.ReactType; transitionDuration?: TransitionProps['timeout']; } diff --git a/packages/material-ui/src/Dialog/Dialog.js b/packages/material-ui/src/Dialog/Dialog.js index 7e13b073aa4a26..b5c508fb9bfe1b 100644 --- a/packages/material-ui/src/Dialog/Dialog.js +++ b/packages/material-ui/src/Dialog/Dialog.js @@ -73,7 +73,7 @@ function Dialog(props) { onExiting, open, PaperProps, - transition: TransitionProp, + TransitionComponent, transitionDuration, TransitionProps, ...other @@ -95,7 +95,7 @@ function Dialog(props) { role="dialog" {...other} > - {children} - + ); } @@ -214,7 +214,7 @@ Dialog.propTypes = { /** * Transition component. */ - transition: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), + TransitionComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), /** * The duration for the transition, in milliseconds. * You may specify a single timeout for all transitions, or individually with an object. @@ -235,7 +235,7 @@ Dialog.defaultProps = { fullScreen: false, fullWidth: false, maxWidth: 'sm', - transition: Fade, + TransitionComponent: Fade, transitionDuration: { enter: duration.enteringScreen, exit: duration.leavingScreen }, }; diff --git a/packages/material-ui/src/Popover/Popover.d.ts b/packages/material-ui/src/Popover/Popover.d.ts index 64bc2bf65ba5aa..a282d8a80d8995 100644 --- a/packages/material-ui/src/Popover/Popover.d.ts +++ b/packages/material-ui/src/Popover/Popover.d.ts @@ -31,7 +31,7 @@ export interface PopoverProps PaperProps?: Partial; role?: string; transformOrigin?: PopoverOrigin; - transition?: React.ReactType; + TransitionComponent?: React.ReactType; transitionDuration?: TransitionProps['timeout'] | 'auto'; } diff --git a/packages/material-ui/src/Popover/Popover.js b/packages/material-ui/src/Popover/Popover.js index 5ba0203c0443d2..d08d2cf45d9e4e 100644 --- a/packages/material-ui/src/Popover/Popover.js +++ b/packages/material-ui/src/Popover/Popover.js @@ -290,7 +290,7 @@ class Popover extends React.Component { PaperProps, role, transformOrigin, - transition: TransitionProp, + TransitionComponent, transitionDuration, TransitionProps, ...other @@ -304,7 +304,7 @@ class Popover extends React.Component { return ( - {children} - + ); } @@ -472,7 +472,7 @@ Popover.propTypes = { /** * Transition component. */ - transition: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), + TransitionComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), /** * Set to 'auto' to automatically calculate transition time based on height. */ @@ -499,7 +499,7 @@ Popover.defaultProps = { vertical: 'top', horizontal: 'left', }, - transition: Grow, + TransitionComponent: Grow, transitionDuration: 'auto', }; diff --git a/packages/material-ui/src/Snackbar/Snackbar.js b/packages/material-ui/src/Snackbar/Snackbar.js index 16bd8824692431..c536047f6ebe50 100644 --- a/packages/material-ui/src/Snackbar/Snackbar.js +++ b/packages/material-ui/src/Snackbar/Snackbar.js @@ -208,7 +208,7 @@ class Snackbar extends React.Component { open, resumeHideDuration, SnackbarContentProps, - transition: TransitionProp, + TransitionComponent, transitionDuration, TransitionProps, ...other @@ -236,7 +236,7 @@ class Snackbar extends React.Component { onFocus={disableWindowBlurListener ? undefined : this.handleResume} onBlur={disableWindowBlurListener ? undefined : this.handlePause} /> - )} - +
); @@ -370,7 +370,7 @@ Snackbar.propTypes = { /** * Transition component. */ - transition: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), + TransitionComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), /** * The duration for the transition, in milliseconds. * You may specify a single timeout for all transitions, or individually with an object. @@ -391,7 +391,7 @@ Snackbar.defaultProps = { horizontal: 'center', }, disableWindowBlurListener: false, - transition: Slide, + TransitionComponent: Slide, transitionDuration: { enter: duration.enteringScreen, exit: duration.leavingScreen, diff --git a/packages/material-ui/src/Stepper/StepContent.d.ts b/packages/material-ui/src/Stepper/StepContent.d.ts index 199367d23e37f1..11169ad38ff678 100644 --- a/packages/material-ui/src/Stepper/StepContent.d.ts +++ b/packages/material-ui/src/Stepper/StepContent.d.ts @@ -12,7 +12,7 @@ export interface StepContentProps last?: boolean; optional?: boolean; orientation?: Orientation; - transition?: React.ComponentType; + TransitionComponent?: React.ComponentType; transitionDuration?: TransitionProps['timeout'] | 'auto'; } diff --git a/packages/material-ui/src/Stepper/StepContent.js b/packages/material-ui/src/Stepper/StepContent.js index 0b79053682f582..b37ac481841167 100644 --- a/packages/material-ui/src/Stepper/StepContent.js +++ b/packages/material-ui/src/Stepper/StepContent.js @@ -32,7 +32,7 @@ function StepContent(props) { last, optional, orientation, - transition: Transition, + TransitionComponent, transitionDuration, TransitionProps, ...other @@ -45,7 +45,7 @@ function StepContent(props) { return (
- {children} - +
); } @@ -101,7 +101,7 @@ StepContent.propTypes = { /** * Collapse component. */ - transition: PropTypes.func, + TransitionComponent: PropTypes.func, /** * Adjust the duration of the content expand transition. * Passed as a property to the transition component. @@ -120,7 +120,7 @@ StepContent.propTypes = { }; StepContent.defaultProps = { - transition: Collapse, + TransitionComponent: Collapse, transitionDuration: 'auto', }; diff --git a/packages/material-ui/src/Table/TablePagination.d.ts b/packages/material-ui/src/Table/TablePagination.d.ts index 8e136b32f348e7..c86e315a3d8cc8 100644 --- a/packages/material-ui/src/Table/TablePagination.d.ts +++ b/packages/material-ui/src/Table/TablePagination.d.ts @@ -13,7 +13,7 @@ export interface LabelDisplayedRowsArgs { export interface TablePaginationProps extends StandardProps { - Actions?: React.ReactType; + ActionsComponent?: React.ReactType; backIconButtonProps?: Partial; component?: React.ReactType; count: number; diff --git a/packages/material-ui/src/Table/TablePagination.js b/packages/material-ui/src/Table/TablePagination.js index 1d01315a05f334..435719017fada2 100644 --- a/packages/material-ui/src/Table/TablePagination.js +++ b/packages/material-ui/src/Table/TablePagination.js @@ -70,7 +70,7 @@ class TablePagination extends React.Component { render() { const { - Actions, + ActionsComponent, backIconButtonProps, classes, colSpan: colSpanProp, @@ -134,7 +134,7 @@ class TablePagination extends React.Component { page, })} - `${from}-${to} of ${count}`, labelRowsPerPage: 'Rows per page:',