Clear sideMenu's visible options after applying (#4937)

* Clear sideMenu's visible options after applying

* If mergeOptions is called before a controller is attached to a parent - don’t clear one time options as they haven’t been applied yet.

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.parse;
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 
+import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.utils.TypefaceLoader;
@@ -146,6 +147,8 @@ public class Options {
     }
 
     public Options clearOneTimeOptions() {
+        sideMenuRootOptions.left.visible = new NullBool();
+        sideMenuRootOptions.right.visible = new NullBool();
         bottomTabsOptions.currentTabId = new NullText();
         bottomTabsOptions.currentTabIndex = new NullNumber();
         return this;

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

@@ -117,8 +117,10 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     public void mergeOptions(Options options) {
         this.initialOptions = this.initialOptions.mergeWith(options);
         this.options = this.options.mergeWith(options);
-        this.options.clearOneTimeOptions();
-        initialOptions.clearOneTimeOptions();
+        if (getParentController() != null) {
+            this.options.clearOneTimeOptions();
+            initialOptions.clearOneTimeOptions();
+        }
     }
 
     @CallSuper

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java

@@ -25,6 +25,7 @@ import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.BottomTabs;
@@ -92,6 +93,7 @@ public class BottomTabsControllerTest extends BaseTest {
         presenter = spy(new BottomTabsPresenter(tabs, new Options()));
         tabsAttacher = spy(new BottomTabsAttacher(tabs, presenter));
         uut = createBottomTabs();
+        uut.setParentController(Mockito.mock(ParentController.class));
         activity.setContentView(uut.getView());
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java

@@ -263,14 +263,18 @@ public class SideMenuControllerTest extends BaseTest {
     }
 
     private void openDrawerAndAssertVisibility(ViewController side, Functions.FuncR1<ViewController, SideMenuOptions> opt) {
-        assertThat(opt.run(side).visible.isTrue()).isFalse();
-        uut.onDrawerOpened(side.getView());
-        assertThat(opt.run(side).visible.isTrue()).isTrue();
+        Options options = new Options();
+        (side == left ? options.sideMenuRootOptions.left : options.sideMenuRootOptions.right).visible = new Bool(true);
+        uut.mergeOptions(options);
+        assertThat(uut.getView().isDrawerVisible(side.getView())).isTrue();
+        assertThat(opt.run(side).visible.isFalseOrUndefined()).isTrue();
     }
 
     private void closeDrawerAndAssertVisibility(ViewController side, Functions.FuncR1<ViewController, SideMenuOptions> opt) {
-        assertThat(opt.run(side).visible.isTrue()).isTrue();
-        uut.onDrawerClosed(side.getView());
+        Options options = new Options();
+        (side == left ? options.sideMenuRootOptions.left : options.sideMenuRootOptions.right).visible = new Bool(false);
+        uut.mergeOptions(options);
+        assertThat(uut.getView().isDrawerVisible(side.getView())).isFalse();
         assertThat(opt.run(side).visible.isTrue()).isFalse();
     }