diff --git a/apps/ui/src/modal-view/nested-modal-tab.xml b/apps/ui/src/modal-view/nested-modal-tab.xml
deleted file mode 100644
index d01de1f9c..000000000
--- a/apps/ui/src/modal-view/nested-modal-tab.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/ui/src/modal-view/nested-modal.ts b/apps/ui/src/modal-view/nested-modal.ts
index 30722e8c5..a40684b74 100644
--- a/apps/ui/src/modal-view/nested-modal.ts
+++ b/apps/ui/src/modal-view/nested-modal.ts
@@ -9,14 +9,6 @@ export function onShowingModally(args: ShownModallyData) {
onTap: function () {
Dialogs.alert('it works!');
},
- openNestedModal: function () {
- page.showModal('modal-view/nested-nested-modal', {
- context: 'Neste mODAL',
- closeCallback: () => {
- console.log('nested-modal.openNestedModal');
- },
- });
- },
});
}
diff --git a/apps/ui/src/modal-view/nested-modal.xml b/apps/ui/src/modal-view/nested-modal.xml
index cb82585fd..7795a0afa 100644
--- a/apps/ui/src/modal-view/nested-modal.xml
+++ b/apps/ui/src/modal-view/nested-modal.xml
@@ -5,6 +5,5 @@
-
diff --git a/apps/ui/src/modal-view/nested-nested-frame.ts b/apps/ui/src/modal-view/nested-nested-frame.ts
deleted file mode 100644
index 2c131ac56..000000000
--- a/apps/ui/src/modal-view/nested-nested-frame.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Page, EventData, fromObject, Dialogs } from '@nativescript/core';
-
-export function navigatingTo(args) {
- const page = args.object;
-
- page.bindingContext = fromObject({
- context: args.context,
- onTap: function () {
- Dialogs.alert('it works!');
- },
- openNestedFrames: function () {
- page.showModal('modal-view/nested-modal-tab', {
- context: 'Nested Modal Tab',
- fullscreen: true,
- closeCallback: () => {
- console.log('nested-modal.openNestedModal');
- },
- });
- },
- });
-}
-
-export function onLoaded(args: EventData) {
- console.log('nested-nested-modal.onLoaded');
-}
-
-export function onUnloaded() {
- console.log('nested-nested-modal.onUnloaded');
-}
diff --git a/apps/ui/src/modal-view/nested-nested-frame.xml b/apps/ui/src/modal-view/nested-nested-frame.xml
deleted file mode 100644
index 6cbdd140f..000000000
--- a/apps/ui/src/modal-view/nested-nested-frame.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apps/ui/src/modal-view/nested-nested-modal.xml b/apps/ui/src/modal-view/nested-nested-modal.xml
deleted file mode 100644
index f664665fd..000000000
--- a/apps/ui/src/modal-view/nested-nested-modal.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index 29e623619..0d7150acc 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -345,9 +345,6 @@ export class View extends ViewCommon {
}
public _getFragmentManager(): androidx.fragment.app.FragmentManager {
- if ((global)._dialogFragment) {
- return (global)._dialogFragment.getChildFragmentManager();
- }
let manager = this._manager;
if (!manager) {
let view: View = this;
@@ -693,19 +690,20 @@ export class View extends ViewCommon {
};
saveModal(dialogOptions);
+
this._dialogFragment = df;
- (global)._dialogFragment = df;
this._raiseShowingModallyEvent();
+
this._dialogFragment.show(parent._getRootFragmentManager(), this._domId.toString());
}
protected _hideNativeModalView(parent: View, whenClosedCallback: () => void) {
- const manager = this._dialogFragment.getParentFragmentManager();
+ const manager = this._dialogFragment.getFragmentManager();
if (manager) {
this._dialogFragment.dismissAllowingStateLoss();
}
+
this._dialogFragment = null;
- (global)._dialogFragment = null;
whenClosedCallback();
}