[Table] Use makeStyles over withStyles

packages/material-ui-benchmark/src/core.js

@@ -1,10 +1,15 @@
-/* eslint-disable no-console */
+/* eslint-disable no-console, react/no-array-index-key */
 
 import Benchmark from 'benchmark';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
 import { StylesProvider } from '@material-ui/styles';
 import ButtonBase from '@material-ui/core/ButtonBase';
+import Table from '@material-ui/core/Table';
+import TableBody from '@material-ui/core/TableBody';
+import TableCell from '@material-ui/core/TableCell';
+import TableHead from '@material-ui/core/TableHead';
+import TableRow from '@material-ui/core/TableRow';
 
 const suite = new Benchmark.Suite('core', {
   onError: event => {
@@ -13,6 +18,65 @@ const suite = new Benchmark.Suite('core', {
 });
 Benchmark.options.minSamples = 100;
 
+const data = { name: 'Frozen yoghurt', calories: 159, fat: 6.0, carbs: 24, protein: 4.0 };
+const rows = Array.from(new Array(100)).map(() => data);
+
+function TableMui() {
+  return (
+    <Table>
+      <TableHead>
+        <TableRow>
+          <TableCell>Dessert (100g serving)</TableCell>
+          <TableCell>Calories</TableCell>
+          <TableCell>Fat (g)</TableCell>
+          <TableCell>Carbs (g)</TableCell>
+          <TableCell>Protein (g)</TableCell>
+        </TableRow>
+      </TableHead>
+      <TableBody>
+        {rows.map((row, index) => (
+          <TableRow key={index}>
+            <TableCell component="th" scope="row">
+              {row.name}
+            </TableCell>
+            <TableCell>{row.calories}</TableCell>
+            <TableCell>{row.fat}</TableCell>
+            <TableCell>{row.carbs}</TableCell>
+            <TableCell>{row.protein}</TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+  );
+}
+
+function TableRaw() {
+  return (
+    <table>
+      <thead>
+        <tr>
+          <th>Dessert (100g serving)</th>
+          <th>Calories</th>
+          <th>Fat (g)</th>
+          <th>Carbs (g)</th>
+          <th>Protein (g)</th>
+        </tr>
+      </thead>
+      <tbody>
+        {rows.map((row, index) => (
+          <tr key={index}>
+            <th scope="row">{row.name}</th>
+            <td>{row.calories}</td>
+            <td>{row.fat}</td>
+            <td>{row.carbs}</td>
+            <td>{row.protein}</td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
+}
+
 function NakedButton(props) {
   return <button type="button" {...props} />;
 }
@@ -26,6 +90,20 @@ class HocButton extends React.Component {
 }
 
 suite
+  .add('TableRaw', () => {
+    ReactDOMServer.renderToString(
+      <StylesProvider sheetsCache={null} sheetsManager={new Map()}>
+        <TableRaw />
+      </StylesProvider>,
+    );
+  })
+  .add('TableMui', () => {
+    ReactDOMServer.renderToString(
+      <StylesProvider sheetsCache={null} sheetsManager={new Map()}>
+        <TableMui />
+      </StylesProvider>,
+    );
+  })
   .add('ButtonBase', () => {
     ReactDOMServer.renderToString(
       <StylesProvider sheetsManager={new Map()}>

packages/material-ui-styles/src/useThemeProps/index.d.ts

@@ -0,0 +1,2 @@
+export { default } from './useThemeProps';
+export * from './useThemeProps';

packages/material-ui-styles/src/useThemeProps/index.js

@@ -0,0 +1 @@
+export { default } from './useThemeProps';

packages/material-ui-styles/src/useThemeProps/useThemeProps.d.ts

@@ -0,0 +1 @@
+export default function useThemeProps(props: any, options: any): any;

packages/material-ui-styles/src/useThemeProps/useThemeProps.js

@@ -0,0 +1,15 @@
+import useTheme from '../useTheme';
+import getThemeProps from '../getThemeProps';
+
+function useThemeProps(props, options) {
+  const { defaultTheme, name } = options;
+  const theme = useTheme() || defaultTheme;
+  const output = getThemeProps({
+    theme,
+    name,
+    props,
+  });
+  return output;
+}
+
+export default useThemeProps;

packages/material-ui/src/Table/Table.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import withStyles from '../styles/withStyles';
+import makeStyles from '../styles/makeStyles';
+import useThemeProps from '../styles/useThemeProps';
 import TableContext from './TableContext';
 
 export const styles = {
@@ -14,8 +15,18 @@ export const styles = {
   },
 };
 
+export const useStyles = makeStyles(styles, { name: 'MuiTable' });
+
 const Table = React.forwardRef(function Table(props, ref) {
-  const { classes, className, component: Component, padding, size, ...other } = props;
+  const {
+    classes: classesProp,
+    className,
+    component: Component,
+    padding,
+    size,
+    ...other
+  } = useThemeProps(props, { name: 'MuiTable' });
+  const classes = useStyles(props);
   const table = React.useMemo(() => ({ padding, size }), [padding, size]);
 
   return (
@@ -34,7 +45,7 @@ Table.propTypes = {
    * Override or extend the styles applied to the component.
    * See [CSS API](#css) below for more details.
    */
-  classes: PropTypes.object.isRequired,
+  classes: PropTypes.object,
   /**
    * @ignore
    */
@@ -65,4 +76,9 @@ Table.defaultProps = {
   size: 'medium',
 };
 
-export default withStyles(styles, { name: 'MuiTable' })(Table);
+Table.useStyles = useStyles;
+Table.options = {
+  name: 'MuiTable',
+};
+
+export default Table;

packages/material-ui/src/TableBody/TableBody.js

@@ -1,22 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import withStyles from '../styles/withStyles';
+import makeStyles from '../styles/makeStyles';
+import useThemeProps from '../styles/useThemeProps';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
+const tablelvl2 = {
+  variant: 'body',
+};
+
 export const styles = {
   /* Styles applied to the root element. */
   root: {
     display: 'table-row-group',
   },
 };
 
-const tablelvl2 = {
-  variant: 'body',
-};
+const useStyles = makeStyles(styles, { name: 'MuiTableBody' });
 
 const TableBody = React.forwardRef(function TableBody(props, ref) {
-  const { classes, className, component: Component, ...other } = props;
+  const { classes: classesProp, className, component: Component, ...other } = useThemeProps(props, {
+    name: 'MuiTableBody',
+  });
+  const classes = useStyles(props);
 
   return (
     <Tablelvl2Context.Provider value={tablelvl2}>
@@ -34,7 +40,7 @@ TableBody.propTypes = {
    * Override or extend the styles applied to the component.
    * See [CSS API](#css) below for more details.
    */
-  classes: PropTypes.object.isRequired,
+  classes: PropTypes.object,
   /**
    * @ignore
    */
@@ -50,4 +56,9 @@ TableBody.defaultProps = {
   component: 'tbody',
 };
 
-export default withStyles(styles, { name: 'MuiTableBody' })(TableBody);
+TableBody.useStyles = useStyles;
+TableBody.options = {
+  name: 'MuiTableBody',
+};
+
+export default TableBody;

packages/material-ui/src/TableCell/TableCell.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import withStyles from '../styles/withStyles';
+import makeStyles from '../styles/makeStyles';
+import useThemeProps from '../styles/useThemeProps';
 import { capitalize } from '../utils/helpers';
 import { darken, fade, lighten } from '../styles/colorManipulator';
 import TableContext from '../Table/TableContext';
@@ -98,11 +99,13 @@ export const styles = theme => ({
   },
 });
 
+const useStyles = makeStyles(styles, { name: 'MuiTableCell' });
+
 const TableCell = React.forwardRef(function TableCell(props, ref) {
   const {
     align,
     children,
-    classes,
+    classes: classesProp,
     className,
     component,
     padding: paddingProp,
@@ -111,8 +114,9 @@ const TableCell = React.forwardRef(function TableCell(props, ref) {
     sortDirection,
     variant,
     ...other
-  } = props;
+  } = useThemeProps(props, { name: 'MuiTableCell' });
 
+  const classes = useStyles(props);
   const table = React.useContext(TableContext);
   const tablelvl2 = React.useContext(Tablelvl2Context);
 
@@ -177,7 +181,7 @@ TableCell.propTypes = {
    * Override or extend the styles applied to the component.
    * See [CSS API](#css) below for more details.
    */
-  classes: PropTypes.object.isRequired,
+  classes: PropTypes.object,
   /**
    * @ignore
    */
@@ -216,4 +220,9 @@ TableCell.defaultProps = {
   align: 'inherit',
 };
 
-export default withStyles(styles, { name: 'MuiTableCell' })(TableCell);
+TableCell.useStyles = useStyles;
+TableCell.options = {
+  name: 'MuiTableCell',
+};
+
+export default TableCell;

packages/material-ui/src/TableFooter/TableFooter.js

@@ -1,22 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import withStyles from '../styles/withStyles';
+import makeStyles from '../styles/makeStyles';
+import useThemeProps from '../styles/useThemeProps';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
+const tablelvl2 = {
+  variant: 'footer',
+};
+
 export const styles = {
   /* Styles applied to the root element. */
   root: {
     display: 'table-footer-group',
   },
 };
 
-const tablelvl2 = {
-  variant: 'footer',
-};
+const useStyles = makeStyles(styles, { name: 'MuiTableFooter' });
 
 const TableFooter = React.forwardRef(function TableFooter(props, ref) {
-  const { classes, className, component: Component, ...other } = props;
+  const { classes: classesProp, className, component: Component, ...other } = useThemeProps(props, {
+    name: 'MuiTableFooter',
+  });
+  const classes = useStyles(props);
 
   return (
     <Tablelvl2Context.Provider value={tablelvl2}>
@@ -34,7 +40,7 @@ TableFooter.propTypes = {
    * Override or extend the styles applied to the component.
    * See [CSS API](#css) below for more details.
    */
-  classes: PropTypes.object.isRequired,
+  classes: PropTypes.object,
   /**
    * @ignore
    */
@@ -50,4 +56,9 @@ TableFooter.defaultProps = {
   component: 'tfoot',
 };
 
-export default withStyles(styles, { name: 'MuiTableFooter' })(TableFooter);
+TableFooter.useStyles = useStyles;
+TableFooter.options = {
+  name: 'MuiTableFooter',
+};
+
+export default TableFooter;

packages/material-ui/src/TableHead/TableHead.js

@@ -1,22 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import withStyles from '../styles/withStyles';
+import makeStyles from '../styles/makeStyles';
+import useThemeProps from '../styles/useThemeProps';
 import Tablelvl2Context from '../Table/Tablelvl2Context';
 
+const tablelvl2 = {
+  variant: 'head',
+};
+
 export const styles = {
   /* Styles applied to the root element. */
   root: {
     display: 'table-header-group',
   },
 };
 
-const tablelvl2 = {
-  variant: 'head',
-};
+const useStyles = makeStyles(styles, { name: 'MuiTableHead' });
 
 const TableHead = React.forwardRef(function TableHead(props, ref) {
-  const { classes, className, component: Component, ...other } = props;
+  const { classes: classesProp, className, component: Component, ...other } = useThemeProps(props, {
+    name: 'MuiTableHead',
+  });
+  const classes = useStyles(props);
 
   return (
     <Tablelvl2Context.Provider value={tablelvl2}>
@@ -34,7 +40,7 @@ TableHead.propTypes = {
    * Override or extend the styles applied to the component.
    * See [CSS API](#css) below for more details.
    */
-  classes: PropTypes.object.isRequired,
+  classes: PropTypes.object,
   /**
    * @ignore
    */
@@ -50,4 +56,9 @@ TableHead.defaultProps = {
   component: 'thead',
 };
 
-export default withStyles(styles, { name: 'MuiTableHead' })(TableHead);
+TableHead.useStyles = useStyles;
+TableHead.options = {
+  name: 'MuiTableHead',
+};
+
+export default TableHead;