Merge pull request FluidGroup#51 from mlight3/master

Add support for attributedText
gnshkamath · May 23, 2017 · 5cd840c · 5cd840c
2 parents b464a04 + b1fb319
commit 5cd840c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/NextGrowingTextView/NextGrowingInternalTextView.swift b/NextGrowingTextView/NextGrowingInternalTextView.swift
@@ -51,6 +51,13 @@ internal class NextGrowingInternalTextView: UITextView {
       updatePlaceholder()
     }
   }
+
+  override var attributedText: NSAttributedString! {
+    didSet {
+      didChange()
+      updatePlaceholder()
+    }
+  }
 
   var placeholderAttributedText: NSAttributedString? {
     didSet {
@@ -64,12 +71,9 @@ internal class NextGrowingInternalTextView: UITextView {
   }
 
   override func draw(_ rect: CGRect) {
-
     super.draw(rect)
 
-    guard displayPlaceholder == true else {
-      return
-    }
+    guard displayPlaceholder else { return }
 
     let paragraphStyle: NSMutableParagraphStyle = NSMutableParagraphStyle()
     paragraphStyle.alignment = textAlignment
@@ -96,7 +100,6 @@ internal class NextGrowingInternalTextView: UITextView {
   }
 
   private dynamic func textDidChangeNotification(_ notification: Notification) {
-
     updatePlaceholder()
     didChange()
   }

diff --git a/NextGrowingTextView/NextGrowingTextView.swift b/NextGrowingTextView/NextGrowingTextView.swift
@@ -62,7 +62,6 @@ open class NextGrowingTextView: UIScrollView {
       return _maxNumberOfLines
     }
     set {
-
       guard newValue > 1 else {
         _maxHeight = 1
         return
@@ -139,10 +138,9 @@ open class NextGrowingTextView: UIScrollView {
 
   open override func layoutSubviews() {
     super.layoutSubviews()
-    if _previousFrame.width != bounds.width {
-      _previousFrame = frame
-      fitToScrollView()
-    }
+    guard _previousFrame.width != bounds.width else { return }
+    _previousFrame = frame
+    fitToScrollView()
   }
 
   // MARK: UIResponder
@@ -217,10 +215,8 @@ open class NextGrowingTextView: UIScrollView {
   }
 
   private func scrollToBottom() {
-    if !disableAutomaticScrollToBottom {
-      let offset = contentOffset
-      contentOffset = CGPoint(x: offset.x, y: contentSize.height - frame.height)
-    }
+    guard !disableAutomaticScrollToBottom else { return }
+    contentOffset.y = contentSize.height - frame.height
   }
 
   private func updateMinimumAndMaximumHeight() {