From 13f1b7c75f9a0f5cf466246e440ca661d26892d6 Mon Sep 17 00:00:00 2001 From: Domino987 Date: Sat, 9 Jul 2022 17:33:23 +0200 Subject: [PATCH] fix: correct merging in store --- src/store/LocalizationStore.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/store/LocalizationStore.js b/src/store/LocalizationStore.js index d3e87cfd..f17865c6 100644 --- a/src/store/LocalizationStore.js +++ b/src/store/LocalizationStore.js @@ -16,7 +16,7 @@ const createStore = () => localization: defaultLocalization, mergeLocalization: (nextLocalization) => { set(({ localization }) => { - const mergedLocalization = deepmerge(nextLocalization, localization); + const mergedLocalization = deepmerge(localization, nextLocalization); mergedLocalization.body.editRow.dateTimePickerLocalization = mergedLocalization.dateTimePickerLocalization; mergedLocalization.body.filterRow.dateTimePickerLocalization = @@ -104,12 +104,11 @@ function useMergeProps(props) { } }, [props.icons]); React.useEffect(() => { - console.log('effect', props.components); if (props.components) { mergeComponents(props.components); } }, [props.components]); - console.log(components); + console.log(localization, props.localization); return { localization, options,