Fix preload display logic

Introduced by #609 Fixes #675
cookpete · Aug 10, 2019 · 57d586a · 57d586a
1 parent 59586ca
commit 57d586a
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 10 deletions.
diff --git a/src/players/DailyMotion.js b/src/players/DailyMotion.js
@@ -90,10 +90,12 @@ export class DailyMotion extends Component {
     this.container = container
   }
   render () {
+    const { display } = this.props
     const style = {
       width: '100%',
       height: '100%',
-      backgroundColor: 'black'
+      backgroundColor: 'black',
+      display
     }
     return (
       <div style={style}>

diff --git a/src/players/SoundCloud.js b/src/players/SoundCloud.js
@@ -78,9 +78,11 @@ export class SoundCloud extends Component {
     this.iframe = iframe
   }
   render () {
+    const { display } = this.props
     const style = {
       width: '100%',
-      height: '100%'
+      height: '100%',
+      display
     }
     return (
       <iframe

diff --git a/src/players/Vimeo.js b/src/players/Vimeo.js
@@ -109,11 +109,13 @@ export class Vimeo extends Component {
     this.container = container
   }
   render () {
+    const { display } = this.props
     const style = {
       width: '100%',
       height: '100%',
       overflow: 'hidden',
-      backgroundColor: 'black'
+      backgroundColor: 'black',
+      display
     }
     return (
       <div

diff --git a/src/players/YouTube.js b/src/players/YouTube.js
@@ -134,9 +134,11 @@ export class YouTube extends Component {
     this.container = container
   }
   render () {
+    const { display } = this.props
     const style = {
       width: '100%',
-      height: '100%'
+      height: '100%',
+      display
     }
     return (
       <div style={style}>

diff --git a/src/preload.js b/src/preload.js
@@ -42,7 +42,7 @@ export default function renderPreloadPlayers (url, controls, config) {
           controls={controls}
           playing
           muted
-          style={{ display: 'none' }}
+          display='none'
         />
       )
     }

diff --git a/test/ReactPlayer/render.js b/test/ReactPlayer/render.js
@@ -41,7 +41,7 @@ test('preload players', t => {
   const props = {
     playing: true,
     muted: true,
-    style: { display: 'none' }
+    display: 'none'
   }
   t.true(wrapper.children().length === 4)
   t.true(wrapper.childAt(0).matchesElement(<Player key='DailyMotion' activePlayer={DailyMotion} {...props} />))

diff --git a/test/players/DailyMotion.js b/test/players/DailyMotion.js
@@ -106,7 +106,8 @@ test('render()', t => {
   const style = {
     width: '100%',
     height: '100%',
-    backgroundColor: 'black'
+    backgroundColor: 'black',
+    display: undefined
   }
   const wrapper = shallow(<DailyMotion config={TEST_CONFIG} />)
   t.true(wrapper.contains(

diff --git a/test/players/SoundCloud.js b/test/players/SoundCloud.js
@@ -79,7 +79,8 @@ test('getSecondsLoaded()', t => {
 test('render()', t => {
   const style = {
     width: '100%',
-    height: '100%'
+    height: '100%',
+    display: undefined
   }
   const wrapper = shallow(<SoundCloud url={TEST_URL} />)
   t.true(wrapper.contains(

diff --git a/test/players/Vimeo.js b/test/players/Vimeo.js
@@ -66,7 +66,8 @@ test('render()', t => {
     width: '100%',
     height: '100%',
     overflow: 'hidden',
-    backgroundColor: 'black'
+    backgroundColor: 'black',
+    display: undefined
   }
   t.true(wrapper.contains(
     <div key={TEST_URL} style={style} />

diff --git a/test/players/YouTube.js b/test/players/YouTube.js
@@ -118,7 +118,7 @@ test('onStateChange() - ready', async t => {
 
 test('render()', t => {
   const wrapper = shallow(<YouTube url={TEST_URL} />)
-  const style = { width: '100%', height: '100%' }
+  const style = { width: '100%', height: '100%', display: undefined }
   t.true(wrapper.contains(
     <div style={style}>
       <div />
-Original file line number
+Diff line change
@@ Expand Up @@
               controls={controls}
               playing
               muted
-              style={{ display: 'none' }}
+              display='none'
             />
           )
         }
@@ Expand Down @@