react-native-navigation 7.25.1 → 7.25.3

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

@@ -3,28 +3,26 @@ 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.options.Options;
-import com.reactnativenavigation.viewcontrollers.overlay.OverlayManager;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.RootPresenter;
+import com.reactnativenavigation.react.CommandListenerAdapter;
 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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+import com.reactnativenavigation.viewcontrollers.overlay.OverlayManager;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.RootPresenter;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity, JsDevReloadHandler.ReloadListener {
     @Nullable

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

@@ -25,6 +25,7 @@ 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"));
@@ -48,6 +49,7 @@ 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();
@@ -70,6 +72,7 @@ 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;
@@ -93,6 +96,7 @@ 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/OverlayOptions.java

@@ -1,3 +1,4 @@
+
 package com.reactnativenavigation.options;
 
 import com.reactnativenavigation.options.params.Bool;
@@ -8,11 +9,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/OverlayOptions.kt

@@ -0,0 +1,31 @@
+package com.reactnativenavigation.options
+
+import com.reactnativenavigation.options.params.NullText
+import com.reactnativenavigation.options.params.Text
+import com.reactnativenavigation.options.parsers.TextParser
+import org.json.JSONObject
+class OverlayAttachOptions{
+
+    @JvmField
+    var layoutId :Text = NullText()
+    @JvmField
+    var anchorId :Text = NullText()
+    @JvmField
+    var gravity:Text = NullText()
+
+    fun hasValue() = layoutId.hasValue()
+    override fun toString(): String {
+        return "OverlayAttachOptions(layoutId=$layoutId, anchorId=$anchorId, gravity=$gravity)"
+    }
+
+    companion object{
+        @JvmStatic
+        fun parse(json: JSONObject?): OverlayAttachOptions {
+            val overlayAttachOptions = OverlayAttachOptions()
+            overlayAttachOptions.layoutId = TextParser.parse(json,"layoutId")
+            overlayAttachOptions.anchorId = TextParser.parse(json?.optJSONObject("anchor"),"id")
+            overlayAttachOptions.gravity = TextParser.parse(json?.optJSONObject("anchor"),"gravity")
+            return overlayAttachOptions
+        }
+    }
+}

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

@@ -6,8 +6,6 @@ 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/viewcontrollers/bottomtabs/BottomTabPresenter.java

@@ -9,7 +9,6 @@ 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;
@@ -58,6 +57,7 @@ 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,6 +87,7 @@ 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,5 +1,10 @@
 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;
@@ -7,6 +12,7 @@ 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;
 
@@ -15,6 +21,7 @@ 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;
@@ -25,6 +32,7 @@ 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;
@@ -34,10 +42,6 @@ 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;
@@ -238,6 +242,29 @@ 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,28 +2,21 @@ 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 android.view.WindowInsets;
+
+import androidx.annotation.CallSuper;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.reactnativenavigation.options.Options;
-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.NoOpYellowBoxDelegate;
+import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 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,8 +3,9 @@ package com.reactnativenavigation.viewcontrollers.component;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
+import android.view.ViewGroup;
 
-import com.reactnativenavigation.utils.LogKt;
+import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
@@ -13,9 +14,11 @@ 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.WindowInsetsCompat;
@@ -26,6 +29,11 @@ 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}
 
@@ -78,14 +86,17 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
         if (view != null)
             view.sendComponentWillStart();
         super.onViewDidAppear();
-        view.requestApplyInsets();
-        if (view != null && lastVisibilityState == VisibilityState.Disappear) view.sendComponentStart();
+        if (view != null) {
+            view.requestApplyInsets();
+            if (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();
         super.onViewDisappear();
@@ -125,7 +136,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void applyTopInset() {
-        if (view != null) presenter.applyTopInsets(view, getTopInset());
+        if (view != null && !ignoreInsets) presenter.applyTopInsets(view, getTopInset());
     }
 
     @Override
@@ -137,22 +148,26 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void applyBottomInset() {
-        if (view != null) presenter.applyBottomInset(view, getBottomInset());
+        if (view != null && !ignoreInsets) presenter.applyBottomInset(view, getBottomInset());
     }
 
     @Override
     protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
         ViewController<?> viewController = findController(view);
-        if (viewController == null || viewController.getView() == null) return insets;
-        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;
+        if (viewController == null || viewController.getView() == null || ignoreInsets) return insets;
+        final Options currentOptions = resolveCurrentOptions(presenter.defaultOptions);
+
+        final int keyboardBottomInset = currentOptions.layout.adjustResize.get(true) ? 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(visibleNavBar*systemBarsInsets.bottom,keyboardBottomInset))
+                        Math.max(0, Math.max(visibleNavBar * systemBarsInsets.bottom, keyboardBottomInset) - controllerBottomInset))
         ).build();
