fix(ios-frame): do not update backstack when navigating the same page… · NativeScript/NativeScript@714af6b · GitHub

NativeScript / NativeScript Public

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

• Code
• Issues 773
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 714af6b

Browse filesBrowse the repository at this point in the historyBrowse files

ADjenkov

authored

fix(ios-frame): do not update backstack when navigating the same page (#5426)

1 parent b8e0bec commit 714af6b
Copy full SHA for 714af6b

2 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui
  • frame
    • frame.ios.ts
  • page
    • page.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

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

+9-1Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -37,6 +37,14 @@ export class Frame extends FrameBase {
37	37	return this._ios;
38	38	}
39	39
	40	+ public setCurrent(entry: BackstackEntry, isBack: boolean): void {
	41	+ if (entry !== this._currentEntry) {
	42	+ this._updateBackstack(entry, isBack);
	43	+ }
	44	+
	45	+ super.setCurrent(entry, isBack);
	46	+ }
	47	+
40	48	@profile
41	49	public _navigateCore(backstackEntry: BackstackEntry) {
42	50	super._navigateCore(backstackEntry);
@@ -352,7 +360,7 @@ class UINavigationControllerImpl extends UINavigationController {
352	360
353	361	@profile
354	362	public viewDidDisappear(animated: boolean): void {
355		- super.viewDidDisappear(animated);
	363	+ super.viewDidDisappear(animated);
356	364	const owner = this._owner.get();
357	365	if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) {
358	366	owner.callUnloaded();

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

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -138,7 +138,6 @@ class UIViewControllerImpl extends UIViewController {
138	138	isBack = isBackNavigationTo(owner, newEntry);
139	139	}
140	140
141		- frame._updateBackstack(newEntry, isBack);
142	141	frame.setCurrent(newEntry, isBack);
143	142
144	143	// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.

0 commit comments

Comments

0 (0)