From 6c68423ee933126cf77f13df0595f7dfd03139fe Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Fri, 18 Mar 2016 14:17:08 +0200
Subject: [PATCH 1/2] Update TextBase/Button `text` property when
 `formattedText` changes

Fixes #1794
---
 apps/tests/ui/button/button-tests.ts          | 36 +++++++++++++++++++
 apps/tests/ui/text-field/text-field-tests.ts  | 36 +++++++++++++++++++
 .../xml-declaration/xml-declaration-tests.ts  |  5 +++
 ui/button/button-common.ts                    | 15 +++++---
 ui/text-base/text-base-common.ts              | 15 +++++---
 5 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/apps/tests/ui/button/button-tests.ts b/apps/tests/ui/button/button-tests.ts
index 7748cc3a2..ac2a39811 100644
--- a/apps/tests/ui/button/button-tests.ts
+++ b/apps/tests/ui/button/button-tests.ts
@@ -5,6 +5,8 @@ import pagesModule = require("ui/page");
 import buttonTestsNative = require("./button-tests-native");
 import colorModule = require("color");
 import enums = require("ui/enums");
+import formattedStringModule = require("text/formatted-string");
+import spanModule = require("text/span");
 
 // <snippet module="ui/button" title="button">
 // # Button
@@ -291,3 +293,37 @@ export var testNativeTextAlignmentFromLocal = function () {
         TKUnit.assert(actualResult === expectedTextAlignment, "Actual: " + actualResult + "; Expected: " + expectedTextAlignment);
     });
 }
+
+export var test_WhenFormattedTextPropertyChanges_TextIsUpdated_Button = function () {
+    var firstSpan = new spanModule.Span();
+    firstSpan.fontSize = 10;
+    firstSpan.text = "First";
+    var secondSpan = new spanModule.Span();
+    secondSpan.fontSize = 15;
+    secondSpan.text = "Second";
+    var thirdSpan = new spanModule.Span();
+    thirdSpan.fontSize = 20;
+    thirdSpan.text = "Third";
+    var formattedString1 = new formattedStringModule.FormattedString();
+    formattedString1.spans.push(firstSpan);
+    var formattedString2 = new formattedStringModule.FormattedString();
+    formattedString2.spans.push(secondSpan);
+    formattedString2.spans.push(thirdSpan);
+
+    var view = new buttonModule.Button();
+    helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
+        TKUnit.assertEqual(view.text, "");
+
+        view.formattedText = formattedString1;
+        TKUnit.assertEqual(view.text, "First");
+
+        view.formattedText = formattedString2;
+        TKUnit.assertEqual(view.text, "SecondThird");
+
+        formattedString2.spans[0].text = "Mecond";
+        TKUnit.assertEqual(view.text, "MecondThird");
+
+        view.formattedText = null;
+        TKUnit.assertEqual(view.text, "");
+    });
+}
\ No newline at end of file
diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/apps/tests/ui/text-field/text-field-tests.ts
index 55819cd6d..4e7b25b4d 100644
--- a/apps/tests/ui/text-field/text-field-tests.ts
+++ b/apps/tests/ui/text-field/text-field-tests.ts
@@ -6,6 +6,8 @@ import textFieldTestsNative = require("./text-field-tests-native");
 import colorModule = require("color");
 import enums = require("ui/enums");
 import platform = require("platform");
+import formattedStringModule = require("text/formatted-string");
+import spanModule = require("text/span");
 
 // <snippet module="ui/text-field" title="TextField">
 // # TextField
@@ -468,3 +470,37 @@ export var testMemoryLeak = function (done) {
         textFieldTestsNative.typeTextNatively(textField, "Hello, world!");
     }, done);
 }
