DiffableTextField now better matches the behavior of SwiftUI.TextField: triggers now stack, and submit actions now automatically dismisses the keyboard.

Author: oscbyspro

Sources/DiffableTextKit/Support/Trigger.swift

@@ -0,0 +1,55 @@
+//=----------------------------------------------------------------------------=
+// This source file is part of the DiffableTextViews open source project.
+//
+// Copyright (c) 2022 Oscar Byström Ericsson
+// Licensed under Apache License, Version 2.0
+//
+// See http://www.apache.org/licenses/LICENSE-2.0 for license information.
+//=----------------------------------------------------------------------------=
+
+//*============================================================================*
+// MARK: * Trigger
+//*============================================================================*
+
+public struct Trigger<Context> {
+    
+    //=------------------------------------------------------------------------=
+    // MARK: State
+    //=------------------------------------------------------------------------=
+    
+    @usableFromInline var action: (Context) -> Void
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Initializers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable public init(_ action: @escaping (Context) -> Void = { _ in }) {
+        self.action = action
+    }
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Utilities
+    //=------------------------------------------------------------------------=
+    
+    @inlinable public func callAsFunction(_ context: Context) {
+        self.action(context)
+    }
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Transformations
+    //=------------------------------------------------------------------------=
+    
+    @inlinable public mutating func append(_ other: Self) {
+        self.action = { [self] context in
+            //=----------------------------------=
+            // MARK: Call This Then Other
+            //=----------------------------------=
+            self .action(context)
+            other.action(context)
+        }
+    }
+    
+    @inlinable public static func += (lhs: inout Self, rhs: Self) {
+        lhs.append(rhs)
+    }
+}

Sources/DiffableTextViewsXUIKit/DiffableTextField.swift

@@ -108,22 +108,6 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
             self.downstream.transform(environment.diffableTextField_onUpdate)
         }
 
-        //=--------------------------------------------------------------------=
-        // MARK: Events
-        //=--------------------------------------------------------------------=
-
-        @inlinable public func textFieldDidBeginEditing(_ textField: UITextField) {
-            synchronize()
-        }
-        
-        @inlinable public func textFieldDidEndEditing(_ textField: UITextField) {
-            synchronize()
-        }
-        
-        @inlinable public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
-            downstream.transform(environment.diffableTextField_onSubmit); return  true
-        }
-        
         //=--------------------------------------------------------------------=
         // MARK: Events
         //=--------------------------------------------------------------------=
@@ -178,6 +162,24 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
             }
         }
 
+        //=--------------------------------------------------------------------=
+        // MARK: Events
+        //=--------------------------------------------------------------------=
+
+        @inlinable public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+            downstream.transform(environment.diffableTextField_onSubmit)
+            downstream.wrapped.resignFirstResponder()
+            return true
+        }
+        
+        @inlinable public func textFieldDidBeginEditing(_ textField: UITextField) {
+            synchronize()
+        }
+        
+        @inlinable public func textFieldDidEndEditing(_ textField: UITextField) {
+            synchronize()
+        }
+        
         //=--------------------------------------------------------------------=
         // MARK: Synchronization
         //=--------------------------------------------------------------------=
@@ -232,22 +234,24 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
 // MARK: * DiffableTextField x ID
 //*============================================================================*
 
-public struct DiffableTextFieldID { public static let diffableTextField = Self() }
+public struct DiffableTextFieldID {
+    public static let diffableTextField = Self()
+}
 
 //*============================================================================*
 // MARK: * DiffableTextField x Environment
 //*============================================================================*
 
