javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix iOS 11 titleView misplacement in ActionBar

Browse Source
This commit is contained in:
Hristo Hristov
2017-11-07 10:40:43 +02:00
parent 2e2467ce5d
commit b489e52a5f
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tns-core-modules/ui/action-bar/action-bar.ios.ts
View File

@ -1,9 +1,13 @@
import { IOSActionItemSettings, ActionItem as ActionItemDefinition } from "."; import { IOSActionItemSettings, ActionItem as ActionItemDefinition } from ".";
import { ActionItemBase, ActionBarBase, isVisible, View, colorProperty, backgroundColorProperty, backgroundInternalProperty, flatProperty, layout, Color } from "./action-bar-common"; import { ActionItemBase, ActionBarBase, isVisible, View, colorProperty, backgroundColorProperty, backgroundInternalProperty, flatProperty, layout, Color } from "./action-bar-common";
import { ImageSource, fromFileOrResource } from "../../image-source"; import { ImageSource, fromFileOrResource } from "../../image-source";
import { ios as iosUtils } from "../../utils/utils";
export * from "./action-bar-common"; export * from "./action-bar-common";
const majorVersion = iosUtils.MajorVersion;
const UNSPECIFIED = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
class TapBarItemHandlerImpl extends NSObject { class TapBarItemHandlerImpl extends NSObject {
private _owner: WeakRef<ActionItemDefinition>; private _owner: WeakRef<ActionItemDefinition>;
@ -46,12 +50,12 @@ export class NavigationButton extends ActionItem {
export class ActionBar extends ActionBarBase { export class ActionBar extends ActionBarBase {
get ios(): UIView { get ios(): UIView {
let page = this.page; const page = this.page;
if (!page || !page.parent) { if (!page || !page.parent) {
return; return;
} }
let viewController = (<UIViewController>page.ios); const viewController = (<UIViewController>page.ios);
if (viewController.navigationController !== null) { if (viewController.navigationController !== null) {
return viewController.navigationController.navigationBar; return viewController.navigationController.navigationBar;
} }
@ -102,10 +106,6 @@ export class ActionBar extends ActionBarBase {
return; return;
} }
if (!this.isLayoutValid) {
this.layoutInternal();
}
const viewController = (<UIViewController>page.ios); const viewController = (<UIViewController>page.ios);
const navigationItem: UINavigationItem = viewController.navigationItem; const navigationItem: UINavigationItem = viewController.navigationItem;
const navController = <UINavigationController>page.frame.ios.controller; const navController = <UINavigationController>page.frame.ios.controller;
@ -169,6 +169,10 @@ export class ActionBar extends ActionBarBase {
// the 'flat' property may have changed in between pages // the 'flat' property may have changed in between pages
this.updateFlatness(navigationBar); this.updateFlatness(navigationBar);
if (!this.isLayoutValid) {
this.layoutInternal();
}
} }
private populateMenuItems(navigationItem: UINavigationItem) { private populateMenuItems(navigationItem: UINavigationItem) {
@ -275,16 +279,13 @@ export class ActionBar extends ActionBarBase {
const heightMode = layout.getMeasureSpecMode(heightMeasureSpec); const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
if (this.titleView) { if (this.titleView) {
View.measureChild(this, this.titleView, View.measureChild(this, this.titleView, UNSPECIFIED, UNSPECIFIED);
layout.makeMeasureSpec(width, layout.AT_MOST),
layout.makeMeasureSpec(height, layout.AT_MOST));
} }
this.actionItems.getItems().forEach((actionItem) => { this.actionItems.getItems().forEach((actionItem) => {
if (actionItem.actionView) { const actionView = actionItem.actionView;
View.measureChild(this, actionItem.actionView, if (actionView) {
layout.makeMeasureSpec(width, layout.AT_MOST), View.measureChild(this, actionView, UNSPECIFIED, UNSPECIFIED);
layout.makeMeasureSpec(height, layout.AT_MOST));
} }
}); });
@ -293,12 +294,24 @@ export class ActionBar extends ActionBarBase {
} }
public onLayout(left: number, top: number, right: number, bottom: number) { public onLayout(left: number, top: number, right: number, bottom: number) {
View.layoutChild(this, this.titleView, 0, 0, right - left, bottom - top); const titleView = this.titleView;
if (titleView) {
if (majorVersion > 10) {
// On iOS 11 titleView is wrapped in another view that is centered with constraints.
View.layoutChild(this, titleView, 0, 0, titleView.getMeasuredWidth(), titleView.getMeasuredHeight());
} else {
// On iOS <11 titleView is direct child of UINavigationBar so we give it full width and leave
// the layout to center it.
View.layoutChild(this, titleView, 0, 0, right - left, bottom - top);
}
}
this.actionItems.getItems().forEach((actionItem) => { this.actionItems.getItems().forEach((actionItem) => {
if (actionItem.actionView && actionItem.actionView.ios) { const actionView = actionItem.actionView;
let measuredWidth = actionItem.actionView.getMeasuredWidth(); if (actionView && actionView.ios) {
let measuredHeight = actionItem.actionView.getMeasuredHeight(); const measuredWidth = actionView.getMeasuredWidth();
View.layoutChild(this, actionItem.actionView, 0, 0, measuredWidth, measuredHeight); const measuredHeight = actionView.getMeasuredHeight();
View.layoutChild(this, actionView, 0, 0, measuredWidth, measuredHeight);
} }
}); });