Skip to content

[CLNP-7537] revert: improve keyboard avoidance behavior for Android API 35+ #261

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
Sep 6, 2025
Merged

[CLNP-7537] revert: improve keyboard avoidance behavior for Android API 35+ #261

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
42 changes: 6 additions & 36 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,6 +1,5 @@
import React, { useEffect, useMemo, useState } from 'react';
import {
Keyboard,
KeyboardAvoidingView,
Platform,
StyleProp,
Expand Down Expand Up @@ -95,12 +94,7 @@ export type ChannelInputProps = {
};

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

// FIXME(iOS): Dynamic style does not work properly when typing the CJK. (https://github.com/facebook/react-native/issues/26107)
// To workaround temporarily, change the key for re-mount the component.
Expand All @@ -115,16 +109,6 @@ const ChannelInput = (props: ChannelInputProps) => {

const safeArea = useSafeAreaPadding(['top', 'left', 'right', 'bottom']);

// Android API 35+ keyboard avoidance handling
/**
* Android API 35+ introduced edge-to-edge layouts, which changed how keyboard avoidance should be handled.
* For API 35+, the system manages insets automatically, so we use the provided keyboardAvoidOffset directly.
* 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 = isAndroidApi35Plus
? keyboardAvoidOffset
: -safeArea.paddingBottom + keyboardAvoidOffset;
const { colors, typography } = useUIKitTheme();
const { sbOptions, mentionManager } = useSendbirdChat();

Expand Down Expand Up @@ -161,30 +145,16 @@ 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} />;
}

return (
<>
<KeyboardAvoidingView keyboardVerticalOffset={keyboardVerticalOffset} behavior={KEYBOARD_AVOID_VIEW_BEHAVIOR}>
<KeyboardAvoidingView
keyboardVerticalOffset={-safeArea.paddingBottom + keyboardAvoidOffset}
behavior={KEYBOARD_AVOID_VIEW_BEHAVIOR}
>
<View
style={{
paddingStart: safeArea.paddingStart,
Expand Down Expand Up @@ -224,7 +194,7 @@ const ChannelInput = (props: ChannelInputProps) => {
/>
)}
</View>
{shouldShowSafeAreaBottom && <SafeAreaBottom height={safeArea.paddingBottom} />}
<SafeAreaBottom height={safeArea.paddingBottom} />
</View>
</KeyboardAvoidingView>
{mentionAvailable && props.SuggestedMentionList && (
Expand Down