react-native-navigation 8.0.0 → 8.1.0-alpha01

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactViewCreator.java

@@ -7,14 +7,8 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator
 
 public class TitleBarReactViewCreator implements ReactViewCreator {
 
-    protected ReactInstanceManager instanceManager;
-
-    public TitleBarReactViewCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-	}
-
 	@Override
 	public TitleBarReactView create(Activity activity, String componentId, String componentName) {
-        return new TitleBarReactView(activity, instanceManager, componentId, componentName);
+        return new TitleBarReactView(activity, componentId, componentName);
     }
 }

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/ReactGateway.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
 
+import com.facebook.react.ReactHost;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.NavigationActivity;
 
@@ -11,14 +12,14 @@ import androidx.annotation.NonNull;
 
 public class ReactGateway {
 
-	private final ReactNativeHost host;
+	private final ReactHost host;
 	private final NavigationReactInitializer initializer;
 	private final JsDevReloadHandler jsDevReloadHandler;
 
-    public ReactGateway(ReactNativeHost host) {
+    public ReactGateway(ReactHost host, boolean isDebug) {
         this.host = host;
-        initializer = new NavigationReactInitializer(host.getReactInstanceManager(), host.getUseDeveloperSupport());
-        jsDevReloadHandler = new JsDevReloadHandler(host.getReactInstanceManager().getDevSupportManager());
+        initializer = new NavigationReactInitializer(host, isDebug);
+        jsDevReloadHandler = new JsDevReloadHandler(host.getDevSupportManager());
         if (host instanceof BundleDownloadListenerProvider) {
             ((BundleDownloadListenerProvider) host).setBundleLoaderListener(jsDevReloadHandler);
         }
@@ -35,17 +36,15 @@ public class ReactGateway {
 	}
 
     public boolean onNewIntent(Intent intent) {
-        if (host.hasInstance()) {
-            host.getReactInstanceManager().onNewIntent(intent);
+        if (host.getCurrentReactContext() != null) {
+            host.onNewIntent(intent);
             return true;
         }
         return false;
     }
 
     public void onConfigurationChanged(NavigationActivity activity, @NonNull Configuration newConfig) {
-        if (host.hasInstance()) {
-            host.getReactInstanceManager().onConfigurationChanged(activity, newConfig);
-        }
+        host.onConfigurationChanged(activity);
     }
 
 	public void onActivityPaused(NavigationActivity activity) {
@@ -63,10 +62,10 @@ public class ReactGateway {
 	}
 
     public void onBackPressed() {
-	    host.getReactInstanceManager().onBackPressed();
+	    host.onBackPressed();
     }
 
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-        host.getReactInstanceManager().onActivityResult(activity, requestCode, resultCode, data);
+        host.onActivityResult(activity, requestCode, resultCode, data);
     }
 }

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -3,52 +3,19 @@ package com.reactnativenavigation.react.modal
 import android.content.Context
 import android.view.MotionEvent
 import android.view.View
-import com.facebook.react.bridge.*
-import com.facebook.react.uimanager.*
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.JSTouchDispatcher
+import com.facebook.react.uimanager.RootView
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 
 class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
-    private var hasAdjustedSize = false
-    private var viewWidth = 0
-    private var viewHeight = 0
-    private val mJSTouchDispatcher = JSTouchDispatcher(this)
 
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-        viewWidth = w
-        viewHeight = h
-        this.updateFirstChildView()
-    }
-    private fun updateFirstChildView() {
-        if (this.childCount > 0) {
-            hasAdjustedSize = false
-            val viewTag = getChildAt(0).id
-            val reactContext: ReactContext = this.getReactContext()
-            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
-                override fun runGuarded() {
-                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
-                            UIManagerModule::class.java
-                    ) as UIManagerModule
-                    uiManager.updateNodeSize(
-                            viewTag,
-                            this@ModalContentLayout.viewWidth,
-                            this@ModalContentLayout.viewHeight
-                    )
-                }
-            })
-        } else {
-            hasAdjustedSize = true
-        }
-    }
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
 
-    override fun addView(child: View?, index: Int, params: LayoutParams?) {
-        super.addView(child, index, params)
-        if (hasAdjustedSize) {
-            updateFirstChildView()
-        }
-    }
     override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent) {
         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
     }
@@ -61,10 +28,9 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
     override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
     private fun getEventDispatcher(): EventDispatcher {
         val reactContext: ReactContext = this.getReactContext()
-        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+        return UIManagerHelper.getEventDispatcher(reactContext, UIManagerType.FABRIC) ?: throw IllegalStateException("EventDispatcher for Fabric UI Manager is not found")
     }
 
