diff --git a/ui/src/album/AlbumContextMenu.js b/ui/src/album/AlbumContextMenu.js
index f3d637bab..822c131e9 100644
--- a/ui/src/album/AlbumContextMenu.js
+++ b/ui/src/album/AlbumContextMenu.js
@@ -14,7 +14,7 @@ const useStyles = makeStyles({
},
})
-const AlbumContextMenu = (props) => {
+const AlbumContextMenu = ({ record }) => {
const classes = useStyles()
const dataProvider = useDataProvider()
const dispatch = useDispatch()
@@ -35,22 +35,23 @@ const AlbumContextMenu = (props) => {
const handleClick = (e) => {
e.preventDefault()
setAnchorEl(e.currentTarget)
+ e.stopPropagation()
}
const handleOnClose = (e) => {
e.preventDefault()
setAnchorEl(null)
+ e.stopPropagation()
}
const handleItemClick = (e) => {
- e.preventDefault()
setAnchorEl(null)
const key = e.target.getAttribute('value')
dataProvider
.getList('albumSong', {
pagination: { page: 1, perPage: -1 },
sort: { field: 'trackNumber', order: 'ASC' },
- filter: { album_id: props.id },
+ filter: { album_id: record.id },
})
.then((response) => {
const adata = response.data.reduce(
@@ -59,6 +60,7 @@ const AlbumContextMenu = (props) => {
)
dispatch(options[key].action(adata, response.data[0].id))
})
+ e.stopPropagation()
}
return (
diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index 295dd36cd..b1407ba96 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -95,7 +95,7 @@ const LoadedAlbumGrid = ({ ids, data, basePath, width }) => {
}
- actionIcon={}
+ actionIcon={}
/>
))}
diff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.js
index 7680111bc..4df476ce6 100644
--- a/ui/src/album/AlbumListView.js
+++ b/ui/src/album/AlbumListView.js
@@ -11,6 +11,7 @@ import {
} from 'react-admin'
import { DurationField, RangeField } from '../common'
import { useMediaQuery } from '@material-ui/core'
+import AlbumContextMenu from './AlbumContextMenu'
const AlbumDetails = (props) => {
return (
@@ -36,8 +37,9 @@ const AlbumListView = ({ hasShow, hasEdit, hasList, ...rest }) => {
/>
{isDesktop && }
{isDesktop && }
-
+ {isDesktop && }
{isDesktop && }
+
)
}