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(android): nested dialog/fragment handling (#9495)

Browse Source
This commit is contained in:
Nathan Walker
2021-08-03 21:57:19 -07:00
committed by GitHub
parent 5309f2d0a7
commit 4c547bb00c
7 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/ui/src/modal-view/nested-modal-tab.xml Normal file
View File

@@ -0,0 +1,24 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<ActionBar>
<Label text="Nested Modal Tab"></Label>
</ActionBar>
<TabView selectedTabTextColor="green">
<TabViewItem title="First">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
<TabViewItem title="Second">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
<TabViewItem title="Third">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
</TabView>
</Page>

8
apps/ui/src/modal-view/nested-modal.ts
View File

@@ -9,6 +9,14 @@ 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');
},
});
},
});
}

1
apps/ui/src/modal-view/nested-modal.xml
View File

@@ -5,5 +5,6 @@
<StackLayout backgroundColor="PaleGreen" margin="10">
<Label text="{{ context }}"/>
<Button text="Show Alert" tap="{{ onTap }}"/>
<Button text="Open Nested Modal" tap="{{ openNestedModal }}"/>
</StackLayout>
</Page>

29
apps/ui/src/modal-view/nested-nested-frame.ts Normal file
View File

@@ -0,0 +1,29 @@
import { Page, EventData, fromObject, Dialogs } from '@nativescript/core';
export function navigatingTo(args) {
const page = <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');
}

9
apps/ui/src/modal-view/nested-nested-frame.xml Normal file
View File

@@ -0,0 +1,9 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd"
navigatingTo="navigatingTo"
loaded="onLoaded" unloaded="onUnloaded" backgroundColor="Red">
<StackLayout backgroundColor="PaleGreen" margin="10">
<Label text="{{ context }}"/>
<Button text="Show Alert" tap="{{ onTap }}"/>
<Button text="Open Nested Frames" tap="{{ openNestedFrames }}" />
</StackLayout>
</Page>

1
apps/ui/src/modal-view/nested-nested-modal.xml Normal file
View File

@@ -0,0 +1 @@
<Frame defaultPage="modal-view/nested-nested-frame"></Frame>

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

@@ -345,6 +345,9 @@ export class View extends ViewCommon {
}
public _getFragmentManager(): androidx.fragment.app.FragmentManager {
if ((<any>global)._dialogFragment) {
return (<any>global)._dialogFragment.getChildFragmentManager();
}
let manager = this._manager;
if (!manager) {
let view: View = this;
@@ -690,20 +693,19 @@ export class View extends ViewCommon {
};
saveModal(dialogOptions);
this._dialogFragment = df;
(<any>global)._dialogFragment = df;
this._raiseShowingModallyEvent();
this._dialogFragment.show(parent._getRootFragmentManager(), this._domId.toString());
}
protected _hideNativeModalView(parent: View, whenClosedCallback: () => void) {
const manager = this._dialogFragment.getFragmentManager();
const manager = this._dialogFragment.getParentFragmentManager();
if (manager) {
this._dialogFragment.dismissAllowingStateLoss();
}
this._dialogFragment = null;
(<any>global)._dialogFragment = null;
whenClosedCallback();
}