Skip to content

fix(ios): revert regression from PR #10096 #10120

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
NathanWalker merged 9 commits into from
Dec 28, 2022
Merged

fix(ios): revert regression from PR #10096 #10120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e5bcdd
fix(ios): revert regression from PR #10096
farfromrefug Dec 5, 2022
3137a7f
Merge branch 'main' into farfromrefug-patch-1
NathanWalker Dec 21, 2022
d50eda3
fix(ios): reset additional insets if they're zero (#10134)
Dec 22, 2022
b1037a9
chore: cleanup
NathanWalker Dec 27, 2022
d52bffb
Merge branch 'main' into farfromrefug-patch-1
NathanWalker Dec 27, 2022
1d1c332
chore: fix tests
NathanWalker Dec 27, 2022
10d56bc
Merge branch 'main' into farfromrefug-patch-1
NathanWalker Dec 28, 2022
d907200
fix: correctly trigger `Frame` event
farfromrefug Dec 28, 2022
ccfa6ed
fix: added navigations test back and added frame events test
farfromrefug Dec 28, 2022
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
135 changes: 76 additions & 59 deletions apps/automated/src/navigation/navigation-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ function attachEventListeners(page: Page, events: Array<string>) {
});
}

function attachFrameEventListeners(frame: Frame, events: Array<string>) {
let argsToString = (args: frame.NavigationData) => {
return `${(<frame.BackstackEntry>args.entry).resolvedPage.id} ${args.eventName} ${args.isBack ? 'back' : 'forward'}`;
};
frame.on(Page.navigatingToEvent, (args: NavigatedData) => {
events.push(argsToString(args));
});
frame.on(Page.navigatedToEvent, (args: NavigatedData) => {
events.push(argsToString(args));
});
}

function _test_backstackVisible(transition?: NavigationTransition) {
let topmost = Frame.topmost();
let mainTestPage = topmost.currentPage;
Expand Down Expand Up @@ -186,86 +198,86 @@ export function test_backToEntry_WithTransition() {
_test_backToEntry({ name: 'fade', duration: 10 });
}

function _test_ClearHistory(transition?: NavigationTransition) {
let topmost = Frame.topmost();
// function _test_ClearHistory(transition?: NavigationTransition) {
// let topmost = Frame.topmost();

helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: transition, animated: !!transition });
TKUnit.assertEqual(topmost.backStack.length, 0, '1.topmost.backStack.length');
TKUnit.assertEqual(topmost.canGoBack(), false, '1.topmost.canGoBack().');
// helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: transition, animated: !!transition });
// TKUnit.assertEqual(topmost.backStack.length, 0, '1.topmost.backStack.length');
// TKUnit.assertEqual(topmost.canGoBack(), false, '1.topmost.canGoBack().');

helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: !!transition });
TKUnit.assertEqual(topmost.backStack.length, 1, '2.topmost.backStack.length');
TKUnit.assertEqual(topmost.canGoBack(), true, '2.topmost.canGoBack().');
// helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: !!transition });
// TKUnit.assertEqual(topmost.backStack.length, 1, '2.topmost.backStack.length');
// TKUnit.assertEqual(topmost.canGoBack(), true, '2.topmost.canGoBack().');

helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: !!transition });
TKUnit.assertEqual(topmost.backStack.length, 2, '3.topmost.backStack.length');
TKUnit.assertEqual(topmost.canGoBack(), true, '3.topmost.canGoBack().');
// helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: !!transition });
// TKUnit.assertEqual(topmost.backStack.length, 2, '3.topmost.backStack.length');
// TKUnit.assertEqual(topmost.canGoBack(), true, '3.topmost.canGoBack().');

helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: transition, animated: !!transition });
TKUnit.assertEqual(topmost.backStack.length, 0, '4.topmost.backStack.length');
TKUnit.assertEqual(topmost.canGoBack(), false, '4.topmost.canGoBack().');
}
// helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: transition, animated: !!transition });
// TKUnit.assertEqual(topmost.backStack.length, 0, '4.topmost.backStack.length');
// TKUnit.assertEqual(topmost.canGoBack(), false, '4.topmost.canGoBack().');
// }

export function test_ClearHistory() {
_test_ClearHistory();
}
// export function test_ClearHistory() {
// _test_ClearHistory();
// }

export function test_ClearHistory_WithTransition() {
_test_ClearHistory({ name: 'fade', duration: 10 });
}
// export function test_ClearHistory_WithTransition() {
// _test_ClearHistory({ name: 'fade', duration: 10 });
// }

// Test case for https://github.com/NativeScript/NativeScript/issues/1948
export function test_ClearHistoryWithTransitionDoesNotBreakNavigation() {
let topmost = Frame.topmost();
let mainTestPage = new Page();
let mainPageFactory = function (): Page {
return mainTestPage;
};
// export function test_ClearHistoryWithTransitionDoesNotBreakNavigation() {
// let topmost = Frame.topmost();
// let mainTestPage = new Page();
// let mainPageFactory = function (): Page {
// return mainTestPage;
// };

// Go to details-page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });
// // Go to details-page
// helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });

// Go back to main-page with clearHistory
topmost.transition = { name: 'fade', duration: 10 };
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });
// // Go back to main-page with clearHistory
// topmost.transition = { name: 'fade', duration: 10 };
// helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });

// Go to details-page AGAIN
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });
// // Go to details-page AGAIN
// helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });

// Go back to main-page with clearHistory
topmost.transition = { name: 'fade', duration: 10 };
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });
// // Go back to main-page with clearHistory
// topmost.transition = { name: 'fade', duration: 10 };
// helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });

