react-native-navigation 7.24.3 → 7.25.1

package/lib/android/app/build.gradle

@@ -172,6 +172,7 @@ allprojects { p ->
 }
 
 dependencies {
+
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
@@ -189,13 +190,15 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
 
-    // tests
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.robolectric:robolectric:4.7.2"
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation 'org.mockito:mockito-core:4.0.0'
-    testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
-    testImplementation 'org.mockito:mockito-inline:3.4.0'
-    testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+    if("Playground".toLowerCase() == rootProject.name.toLowerCase()){
+        // tests only for our playground
+        testImplementation 'junit:junit:4.13.2'
+        testImplementation "org.robolectric:robolectric:4.7.2"
+        testImplementation 'org.assertj:assertj-core:3.11.1'
+        testImplementation 'org.mockito:mockito-core:4.0.0'
+        testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
+        testImplementation 'org.mockito:mockito-inline:3.4.0'
+        testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
+        testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+    }
 }

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

@@ -2,6 +2,8 @@ package com.reactnativenavigation.options;
 
 import android.content.Context;
 
+
+import com.reactnativenavigation.options.layout.LayoutOptions;
 import com.reactnativenavigation.options.params.NullNumber;
 import com.reactnativenavigation.options.params.NullText;
 import com.reactnativenavigation.options.parsers.TypefaceLoader;

package/lib/android/app/src/main/java/com/reactnativenavigation/options/layout/LayoutInsets.kt

@@ -0,0 +1,44 @@
+package com.reactnativenavigation.options.layout
+
+import com.reactnativenavigation.utils.dp
+import org.json.JSONObject
+
+class LayoutInsets(
+    var top: Int?=null,
+    var left: Int?=null,
+    var bottom: Int?=null,
+    var right: Int?=null
+) {
+     fun merge(toMerge: LayoutInsets?, defaults: LayoutInsets?) {
+        toMerge?.let { options->
+            options.top?.let { this.top = it  }
+            options.bottom?.let { this.bottom = it  }
+            options.left?.let { this.left = it  }
+            options.right?.let { this.right = it  }
+        }
+
+        defaults?.let {
+            options->
+            top = top?:options.top
+            left = left?:options.left
+            right = right?:options.right
+            bottom = bottom?:options.bottom
+        }
+    }
+
+    companion object{
+        fun parse(jsonObject: JSONObject?): LayoutInsets {
+            return LayoutInsets(
+                jsonObject?.optInt("top")?.dp,
+                jsonObject?.optInt("left")?.dp,
+                jsonObject?.optInt("bottom")?.dp,
+                jsonObject?.optInt("right")?.dp
+            )
+        }
+    }
+
+     fun hasValue(): Boolean {
+        return top!=null || bottom!=null || left!=null || right!=null
+    }
+
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/options/layout/LayoutOptions.kt

@@ -0,0 +1,71 @@
+package com.reactnativenavigation.options.layout
+
+import android.content.Context
+import com.reactnativenavigation.options.LayoutDirection
+import com.reactnativenavigation.options.OrientationOptions
+import com.reactnativenavigation.options.params.*
+import com.reactnativenavigation.options.params.Number
+import com.reactnativenavigation.options.parsers.BoolParser
+import com.reactnativenavigation.options.parsers.NumberParser
+import org.json.JSONObject
+
+class LayoutOptions {
+    @JvmField
+    var backgroundColor: ThemeColour = NullThemeColour()
+
+    @JvmField
+    var componentBackgroundColor: ThemeColour = NullThemeColour()
+
+    @JvmField
+    var topMargin: Number = NullNumber()
+
+    @JvmField
+    var adjustResize: Bool = NullBool()
+
+    @JvmField
+    var orientation = OrientationOptions()
+
+    @JvmField
+    var direction = LayoutDirection.DEFAULT
+
+    var insets: LayoutInsets = LayoutInsets()
+
+
+    fun mergeWith(other: LayoutOptions) {
+        if (other.backgroundColor.hasValue()) backgroundColor = other.backgroundColor
+        if (other.componentBackgroundColor.hasValue()) componentBackgroundColor = other.componentBackgroundColor
+        if (other.topMargin.hasValue()) topMargin = other.topMargin
+        if (other.orientation.hasValue()) orientation = other.orientation
+        if (other.direction.hasValue()) direction = other.direction
+        if (other.adjustResize.hasValue()) adjustResize = other.adjustResize
+        insets.merge(other.insets, null)
+    }
+
+    fun mergeWithDefault(defaultOptions: LayoutOptions) {
+        if (!backgroundColor.hasValue()) backgroundColor = defaultOptions.backgroundColor
+        if (!componentBackgroundColor.hasValue()) componentBackgroundColor = defaultOptions.componentBackgroundColor
+        if (!topMargin.hasValue()) topMargin = defaultOptions.topMargin
+        if (!orientation.hasValue()) orientation = defaultOptions.orientation
+        if (!direction.hasValue()) direction = defaultOptions.direction
+        if (!adjustResize.hasValue()) adjustResize = defaultOptions.adjustResize
+        insets.merge(null, defaultOptions.insets)
+
+    }
+
+    companion object {
+        @JvmStatic
+        fun parse(context: Context?, json: JSONObject?): LayoutOptions {
+            val result = LayoutOptions()
+            if (json == null) return result
+            result.backgroundColor = ThemeColour.parse(context!!, json.optJSONObject("backgroundColor"))
+            result.componentBackgroundColor = ThemeColour.parse(context, json.optJSONObject("componentBackgroundColor"))
+            result.topMargin = NumberParser.parse(json, "topMargin")
+            result.insets = LayoutInsets.parse(json.optJSONObject("insets"))
+            result.orientation = OrientationOptions.parse(json)
+            result.direction = LayoutDirection.fromString(json.optString("direction", ""))
+            result.adjustResize = BoolParser.parse(json, "adjustResize")
+            return result
+        }
+    }
+
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/PrimitiveExt.kt

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.utils
+
+import android.content.res.Resources
+
+val Int.dp: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
+
+val Float.dp: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java

@@ -144,16 +144,17 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
     protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
         ViewController<?> viewController = findController(view);
         if (viewController == null || viewController.getView() == null) return insets;
-        final Insets keyboardInsets = insets.getInsets( WindowInsetsCompat.Type.ime());
+        final int keyboardBottomInset = options.layout.adjustResize.get(true) ? insets.getInsets( WindowInsetsCompat.Type.ime()).bottom : 0;
         final Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars() );
         final int visibleNavBar = resolveCurrentOptions(presenter.defaultOptions).navigationBar.isVisible.isTrueOrUndefined()?1:0;
         final WindowInsetsCompat finalInsets = new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime(),
                 Insets.of(systemBarsInsets.left,
                         0,
                         systemBarsInsets.right,
-                        Math.max(visibleNavBar*systemBarsInsets.bottom,keyboardInsets.bottom))
+                        Math.max(visibleNavBar*systemBarsInsets.bottom,keyboardBottomInset))
         ).build();
