Skip to content

[CP Staging] Revert "fix: Keyboard opens briefly between ReportActionContextMenu and EmojiPicker modals" #65521

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 1 commit into from
Jul 5, 2025
Merged

[CP Staging] Revert "fix: Keyboard opens briefly between ReportActionContextMenu and EmojiPicker modals" #65521

Show file tree
Hide file tree
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
10 changes: 0 additions & 10 deletions patches/react-native/details.md
View file
Open in desktop

This file was deleted.

237 changes: 0 additions & 237 deletions ...hes/react-native/react-native+0.79.2+025+textinput-prevent-focus-on-first-responder.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/ActionSheetAwareScrollView/ActionSheetAwareScrollViewContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const States = {
POPOVER_CLOSED: 'popoverClosed',
KEYBOARD_POPOVER_CLOSED: 'keyboardPopoverClosed',
KEYBOARD_POPOVER_OPEN: 'keyboardPopoverOpen',
KEYBOARD_CLOSING_POPOVER: 'keyboardClosingPopover',
KEYBOARD_CLOSED_POPOVER: 'keyboardClosingPopover',
POPOVER_MEASURED: 'popoverMeasured',
MODAL_WITH_KEYBOARD_OPEN_DELETED: 'modalWithKeyboardOpenDeleted',
} as const;
Expand Down Expand Up @@ -97,13 +97,13 @@ const STATE_MACHINE: StateMachine<ValueOf<typeof States>, ValueOf<typeof Actions
},
[States.KEYBOARD_POPOVER_OPEN]: {
[Actions.MEASURE_POPOVER]: States.KEYBOARD_POPOVER_OPEN,
[Actions.CLOSE_POPOVER]: States.KEYBOARD_CLOSING_POPOVER,
[Actions.CLOSE_POPOVER]: States.KEYBOARD_CLOSED_POPOVER,
[Actions.OPEN_KEYBOARD]: States.KEYBOARD_OPEN,
},
[States.KEYBOARD_POPOVER_CLOSED]: {
[Actions.OPEN_KEYBOARD]: States.KEYBOARD_OPEN,
},
[States.KEYBOARD_CLOSING_POPOVER]: {
[States.KEYBOARD_CLOSED_POPOVER]: {
[Actions.OPEN_KEYBOARD]: States.KEYBOARD_OPEN,
[Actions.END_TRANSITION]: States.KEYBOARD_OPEN,
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActionSheetAwareScrollView/ActionSheetKeyboardSpace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function ActionSheetKeyboardSpace(props: ActionSheetKeyboardSpaceProps) {
if (isClosedKeyboard || isOpeningKeyboard) {
return lastKeyboardHeight - keyboardHeight;
}
if (previous.state === States.KEYBOARD_CLOSING_POPOVER || (previous.state === States.KEYBOARD_OPEN && elementOffset < 0)) {
if (previous.state === States.KEYBOARD_CLOSED_POPOVER || (previous.state === States.KEYBOARD_OPEN && elementOffset < 0)) {
const returnValue = Math.max(keyboard.heightWhenOpened.get() - keyboard.height.get() - paddingBottom, 0) + Math.max(elementOffset, 0);
return returnValue;
}
Expand Down Expand Up @@ -222,7 +222,7 @@ function ActionSheetKeyboardSpace(props: ActionSheetKeyboardSpaceProps) {
return lastKeyboardHeight;
}

case States.KEYBOARD_CLOSING_POPOVER: {
case States.KEYBOARD_CLOSED_POPOVER: {
if (elementOffset < 0) {
transition({type: Actions.END_TRANSITION});

Expand Down
Loading
Loading