Skip to content

Commit 844ff67

Browse files
committed
fix flow errors
1 parent 805e87f commit 844ff67

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

packages/react-native/Libraries/Components/TextInput/TextInput.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,8 +1672,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
16721672

16731673
// [macOS
16741674
const _onKeyDown = (event: KeyEvent) => {
1675-
if (props.keyDownEvents && !event.isPropagationStopped()) {
1676-
const isHandled = props.keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1675+
const keyDownEvents = props.keyDownEvents;
1676+
if (keyDownEvents != null && !event.isPropagationStopped()) {
1677+
const isHandled = keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
16771678
return (
16781679
event.nativeEvent.key === key &&
16791680
Boolean(metaKey) === event.nativeEvent.metaKey &&
@@ -1682,16 +1683,17 @@ function InternalTextInput(props: TextInputProps): React.Node {
16821683
Boolean(shiftKey) === event.nativeEvent.shiftKey
16831684
);
16841685
});
1685-
if (isHandled) {
1686+
if (isHandled === true) {
16861687
event.stopPropagation();
16871688
}
16881689
}
16891690
props.onKeyDown?.(event);
16901691
};
16911692

16921693
const _onKeyUp = (event: KeyEvent) => {
1693-
if (props.keyUpEvents && !event.isPropagationStopped()) {
1694-
const isHandled = props.keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1694+
const keyUpEvents = props.keyUpEvents;
1695+
if (keyUpEvents != null && !event.isPropagationStopped()) {
1696+
const isHandled = keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
16951697
return (
16961698
event.nativeEvent.key === key &&
16971699
Boolean(metaKey) === event.nativeEvent.metaKey &&
@@ -1700,7 +1702,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
17001702
Boolean(shiftKey) === event.nativeEvent.shiftKey
17011703
);
17021704
});
1703-
if (isHandled) {
1705+
if (isHandled === true) {
17041706
event.stopPropagation();
17051707
}
17061708
}
@@ -1863,6 +1865,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
18631865
onChange={_onChange}
18641866
onContentSizeChange={props.onContentSizeChange}
18651867
onFocus={_onFocus}
1868+
// $FlowFixMe[exponential-spread]
18661869
{...(otherProps.onKeyDown && {onKeyDown: _onKeyDown})} // [macOS]
18671870
{...(otherProps.onKeyUp && {onKeyUp: _onKeyUp})} // [macOS]
18681871
onScroll={_onScroll}

packages/react-native/Libraries/Components/View/View.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ const View: component(
9797

9898
// [macOS
9999
const _onKeyDown = (event: KeyEvent) => {
100-
if (otherProps.keyDownEvents && !event.isPropagationStopped()) {
101-
const isHandled = otherProps.keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
100+
const keyDownEvents = otherProps.keyDownEvents;
101+
if (keyDownEvents != null && !event.isPropagationStopped()) {
102+
const isHandled = keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
102103
return (
103104
event.nativeEvent.key === key &&
104105
Boolean(metaKey) === event.nativeEvent.metaKey &&
@@ -107,16 +108,17 @@ const View: component(
107108
Boolean(shiftKey) === event.nativeEvent.shiftKey
108109
);
109110
});
110-
if (isHandled) {
111+
if (isHandled === true) {
111112
event.stopPropagation();
112113
}
113114
}
114115
otherProps.onKeyDown?.(event);
115116
};
116117

117118
const _onKeyUp = (event: KeyEvent) => {
118-
if (otherProps.keyUpEvents && !event.isPropagationStopped()) {
119-
const isHandled = otherProps.keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
119+
const keyUpEvents = otherProps.keyUpEvents;
120+
if (keyUpEvents != null && !event.isPropagationStopped()) {
121+
const isHandled = keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
120122
return (
121123
event.nativeEvent.key === key &&
122124
Boolean(metaKey) === event.nativeEvent.metaKey &&
@@ -125,7 +127,7 @@ const View: component(
125127
Boolean(shiftKey) === event.nativeEvent.shiftKey
126128
);
127129
});
128-
if (isHandled) {
130+
if (isHandled === true) {
129131
event.stopPropagation();
130132
}
131133
}
@@ -151,6 +153,7 @@ const View: component(
151153
: importantForAccessibility
152154
}
153155
nativeID={id ?? nativeID}
156+
// $FlowFixMe[exponential-spread]
154157
{...(otherProps.onKeyDown && {onKeyDown: _onKeyDown})} // [macOS]
155158
{...(otherProps.onKeyUp && {onKeyUp: _onKeyUp})} // [macOS]
156159
ref={forwardedRef}

packages/rn-tester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// @flow
2-
31
/**
42
* Copyright (c) 2015-present, Facebook, Inc.
53
*

0 commit comments

Comments
 (0)