javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(modal): persist modal through configuration changes (#9533)

Browse Source
This commit is contained in:
Eduardo Speroni
2021-09-03 22:41:49 -03:00
committed by Nathan Walker
parent 75afa325ac
commit 4632aeaae8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/ui/core/view/index.android.ts
View File

@@ -161,6 +161,7 @@ function initializeDialogFragment() {
private _cancelable: boolean;
private _shownCallback: () => void;
private _dismissCallback: () => void;
private activity: WeakRef<android.app.Activity>;
constructor() {
super();
@@ -215,6 +216,7 @@ function initializeDialogFragment() {
public onCreateView(inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View {
const owner = this.owner;
this.activity = new WeakRef(this.getActivity());
owner._setupAsRootView(this.getActivity());
owner._isAddedToNativeVisualTree = true;
@@ -252,7 +254,8 @@ function initializeDialogFragment() {
public onDismiss(dialog: android.content.DialogInterface): void {
super.onDismiss(dialog);
const manager = this.getFragmentManager();
if (manager) {
const activity = this.activity?.get();
if (manager && !activity?.isChangingConfigurations()) {
removeModal(this.owner._domId);
this._dismissCallback();
}
@@ -266,6 +269,10 @@ function initializeDialogFragment() {
public onDestroy(): void {
super.onDestroy();
const owner = this.owner;
const activity = this.activity?.get();
if (!activity?.isChangingConfigurations()) {
this.activity = null;
}
if (owner) {
// Android calls onDestroy before onDismiss.