Skip to content

Don't overwrite config.theme.components entirely #4116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marlo-longley merged 1 commit into from
Feb 27, 2025
Merged

Don't overwrite config.theme.components entirely #4116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion __tests__/src/reducers/config.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { configReducer } from '../../../src/state/reducers/config';
import ActionTypes from '../../../src/state/actions/action-types';
import configFixture from '../../fixtures/config/export.example.json';
import settings from '../../../src/config/settings';

describe('config reducer', () => {
describe('SET_CONFIG', () => {
Expand Down Expand Up @@ -55,6 +56,14 @@ describe('config reducer', () => {
expect(configReducer({}, {
state: { config: { new: 'stuff' } },
type: ActionTypes.IMPORT_MIRADOR_STATE,
})).toEqual({ new: 'stuff' });
})).toMatchObject({ new: 'stuff' });
});
it('handles pre-existing functions in IMPORT_MIRADOR_STATE by deep merging those stems', () => {
const actual = configReducer(settings, {
state: { config: { new: 'stuff', theme: { palette: { mode: 'dark' } } } },
type: ActionTypes.IMPORT_MIRADOR_STATE,
});

expect(actual).toMatchObject({ theme: { ...settings.theme, palette: { ...settings.theme.palette, mode: 'dark' } } });
});
});
8 changes: 7 additions & 1 deletion src/state/reducers/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ export const configReducer = (state = initialState, action) => {
case ActionTypes.SET_CONFIG:
return action.config;
case ActionTypes.IMPORT_MIRADOR_STATE:
return action.state.config || {};
return {
...(action.state.config || {}),
export: deepmerge(state.export || {}, action.state.config?.export || {}, { arrayMerge: overwriteMerge }),
requests: deepmerge(state.requests || {}, action.state.config?.requests || {}, { arrayMerge: overwriteMerge }),
theme: deepmerge(state.theme || {}, action.state.config?.theme || {}, { arrayMerge: overwriteMerge }),
themes: deepmerge(state.themes || {}, action.state.config?.themes || {}, { arrayMerge: overwriteMerge }),
};
default:
return state;
}
Expand Down