Browse Source

Emit ModalDismissed event before resolving dismissModal promise

Guy Carmeli 6 years ago
parent
commit
fd483a00ea

+ 2
- 2
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java View File

58
             CommandListenerAdapter onDismiss = new CommandListenerAdapter(listener) {
58
             CommandListenerAdapter onDismiss = new CommandListenerAdapter(listener) {
59
                 @Override
59
                 @Override
60
                 public void onSuccess(String childId) {
60
                 public void onSuccess(String childId) {
61
-                    super.onSuccess(childId);
62
                     eventEmitter.emitModalDismissed(toDismiss.getId(), 1);
61
                     eventEmitter.emitModalDismissed(toDismiss.getId(), 1);
62
+                    super.onSuccess(childId);
63
                 }
63
                 }
64
             };
64
             };
65
             if (isTop) {
65
             if (isTop) {
86
                 dismissModal(modals.get(0).getId(), root, new CommandListenerAdapter(listener) {
86
                 dismissModal(modals.get(0).getId(), root, new CommandListenerAdapter(listener) {
87
                     @Override
87
                     @Override
88
                     public void onSuccess(String childId) {
88
                     public void onSuccess(String childId) {
89
-                        super.onSuccess(childId);
90
                         eventEmitter.emitModalDismissed(topModalId, modalsDismissed);
89
                         eventEmitter.emitModalDismissed(topModalId, modalsDismissed);
90
+                        super.onSuccess(childId);
91
                     }
91
                     }
92
                 });
92
                 });
93
             } else {
93
             } else {