Commit f5037c0
committed
fix-next: handle fragments removed after save state
1 parent 8241e4b commit f5037c0
12 files changed
Lines changed: 279 additions & 220 deletions
File tree
- apps/app/ui-tests-app
- tests/app/ui/tab-view
- tns-core-modules/ui
- frame
- tab-view
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,34 +1 @@ | |||
| 1 | - <TabView selectedTabTextColor="green" androidOffscreenTabLimit="1" androidTabsPosition="top"> | ||
| 2 | - <TabView.items> | ||
| 3 | - <TabViewItem title="First"> | ||
| 4 | - <TabViewItem.view> | ||
| 5 | - | ||
| 6 | - <Frame defaultPage="ui-tests-app/page1" /> | ||
| 7 | - </TabViewItem.view> | ||
| 8 | - </TabViewItem> | ||
| 9 | - | ||
| 10 | - <TabViewItem title="Second"> | ||
| 11 | - <TabViewItem.view> | ||
| 12 | - | ||
| 13 | - <Frame defaultPage="ui-tests-app/page2" /> | ||
| 14 | - | ||
| 15 | - </TabViewItem.view> | ||
| 16 | - </TabViewItem> | ||
| 17 | - | ||
| 18 | - <TabViewItem title="First1"> | ||
| 19 | - <TabViewItem.view> | ||
| 20 | - | ||
| 21 | - <Frame defaultPage="ui-tests-app/page1" /> | ||
| 22 | - | ||
| 23 | - </TabViewItem.view> | ||
| 24 | - </TabViewItem> | ||
| 25 | - | ||
| 26 | - <TabViewItem title="Second1"> | ||
| 27 | - <TabViewItem.view> | ||
| 28 | - | ||
| 29 | - <Frame defaultPage="ui-tests-app/page2" /> | ||
| 30 | - | ||
| 31 | - </TabViewItem.view> | ||
| 32 | - </TabViewItem> | ||
| 33 | - </TabView.items> | ||
| 34 | - </TabView> | ||
| 1 | + <Frame defaultPage="ui-tests-app/main-page" /> | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,10 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | 3 | import * as application from "tns-core-modules/application"; | |
| 4 | 4 | import * as trace from "tns-core-modules/trace"; | |
| 5 | - // trace.addCategories(trace.categories.NativeLifecycle); | ||
| 6 | - // trace.addCategories(trace.categories.Navigation); | ||
| 7 | - // trace.addCategories(trace.categories.Transition); | ||
| 8 | - trace.addCategories(trace.categories.Debug); | ||
| 5 | + trace.addCategories(trace.categories.NativeLifecycle); | ||
| 6 | + trace.addCategories(trace.categories.Navigation); | ||
| 7 | + trace.addCategories(trace.categories.Transition); | ||
| 9 | 8 | ||
| 10 | 9 | trace.enable(); | |
| 11 | 10 | ||
@@ -84,6 +83,6 @@ application.on(application.uncaughtErrorEvent, function(args: application.Unhand | |||
| 84 | 83 | ||
| 85 | 84 | application.setCssFileName("ui-tests-app/app.css"); | |
| 86 | 85 | ||
| 87 | - // application.start({ moduleName: "ui-tests-app/main-page" }); | ||
| 88 | - application.run({ moduleName: "ui-tests-app/app-root" }); | ||
| 86 | + application.start({ moduleName: "ui-tests-app/main-page" }); | ||
| 87 | + // application.run({ moduleName: "ui-tests-app/app-root" }); | ||
| 89 | 88 | // application.run(); | |
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,6 @@ | |||
| 1 | 1 | import * as TKUnit from "../../TKUnit"; | |
| 2 | 2 | import * as helper from "../helper"; | |
| 3 | + import { isIOS, isAndroid } from "tns-core-modules/platform"; | ||
| 3 | 4 | import { Label } from "tns-core-modules/ui/label"; | |
| 4 | 5 | import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout"; | |
| 5 | 6 | import * as frameModule from "tns-core-modules/ui/frame"; | |
@@ -201,8 +202,15 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() { | |||
| 201 | 202 | ||
| 202 | 203 | topFrame.currentPage.id = null; | |
| 203 | 204 | ||
| 204 | - TKUnit.arrayAssert(loadedEventsCount, [2, 0]); | ||
| 205 | - TKUnit.arrayAssert(unloadedEventsCount, [1, 0]); | ||
| 205 | + if (isIOS) { | ||
| 206 | + TKUnit.arrayAssert(loadedEventsCount, [2, 0]); | ||
| 207 | + TKUnit.arrayAssert(unloadedEventsCount, [1, 0]); | ||
| 208 | + } | ||
| 209 | + | ||
| 210 | + if (isAndroid) { | ||
| 211 | + TKUnit.arrayAssert(loadedEventsCount, [2, 2]); | ||
| 212 | + TKUnit.arrayAssert(unloadedEventsCount, [1, 1]); | ||
| 213 | + } | ||
| 206 | 214 | } | |
| 207 | 215 | ||
| 208 | 216 | function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) { | |
0 commit comments