iOS: Update layout on device rotation (#32)

* iOS: Support rotation on new arch

* iOS: Support rotation on old arch

* revert package.json changes

* Refactor class initializers

Author: paufau

ios/Fabric/RNTModalViewComponentView.h

@@ -19,6 +19,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface RNTModalViewComponentView () <RNTModalViewControllerDelegate>
+
+@end
+
 NS_ASSUME_NONNULL_END
 
 #endif /* RNTModalViewComponentView_h */

ios/Fabric/RNTModalViewComponentView.mm

@@ -7,6 +7,7 @@
 #import <react/renderer/components/multiplemodals/RCTComponentViewHelpers.h>
 #import <react/renderer/components/multiplemodals/RNTModalViewComponentDescriptor.h>
 #import <react/renderer/components/multiplemodals/RNTModalViewShadowNode.h>
+#import <react/renderer/components/multiplemodals/RNTModalViewState.h>
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -42,7 +43,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         _props = defaultProps;
 
         _touchHandler = [RCTSurfaceTouchHandler new];
-        _modalViewController = [[RNTModalViewController alloc] init];
+        _modalViewController = [[RNTModalViewController alloc] initWithDelegate:self];
         _mountingHelper = [[RNTModalMountingHelper alloc] initWithViewController:_modalViewController];
     }
 
@@ -83,6 +84,16 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
     [super updateProps:props oldProps:oldProps];
 }
 