+
+export var test_WhenFormattedTextPropertyChanges_TextIsUpdated_TextBase = function () {
+    var firstSpan = new spanModule.Span();
+    firstSpan.fontSize = 10;
+    firstSpan.text = "First";
+    var secondSpan = new spanModule.Span();
+    secondSpan.fontSize = 15;
+    secondSpan.text = "Second";
+    var thirdSpan = new spanModule.Span();
+    thirdSpan.fontSize = 20;
+    thirdSpan.text = "Third";
+    var formattedString1 = new formattedStringModule.FormattedString();
+    formattedString1.spans.push(firstSpan);
+    var formattedString2 = new formattedStringModule.FormattedString();
+    formattedString2.spans.push(secondSpan);
+    formattedString2.spans.push(thirdSpan);
+
+    var view = new textFieldModule.TextField();
+    helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
+        TKUnit.assertEqual(view.text, "");
+
+        view.formattedText = formattedString1;
+        TKUnit.assertEqual(view.text, "First");
+
+        view.formattedText = formattedString2;
+        TKUnit.assertEqual(view.text, "SecondThird");
+
+        formattedString2.spans[0].text = "Mecond";
+        TKUnit.assertEqual(view.text, "MecondThird");
+
+        view.formattedText = null;
+        TKUnit.assertEqual(view.text, "");
+    });
+}
\ No newline at end of file
diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/apps/tests/xml-declaration/xml-declaration-tests.ts
index 5e71f8e14..83a8fd7fa 100644
--- a/apps/tests/xml-declaration/xml-declaration-tests.ts
+++ b/apps/tests/xml-declaration/xml-declaration-tests.ts
@@ -740,6 +740,7 @@ export function test_parseSpansDirectlyOnLabel() {
         var page = <Page>views[0];
         var testLabel = <Label>page.getViewById("testLabel");
         TKUnit.assertEqual(testLabel.formattedText + "", "We areAwesome", "Formatted string should be set");
+        TKUnit.assertEqual(testLabel.text + "", "We areAwesome", "Formatted string should be set");
     }
 
     helper.navigate(function () { return p; });
@@ -757,6 +758,7 @@ export function test_parseSpansDirectlyOnButton() {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
         TKUnit.assertEqual(testButton.formattedText + "", "We areAwesome", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.text + "", "We areAwesome", "Formatted string should be set");
     }
 
     helper.navigate(function () { return p; });
@@ -774,6 +776,7 @@ export function test_parseFormattedStringWithoutFormattedText() {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
         TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
     }
 
     helper.navigate(function () { return p; });
@@ -791,6 +794,7 @@ export function test_parseFormattedStringFullSyntax() {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
         TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
     }
 
     helper.navigate(function () { return p; });
@@ -808,6 +812,7 @@ export function test_parseSpansDirectlyToFormattedString() {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
         TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
     }
 
     helper.navigate(function () { return p; });
diff --git a/ui/button/button-common.ts b/ui/button/button-common.ts
index 9fa53965c..a012e3195 100644
--- a/ui/button/button-common.ts
+++ b/ui/button/button-common.ts
@@ -99,7 +99,10 @@ export class Button extends view.View implements definition.Button {
     }
 
     private onFormattedTextChanged(eventData: observable.PropertyChangeData) {
-        this._setFormattedTextPropertyToNative(eventData.value);
+        var value = <formattedString.FormattedString>eventData.value;
+        this._setFormattedTextPropertyToNative(value);
+
+        this._onPropertyChangedFromNative(Button.textProperty, value.toString());
     }
 
     public _onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
@@ -111,10 +114,14 @@ export class Button extends view.View implements definition.Button {
     }
 
     public _onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-        if (data.newValue) {
-            (<formattedString.FormattedString>data.newValue).parent = this;
+        var newValue = <formattedString.FormattedString>data.newValue;
+        if (newValue) {
+            newValue.parent = this;
         }
-        this._setFormattedTextPropertyToNative(data.newValue);
+        this._setFormattedTextPropertyToNative(newValue);
+
+        var newText = newValue ? newValue.toString() : "";
+        this._onPropertyChangedFromNative(Button.textProperty, newText);
     }
 
     public _addChildFromBuilder(name: string, value: any): void {
diff --git a/ui/text-base/text-base-common.ts b/ui/text-base/text-base-common.ts
index 7b0288797..7536b642b 100644
--- a/ui/text-base/text-base-common.ts
+++ b/ui/text-base/text-base-common.ts
@@ -96,7 +96,10 @@ export class TextBase extends view.View implements definition.TextBase, formatte
     }
 
     private onFormattedTextChanged(eventData: observable.PropertyChangeData) {
-        this._setFormattedTextPropertyToNative(eventData.value);
+        var value = (<formattedString.FormattedString>eventData.value);
+        this._setFormattedTextPropertyToNative(value);
+
+        this._onPropertyChangedFromNative(TextBase.textProperty, value.toString());
     }
 
     public _onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
