Prepare iOS part for new arch (Obj-c)

ios/Library/RNTModalShadowView/RNTModalShadowView.h

@@ -0,0 +1,9 @@
+#ifndef RNTModalShadowView_h
+#define RNTModalShadowView_h
+
+#import <React/RCTShadowView.h>
+
+@interface RNTModalShadowView : RCTShadowView
+@end
+
+#endif /* RNTModalShadowView_h */

ios/Library/RNTModalShadowView/RNTModalShadowView.mm

@@ -0,0 +1,13 @@
+#import "RNTModalShadowView.h"
+#import <React/RCTUtils.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();
+    }
+}
+
+@end

ios/Library/RNTModalViewController/RNTModalViewController.h

@@ -0,0 +1,16 @@
+#ifndef RNTModalViewController_h
+#define RNTModalViewController_h
+
+#import <UIKit/UIKit.h>
+
+@protocol RNTModalViewControllerProtocol <NSObject>
+- (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView;
+- (void)dismiss;
+- (void)addReactSubview:(UIView *)view;
+@end
+
+@interface RNTModalViewController : UIViewController <RNTModalViewControllerProtocol>
+@property (nonatomic, strong) UIView *reactSubviewContainer;
+@end
+
+#endif /* RNTModalViewController_h */

ios/Library/RNTModalViewController/RNTModalViewController.mm

@@ -0,0 +1,55 @@
+#import <UIKit/UIKit.h>
+#import "RNTModalViewController.h"
+
+@implementation RNTModalViewController
+
+- (instancetype)init {
+    self = [super initWithNibName:nil bundle:nil];
+    if (self) {
+        _reactSubviewContainer = [[UIView alloc] init];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    [NSException raise:@"initWithCoder" format:@"init(coder:) has not been implemented"];
+    return nil;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self.view addSubview:self.reactSubviewContainer];
+    self.reactSubviewContainer.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [NSLayoutConstraint activateConstraints:@[
+        [self.reactSubviewContainer.topAnchor constraintEqualToAnchor:self.view.topAnchor],
+        [self.reactSubviewContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor],
+        [self.reactSubviewContainer.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
+        [self.reactSubviewContainer.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor]
+    ]];
+}
+
+#pragma mark - ModalViewControllerProtocol
+
+- (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView {
+    self.modalPresentationStyle = UIModalPresentationCustom;
+    self.view.accessibilityViewIsModal = YES;
+
+    [self willMoveToParentViewController:parentVC];
+    [parentVC addChildViewController:self];
+    [parentView addSubview:self.view];
+    [self didMoveToParentViewController:parentVC];
+}
+
+- (void)dismiss {
+    [self willMoveToParentViewController:nil];
+    [self.view removeFromSuperview];
+    [self removeFromParentViewController];
+}
+
+- (void)addReactSubview:(UIView *)view {
+    [self.reactSubviewContainer addSubview:view];
+}
+
+@end

ios/RNTModal.xcodeproj/project.pbxproj

@@ -7,11 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		AF43775E2CB5A09C00334A86 /* RNTModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF43775C2CB5A09C00334A86 /* RNTModalView.swift */; };
-		AF43775F2CB5A09C00334A86 /* RNTModalViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */; };
-		AFEFC13A2CC7F0210008863D /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1372CC7F0210008863D /* ModalView.swift */; };
-		AFEFC13B2CC7F0210008863D /* ModalShadowVIew.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */; };
-		AFEFC13C2CC7F0210008863D /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1382CC7F0210008863D /* ModalViewController.swift */; };
+		AFEFC15E2CC8339B0008863D /* RNTModalViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1552CC8339B0008863D /* RNTModalViewController.mm */; };
+		AFEFC15F2CC8339B0008863D /* RNTModalView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1592CC8339B0008863D /* RNTModalView.mm */; };
+		AFEFC1602CC8339B0008863D /* RNTModalShadowView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1522CC8339B0008863D /* RNTModalShadowView.mm */; };
+		AFEFC1612CC8339B0008863D /* RNTModalViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC15B2CC8339B0008863D /* RNTModalViewManager.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -27,13 +26,15 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		AF43775C2CB5A09C00334A86 /* RNTModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTModalView.swift; sourceTree = "<group>"; };
-		AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTModalViewManager.m; sourceTree = "<group>"; };
 		AF4377602CB5A09D00334A86 /* RNTModal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNTModal-Bridging-Header.h"; sourceTree = "<group>"; };
 		AFEFC1352CC7F0140008863D /* libRNTModal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNTModal.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalShadowVIew.swift; sourceTree = "<group>"; };
-		AFEFC1372CC7F0210008863D /* ModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalView.swift; sourceTree = "<group>"; };
-		AFEFC1382CC7F0210008863D /* ModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
+		AFEFC1512CC8339B0008863D /* RNTModalShadowView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNTModalShadowView.h; sourceTree = "<group>"; };
+		AFEFC1522CC8339B0008863D /* RNTModalShadowView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNTModalShadowView.mm; sourceTree = "<group>"; };
+		AFEFC1542CC8339B0008863D /* RNTModalViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNTModalViewController.h; sourceTree = "<group>"; };
+		AFEFC1552CC8339B0008863D /* RNTModalViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNTModalViewController.mm; sourceTree = "<group>"; };
+		AFEFC1592CC8339B0008863D /* RNTModalView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNTModalView.mm; sourceTree = "<group>"; };
+		AFEFC15A2CC8339B0008863D /* RNTModalVIew.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNTModalVIew.h; sourceTree = "<group>"; };
+		AFEFC15B2CC8339B0008863D /* RNTModalViewManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNTModalViewManager.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -50,20 +51,38 @@
 		AF4377422CB59EF500334A86 = {
 			isa = PBXGroup;
 			children = (
-				AFEFC1392CC7F0210008863D /* Library */,
-				AF43775C2CB5A09C00334A86 /* RNTModalView.swift */,
-				AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */,
+				AFEFC1572CC8339B0008863D /* Library */,
+				AFEFC1592CC8339B0008863D /* RNTModalView.mm */,
+				AFEFC15A2CC8339B0008863D /* RNTModalVIew.h */,
+				AFEFC15B2CC8339B0008863D /* RNTModalViewManager.mm */,
 				AF4377602CB5A09D00334A86 /* RNTModal-Bridging-Header.h */,
 				AFEFC1352CC7F0140008863D /* libRNTModal.a */,
 			);
 			sourceTree = "<group>";
 		};
