Skip to content

[CP Staging] Fix emoji picker bounce when keyboard opens/closes on Android #94106

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
mountiny merged 3 commits into from
Jun 21, 2026
Merged

[CP Staging] Fix emoji picker bounce when keyboard opens/closes on Android #94106

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac43857
Fix emoji picker bounce by syncing bottom safe-area padding with keyb…
MelvinBot Jun 20, 2026
7582962
Require keyboardHeight > 0 before dropping bottom safe-area padding
MelvinBot Jun 20, 2026
a6c0d10
Simplify: key bottom safe-area padding on isKeyboardActive only
MelvinBot Jun 20, 2026
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
8 changes: 6 additions & 2 deletions src/components/EmojiPicker/EmojiPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,12 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) {

// Only add the bottom safe-area padding when the keyboard is hidden. When the search keyboard is shown it already
// covers the bottom inset, so adding the padding on top of it leaves an unwanted gap above the keyboard.
const {isKeyboardShown} = useKeyboardState();
const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: !isKeyboardShown});
// Use isKeyboardActive (toggles on keyboardWillShow/WillHide) rather than isKeyboardShown (toggles on
// keyboardDidShow/DidHide) so the padding changes in sync with the modal's keyboard-avoidance animation. Keying it
// on isKeyboardShown removes/re-adds the padding only after the keyboard animation finishes, which abruptly changes
// the picker height a beat behind the modal motion and makes the picker bounce.
const {isKeyboardActive} = useKeyboardState();
const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: !isKeyboardActive});

return (
<PopoverWithMeasuredContent
Expand Down
Loading