Merge pull request #4 from JNDisrupter/development

Add Resign First Responder Method
JNDisrupter · Jul 2, 2019 · b0b0426 · b0b0426
2 parents 02c68ef + e238149
commit b0b0426
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 27 deletions.
diff --git a/Example/Pods/Target Support Files/JNMentionTextView/Info.plist b/Example/Pods/Target Support Files/JNMentionTextView/Info.plist
diff --git a/JNMentionTextView.podspec b/JNMentionTextView.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
     s.name             = "JNMentionTextView"
-    s.version          = "1.0.0"
+    s.version          = "1.0.1"
     s.summary          = "JNMentionTextView is a UITextView replacement supporting the mention feature for iOS applications."
     s.description      = "A UITextView drop-in replacement supporting special characters such as [ #, @ ] and regex patterns, written in Swift."
     s.homepage                  = "https://github.com/JNDisrupter"

diff --git a/JNMentionTextView/Classes/JNMentionTextView/Extensions/JNMentionTextView+MentionEngine.swift b/JNMentionTextView/Classes/JNMentionTextView/Extensions/JNMentionTextView+MentionEngine.swift
@@ -57,17 +57,24 @@ extension JNMentionTextView {
 
     /**
      End Mention Process
+     - Parameter animated: is animated bool value.
+     - Parameter completion: completion block.
      */
-    func endMentionProcess() {
+    func endMentionProcess(animated: Bool = true, completion: (() -> ())? = nil) {
 
-        if let pickerView = self.pickerViewController {
-            pickerView.dismiss(animated: true, completion: {
+        if let pickerView = self.pickerViewController, self.isInMentionProcess() {
+            pickerView.dismiss(animated: animated, completion: {
 
                 self.searchString = ""
                 self.selectedSymbol = ""
                 self.selectedSymbolLocation = 0
                 self.selectedSymbolAttributes = [:]
+
+                completion?()
             })
+        } else {
+
+            completion?()
         }
     }
 

diff --git a/...nTextView/Classes/JNMentionTextView/Extensions/JNMentionTextView+UITextViewDelegate.swift b/...nTextView/Classes/JNMentionTextView/Extensions/JNMentionTextView+UITextViewDelegate.swift
@@ -187,8 +187,9 @@ extension JNMentionTextView: UITextViewDelegate {
     public func textViewDidEndEditing(_ textView: UITextView) {
 
         // end mention process
-        self.endMentionProcess()
-        self.mentionDelegate?.textViewDidEndEditing?(textView)
+        self.endMentionProcess {
+            self.mentionDelegate?.textViewDidEndEditing?(textView)
+        }
     }
 
     /**

diff --git a/JNMentionTextView/Classes/JNMentionTextView/JNMentionTextView.swift b/JNMentionTextView/Classes/JNMentionTextView/JNMentionTextView.swift
@@ -91,6 +91,19 @@ public class JNMentionTextView: UITextView {
 
         self.initView()
     }
+
+    /**
+     Resign First Responder
+     - Parameter completion: Completion block.
+     */
+    public func resignFirstResponder(completion: (() -> ())? = nil){
+
+        // end mention process
+        self.endMentionProcess(animated: false) {
+            self.resignFirstResponder()
+            completion?()
+        }
+    }
 
     /**
      Init View

diff --git a/README.md b/README.md
@@ -185,7 +185,13 @@ Consider the String as template that retured from the BackEnd has this format an
         ```swift
         getSmartReplacement(text: String, data: [String: [JNMentionPickable]], normalAttributes: [NSAttributedString.Key: Any],       mentionReplacements: [String: [NSAttributedString.Key : Any]]) -> NSAttributedString
         ```
-
+   - **Resign First Responder:** 
+   This method is a wrapper of resignFirstResponder for UITextView, but it handle the dismissal of Picker ViewController 
+
+        ```swift
+            public func resignFirstResponder(completion: (() -> ())? = nil)
+        ```
+
 ## Example
 
 To run the example project, clone the repo, and run `pod install` from the Example directory first.