From 0f3732d73f7a7c85b7401563bb11bbcc50c0d775 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Mon, 2 Nov 2015 11:11:25 +0200
Subject: [PATCH] Button textWrap implemented

---
 .../ui/button/button-tests-native.android.ts      |  4 ++++
 apps/tests/ui/button/button-tests-native.d.ts     |  3 ++-
 apps/tests/ui/button/button-tests-native.ios.ts   |  4 ++++
 apps/tests/ui/button/button-tests.ts              | 15 +++++++++++++++
 ui/button/button-common.ts                        | 13 +++++++++++++
 ui/button/button.android.ts                       | 14 ++++++++++++++
 ui/button/button.d.ts                             |  5 +++++
 ui/button/button.ios.ts                           | 14 ++++++++++++++
 8 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/apps/tests/ui/button/button-tests-native.android.ts b/apps/tests/ui/button/button-tests-native.android.ts
index c88e28441..ee1059502 100644
--- a/apps/tests/ui/button/button-tests-native.android.ts
+++ b/apps/tests/ui/button/button-tests-native.android.ts
@@ -8,6 +8,10 @@ export function getNativeText(button: buttonModule.Button): string {
     return button.android.getText();
 }
 
+export function getNativeTextWrap(button: buttonModule.Button): boolean {
+    return (<android.widget.Button>button.android).isSingleLine();
+}
+
 export function getNativeFontSize(button: buttonModule.Button): number {
     var density = utilsModule.layout.getDisplayDensity();
     return button.android.getTextSize() / density;
diff --git a/apps/tests/ui/button/button-tests-native.d.ts b/apps/tests/ui/button/button-tests-native.d.ts
index c4ac2f149..30451a42b 100644
--- a/apps/tests/ui/button/button-tests-native.d.ts
+++ b/apps/tests/ui/button/button-tests-native.d.ts
@@ -2,7 +2,8 @@
 import buttonModule = require("ui/button");
 import colorModule = require("color");
 
-export declare function getNativeText(button: buttonModule.Button) : string;
+export declare function getNativeText(button: buttonModule.Button): string;
+export declare function getNativeTextWrap(button: buttonModule.Button): boolean;
 export declare function getNativeFontSize(button: buttonModule.Button): number;
 export declare function getNativeColor(button: buttonModule.Button): colorModule.Color;
 export declare function getNativeBackgroundColor(button: buttonModule.Button): colorModule.Color;
diff --git a/apps/tests/ui/button/button-tests-native.ios.ts b/apps/tests/ui/button/button-tests-native.ios.ts
index c1d28e7db..ed1e8dc45 100644
--- a/apps/tests/ui/button/button-tests-native.ios.ts
+++ b/apps/tests/ui/button/button-tests-native.ios.ts
@@ -7,6 +7,10 @@ export function getNativeText(button: buttonModule.Button): string {
     return button.ios.titleForState(UIControlState.UIControlStateNormal);
 }
 
+export function getNativeTextWrap(button: buttonModule.Button): boolean {
+    return (<UIButton>button.ios).titleLabel.lineBreakMode === NSLineBreakMode.NSLineBreakByWordWrapping;
+}
+
 export function getNativeFontSize(button: buttonModule.Button): number {
     return button.ios.titleLabel.font.pointSize;
 }
diff --git a/apps/tests/ui/button/button-tests.ts b/apps/tests/ui/button/button-tests.ts
index f626ba0fc..86c6a6721 100644
--- a/apps/tests/ui/button/button-tests.ts
+++ b/apps/tests/ui/button/button-tests.ts
@@ -113,6 +113,21 @@ var _testSetText = function (views: Array<viewModule.View>) {
     TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
 }
 
+var _testSetTextWrap = function (views: Array<viewModule.View>) {
+    var button = <buttonModule.Button>views[0];
+    // <snippet module="ui/button" title="button">
+    // ### Setting the text of a button
+    // ``` JavaScript
+    button.textWrap = true;
+    // ```
+    // </snippet>
+
+    var expectedValue = button.textWrap;
+    var actualValue = buttonTestsNative.getNativeTextWrap(button);
+
+    TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
+}
+
 var _testOnClick = function (views: Array<viewModule.View>) {
     var button = <buttonModule.Button>views[0];
 
diff --git a/ui/button/button-common.ts b/ui/button/button-common.ts
index 3c7823e3d..1b9e0f04e 100644
--- a/ui/button/button-common.ts
+++ b/ui/button/button-common.ts
@@ -37,6 +37,12 @@ export class Button extends view.View implements definition.Button {
     public static textProperty = textProperty;
     public static formattedTextProperty = formattedTextProperty;
 
+    public static textWrapProperty = new dependencyObservable.Property(
+        "textWrap",
+        "Button",
+        new proxy.PropertyMetadata(false, dependencyObservable.PropertyMetadataSettings.AffectsLayout)
+    );
+
     public _onBindingContextChanged(oldValue: any, newValue: any) {
         super._onBindingContextChanged(oldValue, newValue);
         if (this.formattedText) {
@@ -68,6 +74,13 @@ export class Button extends view.View implements definition.Button {
         }
     }
 
+    get textWrap(): boolean {
+        return this._getValue(Button.textWrapProperty);
+    }
+    set textWrap(value: boolean) {
+        this._setValue(Button.textWrapProperty, value);
+    }
+
     private onFormattedTextChanged(eventData: observable.PropertyChangeData) {
         this.setFormattedTextPropertyToNative(eventData.value);
     }
diff --git a/ui/button/button.android.ts b/ui/button/button.android.ts
index 3a98dd718..e4aaee64c 100644
--- a/ui/button/button.android.ts
+++ b/ui/button/button.android.ts
@@ -1,8 +1,22 @@
 import common = require("./button-common");
 import utils = require("utils/utils")
+import dependencyObservable = require("ui/core/dependency-observable");
+import proxy = require("ui/core/proxy");
 
 global.moduleMerge(common, exports);
 
+function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var btn = <Button>data.object;
+    if (!btn.android) {
+        return;
+    }
+
+    btn.android.setSingleLine(data.newValue);
+}
+
+// register the setNativeValue callback
+(<proxy.PropertyMetadata>common.Button.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
+
 export class Button extends common.Button {
     private _android: android.widget.Button;
     private _isPressed: boolean;
diff --git a/ui/button/button.d.ts b/ui/button/button.d.ts
index ef020410f..fe105223a 100644
--- a/ui/button/button.d.ts
+++ b/ui/button/button.d.ts
@@ -36,6 +36,11 @@ declare module "ui/button" {
          */
         text: string;
 
+        /**
+         * Gets or sets whether the Button wraps text or not.
+         */
+        textWrap: boolean;
+
         /**
          * Gets or sets the formatted text (label) displayed by this instance.
          */
diff --git a/ui/button/button.ios.ts b/ui/button/button.ios.ts
index 7e8172ba6..bb17e52aa 100644
--- a/ui/button/button.ios.ts
+++ b/ui/button/button.ios.ts
@@ -1,5 +1,7 @@
 import common = require("./button-common");
 import stateChanged = require("ui/core/control-state-change");
+import dependencyObservable = require("ui/core/dependency-observable");
+import proxy = require("ui/core/proxy");
 
 class TapHandlerImpl extends NSObject {
     private _owner: WeakRef<Button>;
@@ -24,6 +26,18 @@ class TapHandlerImpl extends NSObject {
 
 global.moduleMerge(common, exports);
 
+function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var btn = <Button>data.object;
+    if (!btn.ios) {
+        return;
+    }
+
+    btn.ios.titleLabel.lineBreakMode = data.newValue ? NSLineBreakMode.NSLineBreakByWordWrapping : 0;
+}
+
+// register the setNativeValue callback
+(<proxy.PropertyMetadata>common.Button.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
+
 export class Button extends common.Button {
     private _ios: UIButton;
     private _tapHandler: NSObject;