From 93cf00389e3a35144c3df9cfa2228ba223adbdbb Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Wed, 11 Nov 2015 11:25:55 +0200
Subject: [PATCH 1/3] white-space CSS support added

---
 CrossPlatformModules.csproj           |  4 +++
 apps/ui-tests-app/css/white-space.ts  | 13 ++++++++
 apps/ui-tests-app/css/white-space.xml | 20 ++++++++++++
 apps/ui-tests-app/mainPage.ts         |  2 ++
 tsconfig.json                         |  1 +
 ui/button/button-common.ts            | 10 +++++-
 ui/button/button.android.ts           | 12 -------
 ui/button/button.d.ts                 |  5 +++
 ui/button/button.ios.ts               | 12 -------
 ui/enums/enums.d.ts                   | 15 +++++++++
 ui/enums/enums.ts                     |  5 +++
 ui/label/label-common.ts              | 11 ++++++-
 ui/label/label.android.ts             | 19 -----------
 ui/label/label.ios.ts                 | 19 ++---------
 ui/styling/converters.ts              | 10 ++++++
 ui/styling/style.d.ts                 |  1 +
 ui/styling/style.ts                   | 14 +++++++++
 ui/styling/stylers.android.ts         | 22 +++++++++++++
 ui/styling/stylers.ios.ts             | 45 ++++++++++++++++++++++++++-
 ui/styling/styling.d.ts               |  3 ++
 20 files changed, 180 insertions(+), 63 deletions(-)
 create mode 100644 apps/ui-tests-app/css/white-space.ts
 create mode 100644 apps/ui-tests-app/css/white-space.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 31dde677d..7e4fe85c9 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -189,6 +189,9 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\tests\pages\tab-view.xml" />
+    <Content Include="apps\ui-tests-app\css\white-space.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\ui-tests-app\html-view\html-view.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -239,6 +242,7 @@
       <DependentUpon>color.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\css\text-decoration.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\css\white-space.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\html-view\html-view.ts">
       <DependentUpon>html-view.xml</DependentUpon>
     </TypeScriptCompile>
diff --git a/apps/ui-tests-app/css/white-space.ts b/apps/ui-tests-app/css/white-space.ts
new file mode 100644
index 000000000..468b70542
--- /dev/null
+++ b/apps/ui-tests-app/css/white-space.ts
@@ -0,0 +1,13 @@
+var obj;
+
+export function loaded(args) {
+    obj = args.object;
+}
+
+export function butonTap(args) {
+    if (obj.style.whiteSpace === "normal") {
+        obj.style.whiteSpace = "nowrap";
+    } else if (obj.style.whiteSpace === "nowrap") {
+        obj.style.whiteSpace = "normal";
+    }
+}
\ No newline at end of file
diff --git a/apps/ui-tests-app/css/white-space.xml b/apps/ui-tests-app/css/white-space.xml
new file mode 100644
index 000000000..d0c76b6ab
--- /dev/null
+++ b/apps/ui-tests-app/css/white-space.xml
@@ -0,0 +1,20 @@
+<Page >
+  <ScrollView>
+    <StackLayout width="50">
+      <Button text="Change" tap="butonTap" />
+      <Label text="Text Text" style.whiteSpace="normal" loaded="loaded"/>
+
+      <Label text="Label Normal" style="white-space:normal" />
+      <Label text="Label Nowrap" style="white-space:nowrap" />
+
+      <TextField text="TextField Normal" style="white-space:normal" />
+      <TextField text="TextField Nowrap" style="white-space:nowrap" />
+
+      <TextView text="TextView Normal" style="white-space:normal" />
+      <TextView text="TextView Nowrap" style="white-space:nowrap" />
+
+      <Button text="Button Normal" style="white-space:normal" />
+      <Button text="Button Nowrap" style="white-space:nowrap" />
+    </StackLayout>
+  </ScrollView>
+</Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index 2e1785729..ea1fc5849 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -90,4 +90,6 @@ examples.set("webview", "web-view/web-view");
 examples.set("webtest", "web-view/web-vew-test");
 
 examples.set("decoration", "css/text-decoration");
+examples.set("whitespace", "css/white-space");
+
 //VM.set("selected", "tabAll");
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 84f94ffbd..f56083587 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -334,6 +334,7 @@
         "apps/ui-tests-app/css/background.ts",
         "apps/ui-tests-app/css/styles.ts",
         "apps/ui-tests-app/css/text-decoration.ts",
