ready to be merged

mui · May 6, 2018 · 4a42ebf · 4a42ebf
1 parent 25e3bf3
commit 4a42ebf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/packages/material-ui/src/Tabs/TabIndicator.js b/packages/material-ui/src/Tabs/TabIndicator.js
@@ -25,20 +25,11 @@ export const styles = theme => ({
  * @ignore - internal component.
  */
 function TabIndicator(props) {
-  const { classes, className, color, tabIndicatorProps, style, ...other } = props;
-
-  const styleProps =
-    Object.keys(tabIndicatorProps).length !== 0
-      ? {
-          ...tabIndicatorProps,
-          ...style,
-        }
-      : style;
+  const { classes, className, color, ...other } = props;
 
   return (
     <span
       className={classNames(classes.root, classes[`color${capitalize(color)}`], className)}
-      style={styleProps}
       {...other}
     />
   );
@@ -57,15 +48,7 @@ TabIndicator.propTypes = {
    * @ignore
    * The color of the tab indicator.
    */
-  color: PropTypes.oneOf([PropTypes.string, PropTypes.oneOf(['secondary', 'primary'])]),
-  /**
-   * @ignore
-   */
-  style: PropTypes.object,
-  /**
-   * Useful to extend or add custom style to component
-   */
-  tabIndicatorProps: PropTypes.object,
+  color: PropTypes.oneOf(['primary', 'secondary']),
 };
 
 export default withStyles(styles)(TabIndicator);
diff --git a/packages/material-ui/src/Tabs/Tabs.d.ts b/packages/material-ui/src/Tabs/Tabs.d.ts
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase/ButtonBase';
+import { TabIndicatorProps } from './TabIndicator';
 
 export interface TabsProps extends StandardProps<ButtonBaseProps, TabsClassKey, 'onChange'> {
   action?: (actions: TabsActions) => void;
@@ -12,6 +13,7 @@ export interface TabsProps extends StandardProps<ButtonBaseProps, TabsClassKey,
   scrollable?: boolean;
   ScrollButtonComponent?: React.ReactType;
   scrollButtons?: 'auto' | 'on' | 'off';
+  TabIndicatorProps?: Partial<TabIndicatorProps>;
   textColor?: 'secondary' | 'primary' | 'inherit' | string;
   value: any;
   width?: string;

diff --git a/packages/material-ui/src/Tabs/Tabs.js b/packages/material-ui/src/Tabs/Tabs.js
@@ -279,7 +279,7 @@ class Tabs extends React.Component {
       scrollable,
       ScrollButtonComponent,
       scrollButtons,
-      tabIndicatorProps,
+      TabIndicatorProps,
       textColor,
       theme,
       value,
@@ -306,7 +306,7 @@ class Tabs extends React.Component {
         style={this.state.indicatorStyle}
         className={classes.indicator}
         color={indicatorColor}
-        tabIndicatorProps={tabIndicatorProps}
+        {...TabIndicatorProps}
       />
     );
 
@@ -419,9 +419,9 @@ Tabs.propTypes = {
    */
   scrollButtons: PropTypes.oneOf(['auto', 'on', 'off']),
   /**
-   * Determines a custom style for tab indicator
+   * Properties applied to the `TabIndicator` element.
    */
-  tabIndicatorProps: PropTypes.object,
+  TabIndicatorProps: PropTypes.object,
   /**
    * Determines the color of the `Tab`.
    */
@@ -445,7 +445,6 @@ Tabs.defaultProps = {
   ScrollButtonComponent: TabScrollButton,
   scrollButtons: 'auto',
   textColor: 'inherit',
-  tabIndicatorProps: {},
 };
 
 export default withStyles(styles, { name: 'MuiTabs', withTheme: true })(Tabs);