Skip to content

Commit d785f6b

Browse files
authored
fix local settings overrides (code4recovery#484)
1 parent 2aff162 commit d785f6b

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/helpers/validate-input.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { defaults } from '../hooks/settings';
22
import { formatSearch } from './format-search';
33

44
export const validateInput = (
5-
params: URLSearchParams
5+
params: URLSearchParams,
6+
settings: TSMLReactConfig
67
): TSMLReactConfig['defaults'] => {
7-
const { defaults: defaultInput } = defaults;
8+
const { defaults: defaultInput } = settings;
89

910
const modeParam = params.get('mode');
1011
const mode = isMode(modeParam) ? modeParam : defaultInput.mode;

src/hooks/input.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { useSearchParams } from 'react-router-dom';
99

1010
import { validateInput } from '../helpers';
11-
import { defaults } from './settings';
11+
import { defaults, useSettings } from './settings';
1212

1313
const InputContext = createContext<{
1414
input: TSMLReactConfig['defaults'];
@@ -17,19 +17,19 @@ const InputContext = createContext<{
1717
export const InputProvider = ({ children }: PropsWithChildren) => {
1818
const [searchParams] = useSearchParams();
1919

20+
const { settings } = useSettings();
21+
2022
const [input, setInput] = useState<TSMLReactConfig['defaults']>(
21-
validateInput(searchParams)
23+
validateInput(searchParams, settings)
2224
);
2325

2426
// detect input from URL search params
2527
useEffect(() => {
26-
setInput(validateInput(searchParams));
28+
setInput(validateInput(searchParams, settings));
2729
}, [searchParams]);
2830

2931
return (
30-
<InputContext.Provider value={{ input }}>
31-
{children}
32-
</InputContext.Provider>
32+
<InputContext.Provider value={{ input }}>{children}</InputContext.Provider>
3333
);
3434
};
3535

0 commit comments

Comments
 (0)