Skip to content

chore(0.76): backport some changes #2563

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
Saadnajmi merged 2 commits into from
Jul 23, 2025
Merged

chore(0.76): backport some changes #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb740a
fix: TextInputFocus state not in sync with View focus (#2553)
Saadnajmi Jul 23, 2025
a0c6507
fix: Support Function Key Handling in macOS Views (#2554)
ColinHeffernan Jul 23, 2025
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
6 changes: 5 additions & 1 deletion packages/react-native/Libraries/Components/TextInput/TextInputState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ function focusTextInput(textField: ?ComponentRef) {

if (textField != null) {
const fieldCanBeFocused =
currentlyFocusedInputRef !== textField &&
// [macOS currentlyFocusedInputRef does not account for the fact that any arbritrary view can
// recieve focus on desktop. https://github.com/facebook/react-native/pull/52472/ fixes this,
// disable the check for now
// currentlyFocusedInputRef !== textField &&
// macOS]
// $FlowFixMe - `currentProps` is missing in `NativeMethods`
textField.currentProps?.editable !== false;

Expand Down
24 changes: 24 additions & 0 deletions packages/react-native/React/Views/RCTViewKeyboardEvent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,30 @@ + (NSString *)keyFromEvent:(NSEvent *)event
return @"PageUp";
} else if (code == NSPageDownFunctionKey) {
return @"PageDown";
} else if (code == NSF1FunctionKey) {
return @"F1";
} else if (code == NSF2FunctionKey) {
return @"F2";
} else if (code == NSF3FunctionKey) {
return @"F3";
} else if (code == NSF4FunctionKey) {
return @"F4";
} else if (code == NSF5FunctionKey) {
return @"F5";
} else if (code == NSF6FunctionKey) {
return @"F6";
} else if (code == NSF7FunctionKey) {
return @"F7";
} else if (code == NSF8FunctionKey) {
return @"F8";
} else if (code == NSF9FunctionKey) {
return @"F9";
} else if (code == NSF10FunctionKey) {
return @"F10";
} else if (code == NSF11FunctionKey) {
return @"F11";
} else if (code == NSF12FunctionKey) {
return @"F12";
}

return key;
Expand Down