Skip to content

Fix CollapsibleHeaderOnKeyboard not restoring header height after rotation #97214

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
NicolasBonet merged 2 commits into from
Jul 28, 2026
Merged

Fix CollapsibleHeaderOnKeyboard not restoring header height after rotation #97214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3104784
Fix CollapsibleHeaderOnKeyboard not restoring header height ater rota…
GCyganek Jul 28, 2026
aaf6abd
Fix height updates on onLayout
GCyganek Jul 28, 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
15 changes: 8 additions & 7 deletions src/components/CollapsibleHeaderOnKeyboard/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ function CollapsibleHeaderOnKeyboard({children, collapsibleHeaderOffset = 0, alw
return;
}

// First measurement, or content changed while header is fully open
// First measurement, or content changed while keyboard is fully open
// (to skip onLayout calls triggered by our own height animation collapsing the view to 0)
if (naturalHeightRef.current === -1 || animatedHeight.get() >= naturalHeightRef.current) {
if (naturalHeightRef.current === -1 || (animatedHeight.get() >= naturalHeightRef.current && height !== naturalHeightRef.current)) {
naturalHeightRef.current = height;
naturalHeight.set(height);
animatedHeight.set(height);
Expand Down Expand Up @@ -147,15 +147,16 @@ function CollapsibleHeaderOnKeyboard({children, collapsibleHeaderOffset = 0, alw

// If the keyboard is closing, bail out
const prevKeyboardProgress = previous?.keyboardProgress ?? 0;
if (prevKeyboardProgress >= keyboardProgress) {
if (prevKeyboardProgress > keyboardProgress) {
return;
}

// Only act when the keyboard is starting to open or reaching a threshold, not on every intermediate frame.
// Only act when the keyboard is starting to open, reaching a threshold or fully open, not on every intermediate frame.
const isKeyboardStartingOpening = prevKeyboardProgress === 0 && keyboardProgress > 0;
const isKeyboardOpeningAndReachingThreshold = isKeyboardOpeningAtGivenProgress(keyboardProgress, prevKeyboardProgress, KEYBOARD_OPENING_PROGRESS_THRESHOLDS);
const isKeyboardFullyOpen = keyboardProgress === 1;

if (!isKeyboardStartingOpening && !isKeyboardOpeningAndReachingThreshold) {
if (!isKeyboardStartingOpening && !isKeyboardOpeningAndReachingThreshold && !isKeyboardFullyOpen) {
return;
}

Expand Down Expand Up @@ -190,11 +191,11 @@ function CollapsibleHeaderOnKeyboard({children, collapsibleHeaderOffset = 0, alw
// Inner wrapper slides the content upward during landscape keyboard collapse only.
const innerStyle = useAnimatedStyle(() => {
if (animatedHeight.get() >= naturalHeight.get()) {
return {};
return {transform: [{translateY: 0}]};
}

if (!isInLandscapeModeSV.get()) {
return {};
return {transform: [{translateY: 0}]};
}

return {transform: [{translateY: animatedHeight.get() - naturalHeight.get()}]};
Expand Down
Loading