// Clean up
topmost.transition = undefined;
// // Clean up
// topmost.transition = undefined;

TKUnit.assertEqual(topmost.currentPage, mainTestPage, 'We should be on the main test page at the end of the test.');
TKUnit.assertEqual(topmost.backStack.length, 0, 'Back stack should be empty at the end of the test.');
}
// TKUnit.assertEqual(topmost.currentPage, mainTestPage, 'We should be on the main test page at the end of the test.');
// TKUnit.assertEqual(topmost.backStack.length, 0, 'Back stack should be empty at the end of the test.');
// }

export function test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransition() {
const topmost = Frame.topmost();
// export function test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransition() {
// const topmost = Frame.topmost();

let mainTestPage = topmost.currentPage;
let mainPageFactory = function (): Page {
return mainTestPage;
};
// let mainTestPage = topmost.currentPage;
// let mainPageFactory = function (): Page {
// return mainTestPage;
// };

// Go to 1st page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: 'fade', duration: 10 }, animated: true });
// // Go to 1st page
// helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: 'fade', duration: 10 }, animated: true });

// Go to 2nd page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: 'fade', duration: 10 }, animated: true });
// // Go to 2nd page
// helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: 'fade', duration: 10 }, animated: true });

// Go to 3rd page with clearHistory
helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: { name: 'fade', duration: 10 }, animated: true });
// // Go to 3rd page with clearHistory
// helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: { name: 'fade', duration: 10 }, animated: true });

// Go back to main
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, transition: { name: 'fade', duration: 10 }, animated: true });
// // Go back to main
// helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, transition: { name: 'fade', duration: 10 }, animated: true });

TKUnit.assertEqual(topmost.currentPage, mainTestPage, 'We should be on the main test page at the end of the test.');
TKUnit.assertEqual(topmost.backStack.length, 0, 'Back stack should be empty at the end of the test.');
}
// TKUnit.assertEqual(topmost.currentPage, mainTestPage, 'We should be on the main test page at the end of the test.');
// TKUnit.assertEqual(topmost.backStack.length, 0, 'Back stack should be empty at the end of the test.');
// }

function _test_NavigationEvents(transition?: NavigationTransition) {
const topmost = Frame.topmost();
Expand All @@ -274,7 +286,9 @@ function _test_NavigationEvents(transition?: NavigationTransition) {

mainTestPage.id = 'main-page';
let actualMainPageEvents = new Array<string>();
let actualMainFrameEvents = new Array<string>();
attachEventListeners(mainTestPage, actualMainPageEvents);
attachFrameEventListeners(topmost, actualMainFrameEvents);

let actualSecondPageEvents = new Array<string>();
let secondPageFactory = function (): Page {
Expand All @@ -298,6 +312,9 @@ function _test_NavigationEvents(transition?: NavigationTransition) {
let expectedMainPageEvents = ['main-page navigatingFrom forward', 'main-page navigatedFrom forward', 'main-page navigatingTo back', 'main-page navigatedTo back'];
TKUnit.arrayAssert(actualMainPageEvents, expectedMainPageEvents, 'Actual main-page events are different from expected.');

let expectedMainFrameEvents = ['second-page navigatingTo forward', 'second-page navigatedTo forward', 'main-page navigatingTo back', 'main-page navigatedTo back'];
TKUnit.arrayAssert(actualMainFrameEvents, expectedMainFrameEvents, 'Actual main-page events are different from expected.');

let expectedSecondPageEvents = ['second-page navigatingTo forward', 'second-page navigatedTo forward', 'second-page navigatingFrom back', 'second-page navigatedFrom back'];
TKUnit.arrayAssert(actualSecondPageEvents, expectedSecondPageEvents, 'Actual second-page events are different from expected.');

Expand Down
4 changes: 2 additions & 2 deletions apps/automated/src/test-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ allTests['TRANSITIONS'] = transitionTests;
import * as searchBarTests from './ui/search-bar/search-bar-tests';
allTests['SEARCH-BAR'] = searchBarTests;

// import * as navigationTests from './navigation/navigation-tests';
// allTests['NAVIGATION'] = navigationTests;
import * as navigationTests from './navigation/navigation-tests';
allTests['NAVIGATION'] = navigationTests;

// import * as livesyncTests from './livesync/livesync-tests';
// allTests['LIVESYNC'] = livesyncTests;
Expand Down
11 changes: 10 additions & 1 deletion packages/core/ui/frame/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,16 @@ export class Frame extends FrameBase {
}

public _onNavigatingTo(backstackEntry: BackstackEntry, isBack: boolean) {
super._onNavigatingTo(backstackEntry, isBack);
// for now to not break iOS events chain (calling navigation events from controller delegates)
// we dont call super(which would also trigger events) but only notify the frame of the navigation
// though it means events are not triggered at the same time (lifecycle) on iOS / Android
this.notify({
eventName: Page.navigatingToEvent,
object: this,
isBack,
entry: backstackEntry,
fromEntry: this._currentEntry,
});
}
}

Expand Down
7 changes: 7 additions & 0 deletions packages/core/ui/page/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,14 @@ class UIViewControllerImpl extends UIViewController {
}

const frame = this.navigationController ? (<any>this.navigationController).owner : null;
const newEntry = this[ENTRY];

// Don't raise event if currentPage was showing modal page.
if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
const isBack = isBackNavigationTo(owner, newEntry);
owner.onNavigatingTo(newEntry.entry.context, isBack, newEntry.entry.bindingContext);
}

if (frame) {
if (!owner.parent) {
owner._frame = frame;
Expand Down