kylefang/react
1
0
Fork 0
mirror of https://github.com/zhigang1992/react.git synced 2026-02-02 09:08:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: export deep-merge function by default

Browse Source
This commit is contained in:
unix
2020-04-10 18:19:11 +08:00
parent 8558309a5f
commit e089e1c04b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/styles/theme-provider/theme-provider.tsx
View File

@@ -20,7 +20,7 @@ interface MergeObject {
const isObject = (target: any) => target && typeof target === 'object'
const deepMergeObject = <T extends MergeObject,>(source: T, target: T): T => {
export const deepMergeObject = <T extends MergeObject,>(source: T, target: T): T => {
if (!isObject(target) || !isObject(source)) return source
const sourceKeys = Object.keys(source) as Array<keyof T>
@@ -67,7 +67,7 @@ const ThemeProvider: React.FC<PropsWithChildren<Props>> = ({ children, theme })
const currentTheme = useTheme()
const merged = mergeTheme(currentTheme, customTheme)
const userTheme = currentTheme.type !== merged.type ? switchTheme(merged) : merged
return (
<ThemeContext.Provider value={userTheme}>{children}</ThemeContext.Provider>
)