Skip to content

fix: nested frames order with tabs & suspend/resume #6528

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
manoldonev merged 6 commits into from
Nov 14, 2018
Merged

fix: nested frames order with tabs & suspend/resume #6528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d95ef1
fix: nested frames order with tabs & suspend/resume
manoldonev Nov 8, 2018
4d96504
Merge branch 'master' into mdonev/tab-view-nested-frames-suspend-resume
manoldonev Nov 8, 2018
06daf81
Merge branch 'master' into mdonev/tab-view-nested-frames-suspend-resume
manoldonev Nov 8, 2018
9b85868
rework impl and apply to iOS as well
manoldonev Nov 12, 2018
5531962
Merge branch 'master' into mdonev/tab-view-nested-frames-suspend-resume
manoldonev Nov 12, 2018
70bb618
Merge branch 'master' into mdonev/tab-view-nested-frames-suspend-resume
SvetoslavTsenov Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions tns-core-modules/ui/frame/frame-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,18 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
}
}

private isNestedWithin(parentFrameCandidate: FrameBase): boolean {
let frameAncestor: FrameBase = this;
while (frameAncestor) {
frameAncestor = <FrameBase>getAncestor(frameAncestor, FrameBase);
if (frameAncestor === parentFrameCandidate) {
return true;
}
}

return false;
}

private raiseCurrentPageNavigatedEvents(isBack: boolean) {
const page = this.currentPage;
if (page) {
Expand Down Expand Up @@ -410,6 +422,23 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
return null;
}

public _pushInFrameStackRecursive() {
this._pushInFrameStack();

// make sure nested frames order is kept intact i.e. the nested one should always be on top;
// see https://github.com/NativeScript/nativescript-angular/issues/1596 for more information
const framesToPush = [];
for (const frame of frameStack) {
if (frame.isNestedWithin(this)) {
framesToPush.push(frame);
}
}

for (const frame of framesToPush) {
frame._pushInFrameStack();
}
}

public _pushInFrameStack() {
_pushInFrameStack(this);
}
Expand Down
4 changes: 4 additions & 0 deletions tns-core-modules/ui/frame/frame.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ export class Frame extends View {
* @private
*/
_pushInFrameStack();
/**
* @private
*/
_pushInFrameStackRecursive();
/**
* @private
*/
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/tab-view/tab-view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ export class TabView extends TabViewBase {
const newItem = items[newIndex];
const selectedView = newItem && newItem.view;
if (selectedView instanceof Frame) {
selectedView._pushInFrameStack();
selectedView._pushInFrameStackRecursive();
}

toLoad.forEach(index => {
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/tab-view/tab-view.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export class TabView extends TabViewBase {
const selectedIndex = this.selectedIndex;
const selectedView = this.items && this.items[selectedIndex] && this.items[selectedIndex].view;
if (selectedView instanceof Frame) {
selectedView._pushInFrameStack();
selectedView._pushInFrameStackRecursive();
}

this._ios.delegate = this._delegate;
Expand Down Expand Up @@ -300,7 +300,7 @@ export class TabView extends TabViewBase {
if (newItem && this.isLoaded) {
const selectedView = items[newIndex].view;
if (selectedView instanceof Frame) {
selectedView._pushInFrameStack();
selectedView._pushInFrameStackRecursive();
}

newItem.loadView(newItem.view);
Expand Down