development: combining TextView with Editor

BrookeMa · Mar 8, 2017 · fa08e44 · fa08e44
1 parent 689efbd
commit fa08e44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Sources/iOS/Editor.swift b/Sources/iOS/Editor.swift
@@ -223,7 +223,7 @@ open class Editor: View {
     }
 
     /// Reference to the TextView.
-    open fileprivate(set) var textView: UITextView!
+    open fileprivate(set) var textView: TextView!
 
     /// A reference to an EditorDelegate.
     open weak var delegate: EditorDelegate?
@@ -312,7 +312,7 @@ extension Editor {
 
     /// Prepares the textView.
     fileprivate func prepareTextView() {
-        textView = UITextView(frame: .zero, textContainer: textContainer)
+        textView = TextView(textContainer: textContainer)
         textView.delegate = self
         addSubview(textView)
     }

diff --git a/Sources/iOS/TextView.swift b/Sources/iOS/TextView.swift
@@ -80,6 +80,15 @@ open class TextView: UITextView {
 			preparePlaceholderLabel()
 		}
 	}
+
+    open var placeholder: String? {
+        get {
+            return placeholderLabel?.text
+        }
+        set(value) {
+            placeholderLabel?.text = value
+        }
+    }
 
 	/// An override to the text property.
 	@IBInspectable