-        return ViewCompat.onApplyWindowInsets(viewController.getView(), finalInsets);
+        ViewCompat.onApplyWindowInsets(viewController.getView(), finalInsets);
+        return insets;
     }
 
     @Override

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

@@ -4,11 +4,13 @@ import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.options.Options;
@@ -82,6 +84,8 @@ public class Navigator extends ParentController<ViewGroup> {
         overlaysLayout = new CoordinatorLayout(getActivity());
     }
 
+
+
     public void bindViews() {
         modalStack.setModalsLayout(modalsLayout);
         modalStack.setRootLayout(rootLayout);
@@ -147,6 +151,7 @@ public class Navigator extends ParentController<ViewGroup> {
         final ViewController<?> disappearing = previousRoot;
         root = appearing;
         root.setOverlay(new RootOverlay(getActivity(), contentLayout));
+        root.setParentController(this);
         rootPresenter.setRoot(appearing, disappearing, defaultOptions, new CommandListenerAdapter(commandListener) {
             @Override
             public void onSuccess(String childId) {

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

@@ -5,18 +5,17 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.os.Build;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.Window;
 
-import androidx.core.content.ContextCompat;
-
 import com.reactnativenavigation.options.NavigationBarOptions;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.OrientationOptions;
 import com.reactnativenavigation.options.StatusBarOptions;
 import com.reactnativenavigation.options.StatusBarOptions.TextColorScheme;
+import com.reactnativenavigation.options.layout.LayoutInsets;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.utils.SystemUiUtils;
 import com.reactnativenavigation.viewcontrollers.parent.ParentController;
@@ -25,6 +24,7 @@ import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 public class Presenter {
     private final Activity activity;
     private Options defaultOptions;
+
     public Presenter(Activity activity, Options defaultOptions) {
         this.activity = activity;
         this.defaultOptions = defaultOptions;
@@ -40,9 +40,15 @@ public class Presenter {
     }
 
     public void mergeOptions(ViewController<?> viewController, Options options) {
-        final Options withDefaults =  viewController.resolveCurrentOptions().copy().mergeWith(options).withDefaultOptions(defaultOptions);
+        final Options withDefaults = viewController.resolveCurrentOptions().copy().mergeWith(options).withDefaultOptions(defaultOptions);
         mergeStatusBarOptions(viewController.getView(), withDefaults.statusBar);
         mergeNavigationBarOptions(withDefaults.navigationBar);
+        applyLayoutInsetsOnMostTopParent(viewController,withDefaults.layout.getInsets());
+    }
+
+    private void applyLayoutInsetsOnMostTopParent(ViewController<?> viewController, LayoutInsets layoutInsets) {
+        final ViewController<?> topMostParent = viewController.getTopMostParent();
+        applyLayoutInsets(topMostParent.getView(), layoutInsets);
     }
 
     public void applyOptions(ViewController view, Options options) {
@@ -65,6 +71,16 @@ public class Presenter {
     private void applyViewOptions(ViewController view, Options options) {
         applyBackgroundColor(view, options);
         applyTopMargin(view.getView(), options);
+        applyLayoutInsetsOnMostTopParent(view, options.layout.getInsets());
+    }
+
+    private void applyLayoutInsets(ViewGroup view, LayoutInsets layoutInsets) {
+        if ( view!=null && layoutInsets.hasValue()) {
+            view.setPadding(layoutInsets.getLeft() == null ? view.getPaddingLeft() : layoutInsets.getLeft(),
+                    layoutInsets.getTop() == null ? view.getPaddingTop() : layoutInsets.getTop(),
+                    layoutInsets.getRight() == null ?view.getPaddingRight() : layoutInsets.getRight(),
+                    layoutInsets.getBottom() == null ? view.getPaddingBottom() : layoutInsets.getBottom());
+        }
     }
 
     private void applyTopMargin(View view, Options options) {
@@ -209,12 +225,12 @@ public class Presenter {
     }
 
     private void setNavigationBarBackgroundColor(NavigationBarOptions navigationBar) {
-         int navigationBarDefaultColor = SystemUiUtils.INSTANCE.getNavigationBarDefaultColor();
-         navigationBarDefaultColor = navigationBarDefaultColor==-1?Color.BLACK:navigationBarDefaultColor;
+        int navigationBarDefaultColor = SystemUiUtils.INSTANCE.getNavigationBarDefaultColor();
+        navigationBarDefaultColor = navigationBarDefaultColor == -1 ? Color.BLACK : navigationBarDefaultColor;
         if (navigationBar.backgroundColor.canApplyValue()) {
             int color = navigationBar.backgroundColor.get(navigationBarDefaultColor);
             SystemUiUtils.setNavigationBarBackgroundColor(activity.getWindow(), color, isColorLight(color));
-        }else{
+        } else {
             SystemUiUtils.setNavigationBarBackgroundColor(activity.getWindow(), navigationBarDefaultColor, isColorLight(navigationBarDefaultColor));
 
         }

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

@@ -1,5 +1,8 @@
 package com.reactnativenavigation.viewcontrollers.viewcontroller;
 
+import static com.reactnativenavigation.utils.CollectionUtils.forEach;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
@@ -31,9 +34,6 @@ import com.reactnativenavigation.views.component.Renderable;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.reactnativenavigation.utils.CollectionUtils.forEach;
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-
 public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener,
         ViewGroup.OnHierarchyChangeListener,
         BehaviourAdapter {
@@ -157,6 +157,14 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         }
     }
 
+    public ViewController<?> getTopMostParent(){
+        if(parentController!=null){
+            return parentController.getTopMostParent();
+        }else{
+            return this;
+        }
+    }
+
     @CallSuper
     public void applyOptions(Options options) {
 
@@ -289,6 +297,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
             if (view.getParent() instanceof ViewGroup) {
                 ((ViewManager) view.getParent()).removeView(view);
             }
+            setParentController(null);
             view = null;
             isDestroyed = true;
         }

package/lib/dist/src/interfaces/Options.d.ts

@@ -133,6 +133,16 @@ export interface OptionsLayout {
      * #### (iOS specific)
      */
     autoHideHomeIndicator?: boolean;
+    /**
+     * Add insets to the top layout
+     */
+    insets?: Insets;
+    /**
+     * Resizes the layout when keyboard is visible
+     * @default true
+     * #### (Android specific)
+     */
+    adjustResize?: boolean;
 }
 export declare enum OptionsModalPresentationStyle {
     formSheet = "formSheet",

package/lib/ios/RNNBasePresenter.m

@@ -58,6 +58,15 @@
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
+    UIViewController *viewController = self.boundViewController;
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    if (withDefault.layout.insets.hasValue) {
+        viewController.topMostViewController.additionalSafeAreaInsets =
+            UIEdgeInsetsMake([withDefault.layout.insets.top withDefault:0],
+                             [withDefault.layout.insets.left withDefault:0],
+                             [withDefault.layout.insets.bottom withDefault:0],
+                             [withDefault.layout.insets.right withDefault:0]);
+    }
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)mergeOptions
@@ -83,6 +92,14 @@
         _prefersHomeIndicatorAutoHidden = mergeOptions.layout.autoHideHomeIndicator.get;
         [self.boundViewController setNeedsUpdateOfHomeIndicatorAutoHidden];
     }
+
+    if (mergeOptions.layout.insets.hasValue) {
+        self.boundViewController.topMostViewController.additionalSafeAreaInsets =
+            UIEdgeInsetsMake([withDefault.layout.insets.top withDefault:0],
+                             [withDefault.layout.insets.left withDefault:0],
+                             [withDefault.layout.insets.bottom withDefault:0],
+                             [withDefault.layout.insets.right withDefault:0]);
+    }
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options

package/lib/ios/RNNBottomTabsController.m

@@ -88,6 +88,7 @@
 }
 
 - (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
     [self.presenter viewDidLayoutSubviews];
     [_dotIndicatorPresenter bottomTabsDidLayoutSubviews:self];
 }

package/lib/ios/RNNBridgeManager.mm

@@ -4,11 +4,11 @@
 #import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
 #import "RNNLayoutManager.h"
+#import "RNNModalHostViewManagerHandler.h"
 #import "RNNReactComponentRegistry.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNSplashScreen.h"
 #import <React/RCTBridge.h>
-#import <React/RCTModalHostViewManager.h>
 #import <React/RCTUIManager.h>
 
 @interface RNNBridgeManager ()
@@ -19,6 +19,7 @@
 @property(nonatomic, strong, readonly) RNNLayoutManager *layoutManager;
 @property(nonatomic, strong, readonly) RNNOverlayManager *overlayManager;
 @property(nonatomic, strong, readonly) RNNModalManager *modalManager;
+@property(nonatomic, strong, readonly) RNNModalHostViewManagerHandler *modalHostViewHandler;
 
 @end
 
@@ -66,7 +67,8 @@
         [[RNNModalManagerEventHandler alloc] initWithEventEmitter:eventEmitter];
     _modalManager = [[RNNModalManager alloc] initWithBridge:bridge
                                                eventHandler:modalManagerEventHandler];
-
+    _modalHostViewHandler =
+        [[RNNModalHostViewManagerHandler alloc] initWithModalManager:_modalManager];
     _layoutManager = [[RNNLayoutManager alloc] init];
 
     id<RNNComponentViewCreator> rootViewCreator =
@@ -105,7 +107,7 @@
 
 - (void)onJavaScriptLoaded {
     [_commandsHandler setReadyToReceiveCommands:true];
-    [_modalManager
+    [_modalHostViewHandler
         connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
     [[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
 }

package/lib/ios/RNNComponentViewController.m

@@ -111,6 +111,11 @@
     [self updateReactViewConstraints];
 }
 
+- (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
+    [self.presenter applyOptionsOnViewDidLayoutSubviews:self.resolveOptions];
+}
+
 - (void)updateReactViewConstraints {
     if (self.isViewLoaded && self.reactView) {
         [NSLayoutConstraint deactivateConstraints:_reactViewConstraints];

package/lib/ios/RNNLayoutOptions.h

@@ -1,5 +1,5 @@
+#import "RNNInsetsOptions.h"
 #import "RNNOptions.h"
-
 @interface RNNLayoutOptions : RNNOptions
 
 @property(nonatomic, strong) Color *backgroundColor;
@@ -7,6 +7,7 @@
 @property(nonatomic, strong) Text *direction;
 @property(nonatomic, strong) id orientation;
 @property(nonatomic, strong) Bool *autoHideHomeIndicator;
+@property(nonatomic, strong) RNNInsetsOptions *insets;
 
 - (UIInterfaceOrientationMask)supportedOrientations;
 

package/lib/ios/RNNLayoutOptions.m

@@ -11,6 +11,7 @@
     self.direction = [TextParser parse:dict key:@"direction"];
     self.orientation = dict[@"orientation"];
     self.autoHideHomeIndicator = [BoolParser parse:dict key:@"autoHideHomeIndicator"];
+    self.insets = [[RNNInsetsOptions alloc] initWithDict:dict[@"insets"]];
     return self;
 }
 
@@ -25,6 +26,9 @@
         self.orientation = options.orientation;
     if (options.autoHideHomeIndicator)
         self.autoHideHomeIndicator = options.autoHideHomeIndicator;
+    if (options.insets.hasValue) {
+        self.insets = options.insets;
+    }
 }
 
 - (UIInterfaceOrientationMask)supportedOrientations {

package/lib/ios/RNNModalHostViewManagerHandler.h

@@ -0,0 +1,11 @@
+#import "RNNModalManager.h"
+#import <Foundation/Foundation.h>
+#import <React/RCTModalHostViewManager.h>
+
+@interface RNNModalHostViewManagerHandler : NSObject
+
+- (instancetype)initWithModalManager:(RNNModalManager *)modalManager;
+
+- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager;
+
+@end

package/lib/ios/RNNModalHostViewManagerHandler.m

@@ -0,0 +1,40 @@
+#import "RNNModalHostViewManagerHandler.h"
+
+@implementation RNNModalHostViewManagerHandler {
+    RNNModalManager *_modalManager;
+}
+
+- (instancetype)initWithModalManager:(RNNModalManager *)modalManager {
+    self = [super init];
+    _modalManager = modalManager;
+    return self;
+}
+
+- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
+    modalHostViewManager.presentationBlock =
+        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
+          dispatch_block_t completionBlock) {
+          if (reactViewController.presentedViewController != viewController &&
+              [self->_modalManager topPresentedVC] != viewController) {
+              [self->_modalManager showModal:viewController
+                                    animated:animated
+                                  completion:^(NSString *_Nonnull componentId) {
+                                    if (completionBlock)
+                                        completionBlock();
+                                  }];
+          }
+        };
+
+    modalHostViewManager.dismissalBlock =
+        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
+          dispatch_block_t completionBlock) {
+          [self->_modalManager dismissModal:viewController
+                                   animated:animated
+                                 completion:^{
+                                   if (completionBlock)
+                                       completionBlock();
+                                 }];
+        };
+}
+
+@end

package/lib/ios/RNNModalManager.h

@@ -1,7 +1,6 @@
 #import "RNNModalManagerEventHandler.h"
 #import <Foundation/Foundation.h>
 #import <React/RCTBridge.h>
-#import <React/RCTModalHostViewManager.h>
 #import <UIKit/UIKit.h>
 
 typedef void (^RNNTransitionCompletionBlock)(void);
@@ -13,7 +12,6 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
 
 - (instancetype _Nonnull)initWithBridge:(RCTBridge *_Nonnull)bridge
                            eventHandler:(RNNModalManagerEventHandler *_Nonnull)eventHandler;
-- (void)connectModalHostViewManager:(RCTModalHostViewManager *_Nonnull)modalHostViewManager;
 
 - (void)showModal:(UIViewController *_Nonnull)viewController
          animated:(BOOL)animated
@@ -25,4 +23,6 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
 
 - (void)reset;
 
+- (UIViewController *)topPresentedVC;
+
 @end

package/lib/ios/RNNModalManager.m

@@ -32,32 +32,6 @@
     return self;
 }
 
-- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
-    modalHostViewManager.presentationBlock =
-        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
-          dispatch_block_t completionBlock) {
-          if (reactViewController.presentedViewController != viewController) {
-              [self showModal:viewController
-                     animated:animated
-                   completion:^(NSString *_Nonnull componentId) {
-                     if (completionBlock)
-                         completionBlock();
-                   }];
-          }
-        };
-
-    modalHostViewManager.dismissalBlock =
-        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
-          dispatch_block_t completionBlock) {
-          [self dismissModal:viewController
-                    animated:animated
-                  completion:^{
-                    if (completionBlock)
-                        completionBlock();
-                  }];
-        };
-}
-
 - (void)showModal:(UIViewController<RNNLayoutProtocol> *)viewController
          animated:(BOOL)animated
        completion:(RNNTransitionWithComponentIdCompletionBlock)completion {

package/lib/ios/RNNStackPresenter.m

@@ -88,6 +88,7 @@
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
+    [super applyOptionsOnViewDidLayoutSubviews:options];
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
     if (withDefault.topBar.background.component.name.hasValue) {
         [self presentBackgroundComponent];

package/lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -51,6 +51,8 @@
 		4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */; };
 		500623A525B7003A0086AB39 /* RNNShadowOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 500623A325B7003A0086AB39 /* RNNShadowOptions.h */; };
 		500623A625B7003A0086AB39 /* RNNShadowOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 500623A425B7003A0086AB39 /* RNNShadowOptions.m */; };
+		5006E12C27974B8900D106A6 /* RNNModalHostViewManagerHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */; };
+		5006E12D27974B8900D106A6 /* RNNModalHostViewManagerHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */; };
 		5008641223856A2D00A55BE9 /* UITabBar+utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5008641023856A2C00A55BE9 /* UITabBar+utils.m */; };
 		501214C9217741A000435148 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 501214C8217741A000435148 /* libOCMock.a */; };
 		501223D72173590F000F5F98 /* RNNStackPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501223D52173590F000F5F98 /* RNNStackPresenter.h */; };
