mirror of
https://github.com/navidrome/navidrome.git
synced 2026-11-19 15:23:36 +00:00
fix(ui): remember the player play mode across reloads (#6433)
* fix(ui): remember the player play mode across reloads - #6361 The play mode was kept only in memory, so a page reload always reset it to "In order". It is now saved to localStorage with the rest of the player state, and clearing the queue (closing the player) keeps it too. * test(ui): wait for the throttled save before reloading the store
This commit is contained in:
parent
f5b6805b31
commit
93e01f390e
@ -98,7 +98,11 @@ const mapToAudioLists = (item) => {
|
||||
}
|
||||
}
|
||||
|
||||
const reduceClearQueue = () => ({ ...initialState, clear: true })
|
||||
const reduceClearQueue = (state) => ({
|
||||
...initialState,
|
||||
mode: state.mode,
|
||||
clear: true,
|
||||
})
|
||||
|
||||
const reducePlayTracks = (state, { data, id }) => {
|
||||
let playIndex = 0
|
||||
@ -212,7 +216,7 @@ export const playerReducer = (previousState = initialState, payload) => {
|
||||
const { type } = payload
|
||||
switch (type) {
|
||||
case PLAYER_CLEAR_QUEUE:
|
||||
return reduceClearQueue()
|
||||
return reduceClearQueue(previousState)
|
||||
case PLAYER_PLAY_TRACKS:
|
||||
return reducePlayTracks(previousState, payload)
|
||||
case PLAYER_SET_TRACK:
|
||||
|
||||
@ -4,6 +4,8 @@ import {
|
||||
PLAYER_SYNC_QUEUE,
|
||||
PLAYER_CURRENT,
|
||||
PLAYER_REFRESH_QUEUE,
|
||||
clearQueue,
|
||||
setPlayMode,
|
||||
} from '../actions'
|
||||
|
||||
describe('playerReducer', () => {
|
||||
@ -96,6 +98,17 @@ describe('playerReducer', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('play mode', () => {
|
||||
it('is kept when the queue is cleared', () => {
|
||||
const state = playerReducer(undefined, setPlayMode('singleLoop'))
|
||||
|
||||
const result = playerReducer(state, clearQueue())
|
||||
|
||||
expect(result.mode).toBe('singleLoop')
|
||||
expect(result.queue).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe('play new album after closing player (issue #5440)', () => {
|
||||
it('SYNC_QUEUE preserves pending playIndex=0 after clearQueue', () => {
|
||||
// Scenario: user plays album A, advances to track 3, closes player,
|
||||
|
||||
@ -58,10 +58,11 @@ const createAdminStore = ({
|
||||
saveState({
|
||||
theme: state.theme,
|
||||
library: state.library,
|
||||
player: (({ queue, volume, savedPlayIndex }) => ({
|
||||
player: (({ queue, volume, savedPlayIndex, mode }) => ({
|
||||
queue,
|
||||
volume,
|
||||
savedPlayIndex,
|
||||
mode,
|
||||
}))(state.player),
|
||||
albumView: state.albumView,
|
||||
settings: state.settings,
|
||||
|
||||
27
ui/src/store/createAdminStore.test.js
Normal file
27
ui/src/store/createAdminStore.test.js
Normal file
@ -0,0 +1,27 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { createMemoryHistory } from 'history'
|
||||
import createAdminStore from './createAdminStore'
|
||||
import { loadState } from './persistState'
|
||||
import { playerReducer } from '../reducers'
|
||||
import { setPlayMode } from '../actions'
|
||||
|
||||
const newStore = () =>
|
||||
createAdminStore({
|
||||
authProvider: {},
|
||||
dataProvider: {},
|
||||
history: createMemoryHistory(),
|
||||
customReducers: { player: playerReducer },
|
||||
})
|
||||
|
||||
describe('createAdminStore', () => {
|
||||
beforeEach(() => {
|
||||
localStorage.clear()
|
||||
})
|
||||
|
||||
it('restores the player play mode after a reload', async () => {
|
||||
newStore().dispatch(setPlayMode('orderLoop'))
|
||||
await vi.waitFor(() => expect(loadState()?.player?.mode).toBe('orderLoop'))
|
||||
|
||||
expect(newStore().getState().player.mode).toBe('orderLoop')
|
||||
})
|
||||
})
|
||||
Loading…
x
Reference in New Issue
Block a user