From 6c038d9775924fd4a34a3002a52f051ac9e4693c Mon Sep 17 00:00:00 2001
From: Jack Reed <phillipjreed@gmail.com>
Date: Wed, 29 Jul 2020 09:10:47 -0600
Subject: [PATCH] Move List -> Menus for similarity with other types of
elements
---
src/components/WindowSideBarCollectionPanel.js | 16 +++++++++-------
src/containers/WindowSideBarCollectionPanel.js | 3 ++-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/components/WindowSideBarCollectionPanel.js b/src/components/WindowSideBarCollectionPanel.js
index 564546285..baa41c951 100644
--- a/src/components/WindowSideBarCollectionPanel.js
+++ b/src/components/WindowSideBarCollectionPanel.js
@@ -4,6 +4,8 @@ import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon';
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 Skeleton from '@material-ui/lab/Skeleton';
import ArrowUpwardIcon from '@material-ui/icons/ArrowUpwardSharp';
@@ -54,8 +56,8 @@ export class WindowSideBarCollectionPanel extends Component {
/** */
const Item = ({ manifest, ...otherProps }) => (
- <ListItem
- className={classes.listItem}
+ <MenuItem
+ className={classes.menuItem}
alignItems="flex-start"
button
component="li"
@@ -72,7 +74,7 @@ export class WindowSideBarCollectionPanel extends Component {
</ListItemIcon>
)}
<ListItemText>{WindowSideBarCollectionPanel.getUseableLabel(manifest)}</ListItemText>
- </ListItem>
+ </MenuItem>
);
return (
@@ -106,15 +108,15 @@ export class WindowSideBarCollectionPanel extends Component {
</>
)}
>
- <List>
+ <MenuList>
{ isFetching && (
- <ListItem>
+ <MenuItem>
<ListItemText>
<Skeleton className={classes.placeholder} variant="text" />
<Skeleton className={classes.placeholder} variant="text" />
<Skeleton className={classes.placeholder} variant="text" />
</ListItemText>
- </ListItem>
+ </MenuItem>
)}
{
collection && collection.getCollections().map((manifest) => {
@@ -144,7 +146,7 @@ export class WindowSideBarCollectionPanel extends Component {
);
})
}
- </List>
+ </MenuList>
</CompanionWindow>
);
}
diff --git a/src/containers/WindowSideBarCollectionPanel.js b/src/containers/WindowSideBarCollectionPanel.js
index 4f68f0e38..32b31a77b 100644
--- a/src/containers/WindowSideBarCollectionPanel.js
+++ b/src/containers/WindowSideBarCollectionPanel.js
@@ -63,9 +63,10 @@ const styles = theme => ({
label: {
paddingLeft: theme.spacing(1),
},
- listItem: {
+ menuItem: {
borderBottom: `0.5px solid ${theme.palette.divider}`,
paddingRight: theme.spacing(1),
+ whiteSpace: 'normal',
},
});
--
GitLab