Support setting interceptTouchOutside with mergeOptions

Closes $4225

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -5,6 +5,7 @@ import android.app.Activity;
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.SideMenuPresenter;
 import com.reactnativenavigation.presentation.StackPresenter;
@@ -144,7 +145,8 @@ public class LayoutFactory {
                 name,
                 new ComponentViewCreator(reactInstanceManager),
                 parse(typefaceManager, node.getOptions()),
-                new Presenter(activity, defaultOptions)
+                new Presenter(activity, defaultOptions),
+                new ComponentPresenter()
         );
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/presentation/ComponentPresenter.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.presentation;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.views.ComponentLayout;
+
+public class ComponentPresenter {
+
+    public void mergeOptions(ComponentLayout view, Options options) {
+        if (options.overlayOptions.interceptTouchOutside.hasValue()) view.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside);
+    }
+}

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

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.views.ComponentLayout;
 import com.reactnativenavigation.views.ReactComponent;
@@ -12,7 +13,7 @@ import com.reactnativenavigation.views.ReactComponent;
 public class ComponentViewController extends ChildController<ComponentLayout> {
 
     private final String componentName;
-
+    private ComponentPresenter presenter;
     private final ReactViewCreator viewCreator;
 
     public ComponentViewController(final Activity activity,
@@ -21,10 +22,12 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
                                    final String componentName,
                                    final ReactViewCreator viewCreator,
                                    final Options initialOptions,
-                                   final Presenter presenter) {
+                                   final Presenter presenter,
+                                   final ComponentPresenter componentPresenter) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.componentName = componentName;
         this.viewCreator = viewCreator;
+        this.presenter = componentPresenter;
     }
 
     @Override
@@ -65,6 +68,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
     @Override
     public void mergeOptions(Options options) {
         if (options == Options.EMPTY) return;
+        presenter.mergeOptions(getView(), options);
         performOnParentController(parentController -> parentController.mergeChildOptions(options, this, getView()));
         super.mergeOptions(options);
     }

lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TitleBarButtonController;
@@ -63,6 +64,10 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
         touchDelegate.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside);
     }
 
+    public void setInterceptTouchOutside(Bool interceptTouchOutside) {
+        touchDelegate.setInterceptTouchOutside(interceptTouchOutside);
+    }
+
     @Override
     public void sendOnNavigationButtonPressed(String buttonId) {
         reactView.sendOnNavigationButtonPressed(buttonId);

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleComponentViewController.java

@@ -3,11 +3,12 @@ package com.reactnativenavigation.mocks;
 import android.app.*;
 
 import com.reactnativenavigation.parse.*;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.viewcontrollers.*;
 
 public class SimpleComponentViewController extends ComponentViewController {
     public SimpleComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
-        super(activity, childRegistry,id, "theComponentName", new TestComponentViewCreator(), initialOptions, new Presenter(activity, new Options()));
+        super(activity, childRegistry,id, "theComponentName", new TestComponentViewCreator(), initialOptions, new Presenter(activity, new Options()), new ComponentPresenter());
     }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ComponentViewControllerTest.java

@@ -7,6 +7,7 @@ import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.views.StackLayout;
 
@@ -22,6 +23,7 @@ import static org.mockito.Mockito.when;
 public class ComponentViewControllerTest extends BaseTest {
     private ComponentViewController uut;
     private IReactView view;
+    private ComponentPresenter componentPresenter;
 
     @Override
     public void beforeEach() {
@@ -30,7 +32,8 @@ public class ComponentViewControllerTest extends BaseTest {
         view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
         ParentController<StackLayout> parentController = TestUtils.newStackController(activity).build();
         Presenter presenter = new Presenter(activity, new Options());
-        uut = new ComponentViewController(activity, new ChildControllersRegistry(), "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options(), presenter);
+        this.componentPresenter = spy(new ComponentPresenter());
+        uut = new ComponentViewController(activity, new ChildControllersRegistry(), "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options(), presenter, this.componentPresenter);
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();
     }
@@ -85,4 +88,11 @@ public class ComponentViewControllerTest extends BaseTest {
         spy.mergeOptions(Options.EMPTY);
         verify(spy, times(0)).performOnParentController(any());
     }
+
+    @Test
+    public void mergeOptions_delegatesToPresenter() {
+        Options options = new Options();
+        uut.mergeOptions(options);
+        verify(componentPresenter).mergeOptions(uut.getView(), options);
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -19,6 +19,7 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
@@ -61,7 +62,8 @@ public class OptionsApplyingTest extends BaseTest {
                 "componentName",
                 (activity1, componentId, componentName) -> view,
                 initialNavigationOptions,
-                new Presenter(activity, new Options())
+                new Presenter(activity, new Options()),
+                new ComponentPresenter()
         ) {
             @Override
             public boolean isViewShown() {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopTabsViewControllerTest.java

@@ -12,6 +12,7 @@ import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.presentation.ComponentPresenter;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ViewHelper;
@@ -90,7 +91,8 @@ public class TopTabsViewControllerTest extends BaseTest {
                     "theComponentName",
                     new TestComponentViewCreator(),
                     tabOptions.get(i),
-                    new Presenter(activity, new Options())
+                    new Presenter(activity, new Options()),
+                    new ComponentPresenter()
             );
             tabControllers.add(spy(viewController));
         }