Skip to content
Snippets Groups Projects
Commit 6c038d97 authored by Jack Reed's avatar Jack Reed
Browse files

Move List -> Menus for similarity with other types of elements

parent 179253e9
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,8 @@ import List from '@material-ui/core/List'; ...@@ -4,6 +4,8 @@ import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem'; import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon'; import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText'; import ListItemText from '@material-ui/core/ListItemText';
import MenuList from '@material-ui/core/MenuList';
import MenuItem from '@material-ui/core/MenuItem';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import Skeleton from '@material-ui/lab/Skeleton'; import Skeleton from '@material-ui/lab/Skeleton';
import ArrowUpwardIcon from '@material-ui/icons/ArrowUpwardSharp'; import ArrowUpwardIcon from '@material-ui/icons/ArrowUpwardSharp';
...@@ -54,8 +56,8 @@ export class WindowSideBarCollectionPanel extends Component { ...@@ -54,8 +56,8 @@ export class WindowSideBarCollectionPanel extends Component {
/** */ /** */
const Item = ({ manifest, ...otherProps }) => ( const Item = ({ manifest, ...otherProps }) => (
<ListItem <MenuItem
className={classes.listItem} className={classes.menuItem}
alignItems="flex-start" alignItems="flex-start"
button button
component="li" component="li"
...@@ -72,7 +74,7 @@ export class WindowSideBarCollectionPanel extends Component { ...@@ -72,7 +74,7 @@ export class WindowSideBarCollectionPanel extends Component {
</ListItemIcon> </ListItemIcon>
)} )}
<ListItemText>{WindowSideBarCollectionPanel.getUseableLabel(manifest)}</ListItemText> <ListItemText>{WindowSideBarCollectionPanel.getUseableLabel(manifest)}</ListItemText>
</ListItem> </MenuItem>
); );
return ( return (
...@@ -106,15 +108,15 @@ export class WindowSideBarCollectionPanel extends Component { ...@@ -106,15 +108,15 @@ export class WindowSideBarCollectionPanel extends Component {
</> </>
)} )}
> >
<List> <MenuList>
{ isFetching && ( { isFetching && (
<ListItem> <MenuItem>
<ListItemText> <ListItemText>
<Skeleton className={classes.placeholder} variant="text" /> <Skeleton className={classes.placeholder} variant="text" />
<Skeleton className={classes.placeholder} variant="text" /> <Skeleton className={classes.placeholder} variant="text" />
<Skeleton className={classes.placeholder} variant="text" /> <Skeleton className={classes.placeholder} variant="text" />
</ListItemText> </ListItemText>
</ListItem> </MenuItem>
)} )}
{ {
collection && collection.getCollections().map((manifest) => { collection && collection.getCollections().map((manifest) => {
...@@ -144,7 +146,7 @@ export class WindowSideBarCollectionPanel extends Component { ...@@ -144,7 +146,7 @@ export class WindowSideBarCollectionPanel extends Component {
); );
}) })
} }
</List> </MenuList>
</CompanionWindow> </CompanionWindow>
); );
} }
......
...@@ -63,9 +63,10 @@ const styles = theme => ({ ...@@ -63,9 +63,10 @@ const styles = theme => ({
label: { label: {
paddingLeft: theme.spacing(1), paddingLeft: theme.spacing(1),
}, },
listItem: { menuItem: {
borderBottom: `0.5px solid ${theme.palette.divider}`, borderBottom: `0.5px solid ${theme.palette.divider}`,
paddingRight: theme.spacing(1), paddingRight: theme.spacing(1),
whiteSpace: 'normal',
}, },
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment