Merge branch 'master' into fix/923-module-not-destroyed

Author: m-abs

Diff for: CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="7.2.2"></a>
+## [7.2.2](https://github.com/NativeScript/nativescript-angular/compare/7.2.1...7.2.2) (2019-02-19)
+
+
+### Bug Fixes
+
+* **list-view:** add support for default item template ([4061cc7](https://github.com/NativeScript/nativescript-angular/commit/4061cc7))
+
+
+
 <a name="7.2.1"></a>
 ## [7.2.1](https://github.com/NativeScript/nativescript-angular/compare/7.2.0...7.2.1) (2019-02-10)
 

Diff for: nativescript-angular/directives/templated-items-comp.ts

@@ -154,6 +154,7 @@ export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, Aft
             }
 
             viewRef = args.view[NG_VIEW];
+
             // Getting angular view from original element (in cases when ProxyViewContainer
             // is used NativeScript internally wraps it in a StackLayout)
             if (!viewRef && args.view instanceof LayoutBase && args.view.getChildrenCount() > 0) {
@@ -163,6 +164,11 @@ export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, Aft
             if (!viewRef && isLogEnabled()) {
                 listViewError(`ViewReference not found for item ${index}. View recycling is not working`);
             }
+
+            // No ng-template is setup, continue with 'defaultTemplate'
+            if (!viewRef) {
+                return;
+            }
         }
 
         if (!viewRef) {

Diff for: nativescript-angular/router/router.module.ts

@@ -19,32 +19,39 @@ export { NSEmptyOutletComponent } from "./ns-empty-outlet.component";
 
 export type LocationState = LocationState;
 
+const ROUTER_DIRECTIVES = [NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent];
+
+const NS_ROUTER_PROVIDERS = [
+    {
+        provide: NSLocationStrategy,
+        useFactory: provideLocationStrategy,
+        deps: [[NSLocationStrategy, new Optional(), new SkipSelf()], FrameService],
+    },
+    { provide: LocationStrategy, useExisting: NSLocationStrategy },
+    NativescriptPlatformLocation,
+    { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
+    RouterExtensions,
+    NSRouteReuseStrategy,
+    { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },
+];
+
 @NgModule({
-    declarations: [NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent],
-    providers: [
-        {
-            provide: NSLocationStrategy,
-            useFactory: provideLocationStrategy,
-            deps: [[NSLocationStrategy, new Optional(), new SkipSelf()], FrameService],
-        },
-        { provide: LocationStrategy, useExisting: NSLocationStrategy },
-        NativescriptPlatformLocation,
-        { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
-        RouterExtensions,
-        NSRouteReuseStrategy,
-        { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },
-    ],
+    declarations: ROUTER_DIRECTIVES,
+    entryComponents: [NSEmptyOutletComponent],
     imports: [RouterModule, NativeScriptCommonModule],
-    exports: [RouterModule, NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent],
+    exports: [RouterModule, ...ROUTER_DIRECTIVES],
     schemas: [NO_ERRORS_SCHEMA],
 })
 export class NativeScriptRouterModule {
-    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
-        return RouterModule.forRoot(routes, config);
+    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders<NativeScriptRouterModule> {
+        return {
+            ngModule: NativeScriptRouterModule,
+            providers: [...RouterModule.forRoot(routes, config).providers, ...NS_ROUTER_PROVIDERS]
+        };
     }
 
-    static forChild(routes: Routes): ModuleWithProviders {
-        return RouterModule.forChild(routes);
+    static forChild(routes: Routes): ModuleWithProviders<NativeScriptRouterModule> {
+        return { ngModule: NativeScriptRouterModule, providers: RouterModule.forChild(routes).providers };
     }
 }
 

Diff for: tests/app/tests/list-view-tests.ts

@@ -1,7 +1,8 @@
 import { assert } from "./test-config";
-import { Component, Input } from "@angular/core";
+import { Component, Input, ViewChild } from "@angular/core";
 import { ComponentFixture, async } from "@angular/core/testing";
 import { nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender } from "nativescript-angular/testing";
+import { ListViewComponent } from "nativescript-angular/directives";
 // import trace = require("trace");
 // trace.setCategories("ns-list-view, " + trace.categories.Navigation);
 // trace.enable();
@@ -76,11 +77,34 @@ export class TestListViewSelectorComponent {
     constructor() { testTemplates = { first: 0, second: 0 }; }
 }
 
+@Component({
+    selector: "list-view-default-item-template",
+    template: `
+    <GridLayout>
+        <ListView #listView [items]="myItems"></ListView>
+    </GridLayout>
+    `
+})
+export class TestDefaultItemTemplateComponent {
+    public myItems: Array<DataItem>;
+    constructor () {
+        this.myItems = new Array<DataItem>();
+        for (let i = 0; i < 100; i++) {
+            this.myItems.push(new DataItem(i, "Name " + i));
+        }
+    }
+    @ViewChild("listView") listViewElement: ListViewComponent;
+    onScrollListViewTo() { 
+        this.listViewElement.nativeElement.scrollToIndex(100);
+    }
+}
+
 describe("ListView-tests", () => {
     beforeEach(nsTestBedBeforeEach([
         TestListViewComponent,
         TestListViewSelectorComponent,
-        ItemTemplateComponent
+        ItemTemplateComponent,
+        TestDefaultItemTemplateComponent
     ]));
     afterEach(nsTestBedAfterEach(false));
 
@@ -98,4 +122,12 @@ describe("ListView-tests", () => {
             assert.deepEqual(testTemplates, { first: 2, second: 1 });
         });
     }));
+
+    it("'defaultTemplate' does not throw when list-view is scrolled", async(() => {
+        nsTestBedRender(TestDefaultItemTemplateComponent)
+            .then((fixture: ComponentFixture<TestDefaultItemTemplateComponent>) => {
+                const component = fixture.componentRef.instance;
+                assert.doesNotThrow(component.onScrollListViewTo.bind(component));
+            });
+    }));
 });

Diff for: tests/app/tests/router-module-tests.ts

@@ -0,0 +1,74 @@
+// make sure you import mocha-config before @angular/core
+import { Component, ViewChild } from "@angular/core";
+import { nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender } from "nativescript-angular/testing";
+import { NativeScriptRouterModule, RouterExtensions } from "nativescript-angular/router";
+import { NSRouterLink } from "nativescript-angular/router/ns-router-link";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
+import { assert } from "~/tests/test-config";
+import { ActivatedRoute, Router, RouteReuseStrategy } from "@angular/router";
+import { LocationStrategy, PlatformLocation } from "@angular/common";
+import { NSRouteReuseStrategy } from "nativescript-angular/router/ns-route-reuse-strategy";
+
+@Component({
+    template: `<StackLayout><Label nsRouterLink text="COMPONENT"></Label></StackLayout>`
+})
+class RouterTestComponent {
+    @ViewChild(NSRouterLink)
+    nsRouterLink: NSRouterLink;
+}
+
+describe("NativeScriptRouterModule.forRoot", () => {
+    beforeEach(nsTestBedBeforeEach(
+        [RouterTestComponent],
+        [],
+        [NativeScriptRouterModule.forRoot([])],
+        []));
+
+    afterEach(nsTestBedAfterEach());
+
+    it("should provide nativescript routing services", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const injector = fixture.componentRef.injector
+
+            assert.instanceOf(injector.get(LocationStrategy, null), NSLocationStrategy);
+            assert.instanceOf(injector.get(RouterExtensions, null), RouterExtensions);
+            assert.instanceOf(injector.get(RouteReuseStrategy, null), NSRouteReuseStrategy);
+        });
+    });
+
+    it("should provide nativescript routing directives", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const linkDirective = fixture.componentRef.instance.nsRouterLink;
+            assert.instanceOf(linkDirective, NSRouterLink);
+        });
+    });
+});
+
+describe("NativeScriptRouterModule.forChild", () => {
+    beforeEach(nsTestBedBeforeEach(
+        [RouterTestComponent],
+        [
+            { provide: Router, useValue: {} },
+            { provide: RouterExtensions, useValue: {} },
+            { provide: ActivatedRoute, useValue: {} },
+        ],
+        [NativeScriptRouterModule.forChild([])],
+        []));
+    afterEach(nsTestBedAfterEach());
+
+    it("should not provide nativescript routing services", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const injector = fixture.componentRef.injector
+            assert.isNull(injector.get(LocationStrategy, null));
+            assert.isNull(injector.get(RouteReuseStrategy, null));
+        });
+    });
+
+    it("should provide nativescript routing directives", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const linkDirective = fixture.componentRef.instance.nsRouterLink;
+            assert.instanceOf(linkDirective, NSRouterLink);
+        });
+    });
+});
+