Skip to content

Commit a8cf49e

Browse files
committed
prettier fix
1 parent 844ff67 commit a8cf49e

File tree

3 files changed

+72
-51
lines changed

3 files changed

+72
-51
lines changed

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,15 +1674,17 @@ function InternalTextInput(props: TextInputProps): React.Node {
16741674
const _onKeyDown = (event: KeyEvent) => {
16751675
const keyDownEvents = props.keyDownEvents;
16761676
if (keyDownEvents != null && !event.isPropagationStopped()) {
1677-
const isHandled = keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1678-
return (
1679-
event.nativeEvent.key === key &&
1680-
Boolean(metaKey) === event.nativeEvent.metaKey &&
1681-
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
1682-
Boolean(altKey) === event.nativeEvent.altKey &&
1683-
Boolean(shiftKey) === event.nativeEvent.shiftKey
1684-
);
1685-
});
1677+
const isHandled = keyDownEvents.some(
1678+
({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1679+
return (
1680+
event.nativeEvent.key === key &&
1681+
Boolean(metaKey) === event.nativeEvent.metaKey &&
1682+
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
1683+
Boolean(altKey) === event.nativeEvent.altKey &&
1684+
Boolean(shiftKey) === event.nativeEvent.shiftKey
1685+
);
1686+
},
1687+
);
16861688
if (isHandled === true) {
16871689
event.stopPropagation();
16881690
}
@@ -1693,15 +1695,17 @@ function InternalTextInput(props: TextInputProps): React.Node {
16931695
const _onKeyUp = (event: KeyEvent) => {
16941696
const keyUpEvents = props.keyUpEvents;
16951697
if (keyUpEvents != null && !event.isPropagationStopped()) {
1696-
const isHandled = keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1697-
return (
1698-
event.nativeEvent.key === key &&
1699-
Boolean(metaKey) === event.nativeEvent.metaKey &&
1700-
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
1701-
Boolean(altKey) === event.nativeEvent.altKey &&
1702-
Boolean(shiftKey) === event.nativeEvent.shiftKey
1703-
);
1704-
});
1698+
const isHandled = keyUpEvents.some(
1699+
({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
1700+
return (
1701+
event.nativeEvent.key === key &&
1702+
Boolean(metaKey) === event.nativeEvent.metaKey &&
1703+
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
1704+
Boolean(altKey) === event.nativeEvent.altKey &&
1705+
Boolean(shiftKey) === event.nativeEvent.shiftKey
1706+
);
1707+
},
1708+
);
17051709
if (isHandled === true) {
17061710
event.stopPropagation();
17071711
}

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

Lines changed: 23 additions & 19 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'; // [macOS]
16+
import type {KeyEvent, HandledKeyEvent} from '../../Types/CoreEventTypes'; // [macOS]
1717

1818
export type Props = ViewProps;
1919

@@ -99,15 +99,17 @@ const View: component(
9999
const _onKeyDown = (event: KeyEvent) => {
100100
const keyDownEvents = otherProps.keyDownEvents;
101101
if (keyDownEvents != null && !event.isPropagationStopped()) {
102-
const isHandled = keyDownEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
103-
return (
104-
event.nativeEvent.key === key &&
105-
Boolean(metaKey) === event.nativeEvent.metaKey &&
106-
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
107-
Boolean(altKey) === event.nativeEvent.altKey &&
108-
Boolean(shiftKey) === event.nativeEvent.shiftKey
109-
);
110-
});
102+
const isHandled = keyDownEvents.some(
103+
({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
104+
return (
105+
event.nativeEvent.key === key &&
106+
Boolean(metaKey) === event.nativeEvent.metaKey &&
107+
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
108+
Boolean(altKey) === event.nativeEvent.altKey &&
109+
Boolean(shiftKey) === event.nativeEvent.shiftKey
110+
);
111+
},
112+
);
111113
if (isHandled === true) {
112114
event.stopPropagation();
113115
}
@@ -118,15 +120,17 @@ const View: component(
118120
const _onKeyUp = (event: KeyEvent) => {
119121
const keyUpEvents = otherProps.keyUpEvents;
120122
if (keyUpEvents != null && !event.isPropagationStopped()) {
121-
const isHandled = keyUpEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
122-
return (
123-
event.nativeEvent.key === key &&
124-
Boolean(metaKey) === event.nativeEvent.metaKey &&
125-
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
126-
Boolean(altKey) === event.nativeEvent.altKey &&
127-
Boolean(shiftKey) === event.nativeEvent.shiftKey
128-
);
129-
});
123+
const isHandled = keyUpEvents.some(
124+
({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => {
125+
return (
126+
event.nativeEvent.key === key &&
127+
Boolean(metaKey) === event.nativeEvent.metaKey &&
128+
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
129+
Boolean(altKey) === event.nativeEvent.altKey &&
130+
Boolean(shiftKey) === event.nativeEvent.shiftKey
131+
);
132+
},
133+
);
130134
if (isHandled === true) {
131135
event.stopPropagation();
132136
}

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

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,15 @@ function formatKeyEvent(event: KeyEvent) {
3838
return `${modifierPrefix}${event.nativeEvent.key}`;
3939
}
4040

41-
function isKeyBlocked(
42-
event: KeyEvent,
43-
keyEvents: Array<HandledKeyEvent>,
44-
) {
45-
return keyEvents.some(({key, metaKey, ctrlKey, altKey, shiftKey}) => (
46-
event.nativeEvent.key === key &&
47-
Boolean(metaKey) === event.nativeEvent.metaKey &&
48-
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
49-
Boolean(altKey) === event.nativeEvent.altKey &&
50-
Boolean(shiftKey) === event.nativeEvent.shiftKey
51-
));
41+
function isKeyBlocked(event: KeyEvent, keyEvents: Array<HandledKeyEvent>) {
42+
return keyEvents.some(
43+
({key, metaKey, ctrlKey, altKey, shiftKey}) =>
44+
event.nativeEvent.key === key &&
45+
Boolean(metaKey) === event.nativeEvent.metaKey &&
46+
Boolean(ctrlKey) === event.nativeEvent.ctrlKey &&
47+
Boolean(altKey) === event.nativeEvent.altKey &&
48+
Boolean(shiftKey) === event.nativeEvent.shiftKey,
49+
);
5250
}
5351

5452
const BOX2_KEY_DOWN_EVENTS = [{key: 'f'}, {key: 'g'}];
@@ -96,12 +94,27 @@ function BubblingExample(): React.Node {
9694

9795
return (
9896
<View style={{marginTop: 10}}>
99-
<View style={{marginBottom: 12, padding: 12, backgroundColor: '#f5f5f7', borderRadius: 8, borderWidth: 1, borderColor: '#e5e5e7'}}>
100-
<Text style={{fontSize: 14, fontWeight: '600', marginBottom: 6, color: '#1d1d1f'}}>
97+
<View
98+
style={{
99+
marginBottom: 12,
100+
padding: 12,
101+
backgroundColor: '#f5f5f7',
102+
borderRadius: 8,
103+
borderWidth: 1,
104+
borderColor: '#e5e5e7',
105+
}}>
106+
<Text
107+
style={{
108+
fontSize: 14,
109+
fontWeight: '600',
110+
marginBottom: 6,
111+
color: '#1d1d1f',
112+
}}>
101113
Event Bubbling Behavior:
102114
</Text>
103115
<Text style={{fontSize: 12, marginBottom: 3, color: '#424245'}}>
104-
• Pressable won't bubble Space or Enter keys, it handles those by default
116+
• Pressable won't bubble Space or Enter keys, it handles those by
117+
default
105118
</Text>
106119
<Text style={{fontSize: 12, marginBottom: 3, color: '#424245'}}>
107120
• Keys 'f' and 'g' won't bubble past Box 2 (handled by keyDownEvents)

0 commit comments

Comments
 (0)