fix(android): parallel navigations should not be triggered (#6275) · NativeScript/NativeScript@405ccae · 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 405ccae

Browse filesBrowse the repository at this point in the historyBrowse files

manoldonev

committed

fix(android): parallel navigations should not be triggered (#6275)

1 parent 5d16749 commit 405ccae
Copy full SHA for 405ccae

2 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui
  • core/view
    • view.android.ts
  • frame
    • frame.android.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -497,7 +497,7 @@ export class View extends ViewCommon {
497	497
498	498	public getLocationRelativeTo(otherView: ViewCommon): Point {
499	499	if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken() ||
500		- !otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
	500	+ !otherView || !otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
501	501	this.nativeViewProtected.getWindowToken() !== otherView.nativeViewProtected.getWindowToken()) {
502	502	return undefined;
503	503	}

Collapse file

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

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -143,7 +143,7 @@ export class Frame extends FrameBase {
143	143	// In this case call _navigateCore in order to recreate the current fragment.
144	144	// Don't call navigate because it will fire navigation events.
145	145	// As JS instances are alive it is already done for the current page.
146		- if (!this.isLoaded || !this._attachedToWindow) {
	146	+ if (!this.isLoaded || this._executingEntry || !this._attachedToWindow) {
147	147	return;
148	148	}
149	149

0 commit comments

Comments

0 (0)