-
     override fun handleException(t: Throwable?) {
         getReactContext().handleException(RuntimeException(t))
     }
@@ -84,4 +50,4 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
         return true
     }
 
-}
+}

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,8 +9,8 @@ import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
 
 @SuppressLint("ViewConstructor")
-class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
-                        componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+class TitleBarReactView(context: Context?, componentId: String?,
+                        componentName: String?) : ReactView(context, componentId, componentName) {
     var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         var titleHeightMeasureSpec: Int

package/lib/dist/src/adapters/NativeCommandsSender.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeCommandsSender = void 0;
-const react_native_1 = require("react-native");
+const tslib_1 = require("tslib");
+const NativeRNNTurboModule_1 = tslib_1.__importDefault(require("./NativeRNNTurboModule"));
 class NativeCommandsSender {
     nativeCommandsModule;
     constructor() {
-        this.nativeCommandsModule = react_native_1.NativeModules.RNNBridgeModule;
+        this.nativeCommandsModule = NativeRNNTurboModule_1.default;
     }
     setRoot(commandId, layout) {
         return this.nativeCommandsModule.setRoot(commandId, layout);

package/lib/dist/src/adapters/NativeEventsReceiver.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeEventsReceiver = void 0;
+const tslib_1 = require("tslib");
 const react_native_1 = require("react-native");
+const NativeRNNTurboEventEmitter_1 = tslib_1.__importDefault(require("./NativeRNNTurboEventEmitter"));
 class NativeEventsReceiver {
     emitter;
     constructor() {
         try {
-            this.emitter = new react_native_1.NativeEventEmitter(react_native_1.NativeModules.RNNEventEmitter);
+            this.emitter = new react_native_1.NativeEventEmitter(NativeRNNTurboEventEmitter_1.default);
         }
-        catch {
+        catch (e) {
             this.emitter = {
                 addListener: () => {
                     return {

package/lib/dist/src/adapters/NativeRNNTurboEventEmitter.d.ts

@@ -0,0 +1,7 @@
+import { TurboModule, NativeModule } from 'react-native';
+export interface Spec extends TurboModule {
+    addListener: (eventType: string) => void;
+    removeListeners: (count: number) => void;
+}
+declare const _default: NativeModule;
+export default _default;

package/lib/dist/src/adapters/NativeRNNTurboEventEmitter.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_native_1 = require("react-native");
+let eventEmitter = null;
+try {
+    // Running in bridge mode
+    eventEmitter = react_native_1.NativeModules.RNNBridgeEventEmitter;
+}
+catch (e) {
+    // Running in bridgeless, access to NativeModules is prohibited
+    eventEmitter = react_native_1.TurboModuleRegistry.get('RNNTurboEventEmitter');
+}
+exports.default = eventEmitter;

package/lib/dist/src/adapters/NativeRNNTurboModule.d.ts

@@ -0,0 +1,28 @@
+import { TurboModule } from 'react-native';
+import { UnsafeObject, Double } from 'react-native/Libraries/Types/CodegenTypes';
+export interface Spec extends TurboModule {
+    readonly getConstants: () => {
+        topBarHeight: Double;
+        statusBarHeight: Double;
+        bottomTabsHeight: Double;
+    };
+    setRoot(commandId: string, layout: UnsafeObject): Promise<string>;
+    setDefaultOptions(options: UnsafeObject): void;
+    mergeOptions(componentId: string, options: UnsafeObject): void;
+    push(commandId: string, componentId: string, layout: UnsafeObject): Promise<string>;
+    pop(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
+    popTo(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
+    popToRoot(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
+    setStackRoot(commandId: string, componentId: string, layout: Array<UnsafeObject>): Promise<string>;
+    showModal(commandId: string, layout: UnsafeObject): Promise<string>;
+    dismissModal(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
+    dismissAllModals(commandId: string, options: UnsafeObject): Promise<void>;
+    showOverlay(commandId: string, layout: UnsafeObject): Promise<string>;
+    dismissOverlay(commandId: string, componentId: string): Promise<void>;
+    dismissAllOverlays(commandId: string): Promise<void>;
+    getLaunchArgs(commandId: string): Promise<Array<string>>;
+}
+declare const commands: any;
+export declare const RCTAssertNewArchEnabled: () => void;
+export declare const isRNNTurboModuleAvailable: boolean;
+export default commands;

package/lib/dist/src/adapters/NativeRNNTurboModule.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRNNTurboModuleAvailable = exports.RCTAssertNewArchEnabled = void 0;
+const react_native_1 = require("react-native");
+const isTurboModuleEnabled = globalThis.__turboModuleProxy != null;
+const commands = isTurboModuleEnabled && react_native_1.Platform.OS === 'ios'
+    ? react_native_1.TurboModuleRegistry.get('RNNTurboModule')
+    : react_native_1.NativeModules.RNNBridgeModule;
+const isNewArchWithBridgeless = isTurboModuleEnabled;
+const RCTAssertNewArchEnabled = () => {
+    if (!isNewArchWithBridgeless)
+        throw new Error('Allowed only in New Architecture with Bridgeless!');
+};
+exports.RCTAssertNewArchEnabled = RCTAssertNewArchEnabled;
+exports.isRNNTurboModuleAvailable = isNewArchWithBridgeless;
+exports.default = commands;

package/lib/dist/src/commands/Deprecations.js

@@ -4,7 +4,7 @@ exports.Deprecations = void 0;
 const tslib_1 = require("tslib");
 const once_1 = tslib_1.__importDefault(require("lodash/once"));
 const get_1 = tslib_1.__importDefault(require("lodash/get"));
-const each_1 = tslib_1.__importDefault(require("lodash/each"));
+const lodash_1 = require("lodash");
 const react_native_1 = require("react-native");
 class Deprecations {
     deprecatedOptions = [
@@ -40,7 +40,7 @@ class Deprecations {
         },
     ];
     checkForDeprecatedOptions(options) {
-        (0, each_1.default)(this.deprecatedOptions, (option) => {
+        (0, lodash_1.each)(this.deprecatedOptions, (option) => {
             if ((0, get_1.default)(options, option.key, null)) {
                 option.showWarning(option.key, options);
             }

package/lib/dist/src/components/Modal.js

@@ -2,9 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Modal = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
+const react_1 = tslib_1.__importStar(require("react"));
 const react_native_1 = require("react-native");
 const RNNModalViewManager = (0, react_native_1.requireNativeComponent)('RNNModalViewManager');
+const Container = (rnnProps) => {
+    const viewRef = (0, react_1.useRef)(null);
+    (0, react_1.useLayoutEffect)(() => {
+        const windowWidth = react_native_1.Dimensions.get('window').width;
+        const windowHeight = react_native_1.Dimensions.get('window').height;
+        viewRef?.current?.setNativeProps({ width: windowWidth, height: windowHeight });
+    }, []);
+    return (react_1.default.createElement(react_native_1.View, { ref: viewRef, style: styles.container, collapsable: false }, rnnProps.children));
+};
 class Modal extends react_1.default.Component {
     static defaultProps = {
         transparent: false,
@@ -18,7 +27,7 @@ class Modal extends react_1.default.Component {
         const processed = this.proccessProps();
         if (this.props.visible) {
             return (react_1.default.createElement(RNNModalViewManager, { ...processed },
-                react_1.default.createElement(react_native_1.View, { style: styles.container, collapsable: false }, this.props.children)));
+                react_1.default.createElement(Container, { ...this.props })));
         }
         else {
             return null;

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

@@ -41,7 +41,7 @@
 }
 
 - (NSArray<id<DisplayLinkAnimation>> *)extraAnimations {
-    NSMutableArray *animations = NSMutableArray.new;
+    NSMutableArray *animations = [NSMutableArray new];
     CGFloat startDelay = [_transitionOptions.startDelay withDefault:0];
     CGFloat duration = [_transitionOptions.duration withDefault:300];
     id<Interpolator> interpolator = _transitionOptions.interpolator;

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

@@ -2,6 +2,11 @@
 #import "UIView+Utils.h"
 #import <React/UIView+React.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTImageComponentView.h>
+#import <React/RCTParagraphComponentView.h>
+#endif
+
 @implementation AnimatedReactView {
     UIView *_originalParent;
     CGRect _originalFrame;
@@ -26,7 +31,9 @@
     _toElement.hidden = YES;
     _fromColor = element.backgroundColor;
     _zIndex = toElement.reactZIndex;
-    [self hijackReactElement:element];
+	if ([element isKindOfClass:[RCTImageComponentView class]] || [element isKindOfClass:[RCTParagraphComponentView class]]) {
+		[self hijackReactElement:element];
+	}
 
     return self;
 }

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

@@ -1,7 +1,15 @@
 #import "AnimatedTextView.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTParagraphComponentView.h>
+#import <react/renderer/components/text/ParagraphComponentDescriptor.h>
+#import <react/renderer/components/text/ParagraphProps.h>
+#import <react/renderer/components/text/ParagraphState.h>
+#endif
+
 @implementation AnimatedTextView {
     NSTextContainer *_fromTextContainer;
+	facebook::react::ParagraphShadowNode::ConcreteState::Shared _state;
     CGSize _fromSize;
 }
 
@@ -9,8 +17,21 @@
                   toElement:(UIView *)toElement
           transitionOptions:(SharedElementTransitionOptions *)transitionOptions {
     self = [super initElement:element toElement:toElement transitionOptions:transitionOptions];
+#ifdef RCT_NEW_ARCH_ENABLED
+	auto castedElement = (RCTParagraphComponentView *)element;
+	auto castedToElement = (RCTParagraphComponentView *)toElement;
+
+    // Extract NSAttributedString from the view
+    NSAttributedString *fromAttributedText = castedElement.attributedText;
+    NSAttributedString *toAttributedText = castedToElement.attributedText;
+
+    // Convert to NSTextStorage
+    _fromTextStorage = [[NSTextStorage alloc] initWithAttributedString:fromAttributedText];
+    _toTextStorage = [[NSTextStorage alloc] initWithAttributedString:toAttributedText];
+#else
     _fromTextStorage = [element valueForKey:@"textStorage"];
     _toTextStorage = [toElement valueForKey:@"textStorage"];
+#endif
     _fromTextContainer = [self container:_fromTextStorage];
     _fromSize = _fromTextContainer.size;
     return self;
@@ -24,7 +45,6 @@
 
 - (void)reset {
     [super reset];
-    _fromTextContainer.size = _fromSize;
 }
 
 - (NSTextContainer *)container:(NSTextStorage *)fromTextStorage {

package/lib/ios/BoolParser.h

@@ -1,4 +1,4 @@
-#import "Bool.h"
+#import "ReactNativeNavigation/Bool.h"
 #import <Foundation/Foundation.h>
 
 @interface BoolParser : NSObject

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

@@ -105,7 +105,7 @@
 
 - (void)applyTabBarBorder:(RNNBottomTabsOptions *)options {
     if (options.borderColor.hasValue || options.borderWidth.hasValue) {
-        self.tabBar.backgroundImage = UIImage.new;
+        self.tabBar.backgroundImage = [UIImage new];
         self.tabBar.shadowImage = [UIImage
             imageWithSize:CGSizeMake(1, [[options.borderWidth withDefault:@(1)] floatValue])
                     color:[options.borderColor withDefault:UIColor.blackColor]];

package/lib/ios/ColorParser.h

@@ -1,4 +1,4 @@
-#import "Color.h"
+#import "ReactNativeNavigation/Color.h"
 #import <Foundation/Foundation.h>
 
 @interface ColorParser : NSObject

package/lib/ios/Constants.h

@@ -1,8 +1,16 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <rnnavigation/rnnavigation.h>
+#endif
+
 @interface Constants : NSObject
 
 + (NSDictionary *)getConstants;
 
+#ifdef RCT_NEW_ARCH_ENABLED
++ (JS::NativeRNNTurboModule::Constants::Builder::Input)getTurboConstants;
+#endif
+
 @end

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

@@ -11,6 +11,18 @@
     };
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
++ (JS::NativeRNNTurboModule::Constants::Builder::Input)getTurboConstants {
+	JS::NativeRNNTurboModule::Constants::Builder::Input input = {
+		[self topBarHeight],
+		[self statusBarHeight],
+		[self bottomTabsHeight]
+	};
+
+	return input;
+}
+#endif
+
 + (CGFloat)topBarHeight {
     return [RCTPresentedViewController() getTopBarHeight];
 }

package/lib/ios/NumberParser.h

@@ -1,4 +1,4 @@
-#import "Number.h"
+#import "ReactNativeNavigation/Number.h"
 #import <Foundation/Foundation.h>
 
 @interface NumberParser : NSObject

package/lib/ios/RNNAppDelegate.h

@@ -1,20 +1,13 @@
 #import <Foundation/Foundation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeDelegate.h>
-
-@class RCTSurfacePresenterBridgeAdapter;
-@class RCTTurboModuleManager;
-
-@interface RNNAppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
-
-@property(nonatomic, strong) UIWindow *window;
-
-#if RCT_NEW_ARCH_ENABLED
-
-/// The TurboModule manager
-@property(nonatomic, strong) RCTTurboModuleManager *turboModuleManager;
-@property(nonatomic, strong) RCTSurfacePresenterBridgeAdapter *bridgeAdapter;
+#import <React/CoreModulesPlugins.h>
 
+#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>)
+#import <React-RCTAppDelegate/RCTAppDelegate.h>
+#elif __has_include(<React_RCTAppDelegate/RCTAppDelegate.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppDelegate.h>
 #endif
 
+@interface RNNAppDelegate : RCTAppDelegate
+
 @end