8000 Merge branch 'main' into fix/rootlayout-shade-animation · NativeScript/NativeScript@a8c8466 · GitHub
[go: up one dir, main page]
Skip to content

Commit a8c8466

Browse files
NathanWalkerNathanWalker
authored
Merge branch 'main' into fix/rootlayout-shade-animation
2 parents 1781771 + a11ccd8 commit a8c8466

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

‎apps/automated/src/ui/tab-view/tab-view-root-tests.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ export function test_offset_zero_should_raise_same_events() {
140140
resetActualEventsRaised();
141141
waitUntilNavigatedToMaxTimeout([items[2].page], () => (tabView.selectedIndex = 2));
142142

143-
const expectedEventsRaisedAfterSelectThirdTab = [['Tab0 Frame0 Page0 unloaded', 'Tab0 Frame0 unloaded', 'Tab0 Frame0 Page0 navigatingFrom'], [], ['Tab2 Frame2 loaded', 'Tab2 Frame2 Page2 navigatingTo', 'Tab2 Frame2 Page2 loaded', 'Tab2 Frame2 Page2 navigatedTo']];
143+
const startEvents = ['Tab0 Frame0 Page0 unloaded', 'Tab0 Frame0 unloaded'];
144+
if (__APPLE__) {
145+
startEvents.push('Tab0 Frame0 Page0 navigatingFrom');
146+
}
147+
const expectedEventsRaisedAfterSelectThirdTab = [startEvents, [], ['Tab2 Frame2 loaded', 'Tab2 Frame2 Page2 navigatingTo', 'Tab2 Frame2 Page2 loaded', 'Tab2 Frame2 Page2 navigatedTo']];
144148

145149
TKUnit.assertDeepEqual(actualEventsRaised, expectedEventsRaisedAfterSelectThirdTab);
146150

‎apps/automated/src/ui/tab-view/tab-view-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class TabViewTest extends UITest<tabViewModule.TabView> {
155155
TKUnit.assertEqual(actualValue, expectedValue, 'selectedIndex should be undefined.');
156156
};
157157

158-
public testSelectedIndexBecomesUndefinedWhenItemsSetToNull = function () {
158+
public testSelectedIndexBecomesNegativeOneWhenItemsSetToNull = function () {
159159
var tabView = this.testView;
160160
tabView.items = this._createItems(10);
161161
tabView.selectedIndex = 9;
@@ -164,7 +164,7 @@ export class TabViewTest extends UITest<tabViewModule.TabView> {
164164
tabView.items = null;
165165
var expectedValue = -1;
166166
var actualValue = tabView.selectedIndex;
167-
TKUnit.assertEqual(actualValue, expectedValue, 'selectedIndex should be undefined.');
167+
TKUnit.assertEqual(actualValue, expectedValue, 'selectedIndex should be -1.');
168168
};
169169

170170
public testItemsIsResolvedCorrectlyIfSetBeforeViewIsLoaded = function () {

‎packages/core/ui/tab-view/index.ios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ export class TabView extends TabViewBase {
390390
}
391391

392392
// The "< Back" and "< More" navigation bars should not be visible simultaneously.
393-
const page = this.page || this._selectedView.page || (<any>this)._selectedView.currentPage;
393+
const page = this.page || this._selectedView?.page || (<any>this)._selectedView?.currentPage;
394394
if (!page || !page.frame) {
395395
return;
396396
}

0 commit comments

Comments
 (0)
0