Skip to content

[CLNP-7507] fix: improve keyboard handling when using button navigation on API 35 #257

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
OnestarLee merged 1 commit into from
Aug 31, 2025
Merged

[CLNP-7507] fix: improve keyboard handling when using button navigation on API 35 #257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions packages/uikit-react-native/src/components/ChannelInput/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useEffect, useMemo, useState } from 'react';
import {
Keyboard,
KeyboardAvoidingView,
Platform,
StyleProp,
Expand Down Expand Up @@ -94,10 +95,10 @@ export type ChannelInputProps = {
};

const AUTO_FOCUS = Platform.select({ ios: false, android: true, default: false });
const isAndroidApi35 = Platform.OS === 'android' && Platform.Version >= 35;
const isAndroidApi35Plus = Platform.OS === 'android' && Platform.Version >= 35;
const KEYBOARD_AVOID_VIEW_BEHAVIOR = Platform.select({
ios: 'padding' as const,
android: isAndroidApi35 ? ('padding' as const) : undefined,
android: isAndroidApi35Plus ? ('padding' as const) : undefined,
default: undefined,
});

Expand All @@ -121,7 +122,9 @@ const ChannelInput = (props: ChannelInputProps) => {
* For older Android versions, we manually subtract the safe area bottom padding to avoid overlapping with system UI.
* See: https://developer.android.com/develop/ui/views/layout/edge-to-edge
*/
const keyboardVerticalOffset = isAndroidApi35 ? keyboardAvoidOffset : -safeArea.paddingBottom + keyboardAvoidOffset;
const keyboardVerticalOffset = isAndroidApi35Plus
? keyboardAvoidOffset
: -safeArea.paddingBottom + keyboardAvoidOffset;
const { colors, typography } = useUIKitTheme();
const { sbOptions, mentionManager } = useSendbirdChat();

Expand Down Expand Up @@ -158,6 +161,23 @@ const ChannelInput = (props: ChannelInputProps) => {
onChangeText(replace(text, searchStringRange.start, searchStringRange.end, mentionedMessageText), { user, range });
};

const [keyboardShown, setKeyboardShown] = useState(false);

useEffect(() => {
const keyboardDidShow = () => setKeyboardShown(true);
const keyboardDidHide = () => setKeyboardShown(false);

const showSubscription = Keyboard.addListener('keyboardDidShow', keyboardDidShow);
const hideSubscription = Keyboard.addListener('keyboardDidHide', keyboardDidHide);

return () => {
showSubscription.remove();
hideSubscription.remove();
};
}, []);

const shouldShowSafeAreaBottom = !isAndroidApi35Plus || (isAndroidApi35Plus && !keyboardShown);

if (!props.shouldRenderInput) {
return <SafeAreaBottom height={safeArea.paddingBottom} />;
}
Expand Down Expand Up @@ -204,7 +224,7 @@ const ChannelInput = (props: ChannelInputProps) => {
/>
)}
</View>
{!isAndroidApi35 && <SafeAreaBottom height={safeArea.paddingBottom} />}
{shouldShowSafeAreaBottom && <SafeAreaBottom height={safeArea.paddingBottom} />}
</View>
</KeyboardAvoidingView>
{mentionAvailable && props.SuggestedMentionList && (
Expand Down