From 4c2eb54ca36d87d702b566d26e1a4020471a231a Mon Sep 17 00:00:00 2001
From: Marko Savic <savicmarko1985@gmail.com>
Date: Wed, 5 Jun 2019 12:53:05 -0400
Subject: [PATCH] Video block has black background when upload is in progress
 or upload has failed (#15991)

* Fixed issue with a black background when the upload is in progress or upload has failed
---
 .../block-library/src/video/edit.native.js     | 18 ++++++++++--------
 .../block-library/src/video/style.ios.scss     |  8 --------
 .../block-library/src/video/style.native.scss  |  5 +++++
 3 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 packages/block-library/src/video/style.ios.scss

diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js
index 17b6c416f016d..c37302902e1f0 100644
--- a/packages/block-library/src/video/edit.native.js
+++ b/packages/block-library/src/video/edit.native.js
@@ -212,16 +212,18 @@ class VideoEdit extends React.Component {
 							return (
 								<View onLayout={ this.onVideoContanerLayout } style={ containerStyle }>
 									{ showVideo && isURL( src ) &&
-										<Video
-											isSelected={ isSelected }
-											style={ videoStyle }
-											source={ { uri: src } }
-											paused={ true }
-											muted={ true }
-										/>
+										<View style={ style.videoContainer }>
+											<Video
+												isSelected={ isSelected }
+												style={ videoStyle }
+												source={ { uri: src } }
+												paused={ true }
+												muted={ true }
+											/>
+										</View>
 									}
 									{ ! showVideo &&
-										<View style={ { ...videoStyle, ...style.placeholder } }>
+										<View style={ { height: videoContainerHeight, width: '100%', ...style.placeholder } }>
 											{ videoContainerHeight > 0 && iconContainer }
 											{ isUploadFailed && <Text style={ style.uploadFailedText }>{ retryMessage }</Text> }
 										</View>
diff --git a/packages/block-library/src/video/style.ios.scss b/packages/block-library/src/video/style.ios.scss
deleted file mode 100644
index d13a8ad180129..0000000000000
--- a/packages/block-library/src/video/style.ios.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-// @format
-
-@import "./style.native.scss";
-
-.video {
-	background-color: #000;
-}
-
diff --git a/packages/block-library/src/video/style.native.scss b/packages/block-library/src/video/style.native.scss
index 9825ae09babe8..85e82cc59b367 100644
--- a/packages/block-library/src/video/style.native.scss
+++ b/packages/block-library/src/video/style.native.scss
@@ -4,6 +4,11 @@
 	width: 100%;
 }
 
+.videoContainer {
+	flex: 1;
+	background-color: #000;
+}
+
 .placeholder {
 	flex: 1;
 	justify-content: center;