From bf12b9eccab58dd4454420906f3c9f3c47225b7c Mon Sep 17 00:00:00 2001 From: kirillzyusko Date: Tue, 10 Feb 2026 17:29:13 +0100 Subject: [PATCH 1/2] fix: stable ios 15 tests --- src/components/KeyboardAwareScrollView/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/KeyboardAwareScrollView/index.tsx b/src/components/KeyboardAwareScrollView/index.tsx index 1d484a35c2..9ad112a133 100644 --- a/src/components/KeyboardAwareScrollView/index.tsx +++ b/src/components/KeyboardAwareScrollView/index.tsx @@ -462,6 +462,8 @@ const KeyboardAwareScrollView = forwardRef< onEnd: (e) => { "worklet"; + maybeScroll(e.height); + removeGhostPadding(e.height); keyboardHeight.value = e.height; From afaf76b6489e1f2a6866473ac5a9e8b52a9fb365 Mon Sep 17 00:00:00 2001 From: kirillzyusko Date: Thu, 12 Feb 2026 11:44:18 +0100 Subject: [PATCH 2/2] fix: don't scroll in the end if such behavior is explicitly disabled --- src/components/KeyboardAwareScrollView/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/KeyboardAwareScrollView/index.tsx b/src/components/KeyboardAwareScrollView/index.tsx index 9ad112a133..0bf3d1b97c 100644 --- a/src/components/KeyboardAwareScrollView/index.tsx +++ b/src/components/KeyboardAwareScrollView/index.tsx @@ -462,7 +462,10 @@ const KeyboardAwareScrollView = forwardRef< onEnd: (e) => { "worklet"; - maybeScroll(e.height); + // if the user has set disableScrollOnKeyboardHide, only auto-scroll when the keyboard opens + if (!disableScrollOnKeyboardHide || keyboardWillAppear.value) { + maybeScroll(e.height); + } removeGhostPadding(e.height);