react-native-navigation 8.0.0 → 8.1.0-alpha

package/lib/ios/TurboModules/RNNTurboManager.mm

@@ -0,0 +1,114 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <Foundation/Foundation.h>
+#import "RNNTurboManager.h"
+#import "RNNCommandsHandler.h"
+#import "RNNComponentViewCreator.h"
+#import "RNNTurboEventEmitter.h"
+#import "RNNLayoutManager.h"
+#import "RNNModalHostViewManagerHandler.h"
+#import "RNNReactComponentRegistry.h"
+#import "RNNReactRootViewCreator.h"
+#import "RNNTurboCommandsHandler.h"
+#import <React-RuntimeApple/ReactCommon/RCTHost.h>
+
+@interface RNNTurboManager ()
+
+@property(nonatomic, strong, readwrite) RNNExternalComponentStore *store;
+@property(nonatomic, strong, readwrite) RNNReactComponentRegistry *componentRegistry;
+@property(nonatomic, strong, readonly) RNNLayoutManager *layoutManager;
+@property(nonatomic, strong, readonly) RNNOverlayManager *overlayManager;
+@property(nonatomic, strong, readonly) RNNModalManager *modalManager;
+@property(nonatomic, strong, readonly) RNNModalHostViewManagerHandler *modalHostViewHandler;
+@property(nonatomic, strong, readonly) RNNCommandsHandler *commandsHandler;
+@property(nonatomic, strong, readonly) RNNTurboEventEmitter *eventEmitter;
+
+@end
+
+@implementation RNNTurboManager {
+	UIWindow *_mainWindow;
+}
+
+- (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow {
+	if (self = [super init]) {
+		_host = host;
+		_mainWindow = mainWindow;
+		_overlayManager = [RNNOverlayManager new];
+		_store = [RNNExternalComponentStore new];
+
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptLoaded)
+													 name:@"RCTInstanceDidLoadBundle"
+												   object:nil];
+
+		// TODO: investigate which new event is fired
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptWillLoad)
+													 name:RCTJavaScriptWillStartLoadingNotification
+												   object:nil];
+
+		_eventEmitter = [[_host moduleRegistry] moduleForName:"RNNTurboEventEmitter"];
+		_eventEmitter.host = _host;
+
+		RNNModalManagerEventHandler *modalManagerEventHandler =
+			[[RNNModalManagerEventHandler alloc] initWithEventEmitter:_eventEmitter];
+
+		_modalManager = [[RNNModalManager alloc] initWithHost:_host
+												 eventHandler:modalManagerEventHandler];
+		_modalHostViewHandler =
+			[[RNNModalHostViewManagerHandler alloc] initWithModalManager:_modalManager];
+		_layoutManager = [[RNNLayoutManager alloc] init];
+
+		id<RNNComponentViewCreator> rootViewCreator =
+			[[RNNReactRootViewCreator alloc] initWithHost:_host eventEmitter:_eventEmitter];
+
+		_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
+
+		RNNViewControllerFactory *controllerFactory =
+			[[RNNViewControllerFactory alloc] initWithRootViewCreator:rootViewCreator
+													 eventEmitter:_eventEmitter
+															store:_store
+												componentRegistry:_componentRegistry
+														  andHost:_host
+									  bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]];
+
+		RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new];
+		_commandsHandler = [[RNNCommandsHandler alloc] initWithViewControllerFactory:controllerFactory
+																   layoutManager:_layoutManager
+																	eventEmitter:_eventEmitter
+																	modalManager:_modalManager
+																  overlayManager:_overlayManager
+																 setRootAnimator:setRootAnimator
+																	  mainWindow:_mainWindow];
+
+		[RNNTurboCommandsHandler setSharedInstance:_commandsHandler];
+	}
+
+	return self;
+}
+
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback {
+	[_store registerExternalHostComponent:name callback:callback];
+}
+
+- (UIViewController *)findComponentForId:(NSString *)componentId {
+	return [_layoutManager findComponentForId:componentId];
+}
+
+- (void)onJavaScriptWillLoad {
+	[_componentRegistry clear];
+}
+
+- (void)onJavaScriptLoaded {
+	[_commandsHandler setReadyToReceiveCommands:true];
+	// TODO: Refactor
+//    [_modalHostViewHandler
+//        connectModalHostViewManager:[[_host moduleRegistry] moduleForName:"RCTModalHostViewManager"]];
+	// TODO: Possibly will cause crashes in events with previous copy of emitter, need to test
+	_eventEmitter = [[_host moduleRegistry] moduleForName:"RNNTurboEventEmitter"];
+	_eventEmitter.host = _host;
+
+	[_eventEmitter sendOnAppLaunched];
+}
+
+@end
+#endif

