react-native-navigation 8.0.0 → 8.1.0-alpha01

package/lib/ios/{RNNCustomTitleView.m → RNNCustomTitleView.mm}

@@ -2,7 +2,7 @@
 
 @interface RNNCustomTitleView ()
 
-@property(nonatomic, strong) RCTRootView *subView;
+@property(nonatomic, strong) RNNReactView *subView;
 @property(nonatomic, strong) NSString *alignment;
 
 @end
@@ -10,7 +10,7 @@
 @implementation RNNCustomTitleView
 
 - (instancetype)initWithFrame:(CGRect)frame
-                      subView:(RCTRootView *)subView
+                      subView:(RNNReactView *)subView
                     alignment:(NSString *)alignment {
     self = [super init];
 
@@ -53,6 +53,11 @@
     return _alignment ? _alignment : @"center";
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize {
+	// TODO: FILL WITH DATA
+}
+#else
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView {
     if ([self.alignment isEqualToString:@"center"]) {
         [self setFrame:CGRectMake(self.frame.origin.x, self.frame.origin.y,
@@ -62,5 +67,6 @@
                                           rootView.intrinsicContentSize.height)];
     }
 }
+#endif
 
 @end

package/lib/ios/RNNDotIndicatorPresenter.h

@@ -11,7 +11,7 @@
 
 - (void)bottomTabsDidLayoutSubviews:(UITabBarController *)bottomTabs;
 
-- (void)mergeOptions:(NSDictionary *)options
+- (void)mergeOptions:(RNNNavigationOptions *)options
      resolvedOptions:(RNNNavigationOptions *)resolvedOptions
                child:(UIViewController *)child;
 

package/lib/ios/RNNElementFinder.h

@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+@class RNNReactView;
+
 @interface RNNElementFinder : NSObject
 
 + (UIView *)findElementForId:(NSString *)elementId inView:(UIView *)view;

package/lib/ios/RNNElementFinder.mm

@@ -0,0 +1,44 @@
+#import "RNNElementFinder.h"
+#import "RNNReactView.h"
+#import <React/RCTSurfaceView.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTRootView.h>
+#import <React/RCTUIManager.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#endif
+
+@implementation RNNElementFinder
+
+// TODO: Low performant search, improve later with using UIManager (investigate how to get it with Fabric)
+#ifdef RCT_NEW_ARCH_ENABLED
++ (UIView *)findElementForId:(NSString *)elementId inView:(UIView *)view {
+	auto nativeId = view.nativeID;
+	auto casted = (RCTViewComponentView *)view;
+
+	if (!nativeId && [casted respondsToSelector:@selector(nativeId)]) {
+		nativeId = casted.nativeId;
+	}
+
+	if ([elementId isEqualToString:nativeId]) {
+		return view;
+	}
+
+	if (view.subviews.count > 0) {
+		for (UIView* subview in view.subviews) {
+			UIView* found = [RNNElementFinder findElementForId:elementId inView:subview];
+
+			if (found != nil) return found;
+		}
+	}
+
+	return nil;
+#else
++ (UIView *)findElementForId:(NSString *)elementId inView:(RCTRootView *)view {
+	UIView *subView = [view.bridge.uiManager viewForNativeID:elementId withRootTag:view.reactTag];
+	return subView;
+#endif
+}
+
+@end

package/lib/ios/RNNEventEmitter.h

@@ -1,8 +1,7 @@
 #import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
-@interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
+@interface RNNEventEmitter : RCTEventEmitter
 
 - (void)sendOnAppLaunched;
 

package/lib/ios/{RNNEventEmitter.m → RNNEventEmitter.mm}

@@ -2,12 +2,11 @@
 #import "RNNUtils.h"
 
 @implementation RNNEventEmitter {
+	RCTEventEmitter *_emitter;
     NSInteger _appLaunchedListenerCount;
     BOOL _appLaunchedEventDeferred;
 }
 
-RCT_EXPORT_MODULE();
-
 static NSString *const AppLaunched = @"RNN.AppLaunched";
 static NSString *const CommandCompleted = @"RNN.CommandCompleted";
 static NSString *const BottomTabSelected = @"RNN.BottomTabSelected";
@@ -155,9 +154,6 @@ static NSString *const BottomTabPressed = @"RNN.BottomTabPressed";
 #pragma mark private
 
 - (void)send:(NSString *)eventName body:(id)body {
-    if (self.bridge == nil) {
-        return;
-    }
     [self sendEventWithName:eventName body:body];
 }
 

package/lib/ios/RNNExternalComponentStore.h

@@ -9,4 +9,9 @@
 - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
 - (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback;
+- (UIViewController *)getExternalHostComponent:(RNNLayoutInfo *)layoutInfo host:(RCTHost *)host;
+#endif
+
 @end

package/lib/ios/{RNNExternalComponentStore.m → RNNExternalComponentStore.mm}

@@ -23,4 +23,16 @@
     return creator(layoutInfo.props, bridge);
 }
 
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback {
+	[_externalComponentCreators setObject:[callback copy] forKey:name];
+}
+
+- (UIViewController *)getExternalHostComponent:(RNNLayoutInfo *)layoutInfo host:(RCTHost *)host {
+	RNNExternalHostViewCreator creator = [_externalComponentCreators objectForKey:layoutInfo.name];
+	return creator(layoutInfo.props, host);
+}
+#endif
+
 @end

package/lib/ios/{RNNFontAttributesCreator.m → RNNFontAttributesCreator.mm}

@@ -39,7 +39,7 @@
                                                              style:nil
                                                            variant:nil
                                                    scaleMultiplier:1.0];
-    NSMutableParagraphStyle *paragraphStyle = NSMutableParagraphStyle.new;
+    NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
     if (centered)
         paragraphStyle.alignment = NSTextAlignmentCenter;
 

package/lib/ios/{RNNIconBackgroundOptions.m → RNNIconBackgroundOptions.mm}

@@ -37,7 +37,7 @@
 }
 
 - (RNNIconBackgroundOptions *)copyWithZone:(NSZone *)zone {
-    RNNIconBackgroundOptions *newOptions = RNNIconBackgroundOptions.new;
+    RNNIconBackgroundOptions *newOptions = [RNNIconBackgroundOptions new];
     newOptions.color = self.color.copy;
     newOptions.disabledColor = self.disabledColor.copy;
     newOptions.cornerRadius = self.cornerRadius.copy;

package/lib/ios/{RNNInsetsOptions.m → RNNInsetsOptions.mm}

@@ -14,7 +14,7 @@
 }
 
 - (id)copyWithZone:(NSZone *)zone {
-    RNNInsetsOptions *newOptions = RNNInsetsOptions.new;
+    RNNInsetsOptions *newOptions = [RNNInsetsOptions new];
     newOptions.top = self.top.copy;
     newOptions.left = self.left.copy;
     newOptions.bottom = self.bottom.copy;
@@ -34,7 +34,7 @@
 }
 
 + (RNNInsetsOptions *)withValue:(UIEdgeInsets)insets {
-    RNNInsetsOptions *insetsOptions = RNNInsetsOptions.new;
+    RNNInsetsOptions *insetsOptions = [RNNInsetsOptions new];
     insetsOptions.top = [Double withValue:insets.top];
     insetsOptions.left = [Double withValue:insets.left];
     insetsOptions.bottom = [Double withValue:insets.bottom];

package/lib/ios/RNNModalManager.h

@@ -3,6 +3,7 @@
 #import <React/RCTBridge.h>
 #import <UIKit/UIKit.h>
 
+@class RCTHost;
 typedef void (^RNNTransitionCompletionBlock)(void);
 typedef void (^RNNTransitionWithComponentIdCompletionBlock)(NSString *_Nonnull componentId);
 typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_Nonnull message,
@@ -13,6 +14,11 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
 - (instancetype _Nonnull)initWithBridge:(RCTBridge *_Nonnull)bridge
                            eventHandler:(RNNModalManagerEventHandler *_Nonnull)eventHandler;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype _Nonnull)initWithHost:(RCTHost *_Nonnull)host
