Merge branch 'master' into 14644-nanh-nanm-in-subprocess-view

[arvados-workbench2.git] / src / components / list-item-text-icon / list-item-text-icon.tsx

diff --git a/src/components/list-item-text-icon/list-item-text-icon.tsx b/src/components/list-item-text-icon/list-item-text-icon.tsx
index f140d86063b86db9608a2445a43cb98e8a0f96e2..3afc2cf8773293a18566c468253aaade648c3a4a 100644 (file)
--- a/src/components/list-item-text-icon/list-item-text-icon.tsx
+++ b/src/components/list-item-text-icon/list-item-text-icon.tsx
@@ -4,59 +4,61 @@
 
 import * as React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { ListItemIcon, ListItemText, Typography } from '@material-ui/core';
 import { IconType } from '../icon/icon';
 import * as classnames from "classnames";
 
-export interface ListItemTextIconDataProps {
-    icon: IconType;
-    name: string;
-    isActive?: boolean;
-    hasMargin?: boolean;
-}
-
-type ListItemTextIconProps = ListItemTextIconDataProps & WithStyles<CssRules>;
-
-class ListItemTextIcon extends React.Component<ListItemTextIconProps, {}> {
-    render() {
-        const { classes, isActive, hasMargin, name, icon: Icon } = this.props;
-        return (
-            <Typography component='span' className={classes.root}>
-                <ListItemIcon className={classnames({
-                        [classes.hasMargin]: hasMargin,
-                        [classes.active]: isActive
-                    })}>
-                    <Icon />
-                </ListItemIcon>
-                <ListItemText primary={
-                    <Typography variant='body1' className={classnames(classes.listItemText, {
-                            [classes.active]: isActive
-                        })}>
-                        {name}
-                    </Typography>
-                } />
-            </Typography>
-        );
-    }
-}
-        
 type CssRules = 'root' | 'listItemText' | 'hasMargin' | 'active';
-        
+
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     root: {
         display: 'flex',
         alignItems: 'center'
     },
     listItemText: {
-        fontWeight: 700
+        fontWeight: 400
     },
     active: {
         color: theme.palette.primary.main,
     },
     hasMargin: {
-        marginLeft: '18px',
-    },
+        marginLeft: `${theme.spacing.unit}px`,
+    }
 });
 
-export default withStyles(styles)(ListItemTextIcon);
\ No newline at end of file
+export interface ListItemTextIconDataProps {
+    icon: IconType;
+    name: string;
+    isActive?: boolean;
+    hasMargin?: boolean;
+    iconSize?: number;
+}
+
+type ListItemTextIconProps = ListItemTextIconDataProps & WithStyles<CssRules>;
+
+export const ListItemTextIcon = withStyles(styles)(
+    class extends React.Component<ListItemTextIconProps, {}> {
+        render() {
+            const { classes, isActive, hasMargin, name, icon: Icon, iconSize } = this.props;
+            return (
+                <Typography component='span' className={classes.root}>
+                    <ListItemIcon className={classnames({
+                            [classes.hasMargin]: hasMargin,
+                            [classes.active]: isActive
+                        })}>
+
+                        <Icon style={{ fontSize: `${iconSize}rem` }} />
+                    </ListItemIcon>
+                    <ListItemText primary={
+                        <Typography  className={classnames(classes.listItemText, {
+                                [classes.active]: isActive
+                            })}>
+                            {name}
+                        </Typography>
+                    } />
+                </Typography>
+            );
+        }
+    }
+);