Fix theme not being applied to Player's audioTitle
This commit is contained in:
@@ -5,7 +5,8 @@ import { Link } from 'react-router-dom'
|
|||||||
import { useAuthState, useDataProvider, useTranslate } from 'react-admin'
|
import { useAuthState, useDataProvider, useTranslate } from 'react-admin'
|
||||||
import ReactJkMusicPlayer from 'react-jinke-music-player'
|
import ReactJkMusicPlayer from 'react-jinke-music-player'
|
||||||
import 'react-jinke-music-player/assets/index.css'
|
import 'react-jinke-music-player/assets/index.css'
|
||||||
import { makeStyles } from '@material-ui/core/styles'
|
import { createMuiTheme, makeStyles } from '@material-ui/core/styles'
|
||||||
|
import { ThemeProvider } from '@material-ui/styles'
|
||||||
import { GlobalHotKeys } from 'react-hotkeys'
|
import { GlobalHotKeys } from 'react-hotkeys'
|
||||||
import subsonic from '../subsonic'
|
import subsonic from '../subsonic'
|
||||||
import {
|
import {
|
||||||
@@ -24,7 +25,7 @@ import useCurrentTheme from '../themes/useCurrentTheme'
|
|||||||
const useStyle = makeStyles((theme) => ({
|
const useStyle = makeStyles((theme) => ({
|
||||||
audioTitle: {
|
audioTitle: {
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
color: theme.palette.primary.light,
|
color: theme.palette.primary.dark,
|
||||||
'&.songTitle': {
|
'&.songTitle': {
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
},
|
},
|
||||||
@@ -36,7 +37,10 @@ const useStyle = makeStyles((theme) => ({
|
|||||||
|
|
||||||
let audioInstance = null
|
let audioInstance = null
|
||||||
|
|
||||||
const AudioTitle = React.memo(({ audioInfo, isMobile, className }) => {
|
const AudioTitle = React.memo(({ audioInfo, isMobile }) => {
|
||||||
|
const classes = useStyle()
|
||||||
|
const className = classes.audioTitle
|
||||||
|
|
||||||
if (!audioInfo.name) {
|
if (!audioInfo.name) {
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
@@ -130,11 +134,9 @@ const Player = () => {
|
|||||||
},
|
},
|
||||||
volumeFade: { fadeIn: 200, fadeOut: 200 },
|
volumeFade: { fadeIn: 200, fadeOut: 200 },
|
||||||
renderAudioTitle: (audioInfo, isMobile) => (
|
renderAudioTitle: (audioInfo, isMobile) => (
|
||||||
<AudioTitle
|
<ThemeProvider theme={createMuiTheme(theme)}>
|
||||||
audioInfo={audioInfo}
|
<AudioTitle audioInfo={audioInfo} isMobile={isMobile} />
|
||||||
isMobile={isMobile}
|
</ThemeProvider>
|
||||||
className={classes.audioTitle}
|
|
||||||
/>
|
|
||||||
),
|
),
|
||||||
locale: {
|
locale: {
|
||||||
playListsText: translate('player.playListsText'),
|
playListsText: translate('player.playListsText'),
|
||||||
|
|||||||
Reference in New Issue
Block a user