Merge branch 'feature/delegate-methods' into develop

Close #10

Author: bcylin

.travis.yml

@@ -15,6 +15,8 @@ script:
   - bundle exec rake ci:build
   - make -B carthage
   - make -B docs
+after_script:
+  - sh scripts/update-docs.sh
 notifications:
   email: false
   slack:

CHANGELOG.md

@@ -1,3 +1,18 @@
+## v1.4.0
+
+* Added delegate methods:
+
+  ```swift
+@objc optional func tokenField(_ tokenField: ICTokenField, didChangeInputText text: String)
+@objc optional func tokenField(_ tokenField: ICTokenField, shouldCompleteText text: String) -> Bool
+```
+
+* Changed delegate method:
+
+  ```swift
+@objc optional func tokenField(_ tokenField: ICTokenField, didCompleteText text: String)
+```
+
 ## v1.3.0
 
 * Swift 3.0

Example/CustomizedTokenViewController.swift

@@ -83,13 +83,22 @@ class CustomizedTokenViewController: UIViewController, ICTokenFieldDelegate {
     print(#function)
   }
 
-  func tokenField(_ tokenField: ICTokenField, didEnterText text: String) {
-    print("Add: \"\(text)\"")
+  func tokenField(_ tokenField: ICTokenField, didChangeInputText text: String) {
+    print("Typing \"\(text)\"")
+  }
+
+  func tokenField(_ tokenField: ICTokenField, shouldCompleteText text: String) -> Bool {
+    print("Should add \"\(text)\"?")
+    return text != "42"
+  }
+
+  func tokenField(_ tokenField: ICTokenField, didCompleteText text: String) {
+    print("Added \"\(text)\"")
     updateTexts()
   }
 
   func tokenField(_ tokenField: ICTokenField, didDeleteText text: String, atIndex index: Int) {
-    print("Delete: \"\(text)\"")
+    print("Deleted \"\(text)\"")
     updateTexts()
   }
 

README.md

@@ -135,7 +135,9 @@ See `Example/CustomizedTokenField.swift` for more details.
 * `tokenFieldDidBeginEditing(_:)`
 * `tokenFieldDidEndEditing(_:)`
 * `tokenFieldWillReturn(_:)`
-* `tokenField(_:didEnterText:)`
+* `tokenField(_:didChangeInputText:)`
+* `tokenField(_:shouldCompleteText:)`
+* `tokenField(_:didCompleteText:)`
 * `tokenField(_:didDeleteText:atIndex:)`
 
 ## Development

Source/TokenField/ICTokenField.swift

@@ -34,8 +34,12 @@ import UIKit
   @objc optional func tokenFieldDidEndEditing(_ tokenField: ICTokenField)
   /// Tells the delegate that the token field will process the pressing of the return button.
   @objc optional func tokenFieldWillReturn(_ tokenField: ICTokenField)
+  /// Tells the delegate the input text is changed.
+  @objc optional func tokenField(_ tokenField: ICTokenField, didChangeInputText text: String)
+  /// Asks the delegate if the text should become a token in the token field.
+  @objc optional func tokenField(_ tokenField: ICTokenField, shouldCompleteText text: String) -> Bool
   /// Tells the delegate that the text becomes a token in the token field.
-  @objc optional func tokenField(_ tokenField: ICTokenField, didEnterText text: String)
+  @objc optional func tokenField(_ tokenField: ICTokenField, didCompleteText text: String)
   /// Tells the delegate that the token at certain index is removed from the token field.
   @objc optional func tokenField(_ tokenField: ICTokenField, didDeleteText text: String, atIndex index: Int)
 }
@@ -287,23 +291,28 @@ open class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDelega
     }
 
     let text = (input as NSString).replacingCharacters(in: range, with: string)
+    delegate?.tokenField?(self, didChangeInputText: text)
 
     for delimiter in delimiters {
-      if text.hasSuffix(delimiter) {
-        let index = text.index(text.endIndex, offsetBy: -delimiter.characters.count)
-        let newToken = text.substring(to: index)
-        textField.text = nil
-
-        if !newToken.isEmpty && newToken != delimiter {
-          tokens.append(ICToken(text: newToken, normalAttributes: normalTokenAttributes, highlightedAttributes: highlightedTokenAttributes))
-          layoutTokenTextField()
-          delegate?.tokenField?(self, didEnterText: newToken)
-        }
-        togglePlaceholderIfNeeded()
+      guard text.hasSuffix(delimiter) else {
+        continue
+      }
+
+      let index = text.index(text.endIndex, offsetBy: -delimiter.characters.count)
+      let newToken = text.substring(to: index)
 
-        return false
+      if !newToken.isEmpty && newToken != delimiter && (delegate?.tokenField?(self, shouldCompleteText: newToken) ?? true) {
+        tokens.append(ICToken(text: newToken, normalAttributes: normalTokenAttributes, highlightedAttributes: highlightedTokenAttributes))
+        layoutTokenTextField()
+        delegate?.tokenField?(self, didCompleteText: newToken)
       }
+
+      textField.text = nil
+      togglePlaceholderIfNeeded()
+
+      return false
     }
+
     return true
   }
 
@@ -436,10 +445,16 @@ open class ICTokenField: UIView, UITextFieldDelegate, ICBackspaceTextFieldDelega
     guard let text = inputTextField.text, !text.isEmpty else {
       return
     }
+
+    let shouldCompleteText = delegate?.tokenField?(self, shouldCompleteText: text) ?? true
+    guard shouldCompleteText else {
+      return
+    }
+
     inputTextField.text = nil
     tokens.append(ICToken(text: text, normalAttributes: normalTokenAttributes, highlightedAttributes: highlightedTokenAttributes))
     layoutTokenTextField()
-    delegate?.tokenField?(self, didEnterText: text)
+    delegate?.tokenField?(self, didCompleteText: text)
   }
 
   /// Removes the input text and all displayed tokens.

scripts/update-docs.sh

@@ -17,7 +17,7 @@ git --no-pager diff --stat
 git add .
 git commit -m "[CI] Update documentation at $(date +'%Y-%m-%d %H:%M:%S %z')"
 
-if [ "${TRAVIS_BRANCH}" = "master" ] && [ -n "$DANGER_GITHUB_API_TOKEN" ]; then
+if [ "${TRAVIS_BRANCH}" = "develop" ] && [ -n "$DANGER_GITHUB_API_TOKEN" ]; then
   echo "Updating gh-pages..."
   git remote add upstream "https://${DANGER_GITHUB_API_TOKEN}@github.com/polydice/ICInputAccessory.git"
   git push --quiet upstream HEAD:gh-pages