From ec28d0c52c2fa991a5e6a38fc3d35ac557b73b13 Mon Sep 17 00:00:00 2001
From: debitan <42253716+debitan@users.noreply.github.com>
Date: Thu, 9 Jul 2026 15:32:13 +0200
Subject: [PATCH] fix(android): resolve enclosing scroll view when
 useNestedScrollViewAndroid is enabled

---
 .../com/reactnativekeyboardcontroller/extensions/EditText.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt
index ddd9b880a7..f321d5e3bb 100644
--- a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt
+++ b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt
@@ -8,6 +8,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewTreeObserver.OnPreDrawListener
 import android.widget.EditText
+import androidx.core.widget.NestedScrollView
 import com.facebook.react.views.scroll.ReactScrollView
 import com.facebook.react.views.textinput.ReactEditText
 import com.reactnativekeyboardcontroller.log.Logger
@@ -105,7 +106,9 @@ val EditText.parentScrollViewTarget: Int
     while (currentView != null) {
       val parentView = currentView.parent as? View
 
-      if (parentView is ReactScrollView && parentView.scrollEnabled) {
+      if ((parentView is ReactScrollView && parentView.scrollEnabled) ||
+        parentView is NestedScrollView
+      ) {
         // If the parent is a vertical, scrollable ScrollView - return its id
         return parentView.id
       }