javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: ActionBar update in IOS with modal dialogs

Browse Source
This commit is contained in:
vakrilov
2017-05-12 16:56:48 +03:00
parent 5441e7d1fc
commit f954d64d79
10 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/ui-tests-app/action-bar/main-page.ts
View File

@ -18,6 +18,8 @@ export function pageLoaded(args: EventData) {
examples.set("actionItemPosition", "action-bar/action-item-position");
examples.set("actBGCss", "action-bar/background-css");
examples.set("actTransparentBgCss", "action-bar/transparent-bg-css");
examples.set("modalHiddenActBar", "action-bar/modal-test-hidden-action-bar");
examples.set("modalShownActBar", "action-bar/modal-test-with-action-bar");
let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel;

11
apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.ts Normal file
View File

@ -0,0 +1,11 @@
import { ShownModallyData } from "tns-core-modules/ui/page";
let closeCallback: Function;
export function onShownModally(args: ShownModallyData) {
closeCallback = args.closeCallback;
}
export function onTap() {
closeCallback("sample text");
}

5
apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.xml Normal file
View File

@ -0,0 +1,5 @@
<Page showingModally="onShownModally" actionBarHidden="true">
<StackLayout id="layout" >
<Button text="Close" tap="onTap" />
</StackLayout>
</Page>

11
apps/app/ui-tests-app/action-bar/modal-page.ts Normal file
View File

@ -0,0 +1,11 @@
import { ShownModallyData } from "tns-core-modules/ui/page";
let closeCallback: Function;
export function onShownModally(args: ShownModallyData) {
closeCallback = args.closeCallback;
}
export function onTap() {
closeCallback("sample text");
}

5
apps/app/ui-tests-app/action-bar/modal-page.xml Normal file
View File

@ -0,0 +1,5 @@
<Page showingModally="onShownModally">
<StackLayout id="layout" >
<Button text="Close" tap="onTap" />
</StackLayout>
</Page>

13
apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.ts Normal file
View File

@ -0,0 +1,13 @@
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { topmost } from "tns-core-modules/ui/frame";
export function btnClick(args: EventData) {
(<Page>args.object).page.showModal("ui-tests-app/action-bar/modal-page", "", function (arg: string) {
// ...
}, true);
}
export function btnBack(args: EventData) {
topmost().goBack();
}

6
apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.xml Normal file
View File

@ -0,0 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true">
<StackLayout>
<button text="Open Modal" tap="btnClick" />
<button text="Go Back" tap="btnBack" />
</StackLayout>
</Page>

13
apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.ts Normal file
View File

@ -0,0 +1,13 @@
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { topmost } from "tns-core-modules/ui/frame";
export function btnClick(args: EventData) {
(<Page>args.object).page.showModal("ui-tests-app/action-bar/modal-page-hidden-action-bar", "", function (arg: string) {
// ...
}, true);
}
export function btnBack(args: EventData) {
topmost().goBack();
}

15
apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.xml Normal file
View File

@ -0,0 +1,15 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<Page.actionBar>
<ActionBar backgroundColor="green" title="Main View" icon="">
<NavigationButton text="Back" icon="" tap="" />
<ActionBar.actionItems>
<ActionItem icon="" text="Left" tap="" ios.position="left" />
<ActionItem icon="" text="Right" tap="" ios.position="right" />
</ActionBar.actionItems>
</ActionBar>
</Page.actionBar>
<StackLayout>
<button text="Open Modal" tap="btnClick" />
<button text="Go Back" tap="btnBack" />
</StackLayout>
</Page>

6
tns-core-modules/ui/frame/frame.ios.ts
View File

@ -45,7 +45,7 @@ export class Frame extends FrameBase {
super();
this._ios = new iOSFrame(this);
this.nativeView = this._ios.controller.view;
// When there is a 40px high "in-call" status bar, nobody moves the navigationBar top from 20 to 40 and it remains underneath the status bar.
let frameRef = new WeakRef(this);
application.ios.addNotificationObserver(UIApplicationDidChangeStatusBarFrameNotification, (notification: NSNotification) => {
@ -202,6 +202,10 @@ export class Frame extends FrameBase {
super._updateActionBar(page);
if (page && this.currentPage && this.currentPage.modal === page) {
return;
}
page = page || this.currentPage;
let newValue = this._getNavBarVisible(page);
let disableNavBarAnimationCache = this._ios._disableNavBarAnimation;