Skip to content

fix(Android): fix formSheet not adjusting for keyboard when it contains input with autofocus #2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 20, 2025
Merged

fix(Android): fix formSheet not adjusting for keyboard when it contains input with autofocus #2911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b78afc5
add SheetDelegate as onApplyWindowInsetsListener before onResume is c…
kligarski May 8, 2025
737f029
move adding window instets listener to Screen's onAttachedToWindow
kligarski May 9, 2025
25bcb02
Merge branch 'main' into @kligarski/form-sheet-autofocus-2
kligarski May 12, 2025
78a2576
add check for ScreenStack, rephrase and reformat comment
kligarski May 12, 2025
874a5dc
comment out changing maxHeight when keyboard is visible
kligarski May 12, 2025
55ab288
use HashSet instead of ArraySet
kligarski May 19, 2025
da28da2
remove redundant code
kligarski May 19, 2025
a0f9323
add and use ext method Fragment.asScreenStackFragment()
kligarski May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions android/src/main/java/com/swmansion/rnscreens/Screen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.swmansion.rnscreens.bottomsheet.useSingleDetent
import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
import com.swmansion.rnscreens.events.SheetDetentChangedEvent
import com.swmansion.rnscreens.ext.asScreenStackFragment
import com.swmansion.rnscreens.ext.parentAsViewGroup

@SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
Expand Down Expand Up @@ -548,8 +549,8 @@ class Screen(
// with autofocus - onResume is called after finishing animator animation.
// onAttachedToWindow is called before onApplyWindowInsets so we use it to set the handler
// earlier. More details: https://github.com/software-mansion/react-native-screens/pull/2911
if (usesFormSheetPresentation() && isNativeStackScreen) {
(fragment as ScreenStackFragment?)?.sheetDelegate?.let {
if (usesFormSheetPresentation()) {
fragment?.asScreenStackFragment()?.sheetDelegate?.let {
InsetsObserverProxy.addOnApplyWindowInsetsListener(
it,
)
Expand Down
6 changes: 6 additions & 0 deletions android/src/main/java/com/swmansion/rnscreens/ext/FragmentExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.swmansion.rnscreens.ext

import androidx.fragment.app.Fragment
import com.swmansion.rnscreens.ScreenStackFragment

internal fun Fragment.asScreenStackFragment() = this as ScreenStackFragment
Loading