Skip to content

fix(mobile): align iPad composer without shifting on keyboard focus #23355

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
juliusmarminge merged 1 commit into from
Oct 22, 2026
+10 −12
Merged

fix(mobile): align iPad composer without shifting on keyboard focus #23355

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
22 changes: 10 additions & 12 deletions apps/mobile/src/features/threads/ThreadDetailScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,22 +530,22 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
const selectedThreadKeyRef = useRef(selectedThreadKey);
const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
const [composerExpanded, setComposerExpanded] = useState(false);
const [composerFocused, setComposerFocused] = useState(false);
const handleComposerFocusChange = (focused: boolean) => {
setComposerFocused(focused);
handleOwnedInputFocusChange(focused);
};
const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
const [endFollowEnabled, setEndFollowEnabled] = useState(true);
// Android Back hides the keyboard without blurring. Keep its safe-area padding
// fixed through the animation and cancel it with matching composer/list offsets.
const bottomBarInset = useDuoBottomBarInset();
// The pill already adds its own gutter; iPad and Duo align its edge with the native bar.
const alignedBottomInset =
bottomBarInset ??
(Platform.OS === "ios" && Platform.isPad ? Math.max(insets.bottom, 12) : undefined);
// A hardware keyboard can focus the editor without occupying any screen height.
const composerBottomInset =
Platform.OS === "ios" && (composerExpanded || composerFocused)
Platform.OS === "ios" && (composerExpanded || liveKeyboardHeight > 0)
? 0
: bottomBarInset !== undefined
? bottomBarInset - THREAD_COMPOSER_BOTTOM_GUTTER
: alignedBottomInset !== undefined
? Math.max(0, alignedBottomInset - THREAD_COMPOSER_BOTTOM_GUTTER)
: Math.max(insets.bottom, 12);
const composerKeyboardOffset = Platform.OS === "android" ? composerBottomInset : 0;
const contentPresentationKind = props.contentPresentation.kind;
Expand Down Expand Up @@ -1088,9 +1088,7 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai

useLayoutEffect(() => {
selectedThreadKeyRef.current = selectedThreadKey;
// A replaced or unmounted native editor may not emit a blur event.
setComposerFocused(false);
}, [selectedThreadKey, showContent]);
}, [selectedThreadKey]);

useEffect(() => {
setAnchorMessageId(null);
Expand Down Expand Up @@ -1665,7 +1663,7 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
onUpdateInteractionMode={props.onUpdateThreadInteractionMode}
onExpandedChange={setComposerExpanded}
onEditorFocusChange={handleComposerFocusChange}
onEditorFocusChange={handleOwnedInputFocusChange}
/>
</>
)}
Expand Down
Loading