From 6bc25f1099d0ab9912cb6f59e06ebfc9ae2d771c Mon Sep 17 00:00:00 2001
From: Jens Andersson <jens@fritan.com>
Date: Thu, 7 May 2020 10:58:20 +0200
Subject: [PATCH] Implement pending seek

---
 CHANGELOG.md         | 1 +
 ios/Video/RCTVideo.m | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f8a247d..8033d1c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix iOS bug which would break size of views when video is displayed with controls on a non full-screen React view. [#1931](https://github.com/react-native-community/react-native-video/pull/1931)
 - Fix video dimensions being undefined when playing HLS in ios. [#1992](https://github.com/react-native-community/react-native-video/pull/1992)
 - Add support for audio mix with other apps for iOS. [#1978](https://github.com/react-native-community/react-native-video/pull/1978)
+- Properly implement pending seek for iOS. [#1994](https://github.com/react-native-community/react-native-video/pull/1994)
 
 ### Version 5.1.0-alpha5
 
diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index a9b8e568..d20913d2 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -645,6 +645,11 @@ static int const RCTVideoUnset = -1;
           height = [NSNumber numberWithFloat:_playerItem.presentationSize.height];
           orientation = _playerItem.presentationSize.width > _playerItem.presentationSize.height ? @"landscape" : @"portrait";
         }
+
+        if (_pendingSeek) {
+          [self setCurrentTime:_pendingSeekTime];
+          _pendingSeek = false;
+        }
         
         if (self.onVideoLoad && _videoLoadStarted) {
           self.onVideoLoad(@{@"duration": [NSNumber numberWithFloat:duration],
@@ -962,7 +967,6 @@ static int const RCTVideoUnset = -1;
     }
     
   } else {
-    // TODO: See if this makes sense and if so, actually implement it
     _pendingSeek = true;
     _pendingSeekTime = [seekTime floatValue];
   }