iOS: Set shadow node size depending on interface orientation (#34)

* iOS: Set shadow node size depending on interface orientation

* fix formatting

Author: paufau

common/cpp/react/renderer/components/multiplemodals/RNTModalViewUtils.h

@@ -4,5 +4,5 @@
 
 namespace facebook::react
 {
-  Size RNTModalViewSize(void);
+    Size RNTModalViewSize(void);
 } // namespace facebook::react

common/cpp/react/renderer/components/multiplemodals/RNTModalViewUtils.mm

@@ -3,12 +3,24 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTUtils.h>
 
+#import "RNTModalWindowHelper.h"
+
 namespace facebook::react {
 
 Size RNTModalViewSize(void)
 {
-  CGSize screenSize = RCTScreenSize();
-  return {screenSize.width, screenSize.height};
+    __block CGSize screenSize = RCTScreenSize();
+    
+    dispatch_sync(dispatch_get_main_queue(), ^{
+        RNTModalWindowHelper *windowHelper = [[RNTModalWindowHelper alloc] init];
+        UIInterfaceOrientation orientation = [windowHelper getWindowOrientation];
+        
+        if (UIInterfaceOrientationIsLandscape(orientation)) {
+            screenSize = CGSizeMake(screenSize.height, screenSize.width);
+        }
+    });
+    
+    return { screenSize.width, screenSize.height };
 }
 
-} // namespace facebook::react
+} // namespace facebook::react

ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.h

@@ -5,22 +5,24 @@
 #import "RNTModalViewController.h"
 
 @protocol RNTModalMountingHelperProtocol <NSObject>
-- (instancetype _Nonnull)initWithViewController:(RNTModalViewController *_Nonnull)viewController;
+
 - (void)updatePropsTransaction:(void (^__nullable)(void))completion;
 - (void)updateChildrenTransaction:(void (^__nullable)(void))completion;
 - (void)mountIfNeeded;
 - (void)unmountIfNeeded;
+
 @end
 
 @interface RNTModalMountingHelper : NSObject <RNTModalMountingHelperProtocol>
+- (instancetype _Nonnull)init NS_UNAVAILABLE;
+
+- (instancetype _Nonnull)initWithViewController:(RNTModalViewController *_Nonnull)viewController NS_DESIGNATED_INITIALIZER;
 
 @property(nonatomic, assign) BOOL isMounted;
 @property(nonatomic, assign) BOOL hasProps;
 @property(nonatomic, assign) BOOL hasChildren;
 @property(nullable, weak) RNTModalViewController *modal;
 
-- (UIWindow *_Nullable)getKeyWindow;
-- (UIViewController *_Nullable)getRootController;
 - (void)mount;
 - (void)unmount;
 

ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
 #import "RNTModalMountingHelper.h"
+#import "RNTModalWindowHelper.h"
 
 @implementation RNTModalMountingHelper
 
@@ -17,25 +18,6 @@ - (instancetype _Nonnull)initWithViewController:(RNTModalViewController * _Nonnu
     return self;
 }
 
-- (UIWindow *)getKeyWindow {
-    for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
-        if ([scene isKindOfClass:[UIWindowScene class]]) {
-            UIWindowScene *windowScene = (UIWindowScene *)scene;
-            for (UIWindow *window in windowScene.windows) {
-                if (window.isKeyWindow) {
-                    return window;
-                }
-            }
-        }
-    }
-    
-    return nil;
-}
-
-- (UIViewController *)getRootController {
-    return [self getKeyWindow].rootViewController;
-}
-
 - (void)updateChildrenTransaction:(void (^ _Nullable)(void))completion {
     dispatch_async(dispatch_get_main_queue(), ^{
         if (completion) {
@@ -70,7 +52,8 @@ - (void)unmountIfNeeded {
 }
 
 - (void)mount {
-    UIViewController *rvc = [self getRootController];
+    RNTModalWindowHelper *windowHelper = [[RNTModalWindowHelper alloc] init];
+    UIViewController *rvc = [windowHelper getRootController];
 
     if (!rvc) {
         NSLog(@"reactViewController not found");

ios/Library/RNTModalWindowHelper/RNTModalWindowHelper.h

@@ -0,0 +1,36 @@
+#import <UIKit/UIKit.h>
+#import "RNTModalWindowHelper.h"
+
+@implementation RNTModalWindowHelper
+
+- (UIWindow *)getKeyWindow
+{
+    for (UIScene *scene in [UIApplication sharedApplication].connectedScenes)
+    {
+        if ([scene isKindOfClass:[UIWindowScene class]])
+        {
+            UIWindowScene *windowScene = (UIWindowScene *)scene;
+            for (UIWindow *window in windowScene.windows)
+            {
+                if (window.isKeyWindow)
+                {
+                    return window;
+                }
+            }
+        }
+    }
+
+    return nil;
+}
+
+- (UIViewController *)getRootController
+{
+    return [self getKeyWindow].rootViewController;
+}
+
+- (UIInterfaceOrientation)getWindowOrientation
+{
+    return [self getKeyWindow].windowScene.interfaceOrientation ?: UIInterfaceOrientationPortrait;
+}
+
+@end

ios/Library/RNTModalWindowHelper/RNTModalWindowHelper.m

@@ -0,0 +1,18 @@
+#ifndef RNTModalWindowHelper_h
+#define RNTModalWindowHelper_h
+
+#import <UIKit/UIKit.h>
+
+@protocol RNTModalWindowHelperProtocol <NSObject>
+
+- (UIWindow *_Nullable)getKeyWindow;
+- (UIViewController *_Nullable)getRootController;
+- (UIInterfaceOrientation)getWindowOrientation;
+
+@end
+
+@interface RNTModalWindowHelper : NSObject <RNTModalWindowHelperProtocol>
+
+@end
+
+#endif /* RNTModalWindowHelper_h */

ios/RNTModalShadowView.m

@@ -3,14 +3,26 @@
 #import "RCTBridge.h"
 #import "RCTShadowView.h"
 #import "RCTUtils.h"
+#import "RNTModalWindowHelper.h"
 
 @implementation RNTModalShadowView
 
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex
 {
     [super insertReactSubview:subview atIndex:atIndex];
     if ([subview isKindOfClass:[RCTShadowView class]]) {
-        ((RCTShadowView *)subview).size = RCTScreenSize();
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            RNTModalWindowHelper *windowHelper = [[RNTModalWindowHelper alloc] init];
+            UIInterfaceOrientation orientation = [windowHelper getWindowOrientation];
+            
+            CGSize screenSize = RCTScreenSize();
+            
+            if (UIInterfaceOrientationIsPortrait(orientation)) {
+                ((RCTShadowView *)subview).size = screenSize;
+            } else {
+                ((RCTShadowView *)subview).size = CGSizeMake(screenSize.height, screenSize.width);
+            }
+        });
     }
 }