File tree Expand file tree Collapse file tree 2 files changed +29
-1
lines changed
Libraries/Components/TextInput Expand file tree Collapse file tree 2 files changed +29
-1
lines changed Original file line number Diff line number Diff line change @@ -103,7 +103,11 @@ function focusTextInput(textField: ?HostInstance) {
103
103
104
104
if ( textField != null ) {
105
105
const fieldCanBeFocused =
106
- currentlyFocusedInputRef !== textField &&
106
+ // [macOS currentlyFocusedInputRef does not account for the fact that any arbritrary view can
107
+ // recieve focus on desktop. https://github.com/facebook/react-native/pull/52472/ fixes this,
108
+ // disable the check for now
109
+ // currentlyFocusedInputRef !== textField &&
110
+ // macOS]
107
111
// $FlowFixMe - `currentProps` is missing in `NativeMethods`
108
112
textField . currentProps ?. editable !== false ;
109
113
Original file line number Diff line number Diff line change @@ -63,6 +63,30 @@ + (NSString *)keyFromEvent:(NSEvent *)event
63
63
return @" PageUp" ;
64
64
} else if (code == NSPageDownFunctionKey) {
65
65
return @" PageDown" ;
66
+ } else if (code == NSF1FunctionKey) {
67
+ return @" F1" ;
68
+ } else if (code == NSF2FunctionKey) {
69
+ return @" F2" ;
70
+ } else if (code == NSF3FunctionKey) {
71
+ return @" F3" ;
72
+ } else if (code == NSF4FunctionKey) {
73
+ return @" F4" ;
74
+ } else if (code == NSF5FunctionKey) {
75
+ return @" F5" ;
76
+ } else if (code == NSF6FunctionKey) {
77
+ return @" F6" ;
78
+ } else if (code == NSF7FunctionKey) {
79
+ return @" F7" ;
80
+ } else if (code == NSF8FunctionKey) {
81
+ return @" F8" ;
82
+ } else if (code == NSF9FunctionKey) {
83
+ return @" F9" ;
84
+ } else if (code == NSF10FunctionKey) {
85
+ return @" F10" ;
86
+ } else if (code == NSF11FunctionKey) {
87
+ return @" F11" ;
88
+ } else if (code == NSF12FunctionKey) {
89
+ return @" F12" ;
66
90
}
67
91
68
92
return key;
You can’t perform that action at this time.
0 commit comments