优化UILabel点击计算, 修复换行符问题

Author: lixiang1994

AttributedString.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "AttributedString"
-s.version      = "1.6.7"
+s.version      = "1.6.8"
 s.summary      = "基于Swift字符串插值快速构建你想要的富文本, 支持点击按住等事件获取, 支持多种类型过滤"
 
 s.homepage     = "https://github.com/lixiang1994/AttributedString"

AttributedString.xcodeproj/project.pbxproj

@@ -838,7 +838,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.attributedstring.watchos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = watchos;
@@ -866,7 +866,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.attributedstring.watchos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = watchos;
@@ -893,7 +893,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.attributedstring.tvos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = appletvos;
@@ -920,7 +920,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.attributedstring.tvos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = appletvos;
@@ -996,7 +996,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring.macos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = macosx;
@@ -1023,7 +1023,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring.macos;
 				PRODUCT_NAME = AttributedString;
 				SDKROOT = macosx;
@@ -1170,7 +1170,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring.ios;
 				PRODUCT_NAME = AttributedString;
 				SKIP_INSTALL = YES;
@@ -1199,7 +1199,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.7;
+				MARKETING_VERSION = 1.6.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring.ios;
 				PRODUCT_NAME = AttributedString;
 				SKIP_INSTALL = YES;

Demo/Demo/Debug/DebugLabelViewController.swift

@@ -22,7 +22,6 @@ class DebugLabelViewController: ViewController<DebugLabelView> {
     private var attributedString: AttributedString = """
     我的名字叫李响，我的手机号码是18611401994，我的电子邮件地址是18611401994@163.com，现在是2020/06/28 20:30。我的GitHub主页是https://github.com/lixiang1994。欢迎来Star! \("点击联系我", .action({ }))
     """
-
 
     override func viewDidLoad() {
         super.viewDidLoad()

Sources/Extension/UIKit/UILabel/UILabelLayoutManagerDelegate.swift

@@ -137,6 +137,15 @@ extension UILabelLayoutManagerDelegate {
     }
 
     private func getMaximum(_ layoutManager: NSLayoutManager, with textStorage: NSTextStorage, for glyphRange: NSRange) -> Maximum? {
+        // 排除换行符, 系统不用它计算行.
+        var glyphRange = glyphRange
+        if glyphRange.length > 1 {
+            let property = layoutManager.propertyForGlyph(at: glyphRange.location + glyphRange.length - 1)
+            if property == .controlCharacter {
+                glyphRange = .init(location: glyphRange.location, length: glyphRange.length - 1)
+            }
+        }
+        
         let characterRange = layoutManager.characterRange(forGlyphRange: glyphRange, actualGlyphRange: nil)
 
         var maximumLineHeightFont: UIFont?