+
         ViewCompat.onApplyWindowInsets(viewController.getView(), finalInsets);
         return insets;
     }
@@ -174,6 +189,15 @@ 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,6 +14,7 @@ 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;
@@ -142,6 +143,9 @@ 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,6 +82,9 @@ 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);
     }
 
 
@@ -124,7 +127,7 @@ public class Navigator extends ParentController<ViewGroup> {
 
     public void destroyViews() {
         modalStack.destroy();
-        overlayManager.destroy(overlaysLayout);
+        overlayManager.destroy();
         destroyRoot();
     }
 
@@ -211,16 +214,27 @@ 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) {
-        overlayManager.show(overlaysLayout, overlay, listener);
+        final Options options = overlay.resolveCurrentOptions();
+        overlayManager.show( overlay,options.overlayOptions, listener);
+
     }
 
     public void dismissOverlay(final String componentId, CommandListener listener) {
-        overlayManager.dismiss(overlaysLayout, componentId, listener);
+        overlayManager.dismiss( componentId, listener);
+
     }
 
     public void dismissAllOverlays(CommandListener listener) {
-        overlayManager.dismissAll(overlaysLayout, listener);
+        overlayManager.dismissAll();
+        listener.onSuccess("");
     }
 
     @Nullable
@@ -274,7 +288,7 @@ public class Navigator extends ParentController<ViewGroup> {
         overlayManager.onHostPause();
         if (!modalStack.isEmpty()) {
             modalStack.onHostPause();
-            if(modalStack.peekDisplayedOverCurrentContext()){
+            if (modalStack.peekDisplayedOverCurrentContext()) {
                 onViewDisappear();
             }
         } else {
@@ -286,7 +300,7 @@ public class Navigator extends ParentController<ViewGroup> {
         overlayManager.onHostResume();
         if (!modalStack.isEmpty()) {
             modalStack.onHostResume();
-            if(modalStack.peekDisplayedOverCurrentContext()){
+            if (modalStack.peekDisplayedOverCurrentContext()) {
                 onViewDidAppear();
             }
         } else {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayManager.kt

@@ -3,74 +3,145 @@ package com.reactnativenavigation.viewcontrollers.overlay
 import android.content.res.Configuration
 import android.view.View
 import android.view.ViewGroup
+import com.reactnativenavigation.options.OverlayAttachOptions
+import com.reactnativenavigation.options.OverlayOptions
 import com.reactnativenavigation.react.CommandListener
 import com.reactnativenavigation.utils.CoordinatorLayoutUtils
+import com.reactnativenavigation.utils.removeFromParent
+import com.reactnativenavigation.viewcontrollers.component.ComponentViewController
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
 import com.reactnativenavigation.views.BehaviourDelegate
+import com.reactnativenavigation.views.overlay.ViewTooltip
+
+private fun View.closeNow() {
+    if (this is ViewTooltip.TooltipView) {
+        this.closeNow()
+    } else {
+        removeFromParent()
+    }
+}
+
+private class OverlayEntry(
+    var overlayView: View,
+    val viewController: ViewController<*>
+)
 
 class OverlayManager {
-    private val overlayRegistry = mutableMapOf<String, ViewController<*>>()
-    fun show(overlaysContainer: ViewGroup, overlay: ViewController<*>, listener: CommandListener) {
-        overlaysContainer.visibility = View.VISIBLE
-        overlayRegistry[overlay.id] = overlay
-        overlay.addOnAppearedListener {
-            overlay.onViewDidAppear()
-            listener.onSuccess(overlay.id)
+    private val overlayRegistry = mutableMapOf<String, OverlayEntry>()
+    var mainOverlayContainer: ViewGroup? = null
+    var findController: (String) -> ViewController<*>? = { null }
+    var findAnchorView: (OverlayAttachOptions) -> View? = { null }
+
+    fun show(overlayController: ViewController<*>, overlayOptions: OverlayOptions, listener: CommandListener) {
+        val overlayAttachOptions = overlayOptions.overlayAttachOptions
+        if (overlayAttachOptions.anchorId.hasValue()) {
+            anchorOverlayInParent(overlayAttachOptions, overlayController, listener)
+        } else {
+            attachOverlayToParent(overlayAttachOptions, overlayController, listener)
         }
-        overlaysContainer.addView(
-            overlay.view,
-            CoordinatorLayoutUtils.matchParentWithBehaviour(BehaviourDelegate(overlay))
-        )
+    }
+
+    private fun attachOverlayToParent(
+        overlayAttachOptions: OverlayAttachOptions,
+        overlayController: ViewController<*>,
+        listener: CommandListener
+    ) {
+        val parent = if (overlayAttachOptions.layoutId.hasValue()) {
+            findController(overlayAttachOptions.layoutId.get())?.view
+        } else mainOverlayContainer
+
+        parent?.let {
+            it.visibility = View.VISIBLE
+            registerOverlay(overlayController.view,overlayController, listener)
+            it.addView(
+                overlayController.view,
+                CoordinatorLayoutUtils.matchParentWithBehaviour(BehaviourDelegate(overlayController))
+            )
+        } ?: listener.onError("Cannot find layout with id " + overlayAttachOptions.layoutId)
+    }
+
+    private fun anchorOverlayInParent(
+        overlayAttachOptions: OverlayAttachOptions,
+        overlayController: ViewController<*>,
+        listener: CommandListener
+    ) {
+        val hostController = findController(overlayAttachOptions.layoutId.get())
+        if (hostController != null) {
+            val anchorView: View? = findAnchorView(overlayAttachOptions)
+            if (anchorView != null) {
+                if(overlayController is ComponentViewController){
+                    overlayController.ignoreInsets(true)
+                }
+                val anchoredView =
+                    hostController.showAnchoredOverlay(anchorView, overlayAttachOptions, overlayController)
+                anchoredView?.let {
+                    registerOverlay(it,overlayController, listener)
+                } ?: listener.onError("Parent could not create anchored view, it could be null parent")
+            } else {
+                listener.onError("Cannot find anchor view with id " + overlayAttachOptions.anchorId)
+            }
+        } else {
+            listener.onError("Cannot find layout with id " + overlayAttachOptions.layoutId)
+        }
+    }
+
+    private fun registerOverlay(
+        view:View,
+        viewController: ViewController<*>,
+        listener: CommandListener
+    ) {
+        overlayRegistry[viewController.id] = OverlayEntry(view, viewController)
+        viewController.onViewDidAppear()
+        listener.onSuccess(viewController.id)
     }
 
     fun onConfigurationChanged(configuration: Configuration?) {
-        overlayRegistry.values.forEach { controller -> controller.onConfigurationChanged(configuration) }
+        overlayRegistry.values.forEach { entry -> entry.viewController.onConfigurationChanged(configuration) }
     }
 
-    fun dismiss(overlaysContainer: ViewGroup, componentId: String, listener: CommandListener) {
+    fun dismiss(componentId: String, listener: CommandListener) {
         val overlay = overlayRegistry.remove(componentId)
         if (overlay == null) {
             listener.onError("Could not dismiss Overlay. Overlay with id $componentId was not found.")
         } else {
-            destroyOverlay(overlaysContainer, overlay)
+            destroyOverlay(overlay)
             listener.onSuccess(componentId)
         }
     }
 
-    fun dismissAll(overlaysContainer: ViewGroup, listener: CommandListener) {
-        destroy(overlaysContainer)
-        listener.onSuccess("")
+    fun dismissAll() {
+        destroy()
     }
 
-    fun destroy(overlaysContainer: ViewGroup) {
-        val removedOverlays = overlayRegistry.values.map { overlay ->
-            destroyOverlay(overlaysContainer, overlay)
-            overlay.id
-        }.toList()
-        removedOverlays.forEach {
-            overlayRegistry.remove(it)
+    fun destroy() {
+        val entries = overlayRegistry.entries
+        while (entries.isNotEmpty()) {
+            val first = entries.first()
+            val attachOverlayEntry = first.value
+            attachOverlayEntry.overlayView.closeNow()
+            attachOverlayEntry.viewController.destroy()
+            overlayRegistry.remove(first.key)
         }
+        mainOverlayContainer?.visibility = View.GONE
     }
 
     fun size() = overlayRegistry.size
 
     fun findControllerById(id: String?): ViewController<*>? {
-        return overlayRegistry[id]
+        return overlayRegistry[id]?.viewController
     }
 
-    private fun destroyOverlay(overlaysContainer: ViewGroup, overlay: ViewController<*>) {
-        overlay.destroy()
-        if (isEmpty) overlaysContainer.visibility = View.GONE
+    private fun destroyOverlay(overlay: OverlayEntry?) {
+        overlay?.overlayView?.closeNow()
+        overlay?.viewController?.destroy()
+        if (overlayRegistry.isEmpty()) mainOverlayContainer?.visibility = View.GONE
     }
 
-    private val isEmpty: Boolean
-        get() = size() == 0
-
     fun onHostPause() {
-        overlayRegistry.values.forEach(ViewController<*>::onViewDisappear)
+        overlayRegistry.values.forEach { it.viewController.onViewDisappear() }
     }
 
     fun onHostResume() {
-        overlayRegistry.values.forEach(ViewController<*>::onViewDidAppear)
+        overlayRegistry.values.forEach { it.viewController.onViewDidAppear() }
     }
 }