Dispatch visibility events for SideMenu screens

Visibility events for both left and right SideMenu screens were not dispatched due to how the native
DrawerLayout is implemented.
Fixes #4303

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

@@ -11,6 +11,7 @@ import org.json.JSONObject;
 
 public class SideMenuOptions {
     public Bool visible = new NullBool();
+    public Bool animate = new NullBool();
     public Bool enabled = new NullBool();
     public Number height = new NullNumber();
     public Number width = new NullNumber();
@@ -20,6 +21,7 @@ public class SideMenuOptions {
         if (json == null) return options;
 
         options.visible = BoolParser.parse(json, "visible");
+        options.animate = BoolParser.parse(json, "animate");
         options.enabled = BoolParser.parse(json, "enabled");
         options.height = NumberParser.parse(json, "height");
         options.width = NumberParser.parse(json, "width");
@@ -29,6 +31,7 @@ public class SideMenuOptions {
 
     public void mergeWith(SideMenuOptions other) {
         if (other.visible.hasValue()) visible = other.visible;
+        if (other.animate.hasValue()) animate = other.animate;
         if (other.enabled.hasValue()) enabled = other.enabled;
         if (other.height.hasValue()) height = other.height;
         if (other.width.hasValue()) width = other.width;
@@ -36,6 +39,7 @@ public class SideMenuOptions {
 
     public void mergeWithDefault(SideMenuOptions defaultOptions) {
         if (!visible.hasValue()) visible = defaultOptions.visible;
+        if (!animate.hasValue()) animate = defaultOptions.animate;
         if (!enabled.hasValue()) enabled = defaultOptions.enabled;
         if (!height.hasValue()) height = defaultOptions.height;
         if (!width.hasValue()) width = defaultOptions.width;

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

@@ -51,15 +51,15 @@ public class SideMenuPresenter {
 
     private void mergeVisibility(SideMenuRootOptions options) {
         if (options.left.visible.isTrue()) {
-            sideMenu.openDrawer(Gravity.LEFT);
+            sideMenu.openDrawer(Gravity.LEFT, options.left.animate.get(true));
         } else if (options.left.visible.isFalse()) {
-            sideMenu.closeDrawer(Gravity.LEFT);
+            sideMenu.closeDrawer(Gravity.LEFT, options.left.animate.get(true));
         }
 
         if (options.right.visible.isTrue()) {
-            sideMenu.openDrawer(Gravity.RIGHT);
+            sideMenu.openDrawer(Gravity.RIGHT, options.right.animate.get(true));
         } else if (options.right.visible.isFalse()) {
-            sideMenu.closeDrawer(Gravity.RIGHT);
+            sideMenu.closeDrawer(Gravity.RIGHT, options.right.animate.get(true));
         }
     }
 

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

@@ -24,7 +24,7 @@ import java.util.Collection;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
-public class SideMenuController extends ParentController<DrawerLayout> {
+public class SideMenuController extends ParentController<DrawerLayout> implements DrawerLayout.DrawerListener {
 
 	private ViewController center;
 	private ViewController left;
@@ -51,6 +51,7 @@ public class SideMenuController extends ParentController<DrawerLayout> {
 	protected DrawerLayout createView() {
         DrawerLayout sideMenu = new DrawerLayout(getActivity());
         presenter.bindView(sideMenu);
+        sideMenu.addDrawerListener(this);
         return sideMenu;
 	}
 
@@ -102,6 +103,16 @@ public class SideMenuController extends ParentController<DrawerLayout> {
         return options;
     }
 
+    @Override
+    public void onDrawerOpened(@NonNull View drawerView) {
+        (left != null && drawerView.equals(left.getView()) ? left : right).onViewAppeared();
+    }
+
+    @Override
+    public void onDrawerClosed(@NonNull View drawerView) {
+        (left != null && drawerView.equals(left.getView()) ? left : right).onViewDisappear();
+    }
+
     @Override
     public boolean handleBack(CommandListener listener) {
         return presenter.handleBack() || center.handleBack(listener) || super.handleBack(listener);
@@ -142,4 +153,14 @@ public class SideMenuController extends ParentController<DrawerLayout> {
         }
         return height;
     }
+
+    @Override
+    public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+
+    }
+
+    @Override
+    public void onDrawerStateChanged(int newState) {
+
+    }
 }

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

@@ -198,7 +198,7 @@ public class SideMenuControllerTest extends BaseTest {
         assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
         verify(center, times(1)).handleBack(any());
 
-        uut.mergeOptions(SideMenuTestHelper.LEFT_OPEN);
+        openLeftMenu();
         assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
         verify(center, times(1)).handleBack(any());
     }
@@ -209,8 +209,72 @@ public class SideMenuControllerTest extends BaseTest {
         assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
         verify(center, times(1)).handleBack(any());
 
-        uut.mergeOptions(SideMenuTestHelper.RIGHT_OPEN);
+        openRightMenu();
         assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
         verify(center, times(1)).handleBack(any());
     }
+
+    @Test
+    public void leftMenuOpen_visibilityEventsAreEmitted() {
+        ViewController spy = spy(left);
+        uut.setLeftController(spy);
+        activity.setContentView(uut.getView());
+
+        assertThat(uut.getView().isDrawerOpen(Gravity.LEFT)).isFalse();
+        verify(spy, times(0)).onViewAppeared();
+
+        openLeftMenu();
+        assertThat(uut.getView().isDrawerOpen(Gravity.LEFT)).isTrue();
+        verify(spy).onViewAppeared();
+
+        closeLeft();
+        assertThat(uut.getView().isDrawerOpen(Gravity.LEFT)).isFalse();
+        verify(spy).onViewDisappear();
+    }
+
+    @Test
+    public void rightMenuOpen_visibilityEventsAreEmitted() {
+        ViewController spy = spy(right);
+        uut.setRightController(spy);
+        activity.setContentView(uut.getView());
+
+        assertThat(uut.getView().isDrawerOpen(Gravity.RIGHT)).isFalse();
+        verify(spy, times(0)).onViewAppeared();
+
+        openRightMenu();
+        assertThat(uut.getView().isDrawerOpen(Gravity.RIGHT)).isTrue();
+        verify(spy).onViewAppeared();
+
+        closeRightMenu();
+        assertThat(uut.getView().isDrawerOpen(Gravity.RIGHT)).isFalse();
+        verify(spy).onViewDisappear();
+    }
+
+    private void openLeftMenu() {
+        Options options = new Options();
+        options.sideMenuRootOptions.left.visible = new Bool(true);
+        options.sideMenuRootOptions.left.animate = new Bool(false);
+        uut.mergeOptions(options);
+    }
+
+    private void openRightMenu() {
+        Options options = new Options();
+        options.sideMenuRootOptions.right.visible = new Bool(true);
+        options.sideMenuRootOptions.right.animate = new Bool(false);
+        uut.mergeOptions(options);
+    }
+
+    private void closeLeft() {
+        Options options = new Options();
+        options.sideMenuRootOptions.left.visible = new Bool(false);
+        options.sideMenuRootOptions.left.animate = new Bool(false);
+        uut.mergeOptions(options);
+    }
+
+    private void closeRightMenu() {
+        Options options = new Options();
+        options.sideMenuRootOptions.right.visible = new Bool(false);
+        options.sideMenuRootOptions.right.animate = new Bool(false);
+        uut.mergeOptions(options);
+    }
 }

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

@@ -1,14 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.sidemenu;
-
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.params.Bool;
-
-public class SideMenuTestHelper {
-    static final Options LEFT_OPEN = new Options();
-    static final Options RIGHT_OPEN = new Options();
-
-    static {
-        LEFT_OPEN.sideMenuRootOptions.left.visible = new Bool(true);
-        RIGHT_OPEN.sideMenuRootOptions.right.visible = new Bool(true);
-    }
-}

playground/src/screens/SideMenuScreen.js

@@ -8,6 +8,19 @@ const testIDs = require('../testIDs');
 
 class SideMenuScreen extends Component {
 
+  constructor(props) {
+    super(props);
+    Navigation.events().bindComponent(this);
+  }
+
+  componentDidAppear() {
+    console.log('RNN', `SMS.componentDidAppear ${this.props.side}`);
+  }
+
+  componentDidDisappear() {
+    console.log('RNN', `SMS.componentDidDisappear ${this.props.side}`);
+  }
+
   render() {
     const testID = this.props.side === 'left' ? testIDs.HIDE_LEFT_SIDE_MENU_BUTTON : testIDs.HIDE_RIGHT_SIDE_MENU_BUTTON;
     return (