From 1b9b7348281ab50e8def2aa22c837b0b21f56b49 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 27 Jun 2019 16:40:10 +0300 Subject: [PATCH 1/2] feat(tabs): register tabs elements --- nativescript-angular/element-registry.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nativescript-angular/element-registry.ts b/nativescript-angular/element-registry.ts index 1eb64bcc3..4d42806dc 100644 --- a/nativescript-angular/element-registry.ts +++ b/nativescript-angular/element-registry.ts @@ -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); @@ -202,6 +203,10 @@ 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); From dd04f793f074202e8308ee0ceef6e4aca15993e2 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 27 Jun 2019 17:20:00 +0300 Subject: [PATCH 2/2] feat(tests-app-ng): add tabs component --- e2e/tests-app-ng/app/app.routes.ts | 3 ++ e2e/tests-app-ng/app/tabs/tabs.component.ts | 52 +++++++++++++++++++++ e2e/tests-app-ng/app/vendor.ts | 18 ------- nativescript-angular/element-registry.ts | 3 +- 4 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 e2e/tests-app-ng/app/tabs/tabs.component.ts delete mode 100644 e2e/tests-app-ng/app/vendor.ts diff --git a/e2e/tests-app-ng/app/app.routes.ts b/e2e/tests-app-ng/app/app.routes.ts index dfe3bafe0..9ed5574d0 100644 --- a/e2e/tests-app-ng/app/app.routes.ts +++ b/e2e/tests-app-ng/app/app.routes.ts @@ -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"; @@ -77,6 +78,7 @@ export const routableComponents = [ LazyLoadModalComponent, TabViewComponent, + TabsComponent, NavigationOptionsComponent, NavigationInfoComponent, @@ -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" } }, diff --git a/e2e/tests-app-ng/app/tabs/tabs.component.ts b/e2e/tests-app-ng/app/tabs/tabs.component.ts new file mode 100644 index 000000000..7e6a895d0 --- /dev/null +++ b/e2e/tests-app-ng/app/tabs/tabs.component.ts @@ -0,0 +1,52 @@ +import { Component, OnInit } from "@angular/core"; + +@Component({ + selector: "tabs-component", + template: ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `, +}) + +export class TabsComponent implements OnInit { + public ngOnInit(): void { } +} diff --git a/e2e/tests-app-ng/app/vendor.ts b/e2e/tests-app-ng/app/vendor.ts deleted file mode 100644 index 4a6272bb4..000000000 --- a/e2e/tests-app-ng/app/vendor.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Snapshot the ~/app.css and the theme -const application = require("tns-core-modules/application"); -require("tns-core-modules/ui/styling/style-scope"); -const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/); -global.registerWebpackModules(appCssContext); -application.loadAppCss(); - -require("reflect-metadata"); -require("@angular/platform-browser"); -require("@angular/core"); -require("@angular/common"); -require("@angular/forms"); -require("@angular/common/http"); -require("@angular/router"); - -require("nativescript-angular/platform-static"); -require("nativescript-angular/forms"); -require("nativescript-angular/router"); diff --git a/nativescript-angular/element-registry.ts b/nativescript-angular/element-registry.ts index 4d42806dc..aa13353d3 100644 --- a/nativescript-angular/element-registry.ts +++ b/nativescript-angular/element-registry.ts @@ -205,7 +205,8 @@ 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("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);