修复监听点击事件问题

lixiang1994 · Jul 7, 2020 · 7d1b4cd · 7d1b4cd
1 parent d82df3b
commit 7d1b4cd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/Sources/Action.swift b/Sources/Action.swift
@@ -44,6 +44,12 @@ extension AttributedString {
             self.highlights = highlights
             self.callback = callback
         }
+
+        init(_ trigger: Trigger = .click, highlights: [Highlight] = .defalut) {
+            self.trigger = trigger
+            self.highlights = highlights
+            self.callback = { _ in }
+        }
     }
 }
 

diff --git a/Sources/Extension/AppKit/NSTextFieldExtension.swift b/Sources/Extension/AppKit/NSTextFieldExtension.swift
@@ -98,7 +98,11 @@ extension AttributedStringWrapper where Base: NSTextField {
 
             default:
                 guard let value = observation[type] else { return }
-                base.actions[range] = .init(.click, highlights: value.0) { _ in value.1(result) }
+                var action = Action(.click, highlights: value.0)
+                action.handle = {
+                    value.1(result)
+                }
+                base.actions[range] = action
             }
         }
     }

diff --git a/Sources/Extension/UIKit/UILabelExtension.swift b/Sources/Extension/UIKit/UILabelExtension.swift
@@ -127,7 +127,11 @@ extension AttributedStringWrapper where Base: UILabel {
 
             default:
                 guard let value = observation[type] else { return }
-                base.actions[range] = .init(.click, highlights: value.0) { _ in value.1(result) }
+                var action = Action(.click, highlights: value.0)
+                action.handle = {
+                    value.1(result)
+                }
+                base.actions[range] = action
             }
         }
     }

diff --git a/Sources/Extension/UIKit/UITextViewExtension.swift b/Sources/Extension/UIKit/UITextViewExtension.swift
@@ -97,7 +97,11 @@ extension AttributedStringWrapper where Base: UITextView {
 
             default:
                 guard let value = observation[type] else { return }
-                base.actions[range] = .init(.click, highlights: value.0) { _ in value.1(result) }
+                var action = Action(.click, highlights: value.0)
+                action.handle = {
+                    value.1(result)
+                }
+                base.actions[range] = action
             }
         }
     }