Skip to content

🎧 Your Personal Streaming Service

Fix context menu on mobile, removed console warnings

Deluanfbedbb789381
diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index 8abac5064..1ff5418ab 100644
--- a/ui/src/album/AlbumSongs.js
+++ b/ui/src/album/AlbumSongs.js
@@ -117,7 +117,7 @@ const AlbumSongs = (props) => {
/>
) : (
<SongDatagrid
- expand={!isXsmall && <SongDetails />}
+ expand={isXsmall ? null : <SongDetails />}
rowClick={(id) => dispatch(playTracks(data, ids, id))}
{...controllerProps}
hasBulkActions={hasBulkActions}
diff --git a/ui/src/common/AlbumContextMenu.js b/ui/src/common/AlbumContextMenu.js
index c0bd72f5a..fd2534ff9 100644
--- a/ui/src/common/AlbumContextMenu.js
+++ b/ui/src/common/AlbumContextMenu.js
@@ -107,7 +107,7 @@ const AlbumContextMenu = ({ record, discNumber, color, visible }) => {
onClick={handleClick}
size={'small'}
>
- <MoreVertIcon />
+ <MoreVertIcon fontSize={'small'} />
</IconButton>
<Menu
id="context-menu"
diff --git a/ui/src/common/SongContextMenu.js b/ui/src/common/SongContextMenu.js
index 4be70f593..34eb83ade 100644
--- a/ui/src/common/SongContextMenu.js
+++ b/ui/src/common/SongContextMenu.js
@@ -120,7 +120,7 @@ const SongContextMenu = ({
className={classes.menu}
disabled={updating}
>
- <MoreVertIcon />
+ <MoreVertIcon fontSize={'small'} />
</IconButton>
<Menu
id={'menu' + record.id}
diff --git a/ui/src/common/SongDatagrid.js b/ui/src/common/SongDatagrid.js
index 3ce99bd7e..13ba206a3 100644
--- a/ui/src/common/SongDatagrid.js
+++ b/ui/src/common/SongDatagrid.js
@@ -24,7 +24,12 @@ const useStyles = makeStyles({
},
})
-const DiscSubtitleRow = ({ record, onClickDiscSubtitle, colSpan }) => {
+const DiscSubtitleRow = ({
+ record,
+ onClickDiscSubtitle,
+ colSpan,
+ contextAlwaysVisible,
+}) => {
const classes = useStyles()
const [visible, setVisible] = useState(false)
const handlePlayDisc = (discNumber) => () => {
@@ -49,7 +54,7 @@ const DiscSubtitleRow = ({ record, onClickDiscSubtitle, colSpan }) => {
<AlbumContextMenu
record={{ id: record.albumId }}
discNumber={record.discNumber}
- visible={visible}
+ visible={contextAlwaysVisible || visible}
/>
</TableCell>
</TableRow>
@@ -61,19 +66,19 @@ export const SongDatagridRow = ({
children,
multiDisc,
contextAlwaysVisible,
- contextMenu,
onClickDiscSubtitle,
...rest
}) => {
const [visible, setVisible] = useState(false)
- const childCount = React.Children.count(children)
+ const childCount = children.filter((c) => isValidElement(c)).length
return (
<>
{multiDisc && record.trackNumber === 1 && (
<DiscSubtitleRow
record={record}
onClickDiscSubtitle={onClickDiscSubtitle}
- colSpan={childCount}
+ contextAlwaysVisible={contextAlwaysVisible}
+ colSpan={childCount + (rest.expand ? 1 : 0)}
/>
)}
<DatagridRow
@@ -87,11 +92,10 @@ export const SongDatagridRow = ({
(child, index) =>
child &&
isValidElement(child) &&
- (index < childCount - 1
+ (index < childCount
? child
: cloneElement(child, {
visible: contextAlwaysVisible || visible,
- ...rest,
}))
)}
</DatagridRow>