Fix lots of bugs (#59)

Author: rnystrom

MessageViewController.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		290482271FED90340053978C /* UITextView+Prefixes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2904821E1FED90340053978C /* UITextView+Prefixes.swift */; };
 		29792B141FFAE7FC007A0C57 /* MessageTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29792B121FFAE7FC007A0C57 /* MessageTextView.swift */; };
 		29792B151FFAE7FC007A0C57 /* MessageAutocompleteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29792B131FFAE7FC007A0C57 /* MessageAutocompleteController.swift */; };
+		29C8F9A9208BDAC60075931C /* ExpandedHitTestButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29C8F9A8208BDAC60075931C /* ExpandedHitTestButton.swift */; };
 		29CC293B1FF4266D006B6DE7 /* MessageViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CC293A1FF4266D006B6DE7 /* MessageViewControllerTests.swift */; };
 		29CC293D1FF4266D006B6DE7 /* MessageViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2904820B1FED90070053978C /* MessageViewController.framework */; };
 		29CC29441FF4267F006B6DE7 /* String+WordAtRangeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29CC29431FF4267F006B6DE7 /* String+WordAtRangeTests.swift */; };
@@ -50,6 +51,7 @@
 		2904821E1FED90340053978C /* UITextView+Prefixes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextView+Prefixes.swift"; sourceTree = "<group>"; };
 		29792B121FFAE7FC007A0C57 /* MessageTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageTextView.swift; sourceTree = "<group>"; };
 		29792B131FFAE7FC007A0C57 /* MessageAutocompleteController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageAutocompleteController.swift; sourceTree = "<group>"; };
+		29C8F9A8208BDAC60075931C /* ExpandedHitTestButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandedHitTestButton.swift; sourceTree = "<group>"; };
 		29CC29381FF4266D006B6DE7 /* MessageViewControllerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageViewControllerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		29CC293A1FF4266D006B6DE7 /* MessageViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewControllerTests.swift; sourceTree = "<group>"; };
 		29CC293C1FF4266D006B6DE7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -103,6 +105,7 @@
 				2904820F1FED90070053978C /* Info.plist */,
 				29792B131FFAE7FC007A0C57 /* MessageAutocompleteController.swift */,
 				29792B121FFAE7FC007A0C57 /* MessageTextView.swift */,
+				29C8F9A8208BDAC60075931C /* ExpandedHitTestButton.swift */,
 				290482181FED90340053978C /* MessageView.swift */,
 				2904820E1FED90070053978C /* MessageViewController.h */,
 				290482171FED90340053978C /* MessageViewController.swift */,
@@ -252,6 +255,7 @@
 				2904821F1FED90340053978C /* UIScrollView+StopScrolling.swift in Sources */,
 				29CC29471FF42687006B6DE7 /* String+WordAtRange.swift in Sources */,
 				290482271FED90340053978C /* UITextView+Prefixes.swift in Sources */,
