Skip to content
This repository has been archived by the owner on Mar 4, 2020. It is now read-only.

fix(emptyTheme): avoid theme object mutation #1846

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions packages/react/src/lib/createEmptyTheme.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ThemePrepared } from '../themes/types'

const createEmptyTheme = (): ThemePrepared => ({
siteVariables: {
fontSizes: {},
},
componentVariables: {},
componentStyles: {},
fontFaces: [],
staticStyles: [],
icons: {},
animations: {},
})

export default createEmptyTheme
41 changes: 13 additions & 28 deletions packages/react/src/lib/mergeThemes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,10 @@ import {
ThemeAnimation,
} from '../themes/types'
import callable from './callable'
import createEmptyTheme from './createEmptyTheme'
import toCompactArray from './toCompactArray'
import { ObjectOf } from '../types'

export const emptyTheme: ThemePrepared = {
siteVariables: {
fontSizes: {},
},
componentVariables: {},
componentStyles: {},
fontFaces: [],
staticStyles: [],
icons: {},
animations: {},
}

// ----------------------------------------
// Component level merge functions
// ----------------------------------------
Expand Down Expand Up @@ -189,30 +178,26 @@ export const mergeStyles = (...sources: ComponentSlotStyle[]) => {
}

const mergeThemes = (...themes: ThemeInput[]): ThemePrepared => {
return themes.reduce<ThemePrepared>(
(acc: ThemePrepared, next: ThemeInput) => {
if (!next) return acc
return themes.reduce<ThemePrepared>((acc: ThemePrepared, next: ThemeInput) => {
if (!next) return acc

acc.siteVariables = mergeSiteVariables(acc.siteVariables, next.siteVariables)
acc.siteVariables = mergeSiteVariables(acc.siteVariables, next.siteVariables)

acc.componentVariables = mergeThemeVariables(acc.componentVariables, next.componentVariables)
acc.componentVariables = mergeThemeVariables(acc.componentVariables, next.componentVariables)

acc.componentStyles = mergeThemeStyles(acc.componentStyles, next.componentStyles)
acc.componentStyles = mergeThemeStyles(acc.componentStyles, next.componentStyles)

// Merge icons set, last one wins in case of collisions
acc.icons = mergeIcons(acc.icons, next.icons)
// Merge icons set, last one wins in case of collisions
acc.icons = mergeIcons(acc.icons, next.icons)

acc.fontFaces = mergeFontFaces(...acc.fontFaces, ...(next.fontFaces || []))
acc.fontFaces = mergeFontFaces(...acc.fontFaces, ...(next.fontFaces || []))

acc.staticStyles = mergeStaticStyles(...acc.staticStyles, ...(next.staticStyles || []))
acc.staticStyles = mergeStaticStyles(...acc.staticStyles, ...(next.staticStyles || []))

acc.animations = mergeAnimations(acc.animations, next.animations)
acc.animations = mergeAnimations(acc.animations, next.animations)

return acc
},
// .reduce() will modify "emptyTheme" object, so we should clone it before actual usage
{ ...emptyTheme },
)
return acc
}, createEmptyTheme())
}

export default mergeThemes
5 changes: 3 additions & 2 deletions packages/react/src/lib/renderComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import {
} from './accessibility/types'
import { ReactAccessibilityBehavior, AccessibilityActionHandlers } from './accessibility/reactTypes'
import getKeyDownHandlers from './getKeyDownHandlers'
import { emptyTheme, mergeComponentStyles, mergeComponentVariables } from './mergeThemes'
import createEmptyTheme from './createEmptyTheme'
import { mergeComponentStyles, mergeComponentVariables } from './mergeThemes'
import { FocusZoneProps, FocusZone } from './accessibility/FocusZone'
import { FOCUSZONE_WRAP_ATTRIBUTE } from './accessibility/FocusZone/focusUtilities'
import createAnimationStyles from './createAnimationStyles'
Expand Down Expand Up @@ -160,7 +161,7 @@ const renderComponent = <P extends {}>(
logProviderMissingWarning()
}

const { disableAnimations = false, renderer = null, rtl = false, theme = emptyTheme } =
const { disableAnimations = false, renderer = null, rtl = false, theme = createEmptyTheme() } =
context || {}

const ElementType = getElementType({ defaultProps }, props) as React.ReactType<P>
Expand Down