package/lib/ios/TurboModules/RNNTurboModule.h

@@ -0,0 +1,8 @@
+#pragma once
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNNCommandsHandler.h"
+#import <rnnavigation/rnnavigation.h>
+
+@interface RNNTurboModule : NSObject<NativeRNNTurboModuleSpec>
+@end
+#endif

package/lib/ios/TurboModules/RNNTurboModule.mm

@@ -0,0 +1,177 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNNTurboModule.h"
+#import "Constants.h"
+#import "RNNTurboCommandsHandler.h"
+#import <ReactCommon/RCTTurboModule.h>
+
+@implementation RNNTurboModule
+
+RCT_EXPORT_MODULE()
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+	(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+	return std::make_shared<facebook::react::NativeRNNTurboModuleSpecJSI>(params);
+}
+
+- (facebook::react::ModuleConstants<JS::NativeRNNTurboModule::Constants>)constantsToExport {
+	return facebook::react::typedConstants<JS::NativeRNNTurboModule::Constants>([Constants getTurboConstants]);
+}
+
+- (facebook::react::ModuleConstants<JS::NativeRNNTurboModule::Constants::Builder>)getConstants {
+	return [self constantsToExport];
+}
+
+- (void)dismissAllModals:(NSString *)commandId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] dismissAllModals:options
+                                                         commandId:commandId
+                                    completion:^{
+            resolve(nil);
+                                    }];
+    });
+}
+
+- (void)dismissAllOverlays:(NSString *)commandId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] dismissAllOverlays:commandId];
+        resolve(nil);
+    });
+}
+
+- (void)dismissModal:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] dismissModal:componentId
+                                                     commandId:commandId
+                                                  mergeOptions:options
+                                                    completion:^(NSString *componentId) {
+            resolve(componentId);
+                                                    }
+                                                     rejection:reject];
+    });
+}
+
+- (void)dismissOverlay:(NSString *)commandId componentId:(NSString *)componentId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] dismissOverlay:componentId
+                                                       commandId:commandId
+                                                      completion:^{
+            resolve(@(1));
+                                                       }
+                                                       rejection:reject];
+    });
+}
+
+- (void)getLaunchArgs:(NSString *)commandId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    NSArray *args = [[NSProcessInfo processInfo] arguments];
+    resolve(args);
+}
+
+
+- (void)pop:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] pop:componentId
+                                            commandId:commandId
+                                         mergeOptions:(NSDictionary *)options
+                                           completion:^{
+            resolve(componentId);
+                                            }
+                                            rejection:reject];
+    });
+}
+
+- (void)popTo:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] popTo:componentId
+                                              commandId:commandId
+                                           mergeOptions:options
+                                             completion:^{
+            resolve(componentId);
+                                             }
+                                             rejection:reject];
+    });
+}
+
+- (void)popToRoot:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] popToRoot:componentId
+                                                  commandId:commandId
+                                               mergeOptions:options
+                                                 completion:^{
+            resolve(componentId);
+                                                  }
+                                                  rejection:reject];
+    });
+}
+
+- (void)push:(NSString *)commandId componentId:(NSString *)componentId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] push:componentId
+                                             commandId:commandId
+                                                layout:layout
+                                            completion:^(NSString *pushedComponentId) {
+                                            resolve(pushedComponentId);
+                        }
+                                             rejection:reject];
+    });
+}
+
+- (void)setRoot:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] setRoot:layout
+                                                commandId:commandId
+                                               completion:^(NSString *componentId) {
+                                                resolve(componentId);
+                                                }];
+    });
+}
+
+- (void)setStackRoot:(NSString *)commandId componentId:(NSString *)componentId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] setStackRoot:componentId
+                                                     commandId:commandId
+                                                      children:(NSArray *)layout
+                                                    completion:^{
+            resolve(componentId);
+                                }
+                                                     rejection:reject];
+    });
+}
+
+- (void)showModal:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] showModal:layout
+                                                  commandId:commandId
+                                                  completion:^(NSString *componentId) {
+            resolve(componentId);
+                                                  }];
+    });
+}
+
+- (void)showOverlay:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] showOverlay:layout
+                                                    commandId:commandId
+                                                   completion:^(NSString *_Nonnull componentId) {
+            resolve(componentId);
+                                                   }];
+    });
+}
+
+- (void)mergeOptions:(NSString *)componentId options:(NSDictionary *)options { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] mergeOptions:componentId
+                                   options:options
+                                completion:^{}];
+    });
+}
+
+
+- (void)setDefaultOptions:(NSDictionary *)options { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] setDefaultOptions:options completion: ^() {}];
+    });
+}
+
+@end
+#endif