+						   eventHandler:(RNNModalManagerEventHandler *_Nonnull)eventHandler;
+#endif
+
 - (void)showModal:(UIViewController *_Nonnull)viewController
          animated:(BOOL)animated
        completion:(RNNTransitionWithComponentIdCompletionBlock _Nullable)completion;

package/lib/ios/{RNNModalManager.m → RNNModalManager.mm}

@@ -14,6 +14,9 @@
     NSMutableArray *_pendingModalIdsToDismiss;
     NSMutableArray *_presentedModals;
     RCTBridge *_bridge;
+#ifdef RCT_NEW_ARCH_ENABLED
+	RCTHost *_host;
+#endif
     RNNModalManagerEventHandler *_eventHandler;
 }
 
@@ -32,6 +35,16 @@
     return self;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype _Nonnull)initWithHost:(RCTHost *_Nonnull)host
+						   eventHandler:(RNNModalManagerEventHandler *_Nonnull)eventHandler {
+	self = [self init];
+	_host = host;
+	_eventHandler = eventHandler;
+	return self;
+}
+#endif
+
 - (void)showModal:(UIViewController<RNNLayoutProtocol> *)viewController
          animated:(BOOL)animated
        completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
@@ -50,13 +63,31 @@
     if (viewController.resolveOptionsWithDefault.animations.showModal.hasAnimation) {
         RNNEnterExitAnimation *enterExitAnimationOptions =
             viewController.resolveOptionsWithDefault.animations.showModal;
+#ifdef RCT_NEW_ARCH_ENABLED
+		if (_host != nil) {
+			_showModalTransitionDelegate = [[ScreenAnimationController alloc]
+				initWithContentTransition:enterExitAnimationOptions
+					   elementTransitions:enterExitAnimationOptions.elementTransitions
+				 sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
+								 duration:enterExitAnimationOptions.maxDuration
+								   host:_host];
+		} else {
+			_showModalTransitionDelegate = [[ScreenAnimationController alloc]
+				initWithContentTransition:enterExitAnimationOptions
+					   elementTransitions:enterExitAnimationOptions.elementTransitions
+				 sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
+								 duration:enterExitAnimationOptions.maxDuration
+								   bridge:_bridge];
+		}
+#else
         _showModalTransitionDelegate = [[ScreenAnimationController alloc]
             initWithContentTransition:enterExitAnimationOptions
                    elementTransitions:enterExitAnimationOptions.elementTransitions
              sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
                              duration:enterExitAnimationOptions.maxDuration
                                bridge:_bridge];
-
+#endif
+		
         viewController.transitioningDelegate = _showModalTransitionDelegate;
     }
 