+        "apps/ui-tests-app/css/white-space.ts",
         "apps/ui-tests-app/dialogs/dialogs.ts",
         "apps/ui-tests-app/dialogs/view-model.ts",
         "apps/ui-tests-app/font/button.ts",
diff --git a/ui/button/button-common.ts b/ui/button/button-common.ts
index 1b9e0f04e..223ff6047 100644
--- a/ui/button/button-common.ts
+++ b/ui/button/button-common.ts
@@ -5,6 +5,7 @@ import proxy = require("ui/core/proxy");
 import formattedString = require("text/formatted-string");
 import observable = require("data/observable");
 import weakEvents = require("ui/core/weak-event-listener");
+import enums = require("ui/enums");
 
 var textProperty = new dependencyObservable.Property(
     "text",
@@ -121,4 +122,11 @@ export class Button extends view.View implements definition.Button {
     public _addChildFromBuilder(name: string, value: any): void {
         formattedString.FormattedString.addFormattedStringToView(this, name, value);
     }
-}
\ No newline at end of file
+}
+
+function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var v = <view.View>data.object;
+    v.style.whiteSpace = data.newValue ? enums.WhiteSpace.normal : enums.WhiteSpace.nowrap;
+}
+
+(<proxy.PropertyMetadata>Button.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
\ No newline at end of file
diff --git a/ui/button/button.android.ts b/ui/button/button.android.ts
index e4aaee64c..163e1b04a 100644
--- a/ui/button/button.android.ts
+++ b/ui/button/button.android.ts
@@ -5,18 +5,6 @@ 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 fe105223a..1d4229ed7 100644
--- a/ui/button/button.d.ts
+++ b/ui/button/button.d.ts
@@ -16,6 +16,11 @@ declare module "ui/button" {
          */
         public static textProperty: dependencyObservable.Property;
 
+        /**
+         * Dependency property used to support binding operations for the text wrapping of the current button instance.
+         */
+        public static textWrapProperty: dependencyObservable.Property;
+
         /**
          * String value used when hooking to tap event.
          */
diff --git a/ui/button/button.ios.ts b/ui/button/button.ios.ts
index bb17e52aa..e7c78abc9 100644
--- a/ui/button/button.ios.ts
+++ b/ui/button/button.ios.ts
@@ -26,18 +26,6 @@ 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;
diff --git a/ui/enums/enums.d.ts b/ui/enums/enums.d.ts
index 955ba74cd..60f7731c7 100644
--- a/ui/enums/enums.d.ts
+++ b/ui/enums/enums.d.ts
@@ -437,6 +437,21 @@
          */
         export var lineThrough: string;
     }
+
+    /**
+     * Specifies different white spaces.
+     */
+    export module WhiteSpace {
+        /**
+         * Normal wrap.
+         */
+        export var normal: string;
+        
+        /**
+         * No wrap.
+         */
+        export var nowrap: string;
+    }
     
     /**
      * Specifies different font weights.
diff --git a/ui/enums/enums.ts b/ui/enums/enums.ts
index 9d0618625..cebbe7b7b 100644
--- a/ui/enums/enums.ts
+++ b/ui/enums/enums.ts
@@ -26,6 +26,11 @@ export module TextDecoration {
     export var lineThrough = "line-through";
 }
 
+export module WhiteSpace {
+    export var normal = "normal";
+    export var nowrap = "nowrap";
+}
+
 export module Orientation {
     export var horizontal = "horizontal";
     export var vertical = "vertical";
diff --git a/ui/label/label-common.ts b/ui/label/label-common.ts
index 2b7ab1f4e..403709e69 100644
--- a/ui/label/label-common.ts
+++ b/ui/label/label-common.ts
@@ -2,6 +2,8 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import textBase = require("ui/text-base");
+import enums = require("ui/enums");
+import view = require("ui/core/view");
 
 export class Label extends textBase.TextBase implements definition.Label {
     public static textWrapProperty = new dependencyObservable.Property(
@@ -20,4 +22,11 @@ export class Label extends textBase.TextBase implements definition.Label {
     set textWrap(value: boolean) {
         this._setValue(Label.textWrapProperty, value);
     }
-}
\ No newline at end of file
+}
+
+function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var v = <view.View>data.object;
+    v.style.whiteSpace = data.newValue ? enums.WhiteSpace.normal : enums.WhiteSpace.nowrap;
+}
+
+(<proxy.PropertyMetadata>Label.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
\ No newline at end of file
diff --git a/ui/label/label.android.ts b/ui/label/label.android.ts
index 31e47cf4f..bf243e233 100644
--- a/ui/label/label.android.ts
+++ b/ui/label/label.android.ts
@@ -2,25 +2,6 @@
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
-function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var label = <Label>data.object;
-    if (!label.android) {
-        return;
-    }
-
-    if (data.newValue) {
-        label.android.setSingleLine(false);
-        label.android.setEllipsize(null);
-    }
-    else {
-        label.android.setSingleLine(true);
-        label.android.setEllipsize(android.text.TextUtils.TruncateAt.END);
-    }
-}
-
-// register the setNativeValue callback
-(<proxy.PropertyMetadata>common.Label.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
-
 global.moduleMerge(common, exports);
 
 export class Label extends common.Label {
diff --git a/ui/label/label.ios.ts b/ui/label/label.ios.ts
index e564454c1..5c0d235e6 100644
--- a/ui/label/label.ios.ts
+++ b/ui/label/label.ios.ts
@@ -4,22 +4,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 import utils = require("utils/utils");
 import viewModule = require("ui/core/view");
-
-function onTextWrapPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var label = <Label>data.object;
-
-    if (data.newValue) {
-        label.ios.lineBreakMode = NSLineBreakMode.NSLineBreakByWordWrapping;
-        label.ios.numberOfLines = 0;
-    }
-    else {
-        label.ios.lineBreakMode = NSLineBreakMode.NSLineBreakByTruncatingTail;
-        label.ios.numberOfLines = 1;
-    }
-}
-
-// register the setNativeValue callback
-(<proxy.PropertyMetadata>common.Label.textWrapProperty.metadata).onSetNativeValue = onTextWrapPropertyChanged;
+import enums = require("ui/enums");
 
 global.moduleMerge(common, exports);
 
@@ -104,7 +89,7 @@ export class Label extends common.Label {
 
             var nativeSize = nativeView.sizeThatFits(CGSizeMake(width, height));
             var labelWidth = nativeSize.width;
-            if (!this.textWrap) {
+            if (!this.textWrap && this.style.whiteSpace !== enums.WhiteSpace.nowrap) {
                 labelWidth = Math.min(labelWidth, width);
             }
 
diff --git a/ui/styling/converters.ts b/ui/styling/converters.ts
index 7b4eb4cb2..5c117c40b 100644
--- a/ui/styling/converters.ts
+++ b/ui/styling/converters.ts
@@ -32,6 +32,16 @@ export function textDecorationConverter(value: string): string {
     }
 }
 
+export function whiteSpaceConverter(value: string): string {
+    switch (value) {
+        case enums.WhiteSpace.normal:
+        case enums.WhiteSpace.nowrap:
+            return value;
+        default:
+            throw new Error("CSS white-space \"" + value + "\" is not supported.");
+    }
+}
+
 export var numberConverter = parseFloat;
 
 export function visibilityConverter(value: string): string {
diff --git a/ui/styling/style.d.ts b/ui/styling/style.d.ts
index a3790cbaf..e34f6f3b0 100644
--- a/ui/styling/style.d.ts
+++ b/ui/styling/style.d.ts
@@ -63,6 +63,7 @@ declare module "ui/styling/style" {
         public verticalAlignment: string;
         public visibility: string;
         public opacity: number;
+        public whiteSpace: string;
 
         new(parentView: View);
 
diff --git a/ui/styling/style.ts b/ui/styling/style.ts
index 1513d3b87..aba3c8856 100644
--- a/ui/styling/style.ts
+++ b/ui/styling/style.ts
@@ -245,6 +245,10 @@ function isTextDecorationValid(value: string): boolean {
     return values.indexOf(enums.TextDecoration.none) !== -1 || values.indexOf(enums.TextDecoration.underline) !== -1 || values.indexOf(enums.TextDecoration.lineThrough) !== -1;
 }
 
+function isWhiteSpaceValid(value: string): boolean {
+    return value === enums.WhiteSpace.nowrap || value === enums.WhiteSpace.normal;
+}
+
 function onVisibilityChanged(data: PropertyChangeData) {
     (<any>data.object)._view._isVisibleCache = data.newValue === enums.Visibility.visible;
 }
@@ -549,6 +553,13 @@ export class Style extends DependencyObservable implements styling.Style {
         this._setValue(textDecorationProperty, value);
     }
 
+    get whiteSpace(): string {
+        return this._getValue(whiteSpaceProperty);
+    }
+    set whiteSpace(value: string) {
+        this._setValue(whiteSpaceProperty, value);
+    }
+
     public _updateTextDecoration() {
         if (this._getValue(textDecorationProperty) !== enums.TextDecoration.none) {
             this._applyProperty(textDecorationProperty, this._getValue(textDecorationProperty));
@@ -810,6 +821,9 @@ export var opacityProperty = new styleProperty.Property("opacity", "opacity",
 export var textDecorationProperty = new styleProperty.Property("textDecoration", "text-decoration",
     new PropertyMetadata(enums.TextDecoration.none, PropertyMetadataSettings.None, undefined, isTextDecorationValid), converters.textDecorationConverter);
 
+export var whiteSpaceProperty = new styleProperty.Property("whiteSpace", "white-space",
+    new PropertyMetadata(undefined, AffectsLayout, undefined, isWhiteSpaceValid), converters.whiteSpaceConverter);
+
 // Helper property holding most layout related properties available in CSS.
 // When layout related properties are set in CSS we chache them and send them to the native view in a single call.
 export var nativeLayoutParamsProperty = new styleProperty.Property("nativeLayoutParams", "nativeLayoutParams",
diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts
index 56f7c461b..450b0d789 100644
--- a/ui/styling/stylers.android.ts
+++ b/ui/styling/stylers.android.ts
@@ -438,6 +438,15 @@ export class TextViewStyler implements definition.stylers.Styler {
         setTextDecoration(view._nativeView, enums.TextDecoration.none);
     }
 
+    // white-space
+    private static setWhiteSpaceProperty(view: view.View, newValue: any) {
+        setWhiteSpace(view._nativeView, newValue);
+    }
+
+    private static resetWhiteSpaceProperty(view: view.View, nativeValue: any) {
+        setWhiteSpace(view._nativeView, enums.WhiteSpace.normal);
+    }
+
     public static registerHandlers() {
         style.registerHandler(style.colorProperty, new stylersCommon.StylePropertyChangedHandler(
             TextViewStyler.setColorProperty,
@@ -458,6 +467,10 @@ export class TextViewStyler implements definition.stylers.Styler {
             TextViewStyler.setTextDecorationProperty,
             TextViewStyler.resetTextDecorationProperty), "TextBase");
 
+        style.registerHandler(style.whiteSpaceProperty, new stylersCommon.StylePropertyChangedHandler(
+            TextViewStyler.setWhiteSpaceProperty,
+            TextViewStyler.resetWhiteSpaceProperty), "TextBase");
+
         // Register the same stylers for Button.
         // It also derives from TextView but is not under TextBase in our View hierarchy.
         style.registerHandler(style.colorProperty, new stylersCommon.StylePropertyChangedHandler(
@@ -478,6 +491,10 @@ export class TextViewStyler implements definition.stylers.Styler {
         style.registerHandler(style.textDecorationProperty, new stylersCommon.StylePropertyChangedHandler(
             TextViewStyler.setTextDecorationProperty,
             TextViewStyler.resetTextDecorationProperty), "Button");
+
+        style.registerHandler(style.whiteSpaceProperty, new stylersCommon.StylePropertyChangedHandler(
+            TextViewStyler.setWhiteSpaceProperty,
+            TextViewStyler.resetWhiteSpaceProperty), "Button");
     }
 }
 
@@ -501,6 +518,11 @@ function setTextDecoration(view: android.widget.TextView, value: string) {
     }   
 }
 
+function setWhiteSpace(view: android.widget.TextView, value: string) {
+    view.setSingleLine(value === enums.WhiteSpace.nowrap);
+    view.setEllipsize(value === enums.WhiteSpace.nowrap ? android.text.TextUtils.TruncateAt.END : null);
+}
+
 export class ActivityIndicatorStyler implements definition.stylers.Styler {
     private static setColorProperty(view: view.View, newValue: any) {
         var bar = <android.widget.ProgressBar>view._nativeView;
diff --git a/ui/styling/stylers.ios.ts b/ui/styling/stylers.ios.ts
index 0e2950c5b..36da1f162 100644
--- a/ui/styling/stylers.ios.ts
+++ b/ui/styling/stylers.ios.ts
@@ -16,7 +16,9 @@ interface TextUIView {
     textAlignment: number;
     textColor: UIColor;
     text : string;
-    attributedText : NSAttributedString;
+    attributedText: NSAttributedString;
+    lineBreakMode: number;
+    numberOfLines: number;
 }
 
 var ignorePropertyHandler = new stylersCommon.StylePropertyChangedHandler(
@@ -263,6 +265,15 @@ export class ButtonStyler implements definition.stylers.Styler {
         setTextDecoration((<UIButton>view.ios).titleLabel, enums.TextDecoration.none);
     }
 
+    // white-space
+    private static setWhiteSpaceProperty(view: view.View, newValue: any) {
+        setWhiteSpace((<UIButton>view.ios).titleLabel, newValue, view.ios);
+    }
+
+    private static resetWhiteSpaceProperty(view: view.View, nativeValue: any) {
+        setWhiteSpace((<UIButton>view.ios).titleLabel, enums.WhiteSpace.normal, view.ios);
+    }
+
     public static registerHandlers() {
         style.registerHandler(style.colorProperty, new stylersCommon.StylePropertyChangedHandler(
             ButtonStyler.setColorProperty,
@@ -286,6 +297,10 @@ export class ButtonStyler implements definition.stylers.Styler {
         style.registerHandler(style.textDecorationProperty, new stylersCommon.StylePropertyChangedHandler(
             ButtonStyler.setTextDecorationProperty,
             ButtonStyler.resetTextDecorationProperty), "Button");
+
+        style.registerHandler(style.whiteSpaceProperty, new stylersCommon.StylePropertyChangedHandler(
+            ButtonStyler.setWhiteSpaceProperty,
+            ButtonStyler.resetWhiteSpaceProperty), "Button");
     }
 }
 
@@ -330,6 +345,15 @@ export class TextBaseStyler implements definition.stylers.Styler {
         setTextDecoration(view._nativeView, enums.TextDecoration.none);
     }
 
+    // white-space
+    private static setWhiteSpaceProperty(view: view.View, newValue: any) {
+        setWhiteSpace(view._nativeView, newValue);
+    }
+
+    private static resetWhiteSpaceProperty(view: view.View, nativeValue: any) {
+        setWhiteSpace(view._nativeView, enums.WhiteSpace.normal);
+    }
+
     // color
     private static setColorProperty(view: view.View, newValue: any) {
         var ios: TextUIView = <TextUIView>view._nativeView;
@@ -365,6 +389,10 @@ export class TextBaseStyler implements definition.stylers.Styler {
         style.registerHandler(style.textDecorationProperty, new stylersCommon.StylePropertyChangedHandler(
             TextBaseStyler.setTextDecorationProperty,
             TextBaseStyler.resetTextDecorationProperty), "TextBase");
+
+        style.registerHandler(style.whiteSpaceProperty, new stylersCommon.StylePropertyChangedHandler(
+            TextBaseStyler.setWhiteSpaceProperty,
+            TextBaseStyler.resetWhiteSpaceProperty), "TextBase");
     }
 }
 
@@ -928,6 +956,21 @@ function setTextDecoration(view: TextUIView, value: string) {
     }
 }
 
+function setWhiteSpace(view: TextUIView, value: string, parentView?: UIView) {
+    if (value === enums.WhiteSpace.normal) {
+        view.lineBreakMode = NSLineBreakMode.NSLineBreakByWordWrapping;
+        view.numberOfLines = 0;
+    }
+    else {
+        if (parentView) {
+            view.lineBreakMode = NSLineBreakMode.NSLineBreakByTruncatingMiddle;
+        } else {
+            view.lineBreakMode = NSLineBreakMode.NSLineBreakByTruncatingTail;
+        }
+        view.numberOfLines = 1;
+    }
+}
+
 function setTextDecorationNative(view: TextUIView, value: string | NSAttributedString, attributes: NSMutableDictionary) {
     var attributedString: NSMutableAttributedString;
 
diff --git a/ui/styling/styling.d.ts b/ui/styling/styling.d.ts
index 033854dc2..29e75f14b 100644
--- a/ui/styling/styling.d.ts
+++ b/ui/styling/styling.d.ts
@@ -198,6 +198,9 @@
          */
         opacity: number;
 
+        textDecoration: string;
+        whiteSpace: string;
+
         //@private
         public _beginUpdate();
         public _endUpdate();

From 44a43241667d3568baeedb210df767d11cc95ab2 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 12 Nov 2015 14:31:14 +0200
Subject: [PATCH 2/3] apps updated

---
 apps/ui-tests-app/css/text-decoration.ts  | 27 ++++++++++++-----------
 apps/ui-tests-app/css/text-decoration.xml |  2 +-
 apps/ui-tests-app/css/white-space.ts      | 19 ++++++++--------
 apps/ui-tests-app/css/white-space.xml     |  2 +-
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/apps/ui-tests-app/css/text-decoration.ts b/apps/ui-tests-app/css/text-decoration.ts
index eceb2f30e..1697df70c 100644
--- a/apps/ui-tests-app/css/text-decoration.ts
+++ b/apps/ui-tests-app/css/text-decoration.ts
@@ -1,17 +1,18 @@
-var obj;
-
-export function loaded(args) {
-    obj = args.object;
-}
+import view = require("ui/core/view");
+import observable = require("data/observable");
+import label = require("ui/label");
 
 export function butonTap(args) {
-    if (obj.style.textDecoration === "underline") {
-        obj.style.textDecoration = "line-through";
-    } else if (obj.style.textDecoration === "line-through") {
-        obj.style.textDecoration = "line-through underline";
-    } else if (obj.style.textDecoration === "line-through underline") {
-        obj.style.textDecoration = "none";
-    } else if (obj.style.textDecoration === "none") {
-        obj.style.textDecoration = "underline";
+    var btn = <view.View>args.object;
+    var lbl = <label.Label>btn.parent.getViewById("Label1");
+
+    if (lbl.style.textDecoration === "underline") {
+        lbl.style.textDecoration = "line-through";
+    } else if (lbl.style.textDecoration === "line-through") {
+        lbl.style.textDecoration = "line-through underline";
+    } else if (lbl.style.textDecoration === "line-through underline") {
+        lbl.style.textDecoration = "none";
+    } else if (lbl.style.textDecoration === "none") {
+        lbl.style.textDecoration = "underline";
     }
 }
\ No newline at end of file
diff --git a/apps/ui-tests-app/css/text-decoration.xml b/apps/ui-tests-app/css/text-decoration.xml
index f1a99cadb..4e71c619b 100644
--- a/apps/ui-tests-app/css/text-decoration.xml
+++ b/apps/ui-tests-app/css/text-decoration.xml
@@ -2,7 +2,7 @@
   <ScrollView>
     <StackLayout>
       <Button text="Change" tap="butonTap" />
-      <Label text="Text" style.textDecoration="underline" loaded="loaded"/>
+      <Label id="Label1" text="Text" style.textDecoration="underline" />
 
       <Label text="Label" style="text-decoration:none" />
       <Label text="Label" style="text-decoration:underline" />
diff --git a/apps/ui-tests-app/css/white-space.ts b/apps/ui-tests-app/css/white-space.ts
index 468b70542..d1f3a85c1 100644
--- a/apps/ui-tests-app/css/white-space.ts
+++ b/apps/ui-tests-app/css/white-space.ts
@@ -1,13 +1,14 @@
-var obj;
+import view = require("ui/core/view");
+import observable = require("data/observable");
+import label = require("ui/label");
 
-export function loaded(args) {
-    obj = args.object;
-}
+export function butonTap(args: observable.EventData) {
+    var btn = <view.View>args.object;
+    var lbl = <label.Label>btn.parent.getViewById("Label1");
 
-export function butonTap(args) {
-    if (obj.style.whiteSpace === "normal") {
-        obj.style.whiteSpace = "nowrap";
-    } else if (obj.style.whiteSpace === "nowrap") {
-        obj.style.whiteSpace = "normal";
+    if (lbl.style.whiteSpace === "normal") {
+        lbl.style.whiteSpace = "nowrap";
+    } else if (lbl.style.whiteSpace === "nowrap") {
+        lbl.style.whiteSpace = "normal";
     }
 }
\ No newline at end of file
diff --git a/apps/ui-tests-app/css/white-space.xml b/apps/ui-tests-app/css/white-space.xml
index d0c76b6ab..869c5a988 100644
--- a/apps/ui-tests-app/css/white-space.xml
+++ b/apps/ui-tests-app/css/white-space.xml
@@ -2,7 +2,7 @@
   <ScrollView>
     <StackLayout width="50">
       <Button text="Change" tap="butonTap" />
-      <Label text="Text Text" style.whiteSpace="normal" loaded="loaded"/>
+      <Label id="Label1" text="Text Text" style.whiteSpace="normal" />
 
       <Label text="Label Normal" style="white-space:normal" />
       <Label text="Label Nowrap" style="white-space:nowrap" />

From 4c5d1be1979e163ce9b5a904a0e2f7a38484a599 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 12 Nov 2015 15:18:47 +0200
Subject: [PATCH 3/3] textDecoration and whiteSpace tests added for

---
 apps/tests/ui/style/style-properties-tests.ts | 123 ++++++++++++++++++
 ui/styling/stylers.ios.ts                     |   3 +-
 2 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/apps/tests/ui/style/style-properties-tests.ts b/apps/tests/ui/style/style-properties-tests.ts
index a642bbabf..2d36fe321 100644
--- a/apps/tests/ui/style/style-properties-tests.ts
+++ b/apps/tests/ui/style/style-properties-tests.ts
@@ -1,12 +1,15 @@
 import TKUnit = require("../../TKUnit");
 import helper = require("../helper");
 import buttonModule = require("ui/button");
+import labelModule = require("ui/label");
 import stackModule = require("ui/layouts/stack-layout");
 import page = require("ui/page");
 import color = require("color");
 import observable = require("data/observable");
 import enums = require("ui/enums");
 import fontModule = require("ui/styling/font");
+import platform = require("platform");
+import viewModule = require("ui/core/view");
 
 var testBtn: buttonModule.Button;
 var testPage: page.Page;
@@ -33,6 +36,14 @@ export function tearDown() {
     testPage.css = "";
 }
 
+export function test_setting_textDecoration_property_from_CSS_is_applied_to_Style() {
+    test_property_from_CSS_is_applied_to_style("textDecoration", "text-decoration", "underline");
+}
+
+export function test_setting_whiteSpace_property_from_CSS_is_applied_to_Style() {
+    test_property_from_CSS_is_applied_to_style("whiteSpace", "white-space", "nowrap");
+}
+
 export function test_CSS_properties_are_applied_to_Style() {
     test_property_from_CSS_is_applied_to_style("color", "color", new color.Color("#FF0000"), "#FF0000");
 }
@@ -244,6 +255,58 @@ export function test_setting_different_color_triggers_property_change() {
     TKUnit.assert(changed, "Property changed not triggered.");
 }
 
+export function test_setting_same_textDecoration_does_not_trigger_property_change() {
+    var testView = new buttonModule.Button();
+    testView.style.textDecoration = "underline";
+
+    var changed = false;
+    testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
+        changed = true;
+    });
+
+    testView.style.textDecoration = "underline";
+    TKUnit.assert(!changed, "Property changed triggered.");
+}
+
+export function test_setting_different_textDecoration_triggers_property_change() {
+    var testView = new buttonModule.Button();
+    testView.style.textDecoration = "underline";
+
+    var changed = false;
+    testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
+        changed = true;
+    });
+
+    testView.style.textDecoration = "none";
+    TKUnit.assert(changed, "Property changed not triggered.");
+}
+
+export function test_setting_same_whiteSpace_does_not_trigger_property_change() {
+    var testView = new buttonModule.Button();
+    testView.style.whiteSpace = "normal";
+
+    var changed = false;
+    testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
+        changed = true;
+    });
+
+    testView.style.whiteSpace = "normal";
+    TKUnit.assert(!changed, "Property changed triggered.");
+}
+
+export function test_setting_different_whiteSpace_triggers_property_change() {
+    var testView = new buttonModule.Button();
+    testView.style.whiteSpace = "normal";
+
+    var changed = false;
+    testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
+        changed = true;
+    });
+
+    testView.style.whiteSpace = "nowrap";
+    TKUnit.assert(changed, "Property changed not triggered.");
+}
+
 export function test_setting_same_backgroundColor_does_not_trigger_property_change() {
     var testView = new buttonModule.Button();
     testView.style.backgroundColor = new color.Color("#FF0000");
@@ -366,3 +429,63 @@ function test_native_font(style: string, weight: string) {
     }
     //TODO: If needed add tests for other platforms
 }
