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

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

@@ -3,145 +3,74 @@ 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, 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)
+    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 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)
+        overlaysContainer.addView(
+            overlay.view,
+            CoordinatorLayoutUtils.matchParentWithBehaviour(BehaviourDelegate(overlay))
+        )
     }
 
     fun onConfigurationChanged(configuration: Configuration?) {
-        overlayRegistry.values.forEach { entry -> entry.viewController.onConfigurationChanged(configuration) }
+        overlayRegistry.values.forEach { controller -> controller.onConfigurationChanged(configuration) }
     }
 
-    fun dismiss(componentId: String, listener: CommandListener) {
+    fun dismiss(overlaysContainer: ViewGroup, 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(overlay)
+            destroyOverlay(overlaysContainer, overlay)
             listener.onSuccess(componentId)
         }
     }
 
-    fun dismissAll() {
-        destroy()
+    fun dismissAll(overlaysContainer: ViewGroup, listener: CommandListener) {
+        destroy(overlaysContainer)
+        listener.onSuccess("")
     }
 
-    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)
+    fun destroy(overlaysContainer: ViewGroup) {
+        val removedOverlays = overlayRegistry.values.map { overlay ->
+            destroyOverlay(overlaysContainer, overlay)
+            overlay.id
+        }.toList()
+        removedOverlays.forEach {
+            overlayRegistry.remove(it)
         }
-        mainOverlayContainer?.visibility = View.GONE
     }
 
     fun size() = overlayRegistry.size
 
     fun findControllerById(id: String?): ViewController<*>? {
-        return overlayRegistry[id]?.viewController
+        return overlayRegistry[id]
     }
 