@@ -86,13 +117,31 @@
         RNNEnterExitAnimation *dismissModalOptions =
             root.presentedViewController.resolveOptionsWithDefault.animations.dismissModal;
         if (dismissModalOptions.hasAnimation) {
+#ifdef RCT_NEW_ARCH_ENABLED
+			if (_host != nil) {
+				_dismissModalTransitionDelegate = [[ScreenAnimationController alloc]
+												   initWithContentTransition:dismissModalOptions
+												   elementTransitions:dismissModalOptions.elementTransitions
+												   sharedElementTransitions:dismissModalOptions.sharedElementTransitions
+												   duration:dismissModalOptions.maxDuration
+												   host:_host];
+			} else {
+				_dismissModalTransitionDelegate = [[ScreenAnimationController alloc]
+												   initWithContentTransition:dismissModalOptions
+												   elementTransitions:dismissModalOptions.elementTransitions
+												   sharedElementTransitions:dismissModalOptions.sharedElementTransitions
+												   duration:dismissModalOptions.maxDuration
+												   bridge:_bridge];
+
+			}
+#else
             _dismissModalTransitionDelegate = [[ScreenAnimationController alloc]
                 initWithContentTransition:dismissModalOptions
                        elementTransitions:dismissModalOptions.elementTransitions
                  sharedElementTransitions:dismissModalOptions.sharedElementTransitions
                                  duration:dismissModalOptions.maxDuration
                                    bridge:_bridge];
-
+#endif
             root.presentedViewController.transitioningDelegate = _dismissModalTransitionDelegate;
         }
 
