Merge pull request #1303 from nfb-onf/master

restored autorotate to fullscreen options

README.md

@@ -260,6 +260,7 @@ var styles = StyleSheet.create({
 * [bufferConfig](#bufferconfig)
 * [controls](#controls)
 * [fullscreen](#fullscreen)
+* [fullscreenAutorotate](#fullscreenautorotate)
 * [fullscreenOrientation](#fullscreenorientation)
 * [headers](#headers)
 * [id](#id)
@@ -358,6 +359,11 @@ Controls whether the player enters fullscreen on play.
 
 Platforms: iOS
 
+#### fullscreenAutorotate
+If a preferred [fullscreenOrientation](#fullscreenorientation) is set, causes the video to rotate to that orientation but permits rotation of the screen to orientation held by user. Defaults to TRUE.
+
+Platforms: iOS
+
 #### fullscreenOrientation
 
 * **all (default)** - 

Video.js

@@ -354,6 +354,7 @@ Video.propTypes = {
   controls: PropTypes.bool,
   audioOnly: PropTypes.bool,
   currentTime: PropTypes.number,
+  fullscreenAutorotate: PropTypes.bool,
   fullscreenOrientation: PropTypes.oneOf(['all','landscape','portrait']),
   progressUpdateInterval: PropTypes.number,
   useTextureView: PropTypes.bool,

ios/Video/RCTVideo.m

@@ -64,6 +64,7 @@ @implementation RCTVideo
   NSString * _ignoreSilentSwitch;
   NSString * _resizeMode;
   BOOL _fullscreen;
+  BOOL _fullscreenAutorotate;
   NSString * _fullscreenOrientation;
   BOOL _fullscreenPlayerPresented;
   UIViewController * _presentingViewController;
@@ -83,6 +84,7 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
     _rate = 1.0;
     _volume = 1.0;
     _resizeMode = @"AVLayerVideoGravityResizeAspectFill";
+    _fullscreenAutorotate = YES;
     _fullscreenOrientation = @"all";
     _pendingSeek = false;
     _pendingSeekTime = 0.0f;
@@ -1136,6 +1138,7 @@ - (void)setFullscreen:(BOOL) fullscreen {
       [viewController presentViewController:_playerViewController animated:true completion:^{
         _playerViewController.showsPlaybackControls = YES;
         _fullscreenPlayerPresented = fullscreen;
+        _playerViewController.autorotate = _fullscreenAutorotate;
         if(self.onVideoFullscreenPlayerDidPresent) {
           self.onVideoFullscreenPlayerDidPresent(@{@"target": self.reactTag});
         }
@@ -1151,6 +1154,13 @@ - (void)setFullscreen:(BOOL) fullscreen {
   }
 }
 
+- (void)setFullscreenAutorotate:(BOOL)autorotate {
+  _fullscreenAutorotate = autorotate;
+  if (_fullscreenPlayerPresented) {
+    _playerViewController.autorotate = autorotate;
+  }
+}
+
 - (void)setFullscreenOrientation:(NSString *)orientation {
   _fullscreenOrientation = orientation;
   if (_fullscreenPlayerPresented) {

ios/Video/RCTVideoManager.m

@@ -37,6 +37,7 @@ - (dispatch_queue_t)methodQueue
 RCT_EXPORT_VIEW_PROPERTY(seek, NSDictionary);
 RCT_EXPORT_VIEW_PROPERTY(currentTime, float);
 RCT_EXPORT_VIEW_PROPERTY(fullscreen, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(fullscreenAutorotate, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(fullscreenOrientation, NSString);
 RCT_EXPORT_VIEW_PROPERTY(progressUpdateInterval, float);
 /* Should support: onLoadStart, onLoad, and onError to stay consistent with Image */

ios/Video/RCTVideoPlayerViewController.h

@@ -15,5 +15,6 @@
 
 // Optional paramters
 @property (nonatomic, weak) NSString* preferredOrientation;
+@property (nonatomic) BOOL autorotate;
 
 @end

ios/Video/RCTVideoPlayerViewController.m

@@ -7,7 +7,8 @@ @interface RCTVideoPlayerViewController ()
 @implementation RCTVideoPlayerViewController
 
 - (BOOL)shouldAutorotate {
-  if (self.preferredOrientation.lowercaseString == nil || [self.preferredOrientation.lowercaseString isEqualToString:@"all"])
+
+  if (self.autorotate || self.preferredOrientation.lowercaseString == nil || [self.preferredOrientation.lowercaseString isEqualToString:@"all"])
     return YES;
 
   return NO;