Fix Alert Button not triggering

References #11
divadretlaw · Nov 16, 2023 · 4d5973f · 4d5973f
1 parent 7ecb679
commit 4d5973f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Sources/CustomAlert/AlertButtonStyle.swift b/Sources/CustomAlert/AlertButtonStyle.swift
@@ -32,10 +32,6 @@ public struct AlertButtonStyle: ButtonStyle {
         .padding(buttonConfiguration.padding)
         .frame(maxHeight: maxHeight)
         .background(background(configuration: configuration))
-        .simultaneousGesture(TapGesture().onEnded { _ in
-            guard isEnabled else { return }
-            isPresented = false
-        })
     }
 
     @ViewBuilder

diff --git a/Sources/CustomAlert/Views/CustomAlert.swift b/Sources/CustomAlert/Views/CustomAlert.swift
@@ -109,7 +109,7 @@ struct CustomAlert<Content, Actions>: View where Content: View, Actions: View {
             .frame(height: height)
 
             _VariadicView.Tree(ContentLayout(), content: actions)
-                .buttonStyle(.alert(isPresented: $isPresented))
+                .modifier(AlertButton(isPresented: $isPresented))
                 .captureSize($actionsSize)
         }
         .frame(minWidth: minWidth, maxWidth: maxWidth)
@@ -136,6 +136,20 @@ struct ContentLayout: _VariadicView_ViewRoot {
     }
 }
 
+private struct AlertButton: ViewModifier {
+    @Environment(\.isEnabled) var isEnabled
+    @Binding var isPresented: Bool
+
+    func body(content: Content) -> some View {
+        content
+            .simultaneousGesture(TapGesture().onEnded { _ in
+                guard isEnabled else { return }
+                isPresented = false
+            }, including: .all)
+            .buttonStyle(.alert(isPresented: $isPresented))
+    }
+}
+
 struct CustomAlert_Previews: PreviewProvider {
     static var previews: some View {
         CustomAlert(title: Text("Preview"), isPresented: .constant(true)) {