From e95820b04abd076d236b2008374d4dd82ac239c8 Mon Sep 17 00:00:00 2001
From: Panayot Cankov <Panayot.Cankov@telerik.com>
Date: Fri, 20 Nov 2015 12:43:12 +0200
Subject: [PATCH 1/2] Add Template factory function and use it in the Repeater
 and ListView components

---
 .../simple-template-test.xml                  |  8 +++++
 .../template-builder-tests/template-view.ts   | 33 +++++++++++++++++++
 .../xml-declaration/xml-declaration-tests.ts  | 19 ++++++++++-
 tsconfig.json                                 |  1 +
 ui/builder/builder.d.ts                       |  2 +-
 ui/builder/builder.ts                         | 31 +++++++++--------
 ui/builder/template-builder.d.ts              |  2 ++
 ui/builder/template-builder.ts                | 10 +++++-
 ui/core/view.d.ts                             | 12 +++++++
 ui/list-view/list-view-common.ts              |  5 +--
 ui/list-view/list-view.d.ts                   |  2 +-
 ui/repeater/repeater.d.ts                     |  4 +--
 ui/repeater/repeater.ts                       |  4 +--
 13 files changed, 110 insertions(+), 23 deletions(-)
 create mode 100644 apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml
 create mode 100644 apps/tests/xml-declaration/template-builder-tests/template-view.ts

diff --git a/apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml b/apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml
new file mode 100644
index 000000000..796b5bef5
--- /dev/null
+++ b/apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml
@@ -0,0 +1,8 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+      xmlns:tc="xml-declaration/template-builder-tests/template-view">
+	<tc:TemplateView id="template-view">
+		<tc:TemplateView.template>
+			<Button text="Click!" />
+		</tc:TemplateView.template>
+	</tc:TemplateView>
+</Page>
diff --git a/apps/tests/xml-declaration/template-builder-tests/template-view.ts b/apps/tests/xml-declaration/template-builder-tests/template-view.ts
new file mode 100644
index 000000000..43fcf1d89
--- /dev/null
+++ b/apps/tests/xml-declaration/template-builder-tests/template-view.ts
@@ -0,0 +1,33 @@
+import { View, Template } from "ui/core/view"
+import { PropertyChangeData, Property, PropertyMetadataSettings } from "ui/core/dependency-observable"
+import * as proxy from "ui/core/proxy"
+import { LayoutBase } from "ui/layouts/layout-base"
+import { parse } from "ui/builder"
+
+export module knownTemplates {
+    export var template = "template";
+}
+
+export class TemplateView extends LayoutBase {
+	public static templateProperty = new Property(
+        "template",
+        "TemplateView",
+        new proxy.PropertyMetadata(
+            undefined,
+            PropertyMetadataSettings.AffectsLayout,
+            null
+            )
+        );
+	
+    get template(): string | Template {
+        return this._getValue(TemplateView.templateProperty);
+    }
+	
+    set template(value: string | Template) {
+        this._setValue(TemplateView.templateProperty, value);
+    }
+	
+    public parseTemplate() {
+        this.addChild(parse(this.template));
+    }
+}
diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/apps/tests/xml-declaration/xml-declaration-tests.ts
index 5a1a3890b..5a39c9116 100644
--- a/apps/tests/xml-declaration/xml-declaration-tests.ts
+++ b/apps/tests/xml-declaration/xml-declaration-tests.ts
@@ -14,6 +14,8 @@ import stackLayoutModule = require("ui/layouts/stack-layout");
 import {Label} from "ui/label";
 import {Page} from "ui/page";
 import {Button} from "ui/button";
+import {View} from "ui/core/view";
+import {TemplateView} from "./template-builder-tests/template-view";
 import myCustomControlWithoutXml = require("./mymodule/MyControl");
 import listViewModule = require("ui/list-view");
 import helper = require("../ui/helper");
