Merge pull request NativeScript#2049 from akagr/feature/add-attributes-2048

enchev · enchev · commit 87c9828a043d · 2016-05-11T10:10:38.000+03:00
Expose configurable attributes property when loading components
diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/apps/tests/xml-declaration/xml-declaration-tests.ts
@@ -133,6 +133,26 @@ export function test_loadWithOptionsFromTNSPath() {
     TKUnit.assert(v instanceof Label, "Expected result: Label; Actual result: " + v + ";");
 };
 
+export function test_loadWithAttributes() {
+    var lText = "Nativescript rocks";
+    var lWrap = true;
+    var lColor = "#FF0000"; // red
+
+    var v = builder.load({
+        path: "tns_modules/ui/label",
+        name: "Label",
+        attributes: {
+            text: lText,
+            textWrap: lWrap,
+            style: "color: " + lColor + ";"
+        }
+    });
+
+    TKUnit.assertEqual(v["text"], lText, "Expected result: true; Actual result: " + v + ";");
+    TKUnit.assertEqual(v["textWrap"], true, "Expected result: true; Actual result: " + v + ";");
+    helper.assertViewColor(v, lColor);
+};
+
 export function test_parse_ShouldNotCrashWithoutExports() {
     var file = fs.File.fromPath(fs.path.join(__dirname, "mainPage.xml"));
     var text = file.readTextSync();
@@ -879,4 +899,4 @@ export function test_hasSourceCodeLocations() {
     var label = page.getViewById("label");
     var labelSource = Source.get(label);
     TKUnit.assertEqual(labelSource.toString(), "file:///app/" + basePath + "examples/test-page.xml:3:5");
-}
+}
diff --git a/build/run-testsapp.grunt.js b/build/run-testsapp.grunt.js
@@ -209,7 +209,7 @@ module.exports = {
             },
             shell: {
                 collectAndroidLog: {
-                    command: "./expect.exp " + "'adb logcat' " + localCfg.outFile,
+                    command: "./expect.exp " + "'adb logcat *:D' " + localCfg.outFile,
                     options: {
                         execOptions: {
                             maxBuffer: Infinity
diff --git a/ui/builder/builder.d.ts b/ui/builder/builder.d.ts
@@ -9,6 +9,7 @@
     export interface LoadOptions {
         path: string;
         name: string;
+        attributes?: any;
         exports?: any;
         page?: page.Page;
     }
diff --git a/ui/builder/builder.ts b/ui/builder/builder.ts
@@ -115,7 +115,7 @@ export function load(pathOrOptions: string | LoadOptions, context?: any): View {
     if (!context) {
         if (!isString(pathOrOptions)) {
             let options = <LoadOptions>pathOrOptions;
-            componentModule = loadCustomComponent(options.path, options.name, undefined, options.exports, options.page);
+            componentModule = loadCustomComponent(options.path, options.name, options.attributes, options.exports, options.page);
         } else {
             let path = <string>pathOrOptions;
             componentModule = loadInternal(path);
diff --git a/ui/builder/component-builder.d.ts b/ui/builder/component-builder.d.ts
@@ -2,7 +2,7 @@ declare module "ui/builder/component-builder" {
     import view = require("ui/core/view");
 
     export function getComponentModule(elementName: string, namespace: string, attributes: Object, exports: Object): ComponentModule;
-    export function setPropertyValue(instance: view.View, instanceModuleExports: Object, pageExports: Object, propertyName: string, propertyValue: string) : void;
+    export function setPropertyValue(instance: view.View, instanceModuleExports: Object, pageExports: Object, propertyName: string, propertyValue: any) : void;
 
     export interface ComponentModule {
         component: view.View;
diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts
@@ -154,7 +154,7 @@ export function getComponentModule(elementName: string, namespace: string, attri
     return componentModule;
 }
 
-export function setPropertyValue(instance: View, instanceModule: Object, exports: Object, propertyName: string, propertyValue: string) {
+export function setPropertyValue(instance: View, instanceModule: Object, exports: Object, propertyName: string, propertyValue: any) {
     // Note: instanceModule can be null if we are loading custom compnenet with no code-behind.
 
     if (isBinding(propertyValue) && instance.bind) {
@@ -183,7 +183,7 @@ export function setPropertyValue(instance: View, instanceModule: Object, exports
         if (!attrHandled && (<any>instance)._applyXmlAttribute) {
             attrHandled = (<any>instance)._applyXmlAttribute(propertyName, propertyValue);
         }
-        if (!attrHandled) {           
+        if (!attrHandled) {
             instance[propertyName] = convertString(propertyValue);
         }
     }
@@ -193,7 +193,7 @@ function getBindingExpressionFromAttribute(value: string): string {
     return value.replace("{{", "").replace("}}", "").trim();
 }
 
-function isBinding(value: string): boolean {
+function isBinding(value: any): boolean {
     var isBinding;
 
     if (isString(value)) {
diff --git a/ui/builder/special-properties.d.ts b/ui/builder/special-properties.d.ts
@@ -1,7 +1,7 @@
 declare module "ui/builder/special-properties" {
     import view = require("ui/core/view");
 
-    export type PropertySetter = (instance: view.View, propertyValue: string) => void;
+    export type PropertySetter = (instance: view.View, propertyValue: any) => void;
     export function registerSpecialProperty(name: string, setter: PropertySetter): void;
     export function getSpecialPropertySetter(name: string): PropertySetter;
 }
diff --git a/ui/builder/special-properties.ts b/ui/builder/special-properties.ts
@@ -1,6 +1,6 @@
 import view = require("ui/core/view");
 
-export type PropertySetter = (instance: view.View, propertyValue: string) => void;
+export type PropertySetter = (instance: view.View, propertyValue: any) => void;
 
 var specialProperties: Map<string, PropertySetter> = new Map<string, PropertySetter>();
 
diff --git a/utils/utils-common.ts b/utils/utils-common.ts
@@ -34,10 +34,12 @@ export function escapeRegexSymbols(source: string): string {
     return source.replace(escapeRegex, "\\$&");
 }
 
-export function convertString(value: string): any {
+export function convertString(value: any): any {
     var result;
-    
-    if (value.trim() === "") {
+
+    if (!types.isString(value)) {
+        result = value;
+    } else if (value.trim() === "") {
         result = value;
     } else {
         // Try to convert value to number.
@@ -50,7 +52,7 @@ export function convertString(value: string): any {
             result = value;
         }
     }
-    
+
     return result;
 }
 
@@ -131,4 +133,4 @@ export function isDataURI(uri: string): boolean {
     var firstSegment = uri.trim().split(',')[0];
 
     return firstSegment && firstSegment.indexOf("data:") === 0 && firstSegment.indexOf('base64') >= 0;
-}
+}
diff --git a/utils/utils.d.ts b/utils/utils.d.ts
@@ -240,5 +240,5 @@
      * Converts string value to number or boolean.
      * @param value The original value. 
      */
-    export function convertString(value: string): any    
+    export function convertString(value: any): any    
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`export interface LoadOptions {`
`10`	`10`	`path: string;`
`11`	`11`	`name: string;`
	`12`	`+ attributes?: any;`
`12`	`13`	`exports?: any;`
`13`	`14`	`page?: page.Page;`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ export function getComponentModule(elementName: string, namespace: string, attri`
`154`	`154`	`return componentModule;`
`155`	`155`	`}`
`156`	`156`
`157`		`-export function setPropertyValue(instance: View, instanceModule: Object, exports: Object, propertyName: string, propertyValue: string) {`
	`157`	`+export function setPropertyValue(instance: View, instanceModule: Object, exports: Object, propertyName: string, propertyValue: any) {`
`158`	`158`	`// Note: instanceModule can be null if we are loading custom compnenet with no code-behind.`
`159`	`159`
`160`	`160`	`if (isBinding(propertyValue) && instance.bind) {`
`@@ -183,7 +183,7 @@ export function setPropertyValue(instance: View, instanceModule: Object, exports`
`183`	`183`	`if (!attrHandled && (<any>instance)._applyXmlAttribute) {`
`184`	`184`	`attrHandled = (<any>instance)._applyXmlAttribute(propertyName, propertyValue);`
`185`	`185`	`}`
`186`		`- if (!attrHandled) {`
	`186`	`+ if (!attrHandled) {`
`187`	`187`	`instance[propertyName] = convertString(propertyValue);`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -193,7 +193,7 @@ function getBindingExpressionFromAttribute(value: string): string {`
`193`	`193`	`return value.replace("{{", "").replace("}}", "").trim();`
`194`	`194`	`}`
`195`	`195`
`196`		`-function isBinding(value: string): boolean {`
	`196`	`+function isBinding(value: any): boolean {`
`197`	`197`	`var isBinding;`
`198`	`198`
`199`	`199`	`if (isString(value)) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`declare module "ui/builder/special-properties" {`
`2`	`2`	`import view = require("ui/core/view");`
`3`	`3`
`4`		`- export type PropertySetter = (instance: view.View, propertyValue: string) => void;`
	`4`	`+ export type PropertySetter = (instance: view.View, propertyValue: any) => void;`
`5`	`5`	`export function registerSpecialProperty(name: string, setter: PropertySetter): void;`
`6`	`6`	`export function getSpecialPropertySetter(name: string): PropertySetter;`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,5 +240,5 @@`
`240`	`240`	`* Converts string value to number or boolean.`
`241`	`241`	`* @param value The original value.`
`242`	`242`	`*/`
`243`		`- export function convertString(value: string): any`
	`243`	`+ export function convertString(value: any): any`
`244`	`244`	`}`