-@usableFromInline enum DiffableTextField_OnSetup:  EnvironmentKey {
-    @usableFromInline static let defaultValue: (ProxyTextField) -> Void = { _ in }
+@usableFromInline enum DiffableTextField_OnSetup: EnvironmentKey {
+    @usableFromInline static let defaultValue = Trigger<ProxyTextField>()
 }
 
 @usableFromInline enum DiffableTextField_OnUpdate: EnvironmentKey {
-    @usableFromInline static let defaultValue: (ProxyTextField) -> Void = { _ in }
+    @usableFromInline static let defaultValue = Trigger<ProxyTextField>()
 }
 
 @usableFromInline enum DiffableTextField_OnSubmit: EnvironmentKey {
-    @usableFromInline static let defaultValue: (ProxyTextField) -> Void = { _ in }
+    @usableFromInline static let defaultValue = Trigger<ProxyTextField>()
 }
 
 //*============================================================================*
@@ -260,19 +264,19 @@ extension EnvironmentValues {
     // MARK: Accessors
     //=------------------------------------------------------------------------=
 
-    @inlinable var diffableTextField_onSetup:  (ProxyTextField) -> Void {
-        get { self[DiffableTextField_OnSetup .self] }
-        set { self[DiffableTextField_OnSetup .self] = newValue }
+    @inlinable var diffableTextField_onSetup: Trigger<ProxyTextField> {
+        get { self[DiffableTextField_OnSetup.self] }
+        set { self[DiffableTextField_OnSetup.self] += newValue }
     }
 
-    @inlinable var diffableTextField_onUpdate: (ProxyTextField) -> Void {
+    @inlinable var diffableTextField_onUpdate: Trigger<ProxyTextField> {
         get { self[DiffableTextField_OnUpdate.self] }
-        set { self[DiffableTextField_OnUpdate.self] = newValue }
+        set { self[DiffableTextField_OnUpdate.self] += newValue }
     }
 
-    @inlinable var diffableTextField_onSubmit: (ProxyTextField) -> Void {
+    @inlinable var diffableTextField_onSubmit: Trigger<ProxyTextField> {
         get { self[DiffableTextField_OnSubmit.self] }
-        set { self[DiffableTextField_OnSubmit.self] = newValue }
+        set { self[DiffableTextField_OnSubmit.self] += newValue }
     }
 }
 
@@ -286,19 +290,19 @@ public extension View {
     // MARK: Transformations
     //=------------------------------------------------------------------------=
 
-    @inlinable func onSetup(of  view: DiffableTextFieldID,
+    @inlinable func onSetup(of view: DiffableTextFieldID,
     _ action: @escaping (ProxyTextField) -> Void) -> some View {
-        environment(\.diffableTextField_onSetup,  action)
+        environment(\.diffableTextField_onSetup, Trigger(action))
     }
 
     @inlinable func onUpdate(of view: DiffableTextFieldID,
     _ action: @escaping (ProxyTextField) -> Void) -> some View {
-        environment(\.diffableTextField_onUpdate, action)
+        environment(\.diffableTextField_onUpdate, Trigger(action))
     }
 
     @inlinable func onSubmit(of view: DiffableTextFieldID,
     _ action: @escaping (ProxyTextField) -> Void) -> some View {
-        environment(\.diffableTextField_onSubmit, action)
+        environment(\.diffableTextField_onSubmit, Trigger(action))
     }
 }
 

Sources/DiffableTextViewsXUIKit/Helpers/Downstream.swift

@@ -18,12 +18,14 @@ import UIKit
 
 @usableFromInline final class Downstream {
     @usableFromInline typealias Position = DiffableTextKit.Position<UTF16>
-    
+    @usableFromInline typealias Proxy = DiffableTextKitXUIKit.ProxyTextField
+    @usableFromInline typealias Wrapped = DiffableTextKitXUIKit.BasicTextField
+
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    @usableFromInline var wrapped = BasicTextField()
+    @usableFromInline var wrapped = Wrapped()
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
@@ -63,8 +65,12 @@ import UIKit
         wrapped.selectedTextRange = offsets(selection)
     }
 
-    @inlinable func transform(_ transform: (ProxyTextField) -> Void) {
-        transform(ProxyTextField(wrapped))
+    @inlinable func transform(_ transform: Trigger<Proxy>) {
+        transform(Proxy(wrapped))
+    }
+    
+    @inlinable func transform(_ transform: (Proxy) -> Void) {
+        transform(Proxy(wrapped))
     }
 
     //=------------------------------------------------------------------------=