@@ -818,4 +820,19 @@ export function test_searchbar_donotcrash_whentext_isspace() {
     var sb = <searchBarModule.SearchBar>p.content;
 
     TKUnit.assertEqual(sb.text, " ");
-};
\ No newline at end of file
+};
+
+export function test_parse_template_property() {
+    var page = <Page>builder.load(fs.path.join(__dirname, "template-builder-tests/simple-template-test.xml"));
+    TKUnit.assert(page, "Expected root page.");
+    var templateView = <TemplateView>page.getViewById("template-view");
+    TKUnit.assert(templateView, "Expected TemplateView.");
+    TKUnit.assert(templateView.template, "Expected the template of the TemplateView to be defined");
+    
+    TKUnit.assertEqual(templateView.getChildrenCount(), 0, "Expected TemplateView initially to have no children.");
+    templateView.parseTemplate();
+    TKUnit.assertEqual(templateView.getChildrenCount(), 1, "Expected TemplateView initially to have 1 child.");
+    var button = <Button>templateView.getChildAt(0);
+    TKUnit.assert(button, "Expected the TemplateView's template to create a button child.");
+    TKUnit.assertEqual(button.text, "Click!", "Expected child Button to have text 'Click!'");
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index d866adce5..29bde09d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -320,6 +320,7 @@
         "apps/tests/xml-declaration/mymodule/MyControl.ts",
         "apps/tests/xml-declaration/mymodulewithxml/MyControl.ts",
         "apps/tests/xml-declaration/xml-declaration-tests.ts",
+        "apps/tests/xml-declaration/template-builder-tests/template-view.ts",
         "apps/tests/xml-parser-tests/xml-parser-tests.ts",
         "apps/transforms/app.ts",
         "apps/transforms/main-page.ts",
diff --git a/ui/builder/builder.d.ts b/ui/builder/builder.d.ts
index ccdc5c6cd..e2262d644 100644
--- a/ui/builder/builder.d.ts
+++ b/ui/builder/builder.d.ts
@@ -4,7 +4,7 @@
 
     export function load(fileName: string, exports?: any): view.View;
     export function load(options: LoadOptions): view.View;
-    export function parse(value: string, exports?: any): view.View;
+    export function parse(value: string | view.Template, exports?: any): view.View;
 
     export interface LoadOptions {
         path: string;
diff --git a/ui/builder/builder.ts b/ui/builder/builder.ts
index 24cdbd492..2efdf190b 100644
--- a/ui/builder/builder.ts
+++ b/ui/builder/builder.ts
@@ -21,20 +21,24 @@ function isCurentPlatform(value: string): boolean {
     return value && value.toLowerCase() === platform.device.os.toLowerCase();
 }
 
-export function parse(value: string, context: any): view.View {
-    var viewToReturn: view.View;
-
-    if (context instanceof view.View) {
-        context = getExports(context);
+export function parse(value: string | view.Template, context: any): view.View {
+    if (types.isString(value)) {
+        var viewToReturn: view.View;
+    
+        if (context instanceof view.View) {
+            context = getExports(context);
+        }
+    
+        var componentModule = parseInternal(<string>value, context);
+    
+        if (componentModule) {
+            viewToReturn = componentModule.component;
+        }
+    
+        return viewToReturn;
+    } else if (types.isFunction(value)) {
+        return (<view.Template>value)();
     }
-
-    var componentModule = parseInternal(value, context);
-
-    if (componentModule) {
-        viewToReturn = componentModule.component;
-    }
-
-    return viewToReturn;
 }
 
 function parseInternal(value: string, context: any): componentBuilder.ComponentModule {
@@ -104,6 +108,7 @@ function parseInternal(value: string, context: any): componentBuilder.ComponentM
 
                 if (templateBuilderDef.isKnownTemplate(name, parent.exports)) {
                     templateBuilder = new templateBuilderDef.TemplateBuilder({
+                        context: parent ? getExports(parent.component) : null, // Passing 'context' won't work if you set "codeFile" on the page
                         parent: parent,
                         name: name,
                         elementName: args.elementName,
diff --git a/ui/builder/template-builder.d.ts b/ui/builder/template-builder.d.ts
index 39aa94c2f..f989952bd 100644
--- a/ui/builder/template-builder.d.ts
+++ b/ui/builder/template-builder.d.ts
@@ -1,6 +1,7 @@
 //@private
 declare module "ui/builder/template-builder" {
     import xml = require("xml");
+    import page = require("ui/page");
     import componentBuilder = require("ui/builder/component-builder");
 
     class TemplateBuilder {
@@ -18,6 +19,7 @@ declare module "ui/builder/template-builder" {
     export function isKnownTemplate(name: string, exports: any): boolean;
 
     interface TemplateProperty {
+        context?: any;
         parent: componentBuilder.ComponentModule;
         name: string;
         elementName: string;
diff --git a/ui/builder/template-builder.ts b/ui/builder/template-builder.ts
index bb562934b..53877e215 100644
--- a/ui/builder/template-builder.ts
+++ b/ui/builder/template-builder.ts
@@ -1,14 +1,19 @@
 import definition = require("ui/builder/template-builder");
+import builder = require("ui/builder");
+import view = require("ui/core/view");
+import page = require("ui/page");
 import xml = require("xml");
 
 var KNOWNTEMPLATES = "knownTemplates";
 
 export class TemplateBuilder {
+    private _context: any;
     private _items: Array<string>;
     private _templateProperty: definition.TemplateProperty;
     private _nestingLevel: number;
 
     constructor(templateProperty: definition.TemplateProperty) {
+        this._context = templateProperty.context;
         this._items = new Array<string>();
         this._templateProperty = templateProperty;
         this._nestingLevel = 0;
@@ -56,7 +61,10 @@ export class TemplateBuilder {
 
     private build() {
         if (this._templateProperty.name in this._templateProperty.parent.component) {
-            this._templateProperty.parent.component[this._templateProperty.name] = this._items.join("");
+            var xml = this._items.join("");
+            var context = this._context;
+            var template: view.Template = () => builder.parse(xml, context);
+            this._templateProperty.parent.component[this._templateProperty.name] = template;
         }
     }
 }
diff --git a/ui/core/view.d.ts b/ui/core/view.d.ts
index cf662c710..a6fd21c06 100644
--- a/ui/core/view.d.ts
+++ b/ui/core/view.d.ts
@@ -511,6 +511,18 @@ declare module "ui/core/view" {
      */
     export class CustomLayoutView extends View {
     }
+    
+    /**
+     * Defines an interface for a View factory function.
+     * Commonly used to specify the visualization of data objects.
+     */
+    interface Template {
+        /**
+         * Call signature of the factory function.
+         * Returns a new View instance.
+         */
+        (): View;
+    }
 
     /**
      * Defines an interface for adding arrays declared in xml.
diff --git a/ui/list-view/list-view-common.ts b/ui/list-view/list-view-common.ts
index 4ec9876fb..b2fcf061e 100644
--- a/ui/list-view/list-view-common.ts
+++ b/ui/list-view/list-view-common.ts
@@ -8,6 +8,7 @@ import builder = require("ui/builder");
 import label = require("ui/label");
 import color = require("color");
 import weakEvents = require("ui/core/weak-event-listener");
+import types = require("utils/types");
 
 var ITEMS = "items";
 var ITEMTEMPLATE = "itemTemplate";
@@ -91,10 +92,10 @@ export class ListView extends view.View implements definition.ListView {
         this._setValue(ListView.itemsProperty, value);
     }
 
-    get itemTemplate(): string {
+    get itemTemplate(): string | view.Template {
         return this._getValue(ListView.itemTemplateProperty);
     }
-    set itemTemplate(value: string) {
+    set itemTemplate(value: string | view.Template) {
         this._setValue(ListView.itemTemplateProperty, value);
     }
 
diff --git a/ui/list-view/list-view.d.ts b/ui/list-view/list-view.d.ts
index 5901fadbb..7cc59c293 100644
--- a/ui/list-view/list-view.d.ts
+++ b/ui/list-view/list-view.d.ts
@@ -78,7 +78,7 @@ declare module "ui/list-view" {
         /**
          * Gets or set the item template of the ListView. 
          */
-        itemTemplate: string;
+        itemTemplate: string | view.Template;
 
         /**
          * Gets or set the items separator line color of the ListView. 
diff --git a/ui/repeater/repeater.d.ts b/ui/repeater/repeater.d.ts
index 22f06fcb5..7407e168d 100644
--- a/ui/repeater/repeater.d.ts
+++ b/ui/repeater/repeater.d.ts
@@ -32,9 +32,9 @@ declare module "ui/repeater" {
         items: any;
 
         /**
-         * Gets or set the item template of the Repeater. 
+         * Gets or set the item template of the Repeater.
          */
-        itemTemplate: string;
+        itemTemplate: string | view.Template;
         
         /**
          * Gets or set the items layout of the Repeater. Default value is StackLayout with orientation="vertical".
diff --git a/ui/repeater/repeater.ts b/ui/repeater/repeater.ts
index 26c84ecc3..76da085cb 100644
--- a/ui/repeater/repeater.ts
+++ b/ui/repeater/repeater.ts
@@ -90,10 +90,10 @@ export class Repeater extends viewModule.CustomLayoutView implements definition.
         this._setValue(Repeater.itemsProperty, value);
     }
 
-    get itemTemplate(): string {
+    get itemTemplate(): string | viewModule.Template {
         return this._getValue(Repeater.itemTemplateProperty);
     }
-    set itemTemplate(value: string) {
+    set itemTemplate(value: string | viewModule.Template) {
         this._setValue(Repeater.itemTemplateProperty, value);
     }
 

From 86e8620d4c2f186563b08e76c2e822c6ad3b6841 Mon Sep 17 00:00:00 2001
From: Panayot Cankov <Panayot.Cankov@telerik.com>
Date: Mon, 23 Nov 2015 16:00:15 +0200
Subject: [PATCH 2/2] Add unit tests for itemTemplate set to a 'Template'
 factory function

---
 apps/tests/ui/list-view/list-view-tests.ts | 23 ++++++++++++++++++++++
 apps/tests/ui/repeater/repeater-tests.ts   | 23 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index 730b24f39..11739337e 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -8,6 +8,7 @@ import observable = require("data/observable");
 import types = require("utils/types");
 import platform = require("platform");
 import utils = require("utils/utils");
+import { Label } from "ui/label";
 
 // <snippet module="ui/list-view" title="list-view">
 // # ListView
@@ -481,6 +482,28 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         TKUnit.assertEqual(secondNativeElementText, "2", "second element text");
         TKUnit.assertEqual(thirdNativeElementText, "3", "third element text");
     }
+    
+    public test_ItemTemplateFactoryFunction() {
+        var listView = this.testView;
+
+        listView.itemTemplate = () => {
+            var label = new Label();
+            label.id = "testLabel";
+            label.bind({ sourceProperty: "$value", targetProperty: "text", twoWay: false });
+            return label;
+        }
+        listView.items = [1, 2, 3];
+
+        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+
+        var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
+        var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
+        var thirdNativeElementText = this.getTextFromNativeElementAt(listView, 2);
+
+        TKUnit.assertEqual(firstNativeElementText, "1", "first element text");
+        TKUnit.assertEqual(secondNativeElementText, "2", "second element text");
+        TKUnit.assertEqual(thirdNativeElementText, "3", "third element text");
+    }
 
     public test_BindingListViewToASimpleArrayWithExpression() {
         var listView = this.testView;
diff --git a/apps/tests/ui/repeater/repeater-tests.ts b/apps/tests/ui/repeater/repeater-tests.ts
index 044577520..7fae249fa 100644
--- a/apps/tests/ui/repeater/repeater-tests.ts
+++ b/apps/tests/ui/repeater/repeater-tests.ts
@@ -8,6 +8,7 @@ import layoutBaseModule = require("ui/layouts/layout-base");
 import fs = require("file-system");
 import pageModule = require("ui/page");
 import gestureModule = require("ui/gestures");
+import { Label } from "ui/label";
 
 // <snippet module="ui/repeater" title="repeater">
 // # Repeater
@@ -367,6 +368,28 @@ export function test_BindingRepeaterToASimpleArray() {
     helper.buildUIAndRunTest(repeater, testAction);
 }
 
+export function test_ItemTemplateFactoryFunction() {
+    var repeater = new repeaterModule.Repeater();
+
+    function testAction(views: Array<viewModule.View>) {
+        repeater.itemTemplate = () => {
+            var label = new Label();
+            label.id = "testLabel";
+            label.bind({ sourceProperty: "$value", targetProperty: "text", twoWay: false });
+            return label;
+        }
+        repeater.items = [1, 2, 3];
+
+        TKUnit.wait(ASYNC);
+
+        TKUnit.assertEqual(getChildAtText(repeater, 0), "1", "first element text");
+        TKUnit.assertEqual(getChildAtText(repeater, 1), "2", "second element text");
+        TKUnit.assertEqual(getChildAtText(repeater, 2), "3", "third element text");
+    }
+
+    helper.buildUIAndRunTest(repeater, testAction);
+}
+
 export function test_BindingRepeaterToASimpleArrayWithExpression() {
     var repeater = new repeaterModule.Repeater();