@@ -125,12 +174,32 @@
     if (optionsWithDefault.animations.dismissModal.hasAnimation) {
         RNNEnterExitAnimation *enterExitAnimationOptions =
             modalToDismiss.resolveOptionsWithDefault.animations.dismissModal;
+		
+#ifdef RCT_NEW_ARCH_ENABLED
+			if (_host != nil) {
+				_dismissModalTransitionDelegate = [[ScreenReversedAnimationController alloc]
+					initWithContentTransition:enterExitAnimationOptions
+						   elementTransitions:enterExitAnimationOptions.elementTransitions
+					 sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
+									 duration:enterExitAnimationOptions.maxDuration
+									   host:_host];
+			} else {
+				_dismissModalTransitionDelegate = [[ScreenReversedAnimationController alloc]
+					initWithContentTransition:enterExitAnimationOptions
+						   elementTransitions:enterExitAnimationOptions.elementTransitions
+					 sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
+									 duration:enterExitAnimationOptions.maxDuration
+									   bridge:_bridge];
+
+			}
+#else
         _dismissModalTransitionDelegate = [[ScreenReversedAnimationController alloc]
             initWithContentTransition:enterExitAnimationOptions
                    elementTransitions:enterExitAnimationOptions.elementTransitions
              sharedElementTransitions:enterExitAnimationOptions.sharedElementTransitions
                              duration:enterExitAnimationOptions.maxDuration
                                bridge:_bridge];
+#endif
 
         [self topViewControllerParent:modalToDismiss].transitioningDelegate =
             _dismissModalTransitionDelegate;

package/lib/ios/{RNNNavigationOptions.m → RNNNavigationOptions.mm}

@@ -1,7 +1,7 @@
 #import "RNNNavigationOptions.h"
 #import "RNNBottomTabsController.h"
 #import "RNNComponentViewController.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNSplitViewOptions.h"
 #import "RNNStackController.h"

package/lib/ios/{RNNPushAnimation.m → RNNPushAnimation.mm}

@@ -29,7 +29,7 @@
     [self animateElement:self.screenTransition.topBar
                     view:toViewController.navigationController.navigationBar
              elementName:@"topBar"];
-    [self animateElement:self.screenTransition.content
+    [self animateElement:(ElementTransitionOptions *)self.screenTransition.content
                     view:toViewController.view
              elementName:@"content"];
     [self animateElement:self.screenTransition.bottomTabs

package/lib/ios/RNNReactButtonView.h

@@ -1,4 +1,8 @@
 #import "RNNComponentView.h"
+#import <React-RuntimeApple/ReactCommon/RCTHost.h>
+#import <React/RCTSurfacePresenterStub.h>
+#import <React/RCTFabricSurface.h>
+#import <React/RCTSurfacePresenter.h>
 
 @interface RNNReactButtonView : RNNComponentView
 

package/lib/ios/RNNReactButtonView.mm

@@ -0,0 +1,29 @@
+#import "RNNReactButtonView.h"
+
+@implementation RNNReactButtonView
+
+- (instancetype)initWithHost:(RCTHost *)host
+                  moduleName:(NSString *)moduleName
+           initialProperties:(NSDictionary *)initialProperties
+                eventEmitter:(RNNEventEmitter *)eventEmitter
+             sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+         reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+    self = [super initWithHost:host moduleName:moduleName initialProperties:initialProperties eventEmitter:eventEmitter sizeMeasureMode:convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibilityWidthAndHeight) reactViewReadyBlock:reactViewReadyBlock];
+    [host.surfacePresenter addObserver:self];
+    self.backgroundColor = UIColor.clearColor;
+
+    return self;
+}
+
+- (void)didMountComponentsWithRootTag:(NSInteger)rootTag {
+    if (self.surface.rootTag == rootTag) {
+        [super didMountComponentsWithRootTag:rootTag];
+        [self sizeToFit];
+    }
+}
+
+- (NSString *)componentType {
+	return ComponentTypeButton;
+}
+
+@end

package/lib/ios/RNNReactRootViewCreator.h

@@ -7,4 +7,8 @@
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge eventEmitter:(RNNEventEmitter *)eventEmitter;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithHost:(RCTHost *)host eventEmitter:(RNNEventEmitter *)eventEmitter;
+#endif
+
 @end

package/lib/ios/{RNNReactRootViewCreator.m → RNNReactRootViewCreator.mm}

@@ -6,6 +6,9 @@
 
 @implementation RNNReactRootViewCreator {
     RCTBridge *_bridge;
+#ifdef RCT_NEW_ARCH_ENABLED
+	RCTHost *_host;
+#endif
     RNNEventEmitter *_eventEmitter;
 }
 
@@ -16,20 +19,40 @@
     return self;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithHost:(RCTHost *)host eventEmitter:(RNNEventEmitter *)eventEmitter {
+	self = [super init];
+	_host = host;
+	_eventEmitter = eventEmitter;
+	return self;
+}
+#endif
+
 - (RNNReactView *)createRootView:(NSString *)name
                       rootViewId:(NSString *)rootViewId
                           ofType:(RNNComponentType)componentType
              reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
     [self verifyRootViewId:rootViewId];
 #ifdef RCT_NEW_ARCH_ENABLED
-    return [[[self resolveComponentViewClass:componentType] alloc]
-             initWithBridge:_bridge
-                 moduleName:name
-          initialProperties:@{@"componentId" : rootViewId}
-               eventEmitter:_eventEmitter
-            sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact |
-                            RCTSurfaceSizeMeasureModeHeightExact
-        reactViewReadyBlock:reactViewReadyBlock];
+	if (_host != nil) {
+		return [[[self resolveComponentViewClass:componentType] alloc]
+				   initWithHost:_host
+					 moduleName:name
+			  initialProperties:@{@"componentId" : rootViewId}
+				   eventEmitter:_eventEmitter
+				sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact |
+								RCTSurfaceSizeMeasureModeHeightExact
+			reactViewReadyBlock:reactViewReadyBlock];
+	} else {
+		return [[[self resolveComponentViewClass:componentType] alloc]
+				 initWithBridge:_bridge
+					 moduleName:name
+			  initialProperties:@{@"componentId" : rootViewId}
+				   eventEmitter:_eventEmitter
+				sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact |
+								RCTSurfaceSizeMeasureModeHeightExact
+			reactViewReadyBlock:reactViewReadyBlock];
+	}
 #else
     return [[[self resolveComponentViewClass:componentType] alloc]
              initWithBridge:_bridge

package/lib/ios/RNNReactView.h

@@ -1,5 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfacePresenterStub.h>
 #else
 #import <React/RCTRootView.h>
 #endif
@@ -14,7 +15,40 @@
 #define ComponentTypeButton @"TopBarButton"
 #define ComponentTypeBackground @"TopBarBackground"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+static RCTSurfaceSizeMeasureMode convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibility sizeFlexibility)
+{
+  switch (sizeFlexibility) {
+	case RCTRootViewSizeFlexibilityWidthAndHeight:
+	  return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined;
+	case RCTRootViewSizeFlexibilityWidth:
+	  return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact;
+	case RCTRootViewSizeFlexibilityHeight:
+	  return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined;
+	case RCTRootViewSizeFlexibilityNone:
+	  return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
+  }
+}
+
+static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSizeMeasureMode sizeMeasureMode)
+{
+  switch (sizeMeasureMode) {
+	case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined:
+	  return RCTRootViewSizeFlexibilityWidthAndHeight;
+	case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact:
+	  return RCTRootViewSizeFlexibilityWidth;
+	case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined:
+	  return RCTRootViewSizeFlexibilityHeight;
+	case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact:
+	default:
+	  return RCTRootViewSizeFlexibilityNone;
+  }
+}
+
+#endif
+
 typedef void (^RNNReactViewReadyCompletionBlock)(void);
+@class RCTHost;
 
 @protocol RNNComponentProtocol <NSObject>
 
@@ -32,29 +66,47 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 #ifdef RCT_NEW_ARCH_ENABLED
 @interface RNNReactView
-    : RCTSurfaceHostingProxyRootView <RCTRootViewDelegate, RNNComponentProtocol>
+: RCTSurfaceHostingView <RNNComponentProtocol, RCTSurfaceDelegate, RCTSurfacePresenterObserver>
 #else
 @interface RNNReactView : RCTRootView <RCTRootViewDelegate, RNNComponentProtocol>
 #endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-               sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+					moduleName:(NSString *)moduleName
+			 initialProperties:(NSDictionary *)initialProperties
+				  eventEmitter:(RNNEventEmitter *)eventEmitter
+			   sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+		   reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                  eventEmitter:(RNNEventEmitter *)eventEmitter
-           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+					moduleName:(NSString *)moduleName
+			 initialProperties:(NSDictionary *)initialProperties
+				  eventEmitter:(RNNEventEmitter *)eventEmitter
+		   reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+#endif
+
+#pragma mark - Bridgeless
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithHost:(RCTHost *)host
+				  moduleName:(NSString *)moduleName
+		   initialProperties:(NSDictionary *)initialProperties
+				eventEmitter:(RNNEventEmitter *)eventEmitter
+			 sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+		 reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
+
+@property (atomic, readonly) NSString *moduleName;
+@property (atomic, copy, readwrite) NSDictionary *properties;
+@property (nonatomic, strong, readonly) UIView *view;
+@property (nonatomic, strong, readonly) UIView *contentView;
+@property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
+@property (atomic, readwrite, weak, nullable) id<RCTSurfaceDelegate> delegate;
+@property (nonatomic, assign) BOOL passThroughTouches;
+
 #endif
 
 @property(nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;
 @property(nonatomic, strong) RNNEventEmitter *eventEmitter;
 
-- (void)invalidate;
-
 @end