Skip to content

feat(tabs): register tabs elements #1883

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.

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
merged 2 commits into from
Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions e2e/tests-app-ng/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { ModalViewMainPageComponent } from "./modal/modal-view-main-page.compone
import { LazyLoadModalComponent } from "./modal/lazy/lazy-load-modal.component";

import { TabViewComponent } from "./tab-view/tab-view.component";
import { TabsComponent } from "./tabs/tabs.component";

import { NavigationOptionsComponent } from "./navigation-options/navigation-options.component";
import { NavigationInfoComponent } from "./navigation-options/navigation-info.component";
Expand Down Expand Up @@ -77,6 +78,7 @@ export const routableComponents = [
LazyLoadModalComponent,

TabViewComponent,
TabsComponent,

NavigationOptionsComponent,
NavigationInfoComponent,
Expand Down Expand Up @@ -156,6 +158,7 @@ export const routes = [
{ path: "modal/lazy", component: LazyLoadModalComponent, data: { title: "modal(lazy)" } },

{ path: "tab-view", component: TabViewComponent, data: { title: "tab-view", isNavigatable: true } },
{ path: "tabs", component: TabsComponent, data: { title: "tabs", isNavigatable: true } },

{ path: "nav-options", component: NavigationOptionsComponent, data: { title: "nav-options", isNavigatable: true } },
{ path: "nav-info", component: NavigationInfoComponent, data: { title: "nav-info" } },
Expand Down
52 changes: 52 additions & 0 deletions e2e/tests-app-ng/app/tabs/tabs.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { Component, OnInit } from "@angular/core";

@Component({
selector: "tabs-component",
template: `
<Tabs id="tabs">

<TabStrip>

<TabStripItem title="TabStripItem 1" iconSource="res://icon">
</TabStripItem>

<TabStripItem>
<Label text="TabStripItem 2">
</Label>
<Image src="res://icon">
</Image>
</TabStripItem>

<TabStripItem title="TabStripItem 3" iconSource="res://icon">
</TabStripItem>

</TabStrip>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 1">
</Label>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 2">
</Label>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 3">
</Label>
</StackLayout>
</TabContentItem>

</Tabs>
`,
})

export class TabsComponent implements OnInit {
public ngOnInit(): void { }
}
18 changes: 0 additions & 18 deletions e2e/tests-app-ng/app/vendor.ts

This file was deleted.

6 changes: 6 additions & 0 deletions nativescript-angular/element-registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const frameMeta: ViewClassMeta = {
registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
registerElement("ActivityIndicator", () => require("tns-core-modules/ui/activity-indicator").ActivityIndicator);
registerElement("Border", () => require("tns-core-modules/ui/border").Border);
registerElement("BottomNavigation", () => require("tns-core-modules/ui/bottom-navigation").BottomNavigation);
registerElement("Button", () => require("tns-core-modules/ui/button").Button);
registerElement("ContentView", () => require("tns-core-modules/ui/content-view").ContentView);
registerElement("DatePicker", () => require("tns-core-modules/ui/date-picker").DatePicker);
Expand Down Expand Up @@ -202,6 +203,11 @@ registerElement("StackLayout", () => require("tns-core-modules/ui/layouts/stack-
registerElement("FlexboxLayout", () => require("tns-core-modules/ui/layouts/flexbox-layout").FlexboxLayout);
registerElement("Switch", () => require("tns-core-modules/ui/switch").Switch);
registerElement("TabView", () => require("tns-core-modules/ui/tab-view").TabView);
registerElement("TabStrip", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip);
registerElement("TabStripItem", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem);
registerElement("TabContentItem",
() => require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem);
registerElement("Tabs", () => require("tns-core-modules/ui/tabs").Tabs);
registerElement("TextField", () => require("tns-core-modules/ui/text-field").TextField);
registerElement("TextView", () => require("tns-core-modules/ui/text-view").TextView);
registerElement("TimePicker", () => require("tns-core-modules/ui/time-picker").TimePicker);
Expand Down