kylefang/styled-components
1
0
Fork 0
mirror of https://github.com/zhigang1992/styled-components.git synced 2026-06-19 01:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

revise & simplify theme determination

Browse Source
This commit is contained in:
Evan Jacobs
2019-06-24 20:14:12 -05:00
parent 9497763511
commit 1fbd24855f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/styled-components/src/utils/determineTheme.js
View File

@@ -5,11 +5,6 @@ type Props = {
theme?: any,
};
export default (props: Props, fallbackTheme: any, defaultProps: any = EMPTY_OBJECT) => {
// Props should take precedence over ThemeProvider, which should take precedence over
// defaultProps, but React automatically puts defaultProps on props.
const isDefaultTheme = defaultProps ? props.theme === defaultProps.theme : false;
const theme = props.theme && !isDefaultTheme ? props.theme : fallbackTheme || defaultProps.theme;
return theme;
export default (props: Props, providedTheme: any, defaultProps: any = EMPTY_OBJECT) => {
return (props.theme !== defaultProps.theme && props.theme) || providedTheme || defaultProps.theme;
};