fix(ios): flat action bar incorrect layout after navigation (#7077) · NativeScript/NativeScript@1dc3952 · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 775
• Pull requests 73
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 1dc3952

Browse filesBrowse the repository at this point in the historyBrowse files

MartoYankov

authored

fix(ios): flat action bar incorrect layout after navigation (#7077)

* fix(action-bar): incorrect layout after navigation * set extended layout for opaque bars earlier

1 parent 325f727 commit 1dc3952
Copy full SHA for 1dc3952

3 files changed

+24-9Lines changed: 24 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui
  • core/view
    • view.ios.ts
  • page
    • page.ios.ts
  • tab-view
    • tab-view.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tns-core-modules/ui/core/view/view.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/core/view/view.ios.ts

+8-3Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -904,6 +904,14 @@ export namespace ios {
904	904	return controller;
905	905	}
906	906
	907	+ public viewDidLoad(): void {
	908	+ super.viewDidLoad();
	909	+
	910	+ // Unify translucent and opaque bars layout
	911	+ // this.edgesForExtendedLayout = UIRectEdgeBottom;
	912	+ this.extendedLayoutIncludesOpaqueBars = true;
	913	+ }
	914	+
907	915	public viewWillLayoutSubviews(): void {
908	916	super.viewWillLayoutSubviews();
909	917	const owner = this.owner.get();
@@ -959,9 +967,6 @@ export namespace ios {
959	967	return;
960	968	}
961	969
962		- // Unify translucent and opaque bars layout
963		- this.extendedLayoutIncludesOpaqueBars = true;
964		-
965	970	updateAutoAdjustScrollInsets(this, owner);
966	971
967	972	if (!owner.parent) {

Collapse file

‎tns-core-modules/ui/page/page.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/page/page.ios.ts

+8-3Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -68,6 +68,14 @@ class UIViewControllerImpl extends UIViewController {
68	68	return controller;
69	69	}
70	70
	71	+ public viewDidLoad(): void {
	72	+ super.viewDidLoad();
	73	+
	74	+ // Unify translucent and opaque bars layout
	75	+ // this.edgesForExtendedLayout = UIRectEdgeBottom;
	76	+ this.extendedLayoutIncludesOpaqueBars = true;
	77	+ }
	78	+
71	79	public viewWillAppear(animated: boolean): void {
72	80	super.viewWillAppear(animated);
73	81	const owner = this._owner.get();
@@ -100,9 +108,6 @@ class UIViewControllerImpl extends UIViewController {
100	108	frame._updateActionBar(owner);
101	109	}
102	110
103		- // Unify translucent and opaque bars layout
104		- this.extendedLayoutIncludesOpaqueBars = true;
105		-
106	111	// Set autoAdjustScrollInsets in will appear - as early as possible
107	112	iosView.updateAutoAdjustScrollInsets(this, owner);
108	113

Collapse file

‎tns-core-modules/ui/tab-view/tab-view.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/tab-view/tab-view.ios.ts

+8-3Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -28,6 +28,14 @@ class UITabBarControllerImpl extends UITabBarController {
28	28	return handler;
29	29	}
30	30
	31	+ public viewDidLoad(): void {
	32	+ super.viewDidLoad();
	33	+
	34	+ // Unify translucent and opaque bars layout
	35	+ // this.edgesForExtendedLayout = UIRectEdgeBottom;
	36	+ this.extendedLayoutIncludesOpaqueBars = true;
	37	+ }
	38	+
31	39	@profile
32	40	public viewWillAppear(animated: boolean): void {
33	41	super.viewWillAppear(animated);
@@ -36,9 +44,6 @@ class UITabBarControllerImpl extends UITabBarController {
36	44	return;
37	45	}
38	46
39		- // Unify translucent and opaque bars layout
40		- this.extendedLayoutIncludesOpaqueBars = true;
41		-
42	47	iosView.updateAutoAdjustScrollInsets(this, owner);
43	48
44	49	if (!owner.parent) {

0 commit comments

Comments

0 (0)