@@ -580,6 +582,8 @@
 		4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLargeTitleOptions.m; sourceTree = "<group>"; };
 		500623A325B7003A0086AB39 /* RNNShadowOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNShadowOptions.h; sourceTree = "<group>"; };
 		500623A425B7003A0086AB39 /* RNNShadowOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNShadowOptions.m; sourceTree = "<group>"; };
+		5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalHostViewManagerHandler.h; sourceTree = "<group>"; };
+		5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNModalHostViewManagerHandler.m; sourceTree = "<group>"; };
 		5008641023856A2C00A55BE9 /* UITabBar+utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITabBar+utils.m"; sourceTree = "<group>"; };
 		5008641123856A2D00A55BE9 /* UITabBar+utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITabBar+utils.h"; sourceTree = "<group>"; };
 		501214C8217741A000435148 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
@@ -1092,6 +1096,8 @@
 				390AD476200F499D00A8250D /* RNNSwizzles.m */,
 				506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */,
 				506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */,
+				5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */,
+				5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */,
 				50644A1E20E11A720026709C /* Constants.h */,
 				50644A1F20E11A720026709C /* Constants.m */,
 				50706E6B20CE7CA5003345C3 /* UIImage+utils.h */,
@@ -1818,6 +1824,7 @@
 			files = (
 				506BF6622600AE7600A22755 /* BoundsTransition.h in Headers */,
 				91CB34C9250ED50C000C132B /* RNNSearchBarOptions.h in Headers */,
+				5006E12C27974B8900D106A6 /* RNNModalHostViewManagerHandler.h in Headers */,
 				5060DE73219DAD7E00D0C052 /* ReactNativeNavigation.h in Headers */,
 				506BF7CE26067B0500A22755 /* AnimatedUIImageView.h in Headers */,
 				5022EDBD2405237100852BA6 /* BottomTabPresenterCreator.h in Headers */,
@@ -2337,6 +2344,7 @@
 				5017D9EF239D2FAF00B74047 /* BottomTabsAfterInitialTabAttacher.m in Sources */,
 				5008641223856A2D00A55BE9 /* UITabBar+utils.m in Sources */,
 				9FDA2ABE24F2A42C005678CC /* RCTConvert+UIFontWeight.m in Sources */,
+				5006E12D27974B8900D106A6 /* RNNModalHostViewManagerHandler.m in Sources */,
 				9FDA2AC024F2A43B005678CC /* RCTConvert+SideMenuOpenGestureMode.m in Sources */,
 				50BCB27223F1650800D6C8E5 /* SharedElementTransition.m in Sources */,
 				E5F6C3A822DB4D0F0093C2CE /* UIView+Utils.m in Sources */,