react-native-navigation 8.0.0 → 8.1.0-alpha01

package/ReactNativeNavigation.podspec

@@ -19,23 +19,21 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |ss|
     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files    = 'lib/ios/**/*.{h,m,mm,cpp}'
+    s.source_files        = 'lib/ios/**/*.{h,m,mm,cpp}'
     s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
   end
 
-  if fabric_enabled
-    install_modules_dependencies(s)
-
-    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-    fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
-
-    s.pod_target_xcconfig = {
+  folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
+  s.pod_target_xcconfig = {
       'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
       "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-    }
+  }
+
+  if fabric_enabled
+    install_modules_dependencies(s)
 
-    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'
+    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED' + ' ' + '-DUSE_HERMES=1'
     s.requires_arc    = true
 
     s.dependency "React"
@@ -46,9 +44,12 @@ Pod::Spec.new do |s|
     s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
+    s.dependency "ReactCommon"
     s.dependency "React-runtimeexecutor"
     s.dependency "React-rncore"
+    s.dependency "React-RuntimeCore"
+  else
+    s.compiler_flags  = folly_compiler_flags
   end
 
   s.dependency 'React-Core'

package/lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -53,7 +53,7 @@ public abstract class NavigationApplication extends Application implements React
      * @return a singleton {@link ReactGateway}
      */
 	protected ReactGateway createReactGateway() {
-	    return new ReactGateway(getReactNativeHost());
+	    return new ReactGateway(getReactHost(), getReactNativeHost().getUseDeveloperSupport());
     }
     
 	public ReactGateway getReactGateway() {

package/lib/android/app/src/main/java/com/reactnativenavigation/options/LayoutFactory.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.options;
 import android.app.Activity;
 import android.content.Context;
 
+import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.reactnativenavigation.NavigationApplication;
@@ -50,23 +51,22 @@ import static com.reactnativenavigation.utils.CollectionUtils.*;
 import org.json.JSONObject;
 
 public class LayoutFactory {
-	private Activity activity;
+    private final ReactHost reactHost;
+    private Activity activity;
 	private ChildControllersRegistry childRegistry;
-	private final ReactInstanceManager reactInstanceManager;
 	private EventEmitter eventEmitter;
 	private Map<String, ExternalComponentCreator> externalComponentCreators;
 	private @NonNull Options defaultOptions = new Options();
 	private TypefaceLoader typefaceManager;
+	
+	public LayoutFactory(ReactHost reactHost) {
+        this.reactHost = reactHost;
+    }
 
 	public void setDefaultOptions(@NonNull Options defaultOptions) {
 		Assertions.assertNotNull(defaultOptions);
 		this.defaultOptions = defaultOptions;
 	}
-
-	public LayoutFactory(final ReactInstanceManager reactInstanceManager) {
-		this.reactInstanceManager = reactInstanceManager;
-	}
-
 	public void init(Activity activity, EventEmitter eventEmitter, ChildControllersRegistry childRegistry, Map<String, ExternalComponentCreator> externalComponentCreators) {
 		this.activity = activity;
 		this.eventEmitter = eventEmitter;
@@ -76,7 +76,7 @@ public class LayoutFactory {
 	}
 
 	public ViewController<?> create(final LayoutNode node) {
-		final ReactContext context = reactInstanceManager.getCurrentReactContext();
+		final ReactContext context = reactHost.getCurrentReactContext();
 		switch (node.type) {
 			case Component:
 				return createComponent(node);
@@ -164,7 +164,7 @@ public class LayoutFactory {
 				childRegistry,
 				id,
 				name,
-				new ComponentViewCreator(reactInstanceManager),
+				new ComponentViewCreator(),
 				parseOptions(node.getOptions()),
 				new Presenter(activity, defaultOptions),
 				new ComponentPresenter(defaultOptions)
@@ -179,7 +179,6 @@ public class LayoutFactory {
 				new Presenter(activity, defaultOptions),
 				externalComponent,
 				externalComponentCreators.get(externalComponent.name.get()),
-				reactInstanceManager,
 				new EventEmitter(context),
 				new ExternalComponentPresenter(),
 				parseOptions(node.getOptions())
@@ -194,9 +193,9 @@ public class LayoutFactory {
 				.setId(node.id)
 				.setInitialOptions(parseOptions(node.getOptions()))
 				.setStackPresenter(new StackPresenter(activity,
-						new TitleBarReactViewCreator(reactInstanceManager),
-						new TopBarBackgroundViewCreator(reactInstanceManager),
-						new TitleBarButtonCreator(reactInstanceManager),
+						new TitleBarReactViewCreator(),
+						new TopBarBackgroundViewCreator(),
+						new TitleBarButtonCreator(),
 						new IconResolver(activity, new ImageLoader()),
 						new TypefaceLoader(activity),
 						new RenderChecker(),
@@ -243,7 +242,7 @@ public class LayoutFactory {
 	}
 
     private Options parseOptions(JSONObject jsonOptions) {
-        Context context = reactInstanceManager.getCurrentReactContext();
+        Context context = reactHost.getCurrentReactContext();
         if (context == null) {
             context = activity == null ? NavigationApplication.instance : activity;
         }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -40,19 +40,17 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     private static final String NAME = "RNNBridgeModule";
 
     private final Now now = new Now();
-    private final ReactInstanceManager reactInstanceManager;
     private final JSONParser jsonParser;
     private final LayoutFactory layoutFactory;
     private EventEmitter eventEmitter;
 
     @SuppressWarnings("WeakerAccess")
-    public NavigationModule(ReactApplicationContext reactContext, ReactInstanceManager reactInstanceManager, LayoutFactory layoutFactory) {
-        this(reactContext, reactInstanceManager, new JSONParser(), layoutFactory);
+    public NavigationModule(ReactApplicationContext reactContext, LayoutFactory layoutFactory) {
+        this(reactContext, new JSONParser(), layoutFactory);
     }
 
-    public NavigationModule(ReactApplicationContext reactContext, ReactInstanceManager reactInstanceManager, JSONParser jsonParser, LayoutFactory layoutFactory) {
+    public NavigationModule(ReactApplicationContext reactContext,  JSONParser jsonParser, LayoutFactory layoutFactory) {
         super(reactContext);
-        this.reactInstanceManager = reactInstanceManager;
         this.jsonParser = jsonParser;
         this.layoutFactory = layoutFactory;
         reactContext.addLifecycleEventListener(new LifecycleEventListenerAdapter() {
@@ -116,7 +114,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
         final LayoutNode layoutTree = LayoutNodeParser.parse(Objects.requireNonNull(jsonParser.parse(rawLayoutTree).optJSONObject("root")));
         handle(() -> {
             final ViewController<?> viewController = layoutFactory.create(layoutTree);
-            navigator().setRoot(viewController, new NativeCommandListener("setRoot", commandId, promise, eventEmitter, now), reactInstanceManager);
+            navigator().setRoot(viewController, new NativeCommandListener("setRoot", commandId, promise, eventEmitter, now));
         });
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.kt

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.react
 
-import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
@@ -8,13 +9,13 @@ import com.facebook.react.uimanager.ViewManager
 import com.reactnativenavigation.options.LayoutFactory
 import com.reactnativenavigation.react.modal.ModalViewManager
 
-class NavigationPackage(private val reactNativeHost: ReactNativeHost) : ReactPackage {
+class NavigationPackage() : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        val reactApp = reactContext.applicationContext as ReactApplication
         return listOf(
             NavigationModule(
                 reactContext,
-                reactNativeHost.reactInstanceManager,
-                LayoutFactory(reactNativeHost.reactInstanceManager)
+                LayoutFactory(reactApp.reactHost)
             )
         )
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInitializer.java

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.react;
 
+import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.reactnativenavigation.NavigationActivity;
@@ -9,18 +10,18 @@ import androidx.annotation.NonNull;
 
 public class NavigationReactInitializer implements ReactInstanceManager.ReactInstanceEventListener {
 
-    private final ReactInstanceManager reactInstanceManager;
+    private final ReactHost reactHost;
     private final DevPermissionRequest devPermissionRequest;
     private boolean waitingForAppLaunchEvent = true;
     private boolean isActivityReadyForUi = false;
 
-    NavigationReactInitializer(ReactInstanceManager reactInstanceManager, boolean isDebug) {
-        this.reactInstanceManager = reactInstanceManager;
+    NavigationReactInitializer(ReactHost reactHost, boolean isDebug) {
+        this.reactHost = reactHost;
         this.devPermissionRequest = new DevPermissionRequest(isDebug);
     }
 
     void onActivityCreated() {
-        reactInstanceManager.addReactInstanceEventListener(this);
+        reactHost.addReactInstanceEventListener(this);
         waitingForAppLaunchEvent = true;
     }
 
@@ -28,7 +29,7 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
         if (devPermissionRequest.shouldAskPermission(activity)) {
             devPermissionRequest.askPermission(activity);
         } else {
-            reactInstanceManager.onHostResume(activity, activity);
+            reactHost.onHostResume(activity, activity);
             isActivityReadyForUi = true;
             prepareReactApp();
         }
@@ -36,24 +37,26 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
 
     void onActivityPaused(NavigationActivity activity) {
         isActivityReadyForUi = false;
-        if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-            reactInstanceManager.onHostPause(activity);
-        }
+        // TODO: Check it needed
+        //if (reactHost.hasStartedCreatingInitialContext()) {
+        reactHost.onHostPause(activity);
+        //}
     }
 
     void onActivityDestroyed(NavigationActivity activity) {
-        reactInstanceManager.removeReactInstanceEventListener(this);
-        if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-            reactInstanceManager.onHostDestroy(activity);
-        }
+        reactHost.removeReactInstanceEventListener(this);
+        //if (reactHost.gehasStartedCreatingInitialContext()) {
+        reactHost.onHostDestroy(activity);
+        //}
     }
 
     private void prepareReactApp() {
-        if (shouldCreateContext()) {
-            reactInstanceManager.createReactContextInBackground();
-        } else if (waitingForAppLaunchEvent) {
-            if (reactInstanceManager.getCurrentReactContext() != null) {
-                emitAppLaunched(reactInstanceManager.getCurrentReactContext());
+        // TODO: Check if needed
+        //if (shouldCreateContext()) {
+        reactHost.start();
+        if (waitingForAppLaunchEvent) {
+            if (reactHost.getCurrentReactContext() != null) {
+                emitAppLaunched(reactHost.getCurrentReactContext());
             }
         }
     }
@@ -64,10 +67,6 @@ public class NavigationReactInitializer implements ReactInstanceManager.ReactIns
         new EventEmitter(context).appLaunched();
     }
 
-    private boolean shouldCreateContext() {
-        return !reactInstanceManager.hasStartedCreatingInitialContext();
-    }
-
     @Override
     public void onReactContextInitialized(final ReactContext context) {
         emitAppLaunched(context);

package/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactComponentViewCreator.java

@@ -6,14 +6,8 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator;
 
 public class ReactComponentViewCreator implements ReactViewCreator {
-	private ReactInstanceManager reactInstanceManager;
-
-	public ReactComponentViewCreator(final ReactInstanceManager reactInstanceManager) {
-		this.reactInstanceManager = reactInstanceManager;
-	}
-
 	@Override
 	public ReactView create(final Activity activity, final String componentId, final String componentName) {
-		return new ReactView(activity, reactInstanceManager, componentId, componentName);
+		return new ReactView(activity, componentId, componentName);
 	}
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -1,18 +1,22 @@
 package com.reactnativenavigation.react;
 
+import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParentLP;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
 
 import androidx.annotation.RestrictTo;
 
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactHost;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.uimanager.JSTouchDispatcher;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.interfaces.fabric.ReactSurface;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
@@ -21,21 +25,22 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListe
 import com.reactnativenavigation.views.component.Renderable;
 
 @SuppressLint("ViewConstructor")
-public class ReactView extends ReactRootView implements IReactView, Renderable {
-
-    private final ReactInstanceManager reactInstanceManager;
+public class ReactView extends FrameLayout implements IReactView, Renderable {
     private final String componentId;
     private final String componentName;
     private boolean isAttachedToReactInstance = false;
-    private final JSTouchDispatcher jsTouchDispatcher;
 
-    public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
+    private final ReactSurface reactSurface;
+
+    public ReactView(final Context context, String componentId, String componentName) {
         super(context);
-        this.reactInstanceManager = reactInstanceManager;
         this.componentId = componentId;
         this.componentName = componentName;
-        jsTouchDispatcher = new JSTouchDispatcher(this);
-        setIsFabric(ReactFeatureFlags.enableFabricRenderer);
+
+        final Bundle opts = new Bundle();
+        opts.putString("componentId", componentId);
+        reactSurface = getReactHost().createSurface(context, componentName, opts);
+        addView(reactSurface.getView(), matchParentLP());
     }
 
     @Override
@@ -47,9 +52,7 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
     public void start() {
         if (isAttachedToReactInstance) return;
         isAttachedToReactInstance = true;
-        final Bundle opts = new Bundle();
-        opts.putString("componentId", componentId);
-        startReactApplication(reactInstanceManager, componentName, opts);
+        reactSurface.start();
     }
 
     @Override
@@ -64,13 +67,12 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
 
     @Override
     public void destroy() {
-        unmountReactApplication();
+        reactSurface.stop();
     }
 
     public void sendComponentWillStart(ComponentType type) {
         this.post(()->{
-            if (this.reactInstanceManager == null) return;
-            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            ReactContext currentReactContext = getReactContent();
             if (currentReactContext != null)
                 new EventEmitter(currentReactContext).emitComponentWillAppear(componentId, componentName, type);
         });
@@ -78,8 +80,7 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
 
     public void sendComponentStart(ComponentType type) {
         this.post(()->{
-            if (this.reactInstanceManager == null) return;
-            ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+            ReactContext currentReactContext = getReactContent();
             if (currentReactContext != null) {
                 new EventEmitter(currentReactContext).emitComponentDidAppear(componentId, componentName, type);
             }
@@ -87,8 +88,7 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
     }
 
     public void sendComponentStop(ComponentType type) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+        ReactContext currentReactContext = getReactContent();
         if (currentReactContext != null) {
             new EventEmitter(currentReactContext).emitComponentDidDisappear(componentId, componentName, type);
         }
@@ -96,8 +96,7 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
 
     @Override
     public void sendOnNavigationButtonPressed(String buttonId) {
-        if (this.reactInstanceManager == null) return;
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
+        ReactContext currentReactContext = getReactContent();
         if (currentReactContext != null) {
             new EventEmitter(currentReactContext).emitOnNavigationButtonPressed(componentId, buttonId);
         }
@@ -110,7 +109,10 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
 
     @Override
     public void dispatchTouchEventToJs(MotionEvent event) {
-        jsTouchDispatcher.handleTouchEvent(event, getEventDispatcher());
+        View view = reactSurface.getView();
+        if (view != null) {
+            view.onTouchEvent(event);
+        }
     }
 
     @Override
@@ -119,12 +121,20 @@ public class ReactView extends ReactRootView implements IReactView, Renderable {
     }
 
     public EventDispatcher getEventDispatcher() {
-        ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-        return reactContext == null ? null : reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
+        ReactContext reactContext = getReactContent();
+        return reactContext == null ? null : UIManagerHelper.getEventDispatcher(reactContext, UIManagerType.FABRIC);
     }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
     public String getComponentName() {
         return componentName;
     }
+
+    private ReactHost getReactHost() {
+        return  ((ReactApplication)getContext().getApplicationContext()).getReactHost();
+    }
+
+    private ReactContext getReactContent() {
+        return getReactHost().getCurrentReactContext();
+    }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalFrameLayout.kt

@@ -8,7 +8,7 @@ class ModalFrameLayout(context: ReactContext) : FrameLayout(context) {
     val modalContentLayout = ModalContentLayout(context)
 
     init {
-        addView(modalContentLayout, MarginLayoutParams(MarginLayoutParams.WRAP_CONTENT, MarginLayoutParams.WRAP_CONTENT)
+        addView(modalContentLayout, MarginLayoutParams(MarginLayoutParams.MATCH_PARENT, MarginLayoutParams.MATCH_PARENT)
             .apply {
                 val translucent = context.currentActivity?.window?.let {
                     SystemUiUtils.isTranslucent(it)

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalLayoutController.kt

@@ -2,7 +2,9 @@ package com.reactnativenavigation.react.modal
 
 import android.app.Activity
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.common.UIManagerType
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.react.Constants
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
@@ -35,17 +37,13 @@ class ModalLayoutController(
 
     override fun sendOnNavigationButtonPressed(buttonId: String?) {
         if (buttonId == Constants.HARDWARE_BACK_BUTTON_ID) {
-            val dispatcher = reactContext.getNativeModule(
-                    UIManagerModule::class.java
-            )?.eventDispatcher
+            val dispatcher = UIManagerHelper.getEventDispatcher(reactContext, UIManagerType.FABRIC)
             dispatcher?.dispatchEvent(RequestCloseModalEvent(getHostId()))
         }
     }
 
     fun sendShowEvent() {
-        val dispatcher = reactContext.getNativeModule(
-                UIManagerModule::class.java
-        )?.eventDispatcher
+        val dispatcher = UIManagerHelper.getEventDispatcher(reactContext, UIManagerType.FABRIC)
         dispatcher?.dispatchEvent(ShowModalEvent(getHostId()))
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/externalcomponent/ExternalComponentCreator.java

@@ -7,5 +7,5 @@ import com.facebook.react.ReactInstanceManager;
 import org.json.JSONObject;
 
 public interface ExternalComponentCreator {
-    ExternalComponent create(FragmentActivity activity, ReactInstanceManager reactInstanceManager, JSONObject props);
+    ExternalComponent create(FragmentActivity activity, JSONObject props);
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/externalcomponent/ExternalComponentViewController.java

@@ -24,15 +24,13 @@ import static com.reactnativenavigation.utils.ObjectUtils.perform;
 public class ExternalComponentViewController extends ChildController<ExternalComponentLayout> {
     private final ExternalComponent externalComponent;
     private final ExternalComponentCreator componentCreator;
-    private ReactInstanceManager reactInstanceManager;
     private final EventEmitter emitter;
     private final ExternalComponentPresenter presenter;
 
-    public ExternalComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, ExternalComponent externalComponent, ExternalComponentCreator componentCreator, ReactInstanceManager reactInstanceManager, EventEmitter emitter, ExternalComponentPresenter externalComponentPresenter, Options initialOptions) {
+    public ExternalComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, ExternalComponent externalComponent, ExternalComponentCreator componentCreator, EventEmitter emitter, ExternalComponentPresenter externalComponentPresenter, Options initialOptions) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.externalComponent = externalComponent;
         this.componentCreator = componentCreator;
-        this.reactInstanceManager = reactInstanceManager;
         this.emitter = emitter;
         this.presenter = externalComponentPresenter;
     }
@@ -42,7 +40,7 @@ public class ExternalComponentViewController extends ChildController<ExternalCom
         ExternalComponentLayout content = new ExternalComponentLayout(getActivity());
         enableDrawingBehindStatusBar(content);
         content.addView(componentCreator
-                .create(getActivity(), reactInstanceManager, externalComponent.passProps)
+                .create(getActivity(), externalComponent.passProps)
                 .asView(), CoordinatorLayoutUtils.matchParentWithBehaviour(new BehaviourDelegate(this)));
         return content;
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -143,7 +143,7 @@ public class Navigator extends ParentController<ViewGroup> {
 
     }
 
-    public void setRoot(final ViewController<?> appearing, CommandListener commandListener, ReactInstanceManager reactInstanceManager) {
+    public void setRoot(final ViewController<?> appearing, CommandListener commandListener) {
         previousRoot = root;
         modalStack.destroy();
         final boolean removeSplashView = isRootNotCreated();
@@ -160,7 +160,7 @@ public class Navigator extends ParentController<ViewGroup> {
                 destroyPreviousRoot();
                 super.onSuccess(childId);
             }
-        }, reactInstanceManager);
+        });
     }
 
     public void mergeOptions(final String componentId, Options options) {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/RootPresenter.java

@@ -34,7 +34,7 @@ public class RootPresenter {
         this.layoutDirectionApplier = layoutDirectionApplier;
     }
 
-    public void setRoot(ViewController appearingRoot, ViewController<?> disappearingRoot, Options defaultOptions, CommandListener listener, ReactInstanceManager reactInstanceManager) {
+    public void setRoot(ViewController appearingRoot, ViewController<?> disappearingRoot, Options defaultOptions, CommandListener listener) {
         layoutDirectionApplier.apply(appearingRoot, defaultOptions);
         rootLayout.addView(appearingRoot.getView(), matchParentWithBehaviour(new BehaviourDelegate(appearingRoot)));
         Options options = appearingRoot.resolveCurrentOptions(defaultOptions);

package/lib/android/app/src/main/java/com/reactnativenavigation/views/component/ComponentViewCreator.java

@@ -9,16 +9,9 @@ import com.reactnativenavigation.react.ReactComponentViewCreator;
 import com.reactnativenavigation.react.ReactView;
 
 public class ComponentViewCreator implements ReactViewCreator {
-
-    private ReactInstanceManager instanceManager;
-
-    public ComponentViewCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-	}
-
 	@Override
 	public IReactView create(Activity activity, String componentId, String componentName) {
-        ReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
+        ReactView reactView = new ReactComponentViewCreator().create(activity, componentId, componentName);
         return new ComponentLayout(activity, reactView);
 	}
 }

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

@@ -9,7 +9,7 @@ import com.reactnativenavigation.react.ReactView;
 @SuppressLint("ViewConstructor")
 public class TopBarBackgroundView extends ReactView {
 
-    public TopBarBackgroundView(Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
-        super(context, reactInstanceManager, componentId, componentName);
+    public TopBarBackgroundView(Context context, String componentId, String componentName) {
+        super(context,  componentId, componentName);
     }
 }

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

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

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

@@ -6,14 +6,7 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.options.ComponentOptions;
 
 public class TitleBarButtonCreator {
-
-    private ReactInstanceManager instanceManager;
-
-    public TitleBarButtonCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-	}
-
 	public TitleBarReactButtonView create(Activity activity, ComponentOptions component) {
-        return new TitleBarReactButtonView(activity, instanceManager, component);
+        return new TitleBarReactButtonView(activity, component);
     }
 }

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

@@ -18,8 +18,8 @@ import static com.reactnativenavigation.utils.UiUtils.dpToPx;
 public class TitleBarReactButtonView extends ReactView {
     private final ComponentOptions component;
 
-    public TitleBarReactButtonView(Context context, ReactInstanceManager reactInstanceManager, ComponentOptions component) {
-        super(context, reactInstanceManager, component.componentId.get(), component.name.get());
+    public TitleBarReactButtonView(Context context, ComponentOptions component) {
+        super(context, component.componentId.get(), component.name.get());
         this.component = component;
     }
 
@@ -28,7 +28,7 @@ public class TitleBarReactButtonView extends ReactView {
         
         //This is a workaround, ReactNative throws exception when views have ids, On android MenuItems 
         // With ActionViews like this got an id, see #7253
-        if (!this.isAttachedToWindow() || this.getReactInstanceManager() == null) {
+        if (!this.isAttachedToWindow()) {
             this.setId(View.NO_ID);
         }