🐛 Color theme not working when opening customize page from board page

This commit is contained in:
Meier Lukas
2023-08-06 17:06:00 +02:00
parent f1e8beb659
commit 6efa12b5f0
2 changed files with 12 additions and 14 deletions

View File

@@ -33,23 +33,9 @@ export const ConfigProvider = ({
); );
const [configVersion, setConfigVersion] = useState(0); const [configVersion, setConfigVersion] = useState(0);
const { configs } = useConfigStore((s) => ({ configs: s.configs }), shallow); const { configs } = useConfigStore((s) => ({ configs: s.configs }), shallow);
const { setPrimaryColor, setSecondaryColor, setPrimaryShade } = useColorTheme();
const currentConfig = configs.find((c) => c.value.configProperties.name === configName)?.value; const currentConfig = configs.find((c) => c.value.configProperties.name === configName)?.value;
useEffect(() => {
const config = currentConfig ?? fallbackConfig;
if (!config) return;
setPrimaryColor(config?.settings.customization.colors.primary ?? 'red');
setSecondaryColor(config?.settings.customization.colors.secondary ?? 'orange');
setPrimaryShade(config?.settings.customization.colors.shade ?? 6);
return () => {
setPrimaryColor('red');
setSecondaryColor('orange');
setPrimaryShade(6);
};
}, [currentConfig]);
return ( return (
<ConfigContext.Provider <ConfigContext.Provider
value={{ value={{

View File

@@ -66,6 +66,18 @@ function App(
setPrimaryShade, setPrimaryShade,
}; };
useEffect(() => {
console.log('running page props stuff');
setPrimaryColor(props.pageProps.primaryColor ?? 'red');
setSecondaryColor(props.pageProps.secondaryColor ?? 'orange');
setPrimaryShade(props.pageProps.primaryShade ?? 6);
return () => {
setPrimaryColor('red');
setSecondaryColor('orange');
setPrimaryShade(6);
};
}, [props.pageProps]);
const { setInitialPackageAttributes } = usePackageAttributesStore(); const { setInitialPackageAttributes } = usePackageAttributesStore();
useEffect(() => { useEffect(() => {