-		AFEFC1392CC7F0210008863D /* Library */ = {
+		AFEFC1532CC8339B0008863D /* RNTModalShadowView */ = {
 			isa = PBXGroup;
 			children = (
-				AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */,
-				AFEFC1372CC7F0210008863D /* ModalView.swift */,
-				AFEFC1382CC7F0210008863D /* ModalViewController.swift */,
+				AFEFC1512CC8339B0008863D /* RNTModalShadowView.h */,
+				AFEFC1522CC8339B0008863D /* RNTModalShadowView.mm */,
+			);
+			path = RNTModalShadowView;
+			sourceTree = "<group>";
+		};
+		AFEFC1562CC8339B0008863D /* RNTModalViewController */ = {
+			isa = PBXGroup;
+			children = (
+				AFEFC1542CC8339B0008863D /* RNTModalViewController.h */,
+				AFEFC1552CC8339B0008863D /* RNTModalViewController.mm */,
+			);
+			path = RNTModalViewController;
+			sourceTree = "<group>";
+		};
+		AFEFC1572CC8339B0008863D /* Library */ = {
+			isa = PBXGroup;
+			children = (
+				AFEFC1532CC8339B0008863D /* RNTModalShadowView */,
+				AFEFC1562CC8339B0008863D /* RNTModalViewController */,
 			);
 			path = Library;
 			sourceTree = "<group>";
@@ -130,11 +149,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AF43775E2CB5A09C00334A86 /* RNTModalView.swift in Sources */,
-				AF43775F2CB5A09C00334A86 /* RNTModalViewManager.m in Sources */,
-				AFEFC13A2CC7F0210008863D /* ModalView.swift in Sources */,
-				AFEFC13B2CC7F0210008863D /* ModalShadowVIew.swift in Sources */,
-				AFEFC13C2CC7F0210008863D /* ModalViewController.swift in Sources */,
+				AFEFC15E2CC8339B0008863D /* RNTModalViewController.mm in Sources */,
+				AFEFC15F2CC8339B0008863D /* RNTModalView.mm in Sources */,
+				AFEFC1602CC8339B0008863D /* RNTModalShadowView.mm in Sources */,
+				AFEFC1612CC8339B0008863D /* RNTModalViewManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/RNTModalVIew.h

@@ -0,0 +1,25 @@
+#ifndef RNTModalVIew_h
+#define RNTModalVIew_h
+
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTTouchHandler.h>
+#import <UIKit/UIKit.h>
+#import "RNTModalViewController.h"
+
+@interface RNTModalView : UIView <RCTInvalidating>
+
+@property (nonatomic, strong) RCTUIManager *uiManager;
+@property (nonatomic, strong) RCTTouchHandler *touchHandler;
+@property (nonatomic, strong) RNTModalViewController *modalViewController;
+@property (nonatomic, assign) BOOL isMounted;
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge;
+- (void)setupIfNeeded;
+- (void)mount;
+- (void)unmount;
+- (void)update;
+
+@end
+
+#endif /* RNTModalVIew_h */