From 0c461a838c66f0a167c89a5e3732d07973ba6052 Mon Sep 17 00:00:00 2001
From: peposdd <jose.carmona@doordash.com>
Date: Sat, 8 Jun 2024 17:14:26 -0700
Subject: [PATCH 1/2] [#600] Avoid gesture-related modifier if gestures are
 disabled

---
 CHANGELOG.md                                                  | 4 +++-
 .../interactions/composable/AppyxInteractionsContainer.kt     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17ada0220..e331985ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Pending changes
 
-–
+### Fixed
+
+– [#600](https://github.com/bumble-tech/appyx/issues/600) - Fix Parent interaction is gone once it has a child on top
 
 ## 2.0.0
 
diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
index c31beeb99..3e3a248ef 100644
--- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
+++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
@@ -113,11 +113,11 @@ fun <InteractionTarget : Any, ModelState : Any> AppyxInteractionsContainer(
                     )
                 )
             }
-            .onPointerEvent {
+            .then(if (!appyxComponent.isGesturesEnabled) Modifier else Modifier.onPointerEvent {
                 if (it.type == PointerEventType.Release) {
                     appyxComponent.onRelease()
                 }
-            }
+            })
     ) {
         CompositionLocalProvider(LocalBoxScope provides this) {
             elementUiModels.forEach { elementUiModel ->

From 0bf26af787264ed64487b369ba00cfb010390b07 Mon Sep 17 00:00:00 2001
From: Jose Carmona <126043758+peposdd@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:18:49 -0700
Subject: [PATCH 2/2] Update
 appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt

Co-authored-by: Andrey Kovalev <andreykovalev.nn@gmail.com>
---
 .../composable/AppyxInteractionsContainer.kt          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
index 3e3a248ef..277f22d2e 100644
--- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
+++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt
@@ -113,10 +113,13 @@ fun <InteractionTarget : Any, ModelState : Any> AppyxInteractionsContainer(
                     )
                 )
             }
-            .then(if (!appyxComponent.isGesturesEnabled) Modifier else Modifier.onPointerEvent {
-                if (it.type == PointerEventType.Release) {
-                    appyxComponent.onRelease()
-                }
+            .then(if (appyxComponent.isGesturesEnabled) {
+                Modifier.onPointerEvent {
+                    if (it.type == PointerEventType.Release) {
+                        appyxComponent.onRelease()
+                } else {
+                    Modifier
+                }   
             })
     ) {
         CompositionLocalProvider(LocalBoxScope provides this) {