Skip to content

Commit df56866

Browse files
authored
e2e(tests-app-ng): add bottom-navigation component (#1894)
* chore: update package.json file * e2e(tests-app-ng): add bottom-navigation component Update tabs component.
1 parent a025a09 commit df56866

File tree

4 files changed

+97
-17
lines changed

4 files changed

+97
-17
lines changed

Diff for: e2e/tests-app-ng/app/app.routes.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { NavigationComponent, NAVIGATION_SUBROUTES } from "./router/router-outle
1111
import { LazyNavigationComponent } from "./router/lazy-module-navigation/lazy-navigation.component";
1212

1313
import { BindingComponent } from "./binding/binding-page.component";
14+
import { BottomNavigation } from "./bottom-navigation/bottom-navigation.component"
1415

1516
import { ListViewComponent } from "./list-view/list-view-page.component";
1617
import { ListViewControlComponent } from "./list-view/list-view-item-template.component";
@@ -61,6 +62,7 @@ export const routableComponents = [
6162
SecondActionBarComponent,
6263

6364
BindingComponent,
65+
BottomNavigation,
6466

6567
ListViewMainPageComponent,
6668
ListViewComponent,
@@ -90,7 +92,7 @@ export const routableComponents = [
9092
ButtonTextAlignmentComponent,
9193
];
9294

93-
// Set isNavigatable: true if the page is a mian page to other sub pages
95+
// Set `isNavigatable: true` if the page is a main page to other sub pages
9496
export const routes = [
9597
{ path: "", component: MainComponent, data: { title: "" } },
9698
{ path: "", component: ModalContentComponent, data: { title: "" } },
@@ -119,6 +121,7 @@ export const routes = [
119121
},
120122

121123
{ path: "binding", component: BindingComponent, data: { title: "Binding", isNavigatable: true } },
124+
{ path: "bottom-navigation", component: BottomNavigation, data: { title: "BottomNavigation", isNavigatable: true } },
122125

123126
{
124127
path: "ListViewExamples",
@@ -158,7 +161,7 @@ export const routes = [
158161
{ path: "modal/lazy", component: LazyLoadModalComponent, data: { title: "modal(lazy)" } },
159162

160163
{ path: "tab-view", component: TabViewComponent, data: { title: "tab-view", isNavigatable: true } },
161-
{ path: "tabs", component: TabsComponent, data: { title: "tabs", isNavigatable: true } },
164+
{ path: "tabs", component: TabsComponent, data: { title: "Tabs", isNavigatable: true } },
162165

163166
{ path: "nav-options", component: NavigationOptionsComponent, data: { title: "nav-options", isNavigatable: true } },
164167
{ path: "nav-info", component: NavigationInfoComponent, data: { title: "nav-info" } },
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
import { Component, OnInit } from "@angular/core";
2+
3+
@Component({
4+
selector: "bottom-navigation-component",
5+
template: `
6+
<BottomNavigation #bottomNavigation>
7+
8+
<TabStrip>
9+
10+
<TabStripItem title="TabStripItem 0" iconSource="res://icon">
11+
</TabStripItem>
12+
13+
<TabStripItem>
14+
<Label text="TabStripItem 1">
15+
</Label>
16+
<Image src="res://icon">
17+
</Image>
18+
</TabStripItem>
19+
20+
<TabStripItem title="TabStripItem X" iconSource="res://x">
21+
<Label text="TabStripItem 2">
22+
</Label>
23+
<Image src="res://icon">
24+
</Image>
25+
</TabStripItem>
26+
27+
</TabStrip>
28+
29+
<TabContentItem>
30+
<StackLayout>
31+
<Label text="TabContentItem 0">
32+
</Label>
33+
<Button (tap)="goTo(bottomNavigation, 1)" text="go to 1">
34+
</Button>
35+
</StackLayout>
36+
</TabContentItem>
37+
38+
<TabContentItem>
39+
<StackLayout>
40+
<Label text="TabContentItem 1">
41+
</Label>
42+
<Button (tap)="goTo(bottomNavigation, 2)" text="go to 2">
43+
</Button>
44+
</StackLayout>
45+
</TabContentItem>
46+
47+
<TabContentItem>
48+
<StackLayout>
49+
<Label text="TabContentItem 2">
50+
</Label>
51+
<Button (tap)="goTo(bottomNavigation, 0)" text="go to 0">
52+
</Button>
53+
</StackLayout>
54+
</TabContentItem>
55+
56+
</BottomNavigation>
57+
`,
58+
})
59+
60+
export class BottomNavigation implements OnInit {
61+
62+
public ngOnInit(): void { }
63+
64+
goTo(bottomNavigation: any, index: number) {
65+
bottomNavigation.selectedIndex = index;
66+
}
67+
68+
}

Diff for: e2e/tests-app-ng/app/tabs/tabs.component.ts

+23-7
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,53 @@ import { Component, OnInit } from "@angular/core";
33
@Component({
44
selector: "tabs-component",
55
template: `
6-
<Tabs id="tabs">
6+
<Tabs #tabs>
77
88
<TabStrip>
99
10-
<TabStripItem title="TabStripItem 1" iconSource="res://icon">
10+
<TabStripItem title="TabStripItem 0" iconSource="res://icon">
1111
</TabStripItem>
1212
1313
<TabStripItem>
14-
<Label text="TabStripItem 2">
14+
<Label text="TabStripItem 1">
1515
</Label>
1616
<Image src="res://icon">
1717
</Image>
1818
</TabStripItem>
1919
20-
<TabStripItem title="TabStripItem 3" iconSource="res://icon">
20+
<TabStripItem title="TabStripItem X" iconSource="res://x">
21+
<Label text="TabStripItem 2">
22+
</Label>
23+
<Image src="res://icon">
24+
</Image>
2125
</TabStripItem>
2226
2327
</TabStrip>
2428
2529
<TabContentItem>
2630
<StackLayout>
27-
<Label text="TabContentItem 1">
31+
<Label text="TabContentItem 0">
2832
</Label>
33+
<Button (tap)="goTo(tabs, 1)" text="go to 1">
34+
</Button>
2935
</StackLayout>
3036
</TabContentItem>
3137
3238
<TabContentItem>
3339
<StackLayout>
34-
<Label text="TabContentItem 2">
40+
<Label text="TabContentItem 1">
3541
</Label>
42+
<Button (tap)="goTo(tabs, 2)" text="go to 2">
43+
</Button>
3644
</StackLayout>
3745
</TabContentItem>
3846
3947
<TabContentItem>
4048
<StackLayout>
41-
<Label text="TabContentItem 3">
49+
<Label text="TabContentItem 2">
4250
</Label>
51+
<Button (tap)="goTo(tabs, 0)" text="go to 0">
52+
</Button>
4353
</StackLayout>
4454
</TabContentItem>
4555
@@ -48,5 +58,11 @@ import { Component, OnInit } from "@angular/core";
4858
})
4959

5060
export class TabsComponent implements OnInit {
61+
5162
public ngOnInit(): void { }
63+
64+
goTo(tabs: any, index: number) {
65+
tabs.selectedIndex = index;
66+
}
67+
5268
}

Diff for: e2e/tests-app-ng/package.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@
3636
"@ngtools/webpack": "~8.0.0"
3737
},
3838
"scripts": {
39-
"tslint": "tslint --config tslint.json 'app/**/*.ts'",
40-
"ns-bundle": "ns-bundle",
41-
"start-android-bundle": "npm run ns-bundle --android --run-app",
42-
"start-ios-bundle": "npm run ns-bundle --ios --run-app",
43-
"build-android-bundle": "npm run ns-bundle --android --build-app",
44-
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
45-
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
46-
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install"
39+
"tslint": "tslint --config tslint.json 'app/**/*.ts'"
4740
}
4841
}

0 commit comments

Comments
 (0)