react-native-navigation 7.25.4 → 7.26.0-alpha.1-snapshot.595

package/lib/Mock/Components/NavigationButton.tsx

@@ -18,6 +18,7 @@ export const NavigationButton = class extends Component<ButtonProps> {
         testID={button.testID}
         key={button.id}
         title={button.text || ''}
+        disabled={button.enabled === false}
         onPress={() =>
           button.enabled !== false &&
           events.invokeNavigationButtonPressed({

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -77,17 +77,22 @@ export class NativeCommandsSender {
   }
 
   dismissModal(_commandId: string, componentId: string, _options?: object) {
-    return new Promise((resolve) => {
-      const modal = LayoutStore.getModalById(componentId).getTopParent();
-      modal.componentDidDisappear();
-      LayoutStore.dismissModal(componentId);
-      events.invokeModalDismissed({
-        componentName: modal.data.name,
-        componentId: modal.nodeId,
-        modalsDismissed: 1,
-      });
-      resolve(modal.nodeId);
-      LayoutStore.getVisibleLayout().componentDidAppear();
+    return new Promise((resolve, reject) => {
+      const modal = LayoutStore.getModalById(componentId);
+      if (modal) {
+        const modalTopParent = modal.getTopParent();
+        modalTopParent.componentDidDisappear();
+        LayoutStore.dismissModal(componentId);
+        events.invokeModalDismissed({
+          componentName: modalTopParent.data.name,
+          componentId: modalTopParent.nodeId,
+          modalsDismissed: 1,
+        });
+        resolve(modalTopParent.nodeId);
+        LayoutStore.getVisibleLayout().componentDidAppear();
+      } else {
+        reject(`component with id: ${componentId} is not a modal`);
+      }
     });
   }
 

package/lib/android/app/build.gradle

@@ -106,6 +106,10 @@ android {
             dimension "RNN.reactNativeVersion"
             buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "63")
         }
+        reactNative68 {
+            dimension "RNN.reactNativeVersion"
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "68")
+        }
     }
 
     def flavor = resolveFlavor()
@@ -122,7 +126,9 @@ String resolveFlavor() {
     Integer reactNativeMinorComponent = reactNativeVersionComponents[1].toInteger()
     Integer reactNativePatchComponent = reactNativeVersionComponents[2].toInteger()
 
-    if (reactNativeMinorComponent >= 63) {
+    if (reactNativeMinorComponent >= 68) {
+        return "reactNative68"
+    } else if (reactNativeMinorComponent >= 63) {
         return "reactNative63"
     } else if (reactNativeMinorComponent >= 62) {
         return "reactNative62"
@@ -161,16 +167,6 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
     return reactNativeVersion.tokenize('-')[0].tokenize('.')
 }
 
-allprojects { p ->
-    p.afterEvaluate {
-        p.android.compileOptions.sourceCompatibility JavaVersion.VERSION_1_8
-        p.android.compileOptions.targetCompatibility JavaVersion.VERSION_1_8
-    }
-    p.repositories {
-        maven { url "https://jitpack.io" }
-    }
-}
-
 dependencies {
 
     implementation "androidx.core:core-ktx:1.6.0"

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

@@ -3,26 +3,28 @@ package com.reactnativenavigation;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
-import com.reactnativenavigation.react.CommandListenerAdapter;
+import com.reactnativenavigation.options.Options;
+import com.reactnativenavigation.viewcontrollers.overlay.OverlayManager;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.RootPresenter;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.ReactGateway;
+import com.reactnativenavigation.react.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
-import com.reactnativenavigation.viewcontrollers.overlay.OverlayManager;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.RootPresenter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity, JsDevReloadHandler.ReloadListener {
     @Nullable

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

@@ -25,7 +25,6 @@ public class BottomTabOptions {
         BottomTabOptions options = new BottomTabOptions();
         if (json == null) return options;
 
-        options.id = TextParser.parse(json, "id");
         options.text = TextParser.parse(json, "text");
         options.textColor = ThemeColour.parse(context, json.optJSONObject("textColor"));
         options.selectedTextColor = ThemeColour.parse(context, json.optJSONObject("selectedTextColor"));
@@ -49,7 +48,6 @@ public class BottomTabOptions {
         return options;
     }
 
-    public Text id = new NullText();
     public Text text = new NullText();
     public ThemeColour textColor = new NullThemeColour();
     public ThemeColour selectedTextColor = new NullThemeColour();
@@ -72,7 +70,6 @@ public class BottomTabOptions {
 
 
     void mergeWith(final BottomTabOptions other) {
-        if (other.id.hasValue()) id = other.id;
         if (other.textColor.hasValue()) textColor = other.textColor;
         if (other.selectedTextColor.hasValue()) selectedTextColor = other.selectedTextColor;
         if (other.iconColor.hasValue()) iconColor = other.iconColor;
@@ -96,7 +93,6 @@ public class BottomTabOptions {
     }
 
     void mergeWithDefault(final BottomTabOptions defaultOptions) {
-        if (!id.hasValue()) id = defaultOptions.id;
         if (!textColor.hasValue()) textColor = defaultOptions.textColor;
         if (!selectedTextColor.hasValue()) selectedTextColor = defaultOptions.selectedTextColor;
         if (!iconColor.hasValue()) iconColor = defaultOptions.iconColor;

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

@@ -8,7 +8,8 @@ public enum Orientation {
     Landscape("landscape", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
     Portrait("portrait", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
     PortraitLandscape("sensor", ActivityInfo.SCREEN_ORIENTATION_USER),
-    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE),
+    SensorPortrait("sensorPortrait", ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
 
     public String name;
     public int orientationCode;

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

@@ -44,6 +44,8 @@ public class OrientationOptions {
                 return orientations.contains(Orientation.Landscape) ? Orientation.PortraitLandscape.orientationCode : Orientation.Portrait.orientationCode;
             case SensorLandscape:
                 return Orientation.SensorLandscape.orientationCode;
+            case SensorPortrait:
+                return Orientation.SensorPortrait.orientationCode;
             default:
             case Default:
                 return Orientation.Default.orientationCode;

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

@@ -1,4 +1,3 @@
-
 package com.reactnativenavigation.options;
 
 import com.reactnativenavigation.options.params.Bool;
@@ -9,11 +8,11 @@ import org.json.JSONObject;
 
 public class OverlayOptions {
     public Bool interceptTouchOutside = new NullBool();
-    public OverlayAttachOptions overlayAttachOptions = new OverlayAttachOptions();
+
     public static OverlayOptions parse(JSONObject json) {
         OverlayOptions options = new OverlayOptions();
         if (json == null) return options;
-        options.overlayAttachOptions = OverlayAttachOptions.parse(json.optJSONObject("attach"));
+
         options.interceptTouchOutside = BoolParser.parse(json,"interceptTouchOutside");
         return options;
     }

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

@@ -6,6 +6,8 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableNativeMap;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -59,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
             @Override
             public void onHostPause() {
                 super.onHostPause();
-                navigator().onHostPause();
+                UiUtils.runOnMainThread(() -> navigator().onHostPause());
             }
 
             @Override
@@ -72,7 +72,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                         navigator().getChildRegistry(),
                         ((NavigationApplication) activity().getApplication()).getExternalComponents()
                 );
-                navigator().onHostResume();
+                UiUtils.runOnMainThread(() -> navigator().onHostResume());
             }
         });
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabPresenter.java

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
 
+import com.aurelhubert.ahbottomnavigation.AHTextView;
 import com.aurelhubert.ahbottomnavigation.notification.AHNotification;
 import com.reactnativenavigation.options.BottomTabOptions;
 import com.reactnativenavigation.options.DotIndicatorOptions;
@@ -57,7 +58,6 @@ public class BottomTabPresenter {
         bottomTabs.perform(bottomTabs -> {
             for (int i = 0; i < tabs.size(); i++) {
                 BottomTabOptions tab = tabs.get(i).resolveCurrentOptions(defaultOptions).bottomTabOptions;
-                bottomTabs.setTagForTabIndex(i, tab.id.get(null));
                 bottomTabs.setIconWidth(i, tab.iconWidth.get(null));
                 bottomTabs.setIconHeight(i, tab.iconHeight.get(null));
                 bottomTabs.setTitleTypeface(i, tab.font.getTypeface(typefaceLoader, defaultTypeface));
@@ -87,7 +87,6 @@ public class BottomTabPresenter {
             int index = bottomTabFinder.findByControllerId(child.getId());
             if (index >= 0) {
                 BottomTabOptions tab = options.bottomTabOptions;
-                if (tab.id.hasValue()) bottomTabs.setTagForTabIndex(index, tab.id.get());
                 if (tab.iconWidth.hasValue()) bottomTabs.setIconWidth(index, tab.iconWidth.get(null));
                 if (tab.iconHeight.hasValue()) bottomTabs.setIconHeight(index, tab.iconHeight.get(null));
                 if (tab.font.hasValue()) bottomTabs.setTitleTypeface(index, tab.font.getTypeface(typefaceLoader, defaultTypeface));

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -1,10 +1,5 @@
 package com.reactnativenavigation.viewcontrollers.bottomtabs;
 
-import static com.reactnativenavigation.utils.CollectionUtils.forEach;
-import static com.reactnativenavigation.utils.CollectionUtils.map;
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-import static com.reactnativenavigation.views.bottomtabs.BottomTabs.TAB_NOT_FOUND;
-
 import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
@@ -12,7 +7,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
@@ -21,7 +15,6 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.options.BottomTabOptions;
 import com.reactnativenavigation.options.HwBackBottomTabsBehaviour;
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.react.CommandListener;
 import com.reactnativenavigation.react.CommandListenerAdapter;
 import com.reactnativenavigation.react.events.EventEmitter;
@@ -32,7 +25,6 @@ import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.bottomtabs.BottomTabs;
 import com.reactnativenavigation.views.bottomtabs.BottomTabsContainer;
 import com.reactnativenavigation.views.bottomtabs.BottomTabsLayout;
@@ -42,6 +34,10 @@ import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
 
+import static com.reactnativenavigation.utils.CollectionUtils.forEach;
+import static com.reactnativenavigation.utils.CollectionUtils.map;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 public class BottomTabsController extends ParentController<BottomTabsLayout> implements AHBottomNavigation.OnTabSelectedListener, TabSelector {
 
     private BottomTabsContainer bottomTabsContainer;
@@ -242,29 +238,6 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
         return super.onMeasureChild(parent, child, parentWidthMeasureSpec, widthUsed, parentHeightMeasureSpec, heightUsed);
     }
 
-    @Override
-    public ViewTooltip.TooltipView showAnchoredOverlay(@NonNull View anchorView, @NonNull OverlayAttachOptions overlayAttachOptions,
-                                                       @NonNull ViewController<?> overlayViewController) {
-        if(view!=null){
-            return view.getAttachedOverlayContainer().addAnchoredView(anchorView, overlayViewController.getView(),
-                    overlayAttachOptions.gravity.get());
-        }
-       return null;
-    }
-
-    public View getTabViewByTag(String id) {
-        int tabIndex = bottomTabs.getTabIndexByTag(id);
-        if (tabIndex != TAB_NOT_FOUND) {
-            return bottomTabs.getViewAtPosition(tabIndex);
-        }
-        return null;
-    }
-
-    @Override
-    public List<ViewController<?>> getChildren() {
-        return tabs;
-    }
-
     @Override
     public int getBottomInset(ViewController<?> child) {
         return presenter.getBottomInset(resolveChildOptions(child)) + perform(getParentController(), 0, p -> p.getBottomInset(this));

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildController.java

@@ -2,21 +2,28 @@ package com.reactnativenavigation.viewcontrollers.child;
 
 import android.app.Activity;
 import android.content.res.Configuration;
+import android.os.Build;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-
-import androidx.annotation.CallSuper;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
+import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.utils.LogKt;
+import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.component.Component;
 
+import androidx.annotation.CallSuper;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T> {
     private final Presenter presenter;
     private final ChildControllersRegistry childRegistry;

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

@@ -3,10 +3,8 @@ package com.reactnativenavigation.viewcontrollers.component;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
 
-import com.reactnativenavigation.options.OverlayAttachOptions;
+import com.reactnativenavigation.utils.LogKt;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
@@ -15,42 +13,34 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ReactViewCreator
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.component.ComponentLayout;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
-import androidx.core.view.ViewKt;
 import androidx.core.view.WindowInsetsCompat;
 
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
-import kotlin.Unit;
-
 public class ComponentViewController extends ChildController<ComponentLayout> {
     private final String componentName;
     private final ComponentPresenter presenter;
     private final ReactViewCreator viewCreator;
-    private boolean ignoreInsets = false;
 
-    public void ignoreInsets(boolean ignore) {
-        ignoreInsets = ignore;
+    private enum VisibilityState {
+        Appear, Disappear
     }
 
-    private enum VisibilityState {Appear, Disappear}
-
     private VisibilityState lastVisibilityState = VisibilityState.Disappear;
 
     public ComponentViewController(final Activity activity,
-                                   final ChildControllersRegistry childRegistry,
-                                   final String id,
-                                   final String componentName,
-                                   final ReactViewCreator viewCreator,
-                                   final Options initialOptions,
-                                   final Presenter presenter,
-                                   final ComponentPresenter componentPresenter) {
+            final ChildControllersRegistry childRegistry,
+            final String id,
+            final String componentName,
+            final ReactViewCreator viewCreator,
+            final Options initialOptions,
+            final Presenter presenter,
+            final ComponentPresenter componentPresenter) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.componentName = componentName;
         this.viewCreator = viewCreator;
@@ -59,7 +49,8 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void start() {
-        if (!isDestroyed()) getView().start();
+        if (!isDestroyed())
+            getView().start();
     }
 
     @Override
@@ -90,19 +81,20 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
         if (view != null)
             view.sendComponentWillStart();
         super.onViewDidAppear();
-        if (view != null) {
+        if (view != null)
             view.requestApplyInsets();
-            if (lastVisibilityState == VisibilityState.Disappear)
-                view.sendComponentStart();
-        }
+        if (view != null && lastVisibilityState == VisibilityState.Disappear)
+            view.sendComponentStart();
         lastVisibilityState = VisibilityState.Appear;
     }
 
     @Override
     public void onViewDisappear() {
-        if (lastVisibilityState == VisibilityState.Disappear) return;
+        if (lastVisibilityState == VisibilityState.Disappear)
+            return;
         lastVisibilityState = VisibilityState.Disappear;
-        if (view != null) view.sendComponentStop();
+        if (view != null)
+            view.sendComponentStop();
         super.onViewDisappear();
     }
 
@@ -113,7 +105,8 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void applyOptions(Options options) {
-        if (isRoot()) applyTopInset();
+        if (isRoot())
+            applyTopInset();
         super.applyOptions(options);
         getView().applyOptions(options);
         presenter.applyOptions(getView(), resolveCurrentOptions(presenter.defaultOptions));
@@ -133,50 +126,51 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void mergeOptions(Options options) {
-        if (options == Options.EMPTY) return;
-        if (isViewShown()) presenter.mergeOptions(getView(), options);
+        if (options == Options.EMPTY)
+            return;
+        if (isViewShown())
+            presenter.mergeOptions(getView(), options);
         super.mergeOptions(options);
     }
 
     @Override
     public void applyTopInset() {
-        if (view != null && !ignoreInsets) presenter.applyTopInsets(view, getTopInset());
+        if (view != null)
+            presenter.applyTopInsets(view, getTopInset());
     }
 
     @Override
     public int getTopInset() {
-        int statusBarInset = resolveCurrentOptions(presenter.defaultOptions).statusBar.isHiddenOrDrawBehind() ? 0 : SystemUiUtils.getStatusBarHeight(getActivity());
+        int statusBarInset = resolveCurrentOptions(presenter.defaultOptions).statusBar.isHiddenOrDrawBehind() ? 0
+                : SystemUiUtils.getStatusBarHeight(getActivity());
         final Integer perform = perform(getParentController(), 0, p -> p.getTopInset(this));
         return statusBarInset + perform;
     }
 
     @Override
     public void applyBottomInset() {
-        if (view != null && !ignoreInsets) presenter.applyBottomInset(view, getBottomInset());
+        if (view != null)
+            presenter.applyBottomInset(view, getBottomInset());
     }
 
     @Override
     protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
-        ViewController<?> viewController = findController(view);
-        if (viewController == null || viewController.getView() == null || ignoreInsets) return insets;
-        final Options currentOptions = resolveCurrentOptions(presenter.defaultOptions);
-        int mode = getActivity().getWindow().getAttributes().softInputMode;
-        boolean adjustNothing = (mode & WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) ==WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING ;
-        final int keyboardBottomInset = currentOptions.layout.adjustResize.get(true) &&!adjustNothing ?
-                insets.getInsets(WindowInsetsCompat.Type.ime()).bottom : 0;
         final Insets systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-        final int visibleNavBar = currentOptions.navigationBar.isVisible.isTrueOrUndefined() ? 1 : 0;
-        final int controllerBottomInset = currentOptions.bottomTabsOptions.isHiddenOrDrawBehind() ? 0 : getBottomInset();
-        final WindowInsetsCompat finalInsets = new WindowInsetsCompat.Builder().setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime(),
-                Insets.of(systemBarsInsets.left,
-                        0,
-                        systemBarsInsets.right,
-                        Math.max(0, Math.max(visibleNavBar * systemBarsInsets.bottom, keyboardBottomInset) - controllerBottomInset))
-        ).build();
-        ViewKt.doOnLayout(viewController.getView(), (v) -> {
-            ViewCompat.onApplyWindowInsets(viewController.getView(), finalInsets);
-            return Unit.INSTANCE;
-        });
+        int systemWindowInsetTop = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top +
+                insets.getInsets(WindowInsetsCompat.Type.navigationBars()).top -
+                systemBarsInsets.top;
+        int systemWindowInsetBottom = insets.getInsets(WindowInsetsCompat.Type.ime()).bottom +
+                insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom -
+                systemBarsInsets.bottom;
+
+        WindowInsetsCompat finalInsets = new WindowInsetsCompat.Builder()
+                .setInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime(),
+                        Insets.of(systemBarsInsets.left,
+                                systemWindowInsetTop,
+                                systemBarsInsets.right,
+                                Math.max(systemWindowInsetBottom - getBottomInset(), 0)))
+                .build();
+        ViewCompat.onApplyWindowInsets(view, finalInsets);
         return insets;
     }
 
@@ -197,15 +191,6 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
         }
     }
 
-    @Override
-    public ViewTooltip.TooltipView showAnchoredOverlay(@NonNull View anchorView, @NonNull OverlayAttachOptions overlayAttachOptions, @NonNull ViewController<?> overlayViewController) {
-        if (view != null) {
-            return view.getAttachedOverlayContainer().addAnchoredView(anchorView, overlayViewController.getView(),
-                    overlayAttachOptions.gravity.get());
-        }
-        return null;
-    }
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -14,7 +14,6 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ModalOve
 
 import java.util.ArrayList;
 import java.util.EmptyStackException;
-import java.util.LinkedList;
 import java.util.List;
 
 import androidx.annotation.Nullable;
@@ -143,9 +142,6 @@ public class ModalStack {
     public boolean isEmpty() {
         return modals.isEmpty();
     }
-    public List<ViewController<?>> getChildren(){
-        return new LinkedList<>(modals);
-    }
 
     public int size() {
         return modals.size();

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

@@ -82,9 +82,6 @@ public class Navigator extends ParentController<ViewGroup> {
         rootLayout = new CoordinatorLayout(getActivity());
         modalsLayout = new CoordinatorLayout(getActivity());
         overlaysLayout = new CoordinatorLayout(getActivity());
-        overlayManager.setFindController(this::findController);
-        overlayManager.setFindAnchorView(this::findTooltipAnchorView);
-        overlayManager.setMainOverlayContainer(overlaysLayout);
     }
 
 
@@ -127,7 +124,7 @@ public class Navigator extends ParentController<ViewGroup> {
 
     public void destroyViews() {
         modalStack.destroy();
-        overlayManager.destroy();
+        overlayManager.destroy(overlaysLayout);
         destroyRoot();
     }
 
@@ -214,27 +211,16 @@ public class Navigator extends ParentController<ViewGroup> {
         modalStack.dismissAllModals(root, mergeOptions, listener);
     }
 
-    @Override
-    public List<ViewController<?>> getChildren() {
-        final List<ViewController<?>> children = modalStack.getChildren();
-        children.add(root);
-        return children;
-    }
-
     public void showOverlay(ViewController<?> overlay, CommandListener listener) {
-        final Options options = overlay.resolveCurrentOptions();
-        overlayManager.show( overlay,options.overlayOptions, listener);
-
+        overlayManager.show(overlaysLayout, overlay, listener);
     }
 
     public void dismissOverlay(final String componentId, CommandListener listener) {
-        overlayManager.dismiss( componentId, listener);
-
+        overlayManager.dismiss(overlaysLayout, componentId, listener);
     }
 
     public void dismissAllOverlays(CommandListener listener) {
-        overlayManager.dismissAll();
-        listener.onSuccess("");
+        overlayManager.dismissAll(overlaysLayout, listener);
     }
 
     @Nullable
@@ -288,7 +274,7 @@ public class Navigator extends ParentController<ViewGroup> {
         overlayManager.onHostPause();
         if (!modalStack.isEmpty()) {
             modalStack.onHostPause();
-            if (modalStack.peekDisplayedOverCurrentContext()) {
+            if(modalStack.peekDisplayedOverCurrentContext()){
                 onViewDisappear();
             }
         } else {
@@ -300,7 +286,7 @@ public class Navigator extends ParentController<ViewGroup> {
         overlayManager.onHostResume();
         if (!modalStack.isEmpty()) {
             modalStack.onHostResume();
-            if (modalStack.peekDisplayedOverCurrentContext()) {
+            if(modalStack.peekDisplayedOverCurrentContext()){
                 onViewDidAppear();
             }
         } else {