FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(ios-frame): do not update backstack when navigating the same page by ADjenkov · Pull Request #5426 · NativeScript/NativeScript · GitHub

/ NativeScript Public

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ADjenkov merged 1 commit into from
Feb 19, 2018
+9 −2
Conversation 3 Commits 1 Checks 0 Files changed 2
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .ts  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 9 additions & 1 deletion tns-core-modules/ui/frame/frame.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ export class Frame extends FrameBase {
return this._ios;
}

public setCurrent(entry: BackstackEntry, isBack: boolean): void {
if (entry !== this._currentEntry) {
this._updateBackstack(entry, isBack);
}

super.setCurrent(entry, isBack);
}

@profile
public _navigateCore(backstackEntry: BackstackEntry) {
super._navigateCore(backstackEntry);
Expand Down Expand Up @@ -352,7 +360,7 @@ class UINavigationControllerImpl extends UINavigationController {

@profile
public viewDidDisappear(animated: boolean): void {
super.viewDidDisappear(animated);
super.viewDidDisappear(animated);
const owner = this._owner.get();
if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) {
owner.callUnloaded();
Expand Down
1 change: 0 additions & 1 deletion tns-core-modules/ui/page/page.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ class UIViewControllerImpl extends UIViewController {
isBack = isBackNavigationTo(owner, newEntry);
}

frame._updateBackstack(newEntry, isBack);
frame.setCurrent(newEntry, isBack);

// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.
Expand Down
Back | FazBrowse Home | New Git URL