+
+export var test_setting_button_whiteSpace_normal_sets_native = function () {
+    var testView = new buttonModule.Button();
+    testView.style.whiteSpace = "nowrap";
+
+    helper.buildUIAndRunTest(testView, function (views: Array<viewModule.View>) {
+
+        if (platform.device.os === platform.platformNames.android) {
+            TKUnit.assertEqual((<android.widget.Button>testView.android).getEllipsize(), android.text.TextUtils.TruncateAt.END);
+        } else if (platform.device.os === platform.platformNames.ios) {
+            TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.lineBreakMode, NSLineBreakMode.NSLineBreakByTruncatingMiddle);
+            TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.numberOfLines, 1);
+       }
+    });
+}
+
+export var test_setting_label_whiteSpace_normal_sets_native = function () {
+    var testView = new labelModule.Label();
+    testView.style.whiteSpace = "nowrap";
+
+    helper.buildUIAndRunTest(testView, function (views: Array<viewModule.View>) {
+
+        if (platform.device.os === platform.platformNames.android) {
+            TKUnit.assertEqual((<android.widget.TextView>testView.android).getEllipsize(), android.text.TextUtils.TruncateAt.END);
+        } else if (platform.device.os === platform.platformNames.ios) {
+            TKUnit.assertEqual((<UILabel>testView.ios).lineBreakMode, NSLineBreakMode.NSLineBreakByTruncatingTail);
+            TKUnit.assertEqual((<UILabel>testView.ios).numberOfLines, 1);
+        }
+    });
+}
+
+export var test_setting_button_whiteSpace_nowrap_sets_native = function () {
+    var testView = new buttonModule.Button();
+    testView.style.whiteSpace = "normal";
+
+    helper.buildUIAndRunTest(testView, function (views: Array<viewModule.View>) {
+
+        if (platform.device.os === platform.platformNames.android) {
+            TKUnit.assertNull((<android.widget.Button>testView.android).getEllipsize(), null);
+        } else if (platform.device.os === platform.platformNames.ios) {
+            TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.lineBreakMode, NSLineBreakMode.NSLineBreakByWordWrapping);
+            TKUnit.assertEqual((<UIButton>testView.ios).titleLabel.numberOfLines, 0);
+        }
+    });
+}
+
+export var test_setting_label_whiteSpace_nowrap_sets_native = function () {
+    var testView = new labelModule.Label();
+    testView.style.whiteSpace = "normal";
+
+    helper.buildUIAndRunTest(testView, function (views: Array<viewModule.View>) {
+
+        if (platform.device.os === platform.platformNames.android) {
+            TKUnit.assertNull((<android.widget.TextView>testView.android).getEllipsize(), null);
+        } else if (platform.device.os === platform.platformNames.ios) {
+            TKUnit.assertEqual((<UILabel>testView.ios).lineBreakMode, NSLineBreakMode.NSLineBreakByWordWrapping);
+            TKUnit.assertEqual((<UILabel>testView.ios).numberOfLines, 0);
+        }
+    });
+}
diff --git a/ui/styling/stylers.ios.ts b/ui/styling/stylers.ios.ts
index 36da1f162..0553b6477 100644
--- a/ui/styling/stylers.ios.ts
+++ b/ui/styling/stylers.ios.ts
@@ -8,6 +8,7 @@ import background = require("ui/styling/background");
 import frame = require("ui/frame");
 import tabView = require("ui/tab-view");
 import formattedString = require("text/formatted-string");
+import types = require("utils/types");
 
 global.moduleMerge(stylersCommon, exports);
 
@@ -978,7 +979,7 @@ function setTextDecorationNative(view: TextUIView, value: string | NSAttributedS
         attributedString = NSMutableAttributedString.alloc().initWithAttributedString(value);
         attributedString.addAttributesRange(attributes, NSRangeFromString(attributedString.string));
     } else {
-        view.attributedText = NSAttributedString.alloc().initWithStringAttributes(<string>value, attributes);
+        view.attributedText = NSAttributedString.alloc().initWithStringAttributes(types.isString(value) ? <string>value : "", attributes);
     }
 }