Emit modalDismissed event when modals are dismissed on Android

lib/android/app/src/main/java/com/reactnativenavigation/react/EventEmitter.java

@@ -14,12 +14,11 @@ public class EventEmitter {
 	private static final String ComponentDidAppear      = "RNN.ComponentDidAppear";
 	private static final String ComponentDidDisappear   = "RNN.ComponentDidDisappear";
 	private static final String NavigationButtonPressed = "RNN.NavigationButtonPressed";
-	private static final String SearchBarUpdated        = "RNN.SearchBarUpdated";
-	private static final String SearchBarCancelPressed  = "RNN.SearchBarCancelPressed";
+    private static final String ModalDismissed          = "RNN.ModalDismissed";
 
 	private final RCTDeviceEventEmitter emitter;
 
-	EventEmitter(ReactContext reactContext) {
+	public EventEmitter(ReactContext reactContext) {
 		this.emitter = reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
 	}
 
@@ -55,13 +54,19 @@ public class EventEmitter {
 		emit(BottomTabSelected, event);
 	}
 
-	public void emitCommandCompletedEvent(String commandId, long completionTime) {
+	public void emitCommandCompleted(String commandId, long completionTime) {
 		WritableMap event = Arguments.createMap();
 		event.putString("commandId", commandId);
 		event.putDouble("completionTime", completionTime);
 		emit(CommandCompleted, event);
 	}
 
+    public void emitModalDismissed(String id) {
+        WritableMap event = Arguments.createMap();
+        event.putString("componentId", id);
+        emit(ModalDismissed, event);
+    }
+
 	private void emit(String eventName) {
 		emit(eventName, Arguments.createMap());
 	}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -61,6 +61,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	public void setRoot(String commandId, ReadableMap rawLayoutTree, Promise promise) {
 		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree).optJSONObject("root"));
 		handle(() -> {
+            navigator().setEventEmitter(eventEmitter);
             final ViewController viewController = newLayoutFactory().create(layoutTree);
             navigator().setRoot(viewController, new NativeCommandListener(commandId, promise, eventEmitter, now));
         });

lib/android/app/src/main/java/com/reactnativenavigation/utils/NativeCommandListener.java

@@ -21,7 +21,7 @@ public class NativeCommandListener extends CommandListenerAdapter {
     @Override
     public void onSuccess(String childId) {
         if (promise != null) promise.resolve(childId);
-        eventEmitter.emitCommandCompletedEvent(commandId, now.now());
+        eventEmitter.emitCommandCompleted(commandId, now.now());
     }
 
     @Override

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.presentation.OverlayManager;
+import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
@@ -214,4 +215,8 @@ public class Navigator extends ParentController {
                          fromId +
                          " was not found.");
     }
+
+    public void setEventEmitter(EventEmitter eventEmitter) {
+        modalStack.setEventEmitter(eventEmitter);
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -16,6 +17,7 @@ public class ModalPresenter {
     private ViewGroup content;
     private ModalAnimator animator;
     private Options defaultOptions = new Options();
+    private EventEmitter eventEmitter;
 
     ModalPresenter(ModalAnimator animator) {
         this.animator = animator;
@@ -84,6 +86,11 @@ public class ModalPresenter {
 
     private void onDismissEnd(ViewController toDismiss, CommandListener listener) {
         toDismiss.destroy();
+        eventEmitter.emitModalDismissed(toDismiss.getId());
         listener.onSuccess(toDismiss.getId());
     }
+
+    public void setEventEmitter(EventEmitter eventEmitter) {
+        this.eventEmitter = eventEmitter;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -125,4 +126,8 @@ public class ModalStack {
         }
         return null;
     }
+
+    public void setEventEmitter(EventEmitter eventEmitter) {
+        presenter.setEventEmitter(eventEmitter);
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/utils/NativeCommandListenerTest.java

@@ -39,7 +39,7 @@ public class NativeCommandListenerTest extends BaseTest {
     @Test
     public void onSuccess_emitsNavigationEvent() {
         uut.onSuccess(CHILD_ID);
-        verify(eventEmitter, times(1)).emitCommandCompletedEvent(COMMAND_ID, NOW);
+        verify(eventEmitter, times(1)).emitCommandCompleted(COMMAND_ID, NOW);
     }
 
     @Test

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

@@ -67,6 +67,7 @@ public class NavigatorTest extends BaseTest {
         activityController = newActivityController(TestActivity.class);
         activity = activityController.create().get();
         modalStack = spy(new ModalStack(activity));
+        modalStack.setEventEmitter(Mockito.mock(EventEmitter.class));
         uut = new Navigator(activity, childRegistry, modalStack, overlayManager);
         activity.setNavigator(uut);
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -10,6 +10,7 @@ import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
@@ -19,6 +20,7 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -54,6 +56,7 @@ public class ModalPresenterTest extends BaseTest {
         uut.setContentLayout(contentLayout);
         modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
+        uut.setEventEmitter(Mockito.mock(EventEmitter.class));
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -8,12 +8,14 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import java.util.EmptyStackException;
 
@@ -56,6 +58,7 @@ public class ModalStackTest extends BaseTest {
         presenter = spy(new ModalPresenter(animator));
         uut = new ModalStack(presenter);
         uut.setContentLayout(activityContentView);
+        uut.setEventEmitter(Mockito.mock(EventEmitter.class));
         modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
         modal3 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_3, new Options()));

lib/src/adapters/NativeEventsReceiver.ts

@@ -5,7 +5,8 @@ import {
   ComponentDidDisappearEvent,
   NavigationButtonPressedEvent,
   SearchBarUpdatedEvent,
-  SearchBarCancelPressedEvent
+  SearchBarCancelPressedEvent,
+  ModalDismissedEvent
 } from '../interfaces/ComponentEvents';
 import { CommandCompletedEvent, BottomTabSelectedEvent } from '../interfaces/Events';
 
@@ -41,6 +42,10 @@ export class NativeEventsReceiver {
     return this.emitter.addListener('RNN.NavigationButtonPressed', callback);
   }
 
+  public registerModalDismissedListener(callback: (event: ModalDismissedEvent) => void): EventSubscription {
+    return this.emitter.addListener('RNN.ModalDismissed', callback);
+  }
+
   public registerSearchBarUpdatedListener(callback: (event: SearchBarUpdatedEvent) => void): EventSubscription {
     return this.emitter.addListener('RNN.SearchBarUpdated', callback);
   }

lib/src/events/ComponentEventsObserver.test.tsx

@@ -13,6 +13,7 @@ describe('ComponentEventsObserver', () => {
   const navigationButtonPressedFn = jest.fn();
   const searchBarUpdatedFn = jest.fn();
   const searchBarCancelPressedFn = jest.fn();
+  const modalDismissedFn = jest.fn();
   let subscription;
 
   class SimpleScreen extends React.Component<any, any> {
@@ -47,6 +48,10 @@ describe('ComponentEventsObserver', () => {
       navigationButtonPressedFn(event);
     }
 
+    modalDismissed(event) {
+      modalDismissedFn(event);
+    }
+
     searchBarUpdated(event) {
       searchBarUpdatedFn(event);
     }
@@ -85,6 +90,10 @@ describe('ComponentEventsObserver', () => {
     expect(navigationButtonPressedFn).toHaveBeenCalledTimes(1);
     expect(navigationButtonPressedFn).toHaveBeenCalledWith({ buttonId: 'myButtonId', componentId: 'myCompId' });
 
+    uut.notifyModalDismissed({ componentId: 'myCompId' });
+    expect(modalDismissedFn).toHaveBeenCalledTimes(1);
+    expect(modalDismissedFn).toHaveBeenLastCalledWith({ componentId: 'myCompId' })
+
     uut.notifySearchBarUpdated({ componentId: 'myCompId', text: 'theText', isFocused: true });
     expect(searchBarUpdatedFn).toHaveBeenCalledTimes(1);
     expect(searchBarUpdatedFn).toHaveBeenCalledWith({ componentId: 'myCompId', text: 'theText', isFocused: true });

lib/src/events/ComponentEventsObserver.ts

@@ -6,7 +6,8 @@ import {
   NavigationButtonPressedEvent,
   SearchBarUpdatedEvent,
   SearchBarCancelPressedEvent,
-  ComponentEvent
+  ComponentEvent,
+  ModalDismissedEvent
 } from '../interfaces/ComponentEvents';
 import { NativeEventsReceiver } from '../adapters/NativeEventsReceiver';
 
@@ -18,6 +19,7 @@ export class ComponentEventsObserver {
     this.notifyComponentDidAppear = this.notifyComponentDidAppear.bind(this);
     this.notifyComponentDidDisappear = this.notifyComponentDidDisappear.bind(this);
     this.notifyNavigationButtonPressed = this.notifyNavigationButtonPressed.bind(this);
+    this.notifyModalDismissed = this.notifyModalDismissed.bind(this);
     this.notifySearchBarUpdated = this.notifySearchBarUpdated.bind(this);
     this.notifySearchBarCancelPressed = this.notifySearchBarCancelPressed.bind(this);
   }
@@ -28,6 +30,7 @@ export class ComponentEventsObserver {
     this.nativeEventsReceiver.registerComponentDidAppearListener(this.notifyComponentDidAppear);
     this.nativeEventsReceiver.registerComponentDidDisappearListener(this.notifyComponentDidDisappear);
     this.nativeEventsReceiver.registerNavigationButtonPressedListener(this.notifyNavigationButtonPressed);
+    this.nativeEventsReceiver.registerModalDismissedListener(this.notifyModalDismissed);
     this.nativeEventsReceiver.registerSearchBarUpdatedListener(this.notifySearchBarUpdated);
     this.nativeEventsReceiver.registerSearchBarCancelPressedListener(this.notifySearchBarCancelPressed);
   }
@@ -62,6 +65,10 @@ export class ComponentEventsObserver {
     this.triggerOnAllListenersByComponentId(event, 'navigationButtonPressed');
   }
 
+  notifyModalDismissed(event: ModalDismissedEvent) {
+    this.triggerOnAllListenersByComponentId(event, 'modalDismissed');
+  }
+
   notifySearchBarUpdated(event: SearchBarUpdatedEvent) {
     this.triggerOnAllListenersByComponentId(event, 'searchBarUpdated');
   }

lib/src/events/EventsRegistry.test.tsx

@@ -60,6 +60,13 @@ describe('EventsRegistry', () => {
     expect(mockNativeEventsReceiver.registerNavigationButtonPressedListener).toHaveBeenCalledWith(cb);
   });
 
+  it('delegates modalDismissed to nativeEventsReceiver', () => {
+    const cb = jest.fn();
+    uut.registerModalDismissedListener(cb);
+    expect(mockNativeEventsReceiver.registerModalDismissedListener).toHaveBeenCalledTimes(1);
+    expect(mockNativeEventsReceiver.registerModalDismissedListener).toHaveBeenCalledWith(cb);
+  });
+
   it('delegates searchBarUpdated to nativeEventsReceiver', () => {
     const cb = jest.fn();
     uut.registerSearchBarUpdatedListener(cb);

lib/src/events/EventsRegistry.ts

@@ -7,7 +7,8 @@ import {
   ComponentDidDisappearEvent,
   NavigationButtonPressedEvent,
   SearchBarUpdatedEvent,
-  SearchBarCancelPressedEvent
+  SearchBarCancelPressedEvent,
+  ModalDismissedEvent
 } from '../interfaces/ComponentEvents';
 import { CommandCompletedEvent, BottomTabSelectedEvent } from '../interfaces/Events';
 
@@ -38,6 +39,10 @@ export class EventsRegistry {
     return this.nativeEventsReceiver.registerNavigationButtonPressedListener(callback);
   }
 
+  public registerModalDismissedListener(callback: (event: ModalDismissedEvent) => void): EventSubscription {
+    return this.nativeEventsReceiver.registerModalDismissedListener(callback);
+  }
+
   public registerSearchBarUpdatedListener(callback: (event: SearchBarUpdatedEvent) => void): EventSubscription {
     return this.nativeEventsReceiver.registerSearchBarUpdatedListener(callback);
   }

lib/src/interfaces/ComponentEvents.ts

@@ -14,6 +14,10 @@ export interface NavigationButtonPressedEvent extends ComponentEvent {
   buttonId: string;
 }
 
+export interface ModalDismissedEvent extends ComponentEvent {
+  componentId: string;
+}
+
 export interface SearchBarUpdatedEvent extends ComponentEvent {
   text: string;
   isFocused: boolean;

playground/src/screens/StaticLifecycleOverlay.js

@@ -34,6 +34,11 @@ class StaticLifecycleOverlay extends Component {
         events: [...this.state.events, { event: 'navigationButtonPressed', buttonId, componentId }]
       });
     }));
+    this.listeners.push(Navigation.events().registerModalDismissedListener(({ componentId }) => {
+      this.setState({
+        events: [...this.state.events, { event: 'modalDismissed', componentId }]
+      });
+    }));
   }
 
   componentWillUnmount() {
@@ -47,8 +52,10 @@ class StaticLifecycleOverlay extends Component {
       return <Text style={styles.h2}>{`${event.commandId}`}</Text>;
     } else if (event.componentName) {
       return <Text style={styles.h2}>{`${event.event} | ${event.componentName}`}</Text>;
-    } else {
+    } else if (event.buttonId) {
       return <Text style={styles.h2}>{`${event.event} | ${event.buttonId}`}</Text>;
+    } else {
+      return <Text style={styles.h2}>{`${event.event} | ${event.componentId}`}</Text>;
     }
   }