Skip to content

Commit 3aff057

Browse files
committed
revert: fix(android): nested dialog/fragment handling (NativeScript#9495)
This reverts commit 4c547bb.
1 parent 3e98d1e commit 3aff057

File tree

7 files changed

+4
-78
lines changed

7 files changed

+4
-78
lines changed

apps/ui/src/modal-view/nested-modal-tab.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

apps/ui/src/modal-view/nested-modal.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ export function onShowingModally(args: ShownModallyData) {
99
onTap: function () {
1010
Dialogs.alert('it works!');
1111
},
12-
openNestedModal: function () {
13-
page.showModal('modal-view/nested-nested-modal', {
14-
context: 'Neste mODAL',
15-
closeCallback: () => {
16-
console.log('nested-modal.openNestedModal');
17-
},
18-
});
19-
},
2012
});
2113
}
2214

apps/ui/src/modal-view/nested-modal.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
<StackLayout backgroundColor="PaleGreen" margin="10">
66
<Label text="{{ context }}"/>
77
<Button text="Show Alert" tap="{{ onTap }}"/>
8-
<Button text="Open Nested Modal" tap="{{ openNestedModal }}"/>
98
</StackLayout>
109
</Page>

apps/ui/src/modal-view/nested-nested-frame.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

apps/ui/src/modal-view/nested-nested-frame.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

apps/ui/src/modal-view/nested-nested-modal.xml

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/core/ui/core/view/index.android.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,6 @@ export class View extends ViewCommon {
345345
}
346346

347347
public _getFragmentManager(): androidx.fragment.app.FragmentManager {
348-
if ((<any>global)._dialogFragment) {
349-
return (<any>global)._dialogFragment.getChildFragmentManager();
350-
}
351348
let manager = this._manager;
352349
if (!manager) {
353350
let view: View = this;
@@ -693,19 +690,20 @@ export class View extends ViewCommon {
693690
};
694691

695692
saveModal(dialogOptions);
693+
696694
this._dialogFragment = df;
697-
(<any>global)._dialogFragment = df;
698695
this._raiseShowingModallyEvent();
696+
699697
this._dialogFragment.show(parent._getRootFragmentManager(), this._domId.toString());
700698
}
701699

702700
protected _hideNativeModalView(parent: View, whenClosedCallback: () => void) {
703-
const manager = this._dialogFragment.getParentFragmentManager();
701+
const manager = this._dialogFragment.getFragmentManager();
704702
if (manager) {
705703
this._dialogFragment.dismissAllowingStateLoss();
706704
}
705+
707706
this._dialogFragment = null;
708-
(<any>global)._dialogFragment = null;
709707
whenClosedCallback();
710708
}
711709

0 commit comments

Comments
 (0)