Permalink
Browse files

Fix Modal not disappearing when navigating from inside a Modal to ano…

…ther activity

Reviewed By: achen1

Differential Revision: D6668368

fbshipit-source-id: 809e9c978032e731478bcc8e290eb030e4ee6eca
  • Loading branch information...
mdvacca authored and facebook-github-bot committed Jan 8, 2018
1 parent d85da86 commit e5c2a66897b9c562c549e63adcf70783ea34c418
Showing with 15 additions and 5 deletions.
  1. +15 −5 ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -128,7 +128,10 @@ public void onDropInstance() {
private void dismiss() {
if (mDialog != null) {
mDialog.dismiss();
Activity currentActivity = getCurrentActivity();
if (mDialog.isShowing() && (currentActivity == null || !currentActivity.isFinishing())) {
mDialog.dismiss();
}
mDialog = null;
// We need to remove the mHostView from the parent
@@ -168,8 +171,7 @@ public void onHostResume() {
@Override
public void onHostPause() {
// We dismiss the dialog and reconstitute it onHostResume
dismiss();
// do nothing
}
@Override
@@ -183,6 +185,10 @@ public void onHostDestroy() {
return mDialog;
}
private @Nullable Activity getCurrentActivity() {
return ((ReactContext) getContext()).getCurrentActivity();
}
/**
* showOrUpdate will display the Dialog. It is called by the manager once all properties are set
* because we need to know all of them before creating the Dialog. It is also smart during
@@ -209,7 +215,9 @@ protected void showOrUpdate() {
} else if (mAnimationType.equals("slide")) {
theme = R.style.Theme_FullScreenDialogAnimatedSlide;
}
mDialog = new Dialog(getContext(), theme);
Activity currentActivity = getCurrentActivity();
Context context = currentActivity == null ? getContext() : currentActivity;
mDialog = new Dialog(context, theme);
mDialog.setContentView(getContentView());
updateProperties();
@@ -247,7 +255,9 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (mHardwareAccelerated) {
mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
}
mDialog.show();
if (currentActivity == null || !currentActivity.isFinishing()) {
mDialog.show();
}
}
/**

0 comments on commit e5c2a66

Please sign in to comment.