Fixed nested themes not being republished on outer theme changes

emotion-js · Dec 21, 2017 · 369ad6f · 369ad6f
1 parent 47ec911
commit 369ad6f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/emotion-theming/src/theme-provider.js b/packages/emotion-theming/src/theme-provider.js
@@ -20,6 +20,7 @@ class ThemeProvider extends Component {
     if (this.context[channel] !== undefined) {
       this.unsubscribeToOuterId = this.context[channel].subscribe(theme => {
         this.outerTheme = theme
+        this.publish(this.props.theme)
       })
     }
     this.broadcast = createBroadcast(this.getTheme(this.props.theme))
@@ -36,7 +37,7 @@ class ThemeProvider extends Component {
 
   componentWillReceiveProps(nextProps) {
     if (this.props.theme !== nextProps.theme) {
-      this.broadcast.publish(this.getTheme(nextProps.theme))
+      this.publish(nextProps.theme)
     }
   }
 
@@ -71,6 +72,10 @@ class ThemeProvider extends Component {
     return { ...this.outerTheme, ...theme }
   }
 
+  publish(theme) {
+    this.broadcast.publish(this.getTheme(theme))
+  }
+
   render() {
     if (!this.props.children) {
       return null