+				29C8F9A9208BDAC60075931C /* ExpandedHitTestButton.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MessageViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

MessageViewController/ExpandedHitTestButton.swift

@@ -0,0 +1,18 @@
+//
+//  ExpandedHitTestButton.swift
+//  MessageViewController
+//
+//  Created by Ryan Nystrom on 4/21/18.
+//  Copyright © 2018 Ryan Nystrom. All rights reserved.
+//
+
+import UIKit
+
+internal final class ExpandedHitTestButton: UIButton {
+
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        guard isHidden == false, window != nil else { return false }
+        return bounds.insetBy(dx: -10, dy: -10).contains(point)
+    }
+
+}

MessageViewController/MessageAutocompleteController.swift

@@ -33,20 +33,24 @@ public final class MessageAutocompleteController: MessageTextViewListener {
     /// Adds an additional space after the autocompleted text when true. Default value is `TRUE`
     open var appendSpaceOnCompletion = true
 
-    /// The default text attributes
-    open var defaultTextAttributes: [NSAttributedStringKey: Any] = [.font: UIFont.preferredFont(forTextStyle: .body), .foregroundColor: UIColor.black]
-    
     /// The text attributes applied to highlighted substrings for each prefix
     private var autocompleteTextAttributes: [String: [NSAttributedStringKey: Any]] = [:]
 
     /// A key used for referencing which substrings were autocompletes
     private let NSAttributedAutocompleteKey = NSAttributedStringKey.init("com.messageviewcontroller.autocompletekey")
+
+    private var defaultTextAttributes: [NSAttributedStringKey: Any] {
+        return [
+            .font: textView.defaultFont,
+            .foregroundColor: textView.defaultTextColor,
+        ]
+    }
 
     /// A reference to `defaultTextAttributes` that adds the NSAttributedAutocompleteKey
     private var typingTextAttributes: [NSAttributedStringKey: Any] {
         var attributes = defaultTextAttributes
-        attributes[NSAttributedAutocompleteKey] = false
         attributes[.paragraphStyle] = paragraphStyle
+        attributes[NSAttributedAutocompleteKey] = false
         return attributes
     }
 
@@ -178,10 +182,17 @@ public final class MessageAutocompleteController: MessageTextViewListener {
     // MARK: Private API
 
     private func insertAutocomplete(_ autocomplete: String, at selection: Selection, for range: NSRange, keepPrefix: Bool) {
-        
-        // Apply the autocomplete attributes
-        var attrs = autocompleteTextAttributes[selection.prefix] ?? defaultTextAttributes
+        let defaultTypingTextAttributes = typingTextAttributes
+
+        var attrs = defaultTextAttributes
         attrs[NSAttributedAutocompleteKey] = true
+
+        if let autoAttrs = autocompleteTextAttributes[selection.prefix] {
+            for (k, v) in autoAttrs {
+                attrs[k] = v
+            }
+        }
+
         let newString = (keepPrefix ? selection.prefix : "") + autocomplete
         let newAttributedString = NSAttributedString(string: newString, attributes: attrs)
 
@@ -192,7 +203,7 @@ public final class MessageAutocompleteController: MessageTextViewListener {
         // Replace the attributedText with a modified version including the autocompete
         let newAttributedText = textView.attributedText.replacingCharacters(in: highlightedRange, with: newAttributedString)
         if appendSpaceOnCompletion {
-            newAttributedText.append(NSAttributedString(string: " ", attributes: typingTextAttributes))
+            newAttributedText.append(NSAttributedString(string: " ", attributes: defaultTypingTextAttributes))
         }
         textView.attributedText = newAttributedText
     }

MessageViewController/MessageTextView.swift

@@ -24,13 +24,24 @@ open class MessageTextView: UITextView, UITextViewDelegate {
         set {}
     }
 
+    open var defaultFont: UIFont? = UIFont.preferredFont(forTextStyle: .body)
+
+    open var defaultTextColor: UIColor? = .black
+
     open override var font: UIFont? {
         didSet {
+            defaultFont = font
             placeholderLabel.font = font
             placeholderLayoutDidChange()
         }
     }
 
+    open override var textColor: UIColor? {
+        didSet {
+            defaultTextColor = textColor
+        }
+    }
+
     open override var textAlignment: NSTextAlignment {
         didSet {
             placeholderLabel.textAlignment = textAlignment

MessageViewController/MessageView.swift

@@ -13,12 +13,11 @@ public final class MessageView: UIView, MessageTextViewListener {
     public let textView = MessageTextView()
 
     internal weak var delegate: MessageViewDelegate?
-    internal let leftButton = UIButton()
-    internal let rightButton = UIButton()
+    internal let leftButton = ExpandedHitTestButton()
+    internal let rightButton = ExpandedHitTestButton()
     internal let UITextViewContentSizeKeyPath = #keyPath(UITextView.contentSize)
     internal let topBorderLayer = CALayer()
     internal var contentView: UIView?
-    internal var leftButtonAction: Selector?
     internal var rightButtonAction: Selector?
     internal var leftButtonInset: CGFloat = 0
     internal var rightButtonInset: CGFloat = 0
@@ -111,7 +110,7 @@ public final class MessageView: UIView, MessageTextViewListener {
         }
     }
 
-    public var inset: UIEdgeInsets {
+    public var textViewInset: UIEdgeInsets {
         set {
             textView.textContainerInset = newValue
             setNeedsLayout()
@@ -206,7 +205,6 @@ public final class MessageView: UIView, MessageTextViewListener {
         switch position {
         case .left:
             button = leftButton
-            leftButtonAction = action
         case .right:
             button = rightButton
             rightButtonAction = action
@@ -242,6 +240,12 @@ public final class MessageView: UIView, MessageTextViewListener {
         buttonLayoutDidChange(button: button)
     }
 
+    public var bottomInset: CGFloat = 0 {
+        didSet {
+            delegate?.wantsLayout(messageView: self)
+        }
+    }
+
     // MARK: Overrides
 
     public override func layoutSubviews() {
@@ -270,36 +274,36 @@ public final class MessageView: UIView, MessageTextViewListener {
 
         // adjust by bottom offset so content is flush w/ text view
         let leftButtonFrame = CGRect(
-            x: safeBounds.minX + inset.left,
-            y: textViewMaxY - leftButtonSize.height + leftButton.bottomHeightOffset - inset.bottom,
+            x: safeBounds.minX + leftButtonInset,
+            y: textViewMaxY - leftButtonSize.height + leftButton.bottomHeightOffset - textViewInset.bottom,
             width: leftButtonSize.width,
             height: leftButtonSize.height
         )
         leftButton.frame = showLeftButton ? leftButtonFrame : .zero
 
+        let leftButtonMaxX = (showLeftButton ? leftButtonFrame.maxX : 0)
         let textViewFrame = CGRect(
-            x: leftButtonFrame.maxX + leftButtonInset,
+            x: (showLeftButton ? leftButtonMaxX + leftButtonInset : 0),
             y: textViewY,
-            width: safeBounds.width - leftButtonFrame.maxX - rightButtonSize.width - rightButtonInset - inset.right,
+            width: safeBounds.width - leftButtonMaxX - rightButtonSize.width - rightButtonInset,
             height: textViewHeight
         )
         textView.frame = textViewFrame
 
         // adjust by bottom offset so content is flush w/ text view
         let rightButtonFrame = CGRect(
-            x: textViewFrame.maxX + rightButtonInset,
-            y: textViewMaxY - rightButtonSize.height + rightButton.bottomHeightOffset - inset.bottom,
+            x: textViewFrame.maxX,
+            y: textViewMaxY - rightButtonSize.height + rightButton.bottomHeightOffset - textViewInset.bottom,
             width: rightButtonSize.width,
             height: rightButtonSize.height
         )
         rightButton.frame = rightButtonFrame
 
-        let contentY = textViewFrame.maxY + inset.bottom
         contentView?.frame = CGRect(
             x: safeBounds.minX,
-            y: contentY,
+            y: textViewFrame.maxY,
             width: safeBounds.width,
-            height: bounds.height - contentY - util_safeAreaInsets.bottom
+            height: contentView?.frame.height ?? 0
         )
     }
 
@@ -316,7 +320,9 @@ public final class MessageView: UIView, MessageTextViewListener {
     // MARK: Private API
 
     internal var height: CGFloat {
-        return textViewHeight + (contentView?.bounds.height ?? 0)
+        return textViewHeight
+            + (contentView?.bounds.height ?? 0)
+            + bottomInset
     }
 
     internal var maxLineHeight: CGFloat {