Polishes attributedText.

Author: kzaher

RxCocoa/iOS/UITextField+Rx.swift

@@ -37,12 +37,20 @@ extension Reactive where Base: UITextField {
     }
 
     /// Bindable sink for `attributedText` property.
-    public var attributedText: UIBindingObserver<Base, NSAttributedString?> {
-        return UIBindingObserver(UIElement: self.base) { textField, attributedText in
-            if textField.attributedText != attributedText {
-                textField.attributedText = attributedText
+    public var attributedText: ControlProperty<NSAttributedString?> {
+        return UIControl.rx.value(
+            base,
+            getter: { textField in
+                textField.attributedText
+            }, setter: { textField, value in
+                // This check is important because setting text value always clears control state
+                // including marked text selection which is imporant for proper input
+                // when IME input method is used.
+                if textField.attributedText != value {
+                    textField.attributedText = value
+                }
             }
-        }
+        )
     }
 
 }

RxCocoa/iOS/UITextView+Rx.swift

@@ -70,16 +70,15 @@ extension Reactive where Base: UITextView {
                 // so rebinding a value will cause an exception to be thrown.
                 .observeOn(MainScheduler.asyncInstance)
                 .map { _ in
-                    guard let textStorage = textView?.textStorage else { return nil }
-                    return textStorage.attributedSubstring(from: NSRange(location: 0, length: textStorage.length))
+                    return textView?.attributedText
                 }
                 ?? Observable.empty()
 
             return textChanged
                 .startWith(attributedText)
         }
 
-        let bindingObserver = UIBindingObserver(UIElement: self.base) { (textView, attributedText: NSAttributedString?) in
+        let bindingObserver = Binder(self.base) { (textView, attributedText: NSAttributedString?) in
             // This check is important because setting text value always clears control state
             // including marked text selection which is imporant for proper input
             // when IME input method is used.

RxExample/RxExample-iOSUITests/FlowTests.swift

@@ -125,14 +125,14 @@ extension FlowTests {
 extension FlowTests {
     func testControls() {
         for test in [
-        _testDatePicker,
-        _testBarButtonItemTap,
-        _testButtonTap,
-        _testSegmentedControl,
-        _testUISwitch,
-        _testUITextField,
-        _testUITextView,
-        _testSlider
+            _testDatePicker,
+            _testBarButtonItemTap,
+            _testButtonTap,
+            _testSegmentedControl,
+            _testUISwitch,
+            _testUITextField,
+            _testUITextView,
+            _testSlider
             ] {
             goToControlsView()
             test()
@@ -148,9 +148,14 @@ extension FlowTests {
         tableView.cells.allElementsBoundByIndex[5].tap()
     }
 
-    func checkDebugLabelValue(_ expected: String) {
+    func checkDebugLabelValue(_ expected: String, hasPrefix: Bool = false) {
         let textValue = app.staticTexts["debugLabel"].value as? String
-        XCTAssertEqual(textValue, expected)
+        if hasPrefix {
+            XCTAssertTrue((textValue ?? "").hasPrefix(expected))
+        }
+        else {
+            XCTAssertEqual(textValue, expected)
+        }
     }
 
     func _testDatePicker() {
@@ -184,9 +189,9 @@ extension FlowTests {
 
     func _testUISwitch() {
         let switchControl = app.switches.allElementsBoundByIndex[0]
-        switchControl.tap()
+        switchControl.twoFingerTap()
         checkDebugLabelValue("UISwitch value false")
-        switchControl.tap()
+        switchControl.twoFingerTap()
         checkDebugLabelValue("UISwitch value true")
     }
 
@@ -195,19 +200,27 @@ extension FlowTests {
         textField.tap()
         textField.typeText("f")
         checkDebugLabelValue("UITextField text f")
+        let textField2 = app.textFields.allElementsBoundByIndex[1]
+        textField2.tap()
+        textField2.typeText("f2")
+        checkDebugLabelValue("UITextField attributedText f2{", hasPrefix: true)
     }
 
     func _testUITextView() {
         let textView = app.textViews.allElementsBoundByIndex[0]
         textView.tap()
         textView.typeText("f")
         checkDebugLabelValue("UITextView text f")
+        let textView2 = app.textViews.allElementsBoundByIndex[1]
+        textView2.tap()
+        textView2.typeText("f2")
+        checkDebugLabelValue("UITextView attributedText f2{", hasPrefix: true)
     }
 
     func _testSlider() {
         let slider = app.sliders.allElementsBoundByIndex[0]
         slider.adjust(toNormalizedSliderPosition: 0)
-        checkDebugLabelValue("UISlider value 0.0")
+        checkDebugLabelValue("UISlider value 0.0", hasPrefix: true)
     }
 }