@@ -108,10 +111,14 @@ export class TextBase extends view.View implements definition.TextBase, formatte
     }
 
     public _onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-        if (data.newValue) {
-            (<formattedString.FormattedString>data.newValue).parent = this;
+        var newValue = (<formattedString.FormattedString>data.newValue);
+        if (newValue) {
+            newValue.parent = this;
         }
-        this._setFormattedTextPropertyToNative(data.newValue);
+        this._setFormattedTextPropertyToNative(newValue);
+
+        var newText = newValue ? newValue.toString() : "";
+        this._onPropertyChangedFromNative(TextBase.textProperty, newText);
     }
 
     public _addChildFromBuilder(name: string, value: any): void {

From ed090326b181ce7a951fb95e42f7770cd0e2bff2 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Fri, 18 Mar 2016 14:57:28 +0200
Subject: [PATCH 2/2] Additional fixes

---
 apps/tests/ui/button/button-tests.ts         | 2 +-
 apps/tests/ui/text-field/text-field-tests.ts | 2 +-
 ui/button/button.android.ts                  | 3 ++-
 ui/button/button.ios.ts                      | 3 ++-
 ui/text-base/text-base.android.ts            | 3 ++-
 ui/text-base/text-base.ios.ts                | 3 ++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/tests/ui/button/button-tests.ts b/apps/tests/ui/button/button-tests.ts
index ac2a39811..127a9bb4f 100644
--- a/apps/tests/ui/button/button-tests.ts
+++ b/apps/tests/ui/button/button-tests.ts
@@ -320,7 +320,7 @@ export var test_WhenFormattedTextPropertyChanges_TextIsUpdated_Button = function
         view.formattedText = formattedString2;
         TKUnit.assertEqual(view.text, "SecondThird");
 
-        formattedString2.spans[0].text = "Mecond";
+        formattedString2.spans.getItem(0).text = "Mecond";
         TKUnit.assertEqual(view.text, "MecondThird");
 
         view.formattedText = null;
diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/apps/tests/ui/text-field/text-field-tests.ts
index 4e7b25b4d..b2e780d18 100644
--- a/apps/tests/ui/text-field/text-field-tests.ts
+++ b/apps/tests/ui/text-field/text-field-tests.ts
@@ -497,7 +497,7 @@ export var test_WhenFormattedTextPropertyChanges_TextIsUpdated_TextBase = functi
         view.formattedText = formattedString2;
         TKUnit.assertEqual(view.text, "SecondThird");
 
-        formattedString2.spans[0].text = "Mecond";
+        formattedString2.spans.getItem(0).text = "Mecond";
         TKUnit.assertEqual(view.text, "MecondThird");
 
         view.formattedText = null;
diff --git a/ui/button/button.android.ts b/ui/button/button.android.ts
index a32a7edee..d80a2d163 100644
--- a/ui/button/button.android.ts
+++ b/ui/button/button.android.ts
@@ -45,8 +45,9 @@ export class Button extends common.Button {
     }
 
     public _setFormattedTextPropertyToNative(value) {
+        var newText = value ? value._formattedText : null;
         if (this.android) {
-            this.android.setText(value._formattedText);
+            this.android.setText(newText);
         }
     }
 }
diff --git a/ui/button/button.ios.ts b/ui/button/button.ios.ts
index 7fa02376e..d93ce2eff 100644
--- a/ui/button/button.ios.ts
+++ b/ui/button/button.ios.ts
@@ -64,7 +64,8 @@ export class Button extends common.Button {
         // the UIControlStateNormal value. If the value for UIControlStateNormal is not set, 
         // then the property defaults to a system value. Therefore, at a minimum, you should 
         // set the value for the normal state.
-        this.ios.setAttributedTitleForState(value._formattedText, UIControlState.UIControlStateNormal);
+        var newText = value ? value._formattedText : null;
+        this.ios.setAttributedTitleForState(newText, UIControlState.UIControlStateNormal);
         this.style._updateTextDecoration();
     }
 } 
diff --git a/ui/text-base/text-base.android.ts b/ui/text-base/text-base.android.ts
index 76593efec..e06054bc7 100644
--- a/ui/text-base/text-base.android.ts
+++ b/ui/text-base/text-base.android.ts
@@ -10,8 +10,9 @@ export class TextBase extends common.TextBase {
         }
     }
     public _setFormattedTextPropertyToNative(value) {
+        var newText = value ? value._formattedText : null;
         if (this.android) {
-            this.android.setText(value._formattedText);
+            this.android.setText(newText);
         }
     }
 }
\ No newline at end of file
diff --git a/ui/text-base/text-base.ios.ts b/ui/text-base/text-base.ios.ts
index f0a845646..bf18342e6 100644
--- a/ui/text-base/text-base.ios.ts
+++ b/ui/text-base/text-base.ios.ts
@@ -11,7 +11,8 @@ export class TextBase extends common.TextBase {
     }
 
     public _setFormattedTextPropertyToNative(value) {
-        this.ios.attributedText = value._formattedText;
+        var newText = value ? value._formattedText : null;
+        this.ios.attributedText = newText;
         this.style._updateTextDecoration();
         this.style._updateTextTransform();
         this.requestLayout();