From 4cdfb6405195e850420ad683f84272445ba61d40 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Fri, 6 Nov 2015 11:20:38 +0200
Subject: [PATCH] range fixed

---
 ui/text-field/text-field.ios.ts | 2 ++
 ui/text-view/text-view.ios.ts   | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/text-field/text-field.ios.ts b/ui/text-field/text-field.ios.ts
index cea7093b7..494a80b76 100644
--- a/ui/text-field/text-field.ios.ts
+++ b/ui/text-field/text-field.ios.ts
@@ -70,7 +70,9 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
         let owner = this._owner.get();
         if (owner) {
 
+            var r = textField.selectedTextRange;
             owner.style._updateTextDecoration();
+            textField.selectedTextRange = r;
 
             if (owner.updateTextTrigger === enums.UpdateTextTrigger.textChanged) {
                 if (textField.secureTextEntry && this.firstEdit) {
diff --git a/ui/text-view/text-view.ios.ts b/ui/text-view/text-view.ios.ts
index bfa20245a..bd1fff0af 100644
--- a/ui/text-view/text-view.ios.ts
+++ b/ui/text-view/text-view.ios.ts
@@ -20,13 +20,15 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
     }
 
     public textViewShouldBeginEditing(textView: UITextView): boolean {
-        this._owner.style._updateTextDecoration();
         this._owner._hideHint();
         return true;
     }
 
-    public textViewDidEndEditing(textView: UITextView) {
+    public textViewDidBeginEditing(textView: UITextView) {
         this._owner.style._updateTextDecoration();
+    }
+
+    public textViewDidEndEditing(textView: UITextView) {
         if (this._owner.updateTextTrigger === enums.UpdateTextTrigger.focusLost) {
             this._owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, textView.text);
         }
@@ -36,7 +38,9 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
     }
 
     public textViewDidChange(textView: UITextView) {
+        var range = textView.selectedRange;
         this._owner.style._updateTextDecoration();
+        textView.selectedRange = range;
 
         if (this._owner.updateTextTrigger === enums.UpdateTextTrigger.textChanged) {
             this._owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, textView.text);