完成Action的高亮和触发方式支持, 修复UILabel点击计算错误的问题.

Author: lixiang1994

Demo/Demo/Details/ActionViewController.swift

@@ -28,7 +28,17 @@ class ActionViewController: UIViewController {
             }
         }
 
-        let action = AttributedString.Action(.press, highlights: .defalut) { (result) in
+        func press(_ result: AttributedString.Action.Result) {
+            switch result.content {
+            case .string(let value):
+                print("按住了文本: \n\(value) \nrange: \(result.range)")
+                
+            case .attachment(let value):
+                print("按住了附件: \n\(value) \nrange: \(result.range)")
+            }
+        }
+        
+        let action = AttributedString.Action(.press, highlights: [.background(#colorLiteral(red: 0.5568627715, green: 0.3529411852, blue: 0.9686274529, alpha: 1))]) { (result) in
             switch result.content {
             case .string(let value):
                 print("点击了文本: \n\(value) \nrange: \(result.range)")
@@ -43,7 +53,9 @@ class ActionViewController: UIViewController {
         
         This is a picture -> \(.image(#imageLiteral(resourceName: "huaji"), .custom(size: .init(width: 100, height: 100))), action: click) -> Displayed in custom size.
         
-        This is \("Long Press", .font(.systemFont(ofSize: 30)), .action(action))
+        This is \("Long Press", .font(.systemFont(ofSize: 30)), .action(.press, press))
+        
+        Please long press -> \(.image(#imageLiteral(resourceName: "swift-icon"), .original(.center)), action: action)
         
         """
 
@@ -52,7 +64,10 @@ class ActionViewController: UIViewController {
         
         This is a picture -> \(.image(#imageLiteral(resourceName: "huaji"), .custom(size: .init(width: 100, height: 100))), action: click) -> Displayed in custom size.
         
-        This is \("Long Press", .font(.systemFont(ofSize: 30)), .action(action))
+        This is \("Long Press", .font(.systemFont(ofSize: 30)), .action(.press, press))
+        
+        Please long press -> \(.image(#imageLiteral(resourceName: "swift-icon"), .original(.center)), action: action)
+        
         """
     }
 }

README.md

@@ -186,13 +186,13 @@ let e: AttributedString = "\("lee", .action(click))"
 let f: AttributedString = "\(.image(image), action: click)"
 
 // More information. 
-func click(_ action: AttributedString.Action) {
-    switch action.content {
+func click(_ result: AttributedString.Action.Result) {
+    switch result.content {
     case .string(let value):
-       	print("Currently clicked text: \(value) range: \(action.range)")
+       	print("Currently clicked text: \(value) range: \(result.range)")
 
     case .attachment(let value):
-	print("Currently clicked attachment: \(value) range: \(action.range)")
+        print("Currently clicked attachment: \(value) range: \(result.range)")
     }
 }
 

README_CN.md

@@ -186,13 +186,13 @@ let e: AttributedString = "\("lee", .action(click))"
 let f: AttributedString = "\(.image(image), action: click)"
 
 // 获取更多信息 
-func click(_ action: AttributedString.Action) {
-    switch action.content {
+func click(_ result: AttributedString.Action.Result) {
+    switch result.content {
     case .string(let value):
-        print("点击了文本: \(value) range: \(action.range)")
+        print("点击了文本: \(value) range: \(result.range)")
 
     case .attachment(let value):
-        print("点击了附件: \(value) range: \(action.range)")
+        print("点击了附件: \(value) range: \(result.range)")
     }
 }
 

Sources/Action.swift

@@ -77,6 +77,7 @@ extension AttributedString.Action.Result {
 extension AttributedString.Attribute {
 
     public typealias Action = AttributedString.Action
+    public typealias Trigger = Action.Trigger
     public typealias Highlight = Action.Highlight
     public typealias Result = Action.Result
 
@@ -89,6 +90,10 @@ extension AttributedString.Attribute {
         return .init(attributes: [.action: Action(with: value)])
     }
 
+    public static func action(_ trigger: Trigger, _ closure: @escaping (Result) -> Void) -> Self {
+        return .init(attributes: [.action: Action(trigger, with: closure)])
+    }
+    
     public static func action(_ highlights: [Highlight], _ closure: @escaping (Result) -> Void) -> Self {
         return .init(attributes: [.action: Action(highlights: highlights, with: closure)])
     }
@@ -123,11 +128,24 @@ extension AttributedString {
     public init(_ attachment: Attachment, action: @escaping (Action.Result) -> Void) {
         self.value = AttributedString(attachment.value, action: action).value
     }
+    
+    public init<T: NSTextAttachment>(_ attachment: T, action: Action) {
+        self.value = AttributedString(.init(attachment: attachment), .action(action)).value
+    }
+    
+    public init(_ attachment: ImageTextAttachment, action: Action) {
+        self.value = AttributedString(.init(attachment: attachment), .action(action)).value
+    }
+    
+    public init(_ attachment: Attachment, action: Action) {
+        self.value = AttributedString(attachment.value, action: action).value
+    }
 }
 
 extension AttributedStringInterpolation {
 
-    public typealias Result = AttributedString.Action.Result
+    public typealias Action = AttributedString.Action
+    public typealias Result = Action.Result
 
     public mutating func appendInterpolation(_ value: ImageTextAttachment, action: @escaping () -> Void) {
         self.value.append(AttributedString(.init(attachment: value), .action(action)).value)
@@ -144,6 +162,14 @@ extension AttributedStringInterpolation {
     public mutating func appendInterpolation(_ value: Attachment, action: @escaping (Result) -> Void) {
         self.value.append(AttributedString(.init(attachment: value.value), .action(action)).value)
     }
+    
+    public mutating func appendInterpolation(_ value: ImageTextAttachment, action: Action) {
+        self.value.append(AttributedString(.init(attachment: value), .action(action)).value)
+    }
+    
+    public mutating func appendInterpolation(_ value: Attachment, action: Action) {
+        self.value.append(AttributedString(.init(attachment: value.value), .action(action)).value)
+    }
 }
 
 extension AttributedString.Action.Highlight {

Sources/Extension/AppKit/NSTextFieldExtension.swift

@@ -23,7 +23,14 @@ extension AttributedStringWrapper where Base: NSTextField {
     public var string: AttributedString {
         get { AttributedString(base.attributedStringValue) }
         set {
-            base.attributedStringValue = newValue.value
+            base.attributedStringValue = AttributedString(
+                newValue.value,
+                .font(base.font!),
+                .paragraph(
+                    .alignment(base.alignment),
+                    .baseWritingDirection(base.baseWritingDirection)
+                )
+            ).value
 
             setupGestureRecognizers()
         }
@@ -143,10 +150,7 @@ fileprivate extension NSTextField {
     }
 
     func matching(_ point: CGPoint) -> (NSRange, Action)? {
-        // 同步NSTextField默认样式 使用嵌入包装模式 防止原有富文本样式被覆盖
-        let attributedString: AttributedString = """
-        \(wrap: .embedding(.init(attributedStringValue)), with: [.font(font!), .paragraph(.alignment(alignment), .baseWritingDirection(baseWritingDirection))])
-        """
+        let attributedString = AttributedString(attributedStringValue)
 
         // 构建同步Label设置的TextKit
         let textStorage = NSTextStorage(attributedString: attributedString.value)

Sources/Extension/UIKit/UILabelExtension.swift

@@ -23,11 +23,17 @@ extension UILabel: AttributedStringCompatible {
 }
 
 extension AttributedStringWrapper where Base: UILabel {
-
+    
     public var text: AttributedString? {
         get { AttributedString(base.attributedText) }
         set {
-            base.attributedText = newValue?.value
+            base.attributedText = nil
+            // UILabel 需要先将attributedText置为空 才能拿到真实的默认字体与对齐方式等
+            base.attributedText = AttributedString(
+                newValue?.value,
+                .font(base.font),
+                .paragraph(.alignment(base.textAlignment))
+            )?.value
 
             #if os(iOS)
             setupGestureRecognizers()
@@ -138,11 +144,7 @@ fileprivate extension UILabel {
     }
 
     func matching(_ point: CGPoint) -> (NSRange, Action)? {
-        guard let attributedText = attributedText else { return nil }
-        // 同步Label默认样式 使用嵌入包装模式 防止原有富文本样式被覆盖
-        let attributedString: AttributedString = """
-        \(wrap: .embedding(.init(attributedText)), with: [.font(font), .paragraph(.alignment(textAlignment))])
-        """
+        guard let attributedString = AttributedString(attributedText) else { return nil }
 
         // 构建同步Label设置的TextKit
         let textStorage = NSTextStorage(attributedString: attributedString.value)