-    private fun destroyOverlay(overlay: OverlayEntry?) {
-        overlay?.overlayView?.closeNow()
-        overlay?.viewController?.destroy()
-        if (overlayRegistry.isEmpty()) mainOverlayContainer?.visibility = View.GONE
+    private fun destroyOverlay(overlaysContainer: ViewGroup, overlay: ViewController<*>) {
+        overlay.destroy()
+        if (isEmpty) overlaysContainer.visibility = View.GONE
     }
 
+    private val isEmpty: Boolean
+        get() = size() == 0
+
     fun onHostPause() {
-        overlayRegistry.values.forEach { it.viewController.onViewDisappear() }
+        overlayRegistry.values.forEach(ViewController<*>::onViewDisappear)
     }
 
     fun onHostResume() {
-        overlayRegistry.values.forEach { it.viewController.onViewDidAppear() }
+        overlayRegistry.values.forEach(ViewController<*>::onViewDidAppear)
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/parent/ParentController.java

@@ -1,34 +1,30 @@
 package com.reactnativenavigation.viewcontrollers.parent;
 
-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;
 import android.view.ViewGroup;
 
-import androidx.annotation.CallSuper;
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.ViewPager;
-
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.child.ChildController;
 import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.component.Component;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
+import static com.reactnativenavigation.utils.CollectionUtils.*;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public abstract class ParentController<T extends ViewGroup> extends ChildController<T> {
 
@@ -92,10 +88,6 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
     public abstract ViewController<?> getCurrentChild();
 
-    public List<ViewController<?>> getChildren(){
-        return Collections.emptyList();
-    }
-
     @NonNull
     @Override
     public abstract T createView();
@@ -111,51 +103,6 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         return perform(getParentController(), null, ParentController::getBottomTabsController);
     }
 
-    @Override
-    protected View findTooltipAnchorView(OverlayAttachOptions options) {
-        final String id = options.anchorId.get();
-        View found = null;
-        final View topBarView = findTopBarViewById(id);
-        if (topBarView != null) {
-            found = topBarView;
-        } else {
-            final View bottomTabViewById = findBottomTabViewById(id);
-            if (bottomTabViewById != null) {
-                found = bottomTabViewById;
-            }
-        }
-        return found;
-    }
-
-    @Nullable
-    protected View findTopBarViewById(String id) {
-        final View[] found = {null};
-        lookup((controller) -> {
-            if (controller instanceof StackController) {
-                final StackController stackController = (StackController) controller;
-                final View topBarViewById = stackController.presenter.findTopBarViewById(id);
-                found[0] = topBarViewById;
-                return topBarViewById != null;
-            }
-            return false;
-        });
-        return found[0];
-    }
-
-    @Nullable
-    protected View findBottomTabViewById(@NonNull String id) {
-        final View[] found = {null};
-        lookup((controller) -> {
-            if (controller instanceof BottomTabsController) {
-                BottomTabsController bottomTabsController = (BottomTabsController) controller;
-                found[0] = bottomTabsController.getTabViewByTag(id);
-                return found[0] != null;
-            }
-            return false;
-        });
-        return found[0];
-    }
-
     @Nullable
     @Override
     public ViewController<?> findController(final String id) {
@@ -257,30 +204,6 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         return getCurrentChild().getCurrentComponentName();
     }
 
-    protected interface LookupPredicate<T> {
-        boolean test(T t);
-    }
-    public ViewController<?> lookup(LookupPredicate<ViewController<?>> predicate){
-        if(predicate.test(this)){
-            return this;
-        }else{
-            final List<ViewController<?>> children = getChildren();
-            for(ViewController<?> child : children){
-               if(child instanceof ParentController){
-                   ViewController<?> result= ((ParentController<?>) child).lookup(predicate);
-                   if(result!=null){
-                       return result;
-                   }
-               }else{
-                   if(predicate.test(child)){
-                       return child;
-                   }
-               }
-            }
-            return null;
-        }
-    }
-
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         Collection<? extends ViewController<?>> childControllers = getChildControllers();

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java

@@ -3,10 +3,8 @@ package com.reactnativenavigation.viewcontrollers.sidemenu;
 import android.app.Activity;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.options.SideMenuRootOptions;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.react.CommandListener;
@@ -14,7 +12,6 @@ import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.sidemenu.SideMenu;
 import com.reactnativenavigation.views.sidemenu.SideMenuRoot;
 
@@ -68,15 +65,6 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
         return root;
     }
 
-    @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 sendOnNavigationButtonPressed(String buttonId) {
         center.sendOnNavigationButtonPressed(buttonId);

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -8,7 +8,6 @@ import android.view.ViewGroup;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.options.ButtonOptions;
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.options.StackAnimationOptions;
 import com.reactnativenavigation.react.CommandListener;
 import com.reactnativenavigation.react.CommandListenerAdapter;
@@ -20,7 +19,6 @@ import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.BackButtonHelper;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.stack.StackBehaviour;
 import com.reactnativenavigation.views.stack.StackLayout;
@@ -34,7 +32,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.Size;
 import androidx.annotation.VisibleForTesting;
@@ -54,7 +51,7 @@ public class StackController extends ParentController<StackLayout> {
     private final EventEmitter eventEmitter;
     private final TopBarController topBarController;
     private final BackButtonHelper backButtonHelper;
-    public final StackPresenter presenter;
+    private final StackPresenter presenter;
     private final FabPresenter fabPresenter;
 
     public StackController(Activity activity, List<ViewController<?>> children, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, TopBarController topBarController, StackAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper, StackPresenter stackPresenter, Presenter presenter, FabPresenter fabPresenter) {
@@ -72,7 +69,7 @@ public class StackController extends ParentController<StackLayout> {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        presenter.onConfigurationChanged(resolveCurrentOptions(), getCurrentChild());
+        presenter.onConfigurationChanged(resolveCurrentOptions());
         fabPresenter.onConfigurationChanged(resolveCurrentOptions());
     }
 
@@ -481,20 +478,6 @@ public class StackController extends ParentController<StackLayout> {
         return false;
     }
 
-    @Override
-    public ViewTooltip.TooltipView showAnchoredOverlay(@NonNull View anchorView, @NonNull OverlayAttachOptions overlayAttachOptions, @NonNull ViewController<?> overlayViewController) {
-        if(view!=null){
-            return( (StackLayout)view).getAttachedOverlayContainer().addAnchoredView(anchorView, overlayViewController.getView(),
-                    overlayAttachOptions.gravity.get());
-        }
-        return null;
-    }
-
-    @Override
-    public List<ViewController<?>> getChildren() {
-        return stack.values();
-    }
-
     @Override
     public int getTopInset(ViewController<?> child) {
         return presenter.getTopInset(resolveChildOptions(child));