make sure all decorators pass props through

souporserious · Apr 20, 2016 · e1f9be5 · e1f9be5
1 parent f445dbf
commit e1f9be5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/decorators/with-keyboard-controls.jsx b/src/decorators/with-keyboard-controls.jsx
@@ -1,4 +1,4 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component } from 'react'
 import withMediaProps from './with-media-props'
 
 const MEDIA_KEYS = [0, 'f', 'j', 'k','l', ',', '.', ' ', 'Home', 'End', 'ArrowLeft', 'ArrowTop', 'ArrowRight', 'ArrowDown']
@@ -90,10 +90,12 @@ export default function withKeyboardControls(MediaPlayer) {
     }
 
     render() {
-      return createElement(MediaPlayer, {
-        ...this.props,
-        keyboardControls: this._handlekeyboardControls
-      })
+      return (
+        <MediaPlayer
+          {...this.props}
+          keyboardControls={this._handlekeyboardControls}
+        />
+      )
     }
   })
 }
diff --git a/src/decorators/with-media-player.jsx b/src/decorators/with-media-player.jsx
@@ -17,7 +17,7 @@ export default function withMediaPlayer(MediaPlayer, vendor) {
       return (
         <Media vendor={vendor} src={src}>
           { Player =>
-            <MediaPlayer Player={Player} vendor={vendor} src={src}/>
+            <MediaPlayer {...this.props} Player={Player}/>
           }
         </Media>
       )

diff --git a/src/decorators/with-media-props.jsx b/src/decorators/with-media-props.jsx
@@ -7,7 +7,7 @@ export default function withMediaProps(MediaComponent) {
 
     render() {
       return (
-        <MediaComponent media={{...this.context}} {...this.props}/>
+        <MediaComponent {...this.props} media={{...this.context}}/>
       )
     }
   }