package/lib/ios/UISplitViewController+RNNOptions.h

@@ -1,4 +1,4 @@
-#import "Number.h"
+#import "ReactNativeNavigation/Number.h"
 #import <UIKit/UIKit.h>
 
 @interface UISplitViewController (RNNOptions)

package/lib/ios/{UISplitViewController+RNNOptions.m → UISplitViewController+RNNOptions.mm}

@@ -1,4 +1,3 @@
-#import "RNNSplitViewController.h"
 #import "UISplitViewController+RNNOptions.h"
 
 @implementation UISplitViewController (RNNOptions)

package/lib/ios/UIViewController+SideMenuController.h

@@ -1,8 +1,8 @@
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 #import <UIKit/UIKit.h>
 
 @interface UIViewController (SideMenuController)
 
-- (RNNSideMenuController *)sideMenuController;
+- (RNNSideMenuViewController *)sideMenuController;
 
 @end

package/lib/ios/{UIViewController+SideMenuController.m → UIViewController+SideMenuController.mm}

@@ -2,11 +2,11 @@
 
 @implementation UIViewController (SideMenuController)
 
-- (RNNSideMenuController *)sideMenuController {
+- (RNNSideMenuViewController *)sideMenuController {
     UIViewController *vc = self;
     while (vc) {
-        if ([vc isKindOfClass:[RNNSideMenuController class]]) {
-            return (RNNSideMenuController *)vc;
+        if ([vc isKindOfClass:[RNNSideMenuViewController class]]) {
+            return (RNNSideMenuViewController *)vc;
         }
 
         vc = vc.parentViewController;

package/lib/ios/UIViewController+SideMenuViewController.h

@@ -0,0 +1,8 @@
+#import "RNNSideMenuViewController.h"
+#import <UIKit/UIKit.h>
+
+@interface UIViewController (RNNSideMenuViewController)
+
+- (RNNSideMenuViewController *)sideMenuController;
+
+@end

package/lib/ios/Utils/{UIView+Utils.m → UIView+Utils.mm}

@@ -1,6 +1,12 @@
 #import "UIView+Utils.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTImageComponentView.h>
+#import <React/RCTParagraphComponentView.h>
+#else
 #import <React/RCTImageView.h>
 #import <React/RCTTextView.h>
+#endif
 
 @implementation UIView (Utils)
 
@@ -13,9 +19,17 @@
 }
 
 - (ViewType)viewType {
+#ifdef RCT_NEW_ARCH_ENABLED
+	if ([self isKindOfClass:[RCTImageComponentView class]]) {
+#else
     if ([self isKindOfClass:[RCTImageView class]]) {
+#endif
         return ViewTypeImage;
+#ifdef RCT_NEW_ARCH_ENABLED
+	} else if ([self isKindOfClass:[RCTParagraphComponentView class]]) {
+#else
     } else if ([self isKindOfClass:[RCTTextView class]]) {
+#endif
         return ViewTypeText;
     } else if ([self isKindOfClass:[UIImageView class]]) {
         return ViewTypeUIImage;

package/lib/src/adapters/NativeCommandsSender.ts

@@ -1,5 +1,5 @@
-import { NativeModules } from 'react-native';
 import { NavigationConstants } from './Constants';
+import RNNCommandsModule from './NativeRNNTurboModule';
 
 interface NativeCommandsModule {
   setRoot(commandId: string, layout: { root: any; modals: any[]; overlays: any[] }): Promise<any>;
@@ -19,12 +19,14 @@ interface NativeCommandsModule {
   getLaunchArgs(commandId: string): Promise<any>;
   getNavigationConstants(): Promise<NavigationConstants>;
   getNavigationConstantsSync(): NavigationConstants;
+  // Turbo
+  getConstants?: () => NavigationConstants;
 }
 
 export class NativeCommandsSender {
   private readonly nativeCommandsModule: NativeCommandsModule;
   constructor() {
-    this.nativeCommandsModule = NativeModules.RNNBridgeModule;
+    this.nativeCommandsModule = RNNCommandsModule;
   }
 
   setRoot(commandId: string, layout: { root: any; modals: any[]; overlays: any[] }) {

package/lib/src/adapters/NativeEventsReceiver.ts

@@ -1,4 +1,4 @@
-import { NativeModules, NativeEventEmitter, EmitterSubscription } from 'react-native';
+import { NativeEventEmitter, EmitterSubscription } from 'react-native';
 import {
   ComponentWillAppearEvent,
   ComponentDidAppearEvent,
@@ -17,20 +17,21 @@ import {
   BottomTabLongPressedEvent,
   BottomTabPressedEvent,
 } from '../interfaces/Events';
+import RNNEventEmitter from './NativeRNNTurboEventEmitter';
 
 export class NativeEventsReceiver {
   private emitter: NativeEventEmitter;
   constructor() {
     try {
-      this.emitter = new NativeEventEmitter(NativeModules.RNNEventEmitter);
-    } catch {
-      this.emitter = {
+      this.emitter = new NativeEventEmitter(RNNEventEmitter);
+    } catch (e) {
+      this.emitter = ({
         addListener: () => {
           return {
             remove: () => undefined,
           };
         },
-      } as any as NativeEventEmitter;
+      } as any) as NativeEventEmitter;
     }
   }
 

package/lib/src/adapters/NativeRNNTurboEventEmitter.ts

@@ -0,0 +1,18 @@
+import { TurboModule, TurboModuleRegistry, NativeModules, NativeModule } from 'react-native';
+
+export interface Spec extends TurboModule {
+  addListener: (eventType: string) => void;
+  removeListeners: (count: number) => void;
+}
+
+let eventEmitter: Spec | null = null;
+
+try {
+  // Running in bridge mode
+  eventEmitter = NativeModules.RNNBridgeEventEmitter;
+} catch (e) {
+  // Running in bridgeless, access to NativeModules is prohibited
+  eventEmitter = TurboModuleRegistry.get<Spec>('RNNTurboEventEmitter');
+}
+
+export default eventEmitter as NativeModule;

package/lib/src/adapters/NativeRNNTurboModule.ts

@@ -0,0 +1,47 @@
+import { TurboModule, TurboModuleRegistry, NativeModules, Platform } 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>>;
+}
+
+const isTurboModuleEnabled = (globalThis as any).__turboModuleProxy != null;
+
+const commands =
+  isTurboModuleEnabled && Platform.OS === 'ios'
+    ? TurboModuleRegistry.get<Spec>('RNNTurboModule')
+    : NativeModules.RNNBridgeModule;
+
+const isNewArchWithBridgeless = isTurboModuleEnabled;
+
+export const RCTAssertNewArchEnabled = () => {
+  if (!isNewArchWithBridgeless)
+    throw new Error('Allowed only in New Architecture with Bridgeless!');
+};
+
+export const isRNNTurboModuleAvailable = isNewArchWithBridgeless;
+export default commands;

package/lib/src/commands/Deprecations.ts

@@ -1,6 +1,6 @@
 import once from 'lodash/once';
 import get from 'lodash/get';
-import each from 'lodash/each';
+import { each } from 'lodash';
 import { Platform } from 'react-native';
 
 export class Deprecations {

package/lib/src/components/Modal.tsx

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useLayoutEffect, useRef } from 'react';
 import { requireNativeComponent, View, ViewProps, StyleSheet, Dimensions } from 'react-native';
 import { AnimationOptions, ViewAnimationOptions } from 'react-native-navigation/interfaces/Options';
+
 export interface RNNModalProps extends ViewProps {
   visible: boolean;
   transparent: boolean;
@@ -9,28 +10,46 @@ export interface RNNModalProps extends ViewProps {
   onShow?: () => any;
   onRequestClose: () => any;
 }
+
 interface AnimatedModalProps extends RNNModalProps {
   animation?: AnimationOptions;
 }
+
 const RNNModalViewManager = requireNativeComponent('RNNModalViewManager');
 
+const Container = (rnnProps: RNNModalProps) => {
+  const viewRef = useRef<View>(null);
+
+  useLayoutEffect(() => {
+    const windowWidth = Dimensions.get('window').width;
+    const windowHeight = Dimensions.get('window').height;
+    viewRef?.current?.setNativeProps({ width: windowWidth, height: windowHeight });
+  }, []);
+
+  return (
+    <View ref={viewRef} style={styles.container} collapsable={false}>
+      {rnnProps.children}
+    </View>
+  );
+};
+
 export class Modal extends React.Component<RNNModalProps> {
   static defaultProps = {
     transparent: false,
     blurOnUnmount: false,
     animationType: 'slide',
   };
+
   constructor(props: RNNModalProps) {
     super(props);
   }
+
   render() {
     const processed = this.proccessProps();
     if (this.props.visible) {
       return (
         <RNNModalViewManager {...processed}>
-          <View style={styles.container} collapsable={false}>
-            {this.props.children}
-          </View>
+          <Container {...this.props} />
         </RNNModalViewManager>
       );
     } else {

package/metro.config.js

@@ -1,4 +1,3 @@
-const path = require('node:path');
 const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
 
 const config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.0.0",
+  "version": "8.1.0-alpha",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -19,8 +19,7 @@
   "bin": {
     "rnn-link": "./autolink/postlink/run.js"
   },
-  "main": "lib/dist/src/index.js",
-  "typings": "lib/dist/src/index.d.ts",
+  "main": "lib/src/index.ts",
   "scripts": {
     "build": "node ./scripts/build",
     "watch": "node ./scripts/watch",
@@ -65,6 +64,9 @@
     "lodash": "4.17.x",
     "prop-types": "15.x.x",
     "react-lifecycles-compat": "^3.0.4",
+    "react-native-redash": "^12.6.1",
+    "reanimated-color-picker": "^3.0.6",
+    "ssim.js": "^3.5.0",
     "tslib": "1.9.3"
   },
   "devDependencies": {
@@ -96,7 +98,7 @@
     "@typescript-eslint/parser": "8.21.0",
     "babel-jest": "^27.0.0",
     "clang-format": "^1.4.0",
-    "detox": "20.32.0",
+    "detox": "20.33.0-prerelease.0",
     "detox-testing-library-rnn-adapter": "^2.0.3",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "6.11.0",
@@ -116,7 +118,6 @@
     "react-native-fast-image": "^8.6.3",
     "react-native-gesture-handler": "^2.22.1",
     "react-native-reanimated": "3.16.7",
-    "react-native-ui-lib": "7.3.6",
     "react-redux": "5.x.x",
     "react-test-renderer": "18.3.1",
     "redux": "3.x.x",
@@ -165,7 +166,7 @@
       "genymotion.emulator.name": {
         "type": "android.genycloud",
         "device": {
-          "recipeUUID": "a50a71d6-da90-4c67-bdfa-5b602b0bbd15"
+          "recipeUUID": "9baf12f9-a645-4ffa-a688-0e92584d6194"
         }
       },
       "emulator": {
@@ -224,6 +225,25 @@
         "app": "android.debug",
         "device": "emulator"
       },
+      "android.manual": {
+        "device": "emulator",
+        "app": "android.debug",
+        "behavior": {
+          "launchApp": "manual"
+        },
+        "session": {
+          "autoStart": true,
+          "debugSynchronization": 0,
+          "server": "ws://localhost:8099",
+          "sessionId": "test"
+        },
+        "testRunner": {
+          "args": {
+            "testTimeout": 999999
+          }
+        },
+        "artifacts": false
+      },
       "android.emu.release": {
         "app": "android.release",
         "device": "emulator"
@@ -233,5 +253,13 @@
         "device": "genymotion.emulator.name"
       }
     }
+  },
+  "codegenConfig": {
+    "name": "rnnavigation",
+    "type": "all",
+    "jsSrcsDir": "./lib/src",
+    "android": {
+      "javaPackageName": "wix.rnn.specs"
+    }
   }
 }