[Popover] Fix default value

mui · Jun 5, 2018 · cda700c · cda700c
1 parent ab3bc94
commit cda700c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/packages/material-ui/src/Collapse/Collapse.js b/packages/material-ui/src/Collapse/Collapse.js
@@ -254,6 +254,8 @@ Collapse.defaultProps = {
   timeout: duration.standard,
 };
 
+Collapse.muiSupportAuto = true;
+
 export default withStyles(styles, {
   withTheme: true,
   name: 'MuiCollapse',

diff --git a/packages/material-ui/src/Grow/Grow.js b/packages/material-ui/src/Grow/Grow.js
@@ -178,4 +178,6 @@ Grow.defaultProps = {
   timeout: 'auto',
 };
 
+Grow.muiSupportAuto = true;
+
 export default withTheme()(Grow);
diff --git a/packages/material-ui/src/Popover/Popover.js b/packages/material-ui/src/Popover/Popover.js
@@ -291,11 +291,17 @@ class Popover extends React.Component {
       role,
       transformOrigin,
       TransitionComponent,
-      transitionDuration,
+      transitionDuration: transitionDurationProp,
       TransitionProps,
       ...other
     } = this.props;
 
+    let transitionDuration = transitionDurationProp;
+
+    if (transitionDurationProp === 'auto' && !TransitionComponent.muiSupportAuto) {
+      transitionDuration = undefined;
+    }
+
     // If the container prop is provided, use that
     // If the anchorEl prop is provided, use its parent body element as the container
     // If neither are provided let the Modal take care of choosing the container

diff --git a/packages/material-ui/src/Popover/Popover.test.js b/packages/material-ui/src/Popover/Popover.test.js
@@ -826,4 +826,25 @@ describe('<Popover />', () => {
       popoverActions.updatePosition();
     });
   });
+
+  describe('prop: transitionDuration', () => {
+    it('should apply the auto property if supported', () => {
+      const wrapper = shallow(
+        <Popover {...defaultProps}>
+          <div />
+        </Popover>,
+      );
+      assert.strictEqual(wrapper.find(Grow).props().timeout, 'auto');
+    });
+
+    it('should not apply the auto property if not supported', () => {
+      const TransitionComponent = props => <div {...props} />;
+      const wrapper = shallow(
+        <Popover {...defaultProps} TransitionComponent={TransitionComponent}>
+          <div />
+        </Popover>,
+      );
+      assert.strictEqual(wrapper.find(TransitionComponent).props().timeout, undefined);
+    });
+  });
 });
diff --git a/packages/material-ui/src/StepContent/StepContent.js b/packages/material-ui/src/StepContent/StepContent.js
@@ -33,7 +33,7 @@ function StepContent(props) {
     optional,
     orientation,
     TransitionComponent,
-    transitionDuration,
+    transitionDuration: transitionDurationProp,
     TransitionProps,
     ...other
   } = props;
@@ -43,6 +43,12 @@ function StepContent(props) {
     'Material-UI: <StepContent /> is only designed for use with the vertical stepper.',
   );
 
+  let transitionDuration = transitionDurationProp;
+
+  if (transitionDurationProp === 'auto' && !TransitionComponent.muiSupportAuto) {
+    transitionDuration = undefined;
+  }
+
   return (
     <div className={classNames(classes.root, { [classes.last]: last }, className)} {...other}>
       <TransitionComponent