From 8a595cc669461bb89fb9209b1b5213e66a65690e Mon Sep 17 00:00:00 2001
From: crow <david.crow@airship.com>
Date: Thu, 19 Sep 2024 12:19:47 -0700
Subject: [PATCH] Revert "Fix button tap events from bleeding through to
 container"

This reverts commit c81b08fb6cffff159a70e4125fa87ead45891254.
---
 .../AirshipCore/Source/AirshipButton.swift    | 24 +------------------
 Airship/AirshipCore/Source/ImageButton.swift  |  3 +--
 Airship/AirshipCore/Source/LabelButton.swift  |  3 +--
 .../AirshipCore/Source/ViewExtensions.swift   | 11 +--------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/Airship/AirshipCore/Source/AirshipButton.swift b/Airship/AirshipCore/Source/AirshipButton.swift
index d772d10db..cdfe8d871 100644
--- a/Airship/AirshipCore/Source/AirshipButton.swift
+++ b/Airship/AirshipCore/Source/AirshipButton.swift
@@ -16,10 +16,10 @@ struct AirshipButton<Label> : View  where Label : View {
     let reportingMetadata: AirshipJSON?
     let description: String
     let clickBehaviors:[ButtonClickBehavior]?
-    let eventHandlers: [EventHandler]?
     let actions: ActionsPayload?
     let label: () -> Label
 
+
     var body: some View {
 
         Button(
@@ -111,28 +111,6 @@ struct AirshipButton<Label> : View  where Label : View {
         if let actions = actions {
             thomasEnvironment.runActions(actions, layoutState: layoutState)
         }
-
-        applyEventHandlers(type: .tap)
-    }
-
-    private func applyEventHandlers(type: EventHandlerType) {
-        self.eventHandlers?.forEach { eventHandler in
-            if eventHandler.type == type {
-                eventHandler.stateActions.forEach { action in
-                    switch action {
-                    case .setState(let details):
-                        viewState.updateState(
-                            key: details.key,
-                            value: details.value?.unWrap()
-                        )
-                    case .clearState:
-                        viewState.clearState()
-                    case .formValue(_):
-                        AirshipLogger.error("Unable to process form value")
-                    }
-                }
-            }
-        }
     }
 }
 
diff --git a/Airship/AirshipCore/Source/ImageButton.swift b/Airship/AirshipCore/Source/ImageButton.swift
index e4ed24d19..1ad5048b5 100644
--- a/Airship/AirshipCore/Source/ImageButton.swift
+++ b/Airship/AirshipCore/Source/ImageButton.swift
@@ -24,7 +24,6 @@ struct ImageButton : View {
             reportingMetadata: self.model.reportingMetadata,
             description: self.model.contentDescription ?? self.model.identifier,
             clickBehaviors: self.model.clickBehaviors,
-            eventHandlers: self.model.eventHandlers,
             actions: self.model.actions
         ) {
             makeInnerButton()
@@ -33,7 +32,7 @@ struct ImageButton : View {
                 .border(self.model.border)
                 .accessible(self.model)
         }
-        .commonButton(self.model)
+        .common(self.model)
         .environment(
             \.layoutState,
              layoutState.override(
diff --git a/Airship/AirshipCore/Source/LabelButton.swift b/Airship/AirshipCore/Source/LabelButton.swift
index ac9339b36..c23b68aed 100644
--- a/Airship/AirshipCore/Source/LabelButton.swift
+++ b/Airship/AirshipCore/Source/LabelButton.swift
@@ -21,7 +21,6 @@ struct LabelButton : View {
             reportingMetadata: self.model.reportingMetadata,
             description: self.model.contentDescription ?? self.model.label.text,
             clickBehaviors: self.model.clickBehaviors,
-            eventHandlers: self.model.eventHandlers,
             actions: self.model.actions
         ) {
             Label(model: self.model.label, constraints: constraints)
@@ -37,7 +36,7 @@ struct LabelButton : View {
                 .border(self.model.border)
                 .accessible(self.model)
         }
-        .commonButton(self.model)
+        .common(self.model)
         .buttonStyle(PlainButtonStyle())
         .environment(
             \.layoutState,
diff --git a/Airship/AirshipCore/Source/ViewExtensions.swift b/Airship/AirshipCore/Source/ViewExtensions.swift
index 8ab2e036f..7f024b603 100644
--- a/Airship/AirshipCore/Source/ViewExtensions.swift
+++ b/Airship/AirshipCore/Source/ViewExtensions.swift
@@ -27,7 +27,7 @@ public extension View {
         // broken on tvOS for now
         self
         #else
-        self.gesture(TapGesture().onEnded(action))
+        self.simultaneousGesture(TapGesture().onEnded(action))
             .accessibilityAction(.default) {
                 action()
             }
@@ -44,15 +44,6 @@ public extension View {
         }
     }
 
-    /// Common modifier for buttons so event handlers can be added separately to prevent tap issues
-    @ViewBuilder
-    internal func commonButton<Content: BaseModel>(
-        _ model: Content
-    ) -> some View {
-        self.enableBehaviors(model.enableBehaviors)
-        .visibility(model.visibility)
-    }
-
     @ViewBuilder
     internal func common<Content: BaseModel>(
         _ model: Content,