Clean up shouldComponentUpdate logic

* All players now need to update when url changes
albanqoku · Dec 24, 2015 · 3039df9 · 3039df9
1 parent 4ef3d47
commit 3039df9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/src/players/Base.js b/src/players/Base.js
@@ -32,6 +32,9 @@ export default class Base extends Component {
       this.setVolume(nextProps.volume)
     }
   }
+  shouldComponentUpdate (nextProps) {
+    return this.props.url !== nextProps.url
+  }
   update = () => {
     let progress = {}
     const loaded = this.getFractionLoaded()

diff --git a/src/players/FilePlayer.js b/src/players/FilePlayer.js
@@ -21,9 +21,6 @@ export default class FilePlayer extends Base {
     this.player.onerror = this.props.onError
     super.componentDidMount()
   }
-  shouldComponentUpdate (nextProps) {
-    return this.props.url !== nextProps
-  }
   play (url) {
     this.player.play()
   }

diff --git a/src/players/SoundCloud.js b/src/players/SoundCloud.js
@@ -19,7 +19,10 @@ export default class SoundCloud extends Base {
     image: null
   }
   shouldComponentUpdate (nextProps, nextState) {
-    return this.state.image !== nextState.image
+    return (
+      super.shouldComponentUpdate(nextProps, nextState) ||
+      this.state.image !== nextState.image
+    )
   }
   getSDK () {
     if (window[SDK_GLOBAL]) {

diff --git a/src/players/Vimeo.js b/src/players/Vimeo.js
@@ -27,9 +27,6 @@ export default class Vimeo extends Base {
     this.iframe = this.refs.iframe
     super.componentDidMount()
   }
-  shouldComponentUpdate () {
-    return false
-  }
   play (url) {
     if (url) {
       const id = url.match(MATCH_URL)[3]

diff --git a/src/players/YouTube.js b/src/players/YouTube.js
@@ -20,9 +20,6 @@ export default class YouTube extends Base {
   static canPlay (url) {
     return MATCH_URL.test(url)
   }
-  shouldComponentUpdate () {
-    return false
-  }
   getSDK () {
     if (window[SDK_GLOBAL]) {
       return Promise.resolve(window[SDK_GLOBAL])