Link is not on the album cover, leaving a gap between albums.

Other small improvements
This commit is contained in:
Deluan 2020-05-31 13:57:17 -04:00
parent 86a9f9e410
commit ddcfc546fb
3 changed files with 25 additions and 28 deletions

View File

@ -71,7 +71,7 @@ const Cover = withContentRect('bounds')(
} }
) )
const AlbumGridTile = ({ record }) => { const AlbumGridTile = ({ record, basePath }) => {
const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md')) const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
const classes = useStyles() const classes = useStyles()
const [visible, setVisible] = useState(false) const [visible, setVisible] = useState(false)
@ -85,6 +85,7 @@ const AlbumGridTile = ({ record }) => {
setVisible(false) setVisible(false)
}} }}
> >
<Link to={linkToRecord(basePath, record.id, 'show')}>
<Cover album={record} /> <Cover album={record} />
{(!isDesktop || visible) && ( {(!isDesktop || visible) && (
<GridListTileBar <GridListTileBar
@ -100,6 +101,7 @@ const AlbumGridTile = ({ record }) => {
actionIcon={<AlbumContextMenu record={record} color={'white'} />} actionIcon={<AlbumContextMenu record={record} color={'white'} />}
/> />
)} )}
</Link>
</div> </div>
) )
} }
@ -116,13 +118,8 @@ const LoadedAlbumGrid = ({ ids, data, basePath, width }) => {
spacing={20} spacing={20}
> >
{ids.map((id) => ( {ids.map((id) => (
<GridListTile <GridListTile className={classes.gridListTile} key={id}>
className={classes.gridListTile} <AlbumGridTile record={data[id]} basePath={basePath} />
component={Link}
key={id}
to={linkToRecord(basePath, id, 'show')}
>
<AlbumGridTile record={data[id]} />
</GridListTile> </GridListTile>
))} ))}
</GridList> </GridList>

View File

@ -36,7 +36,7 @@ export const useStyles = makeStyles((theme) => ({
width: '26em', width: '26em',
}, },
[theme.breakpoints.up('lg')]: { [theme.breakpoints.up('lg')]: {
width: '38em', width: '43em',
}, },
}, },
albumTitle: { albumTitle: {

View File

@ -26,14 +26,14 @@ const useStyles = makeStyles({
const DiscSubtitleRow = ({ const DiscSubtitleRow = ({
record, record,
onClickDiscSubtitle, onClick,
colSpan, colSpan,
contextAlwaysVisible, contextAlwaysVisible,
}) => { }) => {
const classes = useStyles() const classes = useStyles()
const [visible, setVisible] = useState(false) const [visible, setVisible] = useState(false)
const handlePlayDisc = (discNumber) => () => { const handlePlayDisc = (discNumber) => () => {
onClickDiscSubtitle(discNumber) onClick(discNumber)
} }
return ( return (
<TableRow <TableRow
@ -79,14 +79,14 @@ export const SongDatagridRow = ({
{multiDisc && record.trackNumber === 1 && ( {multiDisc && record.trackNumber === 1 && (
<DiscSubtitleRow <DiscSubtitleRow
record={record} record={record}
onClickDiscSubtitle={onClickDiscSubtitle} onClick={onClickDiscSubtitle}
contextAlwaysVisible={contextAlwaysVisible} contextAlwaysVisible={contextAlwaysVisible}
colSpan={childCount + (rest.expand ? 1 : 0)} colSpan={childCount + (rest.expand ? 1 : 0)}
/> />
)} )}
<DatagridRow <DatagridRow
record={record} record={record}
onMouseEnter={() => setVisible(true)} onMouseMove={() => setVisible(true)}
onMouseLeave={() => setVisible(false)} onMouseLeave={() => setVisible(false)}
{...rest} {...rest}
> >