Refactor event binding preference key

Author: carson-katri

Sources/LiveViewNative/BuiltinRegistry+applyBinding.swift

@@ -8,47 +8,56 @@
 import SwiftUI
 import LiveViewNativeCore
 
+public enum _EventBinding: String {
+    case windowFocus = "phx-window-focus"
+    case windowBlur = "phx-window-blur"
+    case focus = "phx-focus"
+    case blur = "phx-blur"
+    case click = "phx-click"
+}
+
 extension BuiltinRegistry {
     @ViewBuilder
     static func applyBinding(
-        _ binding: AttributeName,
+        _ binding: _EventBinding,
         event: String,
         value: Payload,
         to view: some View,
         element: ElementNode
     ) -> some View {
         ProvidedBindingsReader(
-            binding: binding.rawValue,
+            binding: binding,
             content: view
         ) {
             switch binding {
-            case "phx-window-focus":
+            case .windowFocus:
                 ScenePhaseObserver(content: view, target: .active, type: "focus", event: event, value: value)
-            case "phx-window-blur":
+            case .windowBlur:
                 ScenePhaseObserver(content: view, target: .background, type: "blur", event: event, value: value)
-            case "phx-focus":
+            case .focus:
                 FocusObserver(content: view, target: true, type: "focus", event: event, value: value)
-            case "phx-blur":
+            case .blur:
                 FocusObserver(content: view, target: false, type: "blur", event: event, value: value)
-            case "phx-click":
+            case .click:
                 TapGestureView(content: view, type: "click", event: event, value: value)
-            default:
-                view
             }
         }
     }
 }
 
 /// A preference key that specifies what bindings the View handles internally.
 public enum _ProvidedBindingsKey: PreferenceKey {
-    public static var defaultValue: Set<String> { [] }
-    public static func reduce(value: inout Set<String>, nextValue: () -> Set<String>) {
+    public static var defaultValue: Set<_EventBinding> { [] }
+    public static func reduce(
+        value: inout Set<_EventBinding>,
+        nextValue: () -> Set<_EventBinding>
+    ) {
         value = nextValue()
     }
 }
 
 fileprivate struct ProvidedBindingsReader<Content: View, ApplyBinding: View>: View {
-    let binding: String
+    let binding: _EventBinding
     let content: Content
     @ViewBuilder let applyBinding: () -> ApplyBinding
     @State private var providesBinding: Bool = false

Sources/LiveViewNative/ViewTree.swift

@@ -89,10 +89,12 @@ struct ViewTreeBuilder<R: RootRegistry> {
         context: LiveContextStorage<R>
     ) -> some View {
         view.applyBindings(
-            element.attributes.filter({
-                $0.name.namespace == nil
-                    && $0.name.name.hasPrefix("phx-")
-                    && $0.value != nil
+            element.attributes.compactMap({
+                guard $0.name.namespace == nil,
+                      $0.value != nil,
+                      let name = _EventBinding(rawValue: $0.name.name)
+                else { return nil }
+                return (name, $0)
             })[...],
             element: element,
             context: context
@@ -200,7 +202,7 @@ extension EnvironmentValues {
 
 private struct BindingApplicator<Parent: View, R: RootRegistry>: View {
     let parent: Parent
-    let bindings: ArraySlice<LiveViewNativeCore.Attribute>
+    let bindings: ArraySlice<(_EventBinding, LiveViewNativeCore.Attribute)>
     let element: ElementNode
     let context: LiveContextStorage<R>
 
@@ -209,8 +211,8 @@ private struct BindingApplicator<Parent: View, R: RootRegistry>: View {
         // force-unwrap is okay, this view is never constructed with an empty slice
         let binding = bindings.first!
         BuiltinRegistry<R>.applyBinding(
-            binding.name,
-            event: binding.value!,
+            binding.0,
+            event: binding.1.value!,
             value: element.buildPhxValuePayload(),
             to: parent,
             element: element
@@ -238,7 +240,11 @@ private struct ModifierApplicator<Parent: View, R: RootRegistry>: View {
 
 extension View {
     @ViewBuilder
-    func applyBindings<R: RootRegistry>(_ bindings: ArraySlice<LiveViewNativeCore.Attribute>, element: ElementNode, context: LiveContextStorage<R>) -> some View {
+    func applyBindings<R: RootRegistry>(
+        _ bindings: ArraySlice<(_EventBinding, LiveViewNativeCore.Attribute)>,
+        element: ElementNode,
+        context: LiveContextStorage<R>
+    ) -> some View {
         if bindings.isEmpty {
             self
         } else {

Sources/LiveViewNative/Views/Controls and Indicators/Buttons/Button.swift

@@ -53,7 +53,7 @@ public struct Button<Root: RootRegistry>: View {
         SwiftUI.Button(role: role, action: self.handleClick) {
             $liveElement.children()
         }
-        .preference(key: _ProvidedBindingsKey.self, value: ["phx-click"])
+        .preference(key: _ProvidedBindingsKey.self, value: [.click])
     }
 
     private func handleClick() {

Sources/LiveViewNative/Views/Controls and Indicators/Buttons/PasteButton.swift

@@ -49,7 +49,7 @@ struct PasteButton<Root: RootRegistry>: View {
         SwiftUI.PasteButton(payloadType: String.self) { strings in
             click(value: ["value": strings]) {}
         }
-            .preference(key: _ProvidedBindingsKey.self, value: ["phx-click"])
+        .preference(key: _ProvidedBindingsKey.self, value: [.click])
         #endif
     }
 }

Sources/LiveViewNative/Views/Text Input and Output/SecureField.swift

@@ -53,7 +53,7 @@ struct SecureField<Root: RootRegistry>: TextFieldProtocol {
         }
             .focused($isFocused)
             .onChange(of: isFocused, perform: handleFocus)
-            .preference(key: _ProvidedBindingsKey.self, value: ["phx-focus", "phx-blur"])
+            .preference(key: _ProvidedBindingsKey.self, value: [.focus, .blur])
     }
 
     @MainActor

Sources/LiveViewNative/Views/Text Input and Output/TextEditor.swift

@@ -39,7 +39,7 @@ struct TextEditor<Root: RootRegistry>: TextFieldProtocol {
         SwiftUI.TextEditor(text: textBinding)
             .focused($isFocused)
             .onChange(of: isFocused, perform: handleFocus)
-            .preference(key: _ProvidedBindingsKey.self, value: ["phx-focus", "phx-blur"])
+            .preference(key: _ProvidedBindingsKey.self, value: [.focus, .blur])
 #endif
     }
 

Sources/LiveViewNative/Views/Text Input and Output/TextField.swift

@@ -141,7 +141,7 @@ struct TextField<Root: RootRegistry>: TextFieldProtocol {
         field
             .focused($isFocused)
             .onChange(of: isFocused, perform: handleFocus)
-            .preference(key: _ProvidedBindingsKey.self, value: ["phx-focus", "phx-blur"])
+            .preference(key: _ProvidedBindingsKey.self, value: [.focus, .blur])
     }
 
     @MainActor