fix attributtedString: end of range - don’t emit next if equal an tests

Author: carlosypunto

RxCocoa/iOS/UITextField+Rx.swift

@@ -39,7 +39,9 @@ extension Reactive where Base: UITextField {
     /// Bindable sink for `attributedText` property.
     public var attributedText: UIBindingObserver<Base, NSAttributedString?> {
         return UIBindingObserver(UIElement: self.base) { textField, attributedText in
-            textField.attributedText = attributedText
+            if textField.attributedText != attributedText {
+                textField.attributedText = attributedText
+            }
         }
     }
 

RxCocoa/iOS/UITextView+Rx.swift

@@ -71,7 +71,7 @@ extension Reactive where Base: UITextView {
                 .observeOn(MainScheduler.asyncInstance)
                 .map { _ in
                     guard let textStorage = textView?.textStorage else { return nil }
-                    return textStorage.attributedSubstring(from: NSRange(location: 0, length: textStorage.string.utf8.count))
+                    return textStorage.attributedSubstring(from: NSRange(location: 0, length: textStorage.length))
                 }
                 ?? Observable.empty()
 
@@ -84,8 +84,6 @@ extension Reactive where Base: UITextView {
             // including marked text selection which is imporant for proper input
             // when IME input method is used.
             if textView.attributedText != attributedText {
-                print(textView.attributedText)
-                print(attributedText)
                 textView.attributedText = attributedText
             }
         }

Tests/RxCocoaTests/UITextField+RxTests.swift

@@ -23,34 +23,40 @@ final class UITextFieldTests : RxTest {
 
     func testSettingTextDoesntClearMarkedText() {
         let textField = UITextFieldSubclass(frame: CGRect.zero)
-        
         textField.text = "Text1"
-        textField.settedText = false
+        textField.isSettedText = false
         textField.rx.text.on(.next("Text1"))
-        XCTAssertTrue(!textField.settedText)
+        XCTAssertTrue(!textField.isSettedText)
         textField.rx.text.on(.next("Text2"))
-        XCTAssertTrue(textField.settedText)
+        XCTAssertTrue(textField.isSettedText)
     }
 
     func testLabel_attributedTextObserver() {
-        let label = UILabel()
-        XCTAssertEqual(label.attributedText, nil)
-        let text = NSAttributedString(string: "Hello!")
-        _ = Observable.just(text).bind(to: label.rx.attributedText)
-        
-        XCTAssertEqual(label.attributedText, text)
+        let textField = UITextField()
+        XCTAssertEqual(textField.attributedText, "".textFieldAttributedString)
+        let attributedText = "Hello!".textFieldAttributedString
+        _ = Observable.just(attributedText).bind(to: textField.rx.attributedText)
+        XCTAssertEqual(textField.attributedText!, attributedText)
+    }
+}
+
+private extension String {
+    var textFieldAttributedString: NSAttributedString {
+        let tf = UITextField()
+        tf.attributedText = NSAttributedString(string: self)
+        return tf.attributedText!
     }
 }
 
 final class UITextFieldSubclass : UITextField {
-    var settedText = false
+    var isSettedText = false
 
     override var text: String? {
         get {
             return super.text
         }
         set {
-            settedText = true
+            isSettedText = true
             super.text = newValue
         }
     }

Tests/RxCocoaTests/UITextView+RxTests.swift

@@ -27,27 +27,27 @@ final class UITextViewTests : RxTest {
         let textView = UITextViewSubclass2(frame: CGRect.zero)
 
         textView.text = "Text1"
-        textView.settedText = false
+        textView.isSettedText = false
         textView.rx.text.on(.next("Text1"))
-        XCTAssertTrue(!textView.settedText)
+        XCTAssertTrue(!textView.isSettedText)
         textView.rx.text.on(.next("Text2"))
-        XCTAssertTrue(textView.settedText)
+        XCTAssertTrue(textView.isSettedText)
     }
 
     func testSettingTextDoesntClearMarkedAttributtedText() {
         let textView = UITextViewSubclass2(frame: CGRect.zero)
 
-        let initialAttributedString = NSAttributedString(string: "Test1")
-        let nextAttributedString = NSAttributedString(string: "Test1")
+        let testAttributedString = "Test1".textViewAttributedString
+        let test2AttributedString = "Test2".textViewAttributedString
 
-        textView.attributedText = initialAttributedString
-        let textViewSettedAttributedText = textView.attributedText
-        textView.settedAttributedText = false
-        
-        textView.rx.attributedText.on(.next(textViewSettedAttributedText))
-        XCTAssertTrue(!textView.settedAttributedText)
-        textView.rx.attributedText.on(.next(nextAttributedString))
-        XCTAssertTrue(textView.settedAttributedText)
+        textView.attributedText = testAttributedString
+        textView.isSettedAttributedText = false
+        textView.rx.attributedText.on(.next(testAttributedString))
+        XCTAssertTrue(!textView.isSettedAttributedText)
+        textView.rx.attributedText.on(.next(testAttributedString))
+        XCTAssertTrue(!textView.isSettedAttributedText)
+        textView.rx.attributedText.on(.next(test2AttributedString))
+        XCTAssertTrue(textView.isSettedAttributedText)
     }
 
     func testDidBeginEditing() {
@@ -131,16 +131,24 @@ final class UITextViewTests : RxTest {
     }
 }
 
+private extension String {
+    var textViewAttributedString: NSAttributedString {
+        let tf = UITextView()
+        tf.attributedText = NSAttributedString(string: self)
+        return tf.attributedText!
+    }
+}
+
 final class UITextViewSubclass2 : UITextView {
-    var settedText = false
-    var settedAttributedText = false
+    var isSettedText = false
+    var isSettedAttributedText = false
 
     override var text: String? {
         get {
             return super.text
         }
         set {
-            settedText = true
+            isSettedText = true
             super.text = newValue
         }
     }
@@ -150,7 +158,7 @@ final class UITextViewSubclass2 : UITextView {
             return super.attributedText
         }
         set {
-            settedAttributedText = true
+            isSettedAttributedText = true
             super.attributedText = newValue
         }
     }