+#pragma mark - RNTModalViewControllerDelegate
+
+- (void)boundsDidChange:(CGRect)newBounds
+{
+    if (_state != nullptr) {
+        auto newState = RNTModalViewState{RCTSizeFromCGSize(newBounds.size)};
+        _state->updateState(std::move(newState));
+    }
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider

ios/Library/RNTModalViewController/RNTModalViewController.h

@@ -4,6 +4,10 @@
 #import <UIKit/UIKit.h>
 #import "ModalAnimation.h"
 
+@protocol RNTModalViewControllerDelegate <NSObject>
+- (void)boundsDidChange:(CGRect)newBounds;
+@end
+
 @protocol RNTModalViewControllerProtocol <NSObject>
 - (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView;
 - (void)dismiss;
@@ -13,9 +17,19 @@
 @end
 
 @interface RNTModalViewController : UIViewController <RNTModalViewControllerProtocol>
+- (instancetype)init NS_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
+
+- (instancetype)initWithDelegate:(id<RNTModalViewControllerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
+
+@property(nonatomic, weak) id<RNTModalViewControllerDelegate> delegate;
 @property(nonatomic, strong) UIView *reactSubviewContainer;
 @property(nonatomic, strong) ModalAnimation *inAnimation;
 @property(nonatomic, strong) ModalAnimation *outAnimation;
+@property(nonatomic, assign) CGRect lastBounds;
+@property(nonatomic, assign) BOOL shouldTrackRotationChange;
+
 @end
 
 #endif /* RNTModalViewController_h */

ios/Library/RNTModalViewController/RNTModalViewController.m

@@ -9,20 +9,16 @@
 
 @implementation RNTModalViewController
 
-- (instancetype)init {
+- (instancetype)initWithDelegate:(id<RNTModalViewControllerDelegate>)delegate {
     self = [super initWithNibName:nil bundle:nil];
     if (self) {
-        _reactSubviewContainer = [[UIView alloc] init];
+        self.reactSubviewContainer = [[UIView alloc] init];
+        self.delegate = delegate;
+        self.shouldTrackRotationChange = NO;
     }
     return self;
 }
 
-- (instancetype)initWithCoder:(NSCoder *)coder {
-    [NSException raise:@"initWithCoder" format:@"init(coder:) has not been implemented"];
-    self = [super initWithNibName:nil bundle:nil];
-    return self;
-}
-
 - (void)setupReactSubview:(UIView *)subview {
     [self.view addSubview:self.reactSubviewContainer];
     self.reactSubviewContainer.translatesAutoresizingMaskIntoConstraints = NO;
@@ -43,7 +39,18 @@ - (void)viewDidLoad {
 }
 
 - (void)viewDidAppear:(BOOL)animated {
-    [self.inAnimation animate:self.reactSubviewContainer completion:NULL];
+    [self.inAnimation animate:self.reactSubviewContainer completion:^(BOOL finished) {
+        self.shouldTrackRotationChange = YES;
+    }];
+}
+
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    if (!CGRectEqualToRect(self.lastBounds, self.view.bounds) && self.shouldTrackRotationChange) {
+        [self.delegate boundsDidChange:self.view.bounds];
+        self.lastBounds = self.view.bounds;
+    }
 }
 
 #pragma mark - ModalViewControllerProtocol
@@ -62,7 +69,8 @@ - (void)dismiss {
     UIView *prevReactSubviewContainer = self.reactSubviewContainer;
     self.reactSubviewContainer = [self.reactSubviewContainer snapshotViewAfterScreenUpdates:NO];
     [prevReactSubviewContainer removeFromSuperview];
-    
+
+    self.shouldTrackRotationChange = NO;
     [self setupReactSubview:self.reactSubviewContainer];
     [self.outAnimation prepareAnimation:self.reactSubviewContainer];
     [self.outAnimation animate:self.reactSubviewContainer completion:^(BOOL finished) {

ios/RNTModalVIew.h

@@ -12,12 +12,18 @@
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
+@property(nonatomic, weak) RCTBridge *bridge;
+@property(nonatomic, weak) UIView *reactSubview;
 @property(nonatomic, strong) RCTTouchHandler *touchHandler;
 @property(nonatomic, strong) RNTModalViewController *modalViewController;
 @property(nonatomic, strong) RNTModalMountingHelper *mountingHelper;
 
 // Props
-@property(nonatomic, strong) NSString *animationType;
+@property(nonatomic, copy) NSString *animationType;
+
+@end
+
+@interface RNTModalView () <RNTModalViewControllerDelegate>
 
 @end
 

ios/RNTModalView.m

@@ -10,10 +10,12 @@ @implementation RNTModalView
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge {
     self = [super initWithFrame:CGRectZero];
+    
     if (self) {
-        _touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
-        _modalViewController = [[RNTModalViewController alloc] init];
-        _mountingHelper = [[RNTModalMountingHelper alloc] initWithViewController:_modalViewController];
+        self.bridge = bridge;
+        self.touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
+        self.modalViewController = [[RNTModalViewController alloc] initWithDelegate:self];
+        self.mountingHelper = [[RNTModalMountingHelper alloc] initWithViewController:self.modalViewController];
     }
     return self;
 }
@@ -25,25 +27,27 @@ - (void)layoutSubviews {
     [self.mountingHelper mountIfNeeded];
 }
 
-- (void)addSubview:(UIView *)view {
-    [super addSubview:view];
-}
-
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex {
+    RCTAssert(_reactSubview == nil, @"[RNTModalView]: can only have one react subview");
+    
     [super insertReactSubview:subview atIndex:atIndex];
     [self.mountingHelper updateChildrenTransaction:^{
         [self.touchHandler attachToView:subview];
         [self.modalViewController addReactSubview:subview];
+        self.reactSubview = subview;
     }];
 }
 
 - (void)removeReactSubview:(UIView *)subview
 {
+    RCTAssert(subview == _reactSubview, @"[RNTModalView]: cannot remove view other than react subview");
+    
     [super removeReactSubview:subview];
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.touchHandler detachFromView:subview];
         [self.mountingHelper unmountIfNeeded];
         [subview removeFromSuperview];
+        self.reactSubview = nil;
     });
 }
 
@@ -57,11 +61,10 @@ - (void) didSetProps: (NSArray<NSString*>*)changedProps {
     }];
 }
 
-// Props
+#pragma mark - RNTModalViewControllerDelegate
 
-- (void)setAnimationType:(NSString *)animationType
-{
-    _animationType = animationType;
+- (void)boundsDidChange:(CGRect)newBounds {
+    [self.bridge.uiManager setSize:newBounds.size forView:self.reactSubview];
 }
 
 @end