Merge pull request #3584 from jaytula/usestyles-menulinkitem

[RFR] Convert MenuLinkItem component to useStyles
marmelab · Aug 28, 2019 · a83e7a5 · a83e7a5
2 parents 335afe8 + 91bc868
commit a83e7a5
Showing 1 changed file with 49 additions and 52 deletions.
diff --git a/packages/ra-ui-materialui/src/layout/MenuItemLink.js b/packages/ra-ui-materialui/src/layout/MenuItemLink.js
@@ -1,61 +1,52 @@
-import React, { Component, cloneElement } from 'react';
+import React, { cloneElement, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { NavLink } from 'react-router-dom';
 import MenuItem from '@material-ui/core/MenuItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Tooltip from '@material-ui/core/Tooltip';
-import { withStyles, createStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@material-ui/core/styles';
 
 const NavLinkRef = React.forwardRef((props, ref) => (
     <NavLink innerRef={ref} {...props} />
 ));
 
-const styles = theme =>
-    createStyles({
-        root: {
-            color: theme.palette.text.secondary,
-        },
-        active: {
-            color: theme.palette.text.primary,
-        },
-        icon: { minWidth: theme.spacing(5) },
-    });
+const useStyles = makeStyles(theme => ({
+    root: {
+        color: theme.palette.text.secondary,
+    },
+    active: {
+        color: theme.palette.text.primary,
+    },
+    icon: { minWidth: theme.spacing(5) },
+}));
 
-export class MenuItemLink extends Component {
-    static propTypes = {
-        classes: PropTypes.object.isRequired,
-        className: PropTypes.string,
-        leftIcon: PropTypes.element,
-        onClick: PropTypes.func,
-        primaryText: PropTypes.node,
-        staticContext: PropTypes.object,
-        to: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
-            .isRequired,
-    };
+function MenuItemLink({
+    classes: classesOverride,
+    className,
+    primaryText,
+    leftIcon,
+    onClick,
+    sidebarIsOpen,
+    ...props
+}) {
+    const classes = useStyles({ classes: classesOverride });
 
-    handleMenuTap = e => {
-        this.props.onClick && this.props.onClick(e);
-    };
-
-    renderMenuItem() {
-        const {
-            classes,
-            className,
-            primaryText,
-            leftIcon,
-            staticContext,
-            sidebarIsOpen,
-            ...props
-        } = this.props;
+    const handleMenuTap = useCallback(
+        e => {
+            onClick && onClick(e);
+        },
+        [onClick]
+    );
 
+    const renderMenuItem = () => {
         return (
             <MenuItem
                 className={classnames(classes.root, className)}
                 activeClassName={classes.active}
                 component={NavLinkRef}
                 {...props}
-                onClick={this.handleMenuTap}
+                onClick={handleMenuTap}
             >
                 {leftIcon && (
                     <ListItemIcon className={classes.icon}>
@@ -65,21 +56,27 @@ export class MenuItemLink extends Component {
                 {primaryText}
             </MenuItem>
         );
-    }
-
-    render() {
-        const { sidebarIsOpen, primaryText } = this.props;
-
-        if (sidebarIsOpen) {
-            return this.renderMenuItem();
-        }
+    };
 
-        return (
-            <Tooltip title={primaryText} placement="right">
-                {this.renderMenuItem()}
-            </Tooltip>
-        );
+    if (sidebarIsOpen) {
+        return renderMenuItem();
     }
+
+    return (
+        <Tooltip title={primaryText} placement="right">
+            {renderMenuItem()}
+        </Tooltip>
+    );
 }
 
-export default withStyles(styles)(MenuItemLink);
+MenuItemLink.propTypes = {
+    classes: PropTypes.object,
+    className: PropTypes.string,
+    leftIcon: PropTypes.element,
+    onClick: PropTypes.func,
+    primaryText: PropTypes.node,
+    staticContext: PropTypes.object,
+    to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
+};
+
+export default MenuItemLink;