Skip to content

Commit 16b501f

Browse files
committed
tags
1 parent acac6dd commit 16b501f

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import type {HostInstance} from '../../../src/private/types/HostInstance';
1212
import type {____TextStyle_Internal as TextStyleInternal} from '../../StyleSheet/StyleSheetTypes';
1313
import type {
1414
GestureResponderEvent,
15-
KeyEvent,
16-
HandledKeyEvent,
15+
KeyEvent, // [macOS]
16+
HandledKeyEvent, // [macOS]
1717
NativeSyntheticEvent,
1818
ScrollEvent,
1919
} from '../../Types/CoreEventTypes';
@@ -1670,7 +1670,8 @@ function InternalTextInput(props: TextInputProps): React.Node {
16701670
props.onScroll && props.onScroll(event);
16711671
};
16721672

1673-
const _keyDown = (event: KeyEvent) => {
1673+
// [macOS
1674+
const _onKeyDown = (event: KeyEvent) => {
16741675
if (props.keyDownEvents && event.isPropagationStopped() !== true) {
16751676
const isHandled = props.keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
16761677
return (
@@ -1688,7 +1689,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
16881689
props.onKeyDown && props.onKeyDown(event);
16891690
};
16901691

1691-
const _keyUp = (event: KeyEvent) => {
1692+
const _onKeyUp = (event: KeyEvent) => {
16921693
if (props.keyUpEvents && event.isPropagationStopped() !== true) {
16931694
const isHandled = props.keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
16941695
return (
@@ -1705,6 +1706,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
17051706
}
17061707
props.onKeyUp && props.onKeyUp(event);
17071708
};
1709+
// macOS]
17081710

17091711
let textInput = null;
17101712

@@ -1861,8 +1863,8 @@ function InternalTextInput(props: TextInputProps): React.Node {
18611863
onChange={_onChange}
18621864
onContentSizeChange={props.onContentSizeChange}
18631865
onFocus={_onFocus}
1864-
onKeyDown={_keyDown} // [macOS]
1865-
onKeyUp={_keyUp} // [macOS]
1866+
onKeyDown={_onKeyDown} // [macOS]
1867+
onKeyUp={_onKeyUp} // [macOS]
18661868
onScroll={_onScroll}
18671869
onSelectionChange={_onSelectionChange}
18681870
onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type {ViewProps} from './ViewPropTypes';
1313
import TextAncestor from '../../Text/TextAncestor';
1414
import ViewNativeComponent from './ViewNativeComponent';
1515
import * as React from 'react';
16-
import type { KeyEvent, HandledKeyEvent } from '../../Types/CoreEventTypes';
16+
import type { KeyEvent, HandledKeyEvent } from '../../Types/CoreEventTypes'; // [macOS]
1717

1818
export type Props = ViewProps;
1919

@@ -95,7 +95,8 @@ const View: component(
9595
};
9696
}
9797

98-
const _keyDown = (event: KeyEvent) => {
98+
// [macOS
99+
const _onKeyDown = (event: KeyEvent) => {
99100
if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {
100101
const isHandled = otherProps.keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
101102
return (
@@ -113,7 +114,7 @@ const View: component(
113114
otherProps.onKeyDown && otherProps.onKeyDown(event);
114115
};
115116

116-
const _keyUp = (event: KeyEvent) => {
117+
const _onKeyUp = (event: KeyEvent) => {
117118
if (otherProps.keyUpEvents && event.isPropagationStopped() !== true) {
118119
const isHandled = otherProps.keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
119120
return (
@@ -130,6 +131,7 @@ const View: component(
130131
}
131132
otherProps.onKeyUp && otherProps.onKeyUp(event);
132133
};
134+
// macOS]
133135

134136
const actualView = (
135137
<ViewNativeComponent
@@ -149,8 +151,8 @@ const View: component(
149151
: importantForAccessibility
150152
}
151153
nativeID={id ?? nativeID}
152-
onKeyDown={_keyDown}
153-
onKeyUp={_keyUp}
154+
onKeyDown={_onKeyDown} // [macOS]
155+
onKeyUp={_onKeyUp} // [macOS]
154156
ref={forwardedRef}
155157
/>
156158
);

0 commit comments

Comments
 (0)