look into the build fail

eps1lon · Feb 10, 2019 · ef1e87a · ef1e87a
1 parent af3d812
commit ef1e87a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 42 deletions.
diff --git a/packages/material-ui/src/Collapse/Collapse.js b/packages/material-ui/src/Collapse/Collapse.js
@@ -161,13 +161,13 @@ class Collapse extends React.Component {
               classes.container,
               {
                 [classes.entered]: state === 'entered',
-                [classes.exited]: state === 'exited',
+                [classes.exited]: state === 'exited' && collapsedHeight === '0px',
               },
               className,
             )}
             style={{
-              ...style,
               minHeight: collapsedHeight,
+              ...style,
             }}
             {...childProps}
           >

diff --git a/packages/material-ui/src/Fade/Fade.js b/packages/material-ui/src/Fade/Fade.js
@@ -55,22 +55,20 @@ class Fade extends React.Component {
   };
 
   render() {
-    const { children, onEnter, onExit, style: styleProp, theme, ...other } = this.props;
+    const { children, onEnter, onExit, style, theme, ...other } = this.props;
 
     return (
       <Transition appear onEnter={this.handleEnter} onExit={this.handleExit} {...other}>
         {(state, childProps) => {
-          const style = {
-            opacity: 0,
-            ...styles[state],
-            ...styleProp,
-            ...childProps.style,
-          };
-
           return React.cloneElement(children, {
-            ...childProps,
             'aria-hidden': state === 'exited',
-            style,
+            style: {
+              opacity: 0,
+              ...styles[state],
+              ...style,
+              ...children.props.style,
+            },
+            ...childProps,
           });
         }}
       </Transition>

diff --git a/packages/material-ui/src/Grow/Grow.js b/packages/material-ui/src/Grow/Grow.js
@@ -106,7 +106,7 @@ class Grow extends React.Component {
   };
 
   render() {
-    const { children, onEnter, onExit, style: styleProp, theme, timeout, ...other } = this.props;
+    const { children, onEnter, onExit, style, theme, timeout, ...other } = this.props;
 
     return (
       <Transition
@@ -118,18 +118,16 @@ class Grow extends React.Component {
         {...other}
       >
         {(state, childProps) => {
-          const style = {
-            opacity: 0,
-            transform: getScale(0.75),
-            ...styles[state],
-            ...styleProp,
-            ...children.props.style,
-          };
-
           return React.cloneElement(children, {
-            ...childProps,
             'aria-hidden': state === 'exited',
-            style,
+            style: {
+              opacity: 0,
+              transform: getScale(0.75),
+              ...styles[state],
+              ...style,
+              ...children.props.style,
+            },
+            ...childProps,
           });
         }}
       </Transition>

diff --git a/packages/material-ui/src/Slide/Slide.js b/packages/material-ui/src/Slide/Slide.js
@@ -191,7 +191,7 @@ class Slide extends React.Component {
       onEntering,
       onExit,
       onExited,
-      style: styleProp,
+      style,
       theme,
       ...other
     } = this.props;
@@ -210,16 +210,14 @@ class Slide extends React.Component {
           {...other}
         >
           {(state, childProps) => {
-            const style = {
-              visibility: state === 'exited' ? 'hidden' : undefined,
-              ...styleProp,
-              ...children.props.style,
-            };
-
             return React.cloneElement(children, {
-              ...childProps,
               'aria-hidden': state === 'exited',
-              style,
+              style: {
+                visibility: state === 'exited' ? 'hidden' : undefined,
+                ...style,
+                ...children.props.style,
+              },
+              ...childProps,
             });
           }}
         </Transition>

diff --git a/packages/material-ui/src/Zoom/Zoom.js b/packages/material-ui/src/Zoom/Zoom.js
@@ -54,22 +54,20 @@ class Zoom extends React.Component {
   };
 
   render() {
-    const { children, onEnter, onExit, style: styleProp, theme, ...other } = this.props;
+    const { children, onEnter, onExit, style, theme, ...other } = this.props;
 
     return (
       <Transition appear onEnter={this.handleEnter} onExit={this.handleExit} {...other}>
         {(state, childProps) => {
-          const style = {
-            transform: 'scale(0)',
-            ...styles[state],
-            ...styleProp,
-            ...children.props.style,
-          };
-
           return React.cloneElement(children, {
-            ...childProps,
             'aria-hidden': state === 'exited',
-            style,
+            style: {
+              transform: 'scale(0)',
+              ...styles[state],
+              ...style,
+              ...children.props.style,
+            },
+            ...childProps,
           });
         }}
       </Transition>