Skip to content

Remove warning caused due to usage of componentWillRecieveProps #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove warning caused due to usage of componentWillRecieveProps #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions src/components/themr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>

constructor(...args) {
super(...args)
this.theme_ = this.calcTheme(this.props)
this.theme_ = this.calcTheme()
}

getWrappedInstance() {
Expand All @@ -89,8 +89,8 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
return this.refs.wrappedInstance
}

getNamespacedTheme(props) {
const { themeNamespace, theme } = props
getNamespacedTheme() {
const { themeNamespace, theme } = this.props
if (!themeNamespace) return theme
if (themeNamespace && !theme) throw new Error('Invalid themeNamespace use in react-css-themr. ' +
'themeNamespace prop should be used only with theme prop.')
Expand All @@ -100,8 +100,9 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
.reduce((result, key) => ({ ...result, [removeNamespace(key, themeNamespace)]: theme[key] }), {})
}

getThemeNotComposed(props) {
if (props.theme) return this.getNamespacedTheme(props)
getThemeNotComposed() {
const { theme } = this.props
if (theme) return this.getNamespacedTheme()
if (config.localTheme) return config.localTheme
return this.getContextTheme()
}
Expand All @@ -112,34 +113,38 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
: {}
}

getTheme(props) {
return props.composeTheme === COMPOSE_SOFTLY
getTheme() {
const { composeTheme } = this.props
return composeTheme === COMPOSE_SOFTLY
? {
...this.getContextTheme(),
...config.localTheme,
...this.getNamespacedTheme(props)
...this.getNamespacedTheme()
}
: themeable(
themeable(this.getContextTheme(), config.localTheme),
this.getNamespacedTheme(props)
this.getNamespacedTheme()
)
}

calcTheme(props) {
const { composeTheme } = props
calcTheme() {
const { composeTheme } = this.props
return composeTheme
? this.getTheme(props)
: this.getThemeNotComposed(props)
? this.getTheme()
: this.getThemeNotComposed()
}

componentWillReceiveProps(nextProps) {
shouldComponentUpdate(prevProps) {
const { composeTheme, theme, themeNamespace } = this.props
if (
nextProps.composeTheme !== this.props.composeTheme ||
nextProps.theme !== this.props.theme ||
nextProps.themeNamespace !== this.props.themeNamespace
composeTheme !== prevProps.composeTheme ||
theme !== prevProps.theme ||
themeNamespace !== prevProps.themeNamespace
) {
this.theme_ = this.calcTheme(nextProps)
this.theme_ = this.calcTheme()
return true
}
return false
}

render() {
Expand Down