🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
fix(ui): make playlist toggle switches visible in all themes (#6277)
Deluan Quintãocaa2f8a0c012
diff --git a/ui/src/playlist/PlaylistList.jsx b/ui/src/playlist/PlaylistList.jsxindex 14d819a4e..e1695e980 100644--- a/ui/src/playlist/PlaylistList.jsx+++ b/ui/src/playlist/PlaylistList.jsx@@ -95,6 +95,7 @@ export const ToggleField = ({ resource, source }) => {return (<Switchchecked={record[source]}+ color="primary"onClick={handleClick}disabled={!isWritable(record.ownerId)}/>diff --git a/ui/src/playlist/PlaylistList.test.jsx b/ui/src/playlist/PlaylistList.test.jsxindex 6c714b827..c05833166 100644--- a/ui/src/playlist/PlaylistList.test.jsx+++ b/ui/src/playlist/PlaylistList.test.jsx@@ -2,6 +2,7 @@ import React from 'react'import { render, screen } from '@testing-library/react'import { describe, it, expect, vi } from 'vitest'import { TestContext } from 'ra-test'+import { RecordContextProvider } from 'react-admin'import { PlaylistLove, ToggleField, ToggleAutoImport } from './PlaylistList'vi.mock('../config', () => ({@@ -14,6 +15,7 @@ vi.mock('../common', () => ({{record?.starred ? 'starred' : 'not-starred'}</button>),+ isWritable: (ownerId) => ownerId === 'me',}))describe('<PlaylistLove />', () => {@@ -55,3 +57,28 @@ describe('playlist toggles without a record', () => {expect(container.innerHTML).toBe('')})})++// Secondary is a surface color in many themes, so these toggles must use primary+describe('<ToggleField />', () => {+ const renderToggle = (record) =>+ render(+ <TestContext>+ <RecordContextProvider value={record}>+ <ToggleField resource="playlist" source="public" />+ </RecordContextProvider>+ </TestContext>,+ )++ it.each([+ ['owner', 'me', false],+ ['non-owner', 'someone-else', true],+ ])('renders a primary-colored switch for the %s', (_, ownerId, disabled) => {+ renderToggle({ id: 'pl-1', public: true, ownerId })+ const input = screen.getByRole('checkbox')+ const switchBase = input.closest('.MuiSwitch-switchBase')+ expect(input.checked).toBe(true)+ expect(input.disabled).toBe(disabled)+ expect(switchBase.classList).toContain('MuiSwitch-colorPrimary')+ expect(switchBase.classList).not.toContain('MuiSwitch-colorSecondary')+ })+})diff --git a/ui/src/themes/dracula.js b/ui/src/themes/dracula.jsindex 2e4ae38e5..45559c3af 100644--- a/ui/src/themes/dracula.js+++ b/ui/src/themes/dracula.js@@ -185,16 +185,6 @@ export default {color: `${foreground} !important`,},},- MuiSwitch: {- colorSecondary: {- '&$checked': {- color: green,- },- '&$checked + $track': {- backgroundColor: green,- },- },- },NDAlbumGridView: {albumName: {marginTop: '0.5rem',diff --git a/ui/src/themes/gruvboxDark.js b/ui/src/themes/gruvboxDark.jsindex 0f4cbd7c4..3e2955dcd 100644--- a/ui/src/themes/gruvboxDark.js+++ b/ui/src/themes/gruvboxDark.js@@ -121,16 +121,6 @@ export default {boxShadow: '3px 3px 5px #3c3836',},},- MuiSwitch: {- colorSecondary: {- '&$checked': {- color: '#458588',- },- '&$checked + $track': {- backgroundColor: '#458588',- },- },- },NDMobileArtistDetails: {bgContainer: {background:diff --git a/ui/src/themes/tokyoNight.js b/ui/src/themes/tokyoNight.jsindex 07d372a6b..9f6424b77 100644--- a/ui/src/themes/tokyoNight.js+++ b/ui/src/themes/tokyoNight.js@@ -184,16 +184,6 @@ export default {color: `${foreground} !important`,},},- MuiSwitch: {- colorSecondary: {- '&$checked': {- color: blue,- },- '&$checked + $track': {- backgroundColor: blue,- },- },- },NDAlbumGridView: {albumName: {marginTop: '0.5rem',diff --git a/ui/src/themes/tokyoNightLight.js b/ui/src/themes/tokyoNightLight.jsindex f84cd0be9..a61c0fe87 100644--- a/ui/src/themes/tokyoNightLight.js+++ b/ui/src/themes/tokyoNightLight.js@@ -184,16 +184,6 @@ export default {color: `${foreground} !important`,},},- MuiSwitch: {- colorSecondary: {- '&$checked': {- color: blue,- },- '&$checked + $track': {- backgroundColor: blue,- },- },- },NDAlbumGridView: {albumName: {marginTop: '0.5rem',diff --git a/ui/src/themes/useCurrentTheme.js b/ui/src/themes/useCurrentTheme.jsindex 4ccefe820..fbb5e9bc8 100644--- a/ui/src/themes/useCurrentTheme.js+++ b/ui/src/themes/useCurrentTheme.js@@ -63,6 +63,8 @@ const useCurrentTheme = () => {...theme.props,MuiUseMediaQuery: { noSsr: true },MuiPopover: { disableScrollLock: true },+ // MUI defaults to secondary, which many themes use as a surface color+ MuiSwitch: { color: 'primary' },},}),[theme],diff --git a/ui/src/themes/useCurrentTheme.test.jsx b/ui/src/themes/useCurrentTheme.test.jsxindex 65c3be8c6..6553d9866 100644--- a/ui/src/themes/useCurrentTheme.test.jsx+++ b/ui/src/themes/useCurrentTheme.test.jsx@@ -3,6 +3,10 @@ import { Provider } from 'react-redux'import { createStore } from 'redux'import mediaQuery from 'css-mediaquery'import { renderHook } from '@testing-library/react-hooks'+import { render, screen } from '@testing-library/react'+import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles'+import Switch from '@material-ui/core/Switch'+import themes from './index'import useCurrentTheme from './useCurrentTheme'import { themeReducer } from '../reducers/themeReducer'import { AUTO_THEME_ID } from '../consts'@@ -161,4 +165,27 @@ describe('useCurrentTheme', () => {expect(document.body.style.backgroundColor).toBe('rgb(18, 18, 18)')})})+ describe('switch color', () => {+ it.each(Object.keys(themes))(+ 'renders switches with the primary color in %s',+ (theme) => {+ const { result } = renderHook(() => useCurrentTheme(), {+ wrapper: ({ children }) => (+ <Provider store={createStore(themeReducer, { theme })}>+ {children}+ </Provider>+ ),+ })+ render(+ <ThemeProvider theme={createMuiTheme(result.current)}>+ <Switch checked onChange={() => {}} />+ </ThemeProvider>,+ )+ const switchBase = screen+ .getByRole('checkbox')+ .closest('.MuiSwitch-switchBase')+ expect(switchBase.classList).toContain('MuiSwitch-colorPrimary')+ },+ )+ })})