|
9 | 9 | */ |
10 | 10 |
|
11 | 11 | import type {ViewProps} from './ViewPropTypes'; |
12 | | -import type {KeyEvent, HandledKeyEvent} from 'react-native'; // [macOS] |
| 12 | +import type {KeyEvent, HandledKeyEvent} from '../../Types/CoreEventTypes'; // [macOS] |
13 | 13 |
|
14 | 14 | import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags'; |
15 | 15 | import TextAncestorContext from '../../Text/TextAncestorContext'; |
@@ -198,6 +198,50 @@ export default component View( |
198 | 198 | const _accessibilityLabelledBy = |
199 | 199 | ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy; |
200 | 200 |
|
| 201 | + // [macOS |
| 202 | + const _onKeyDown = (event: KeyEvent) => { |
| 203 | + const keyDownEvents = otherProps.keyDownEvents; |
| 204 | + if (keyDownEvents != null && !event.isPropagationStopped()) { |
| 205 | + const isHandled = keyDownEvents.some( |
| 206 | + ({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => { |
| 207 | + return ( |
| 208 | + event.nativeEvent.key === key && |
| 209 | + Boolean(metaKey) === event.nativeEvent.metaKey && |
| 210 | + Boolean(ctrlKey) === event.nativeEvent.ctrlKey && |
| 211 | + Boolean(altKey) === event.nativeEvent.altKey && |
| 212 | + Boolean(shiftKey) === event.nativeEvent.shiftKey |
| 213 | + ); |
| 214 | + }, |
| 215 | + ); |
| 216 | + if (isHandled === true) { |
| 217 | + event.stopPropagation(); |
| 218 | + } |
| 219 | + } |
| 220 | + otherProps.onKeyDown?.(event); |
| 221 | + }; |
| 222 | + |
| 223 | + const _onKeyUp = (event: KeyEvent) => { |
| 224 | + const keyUpEvents = otherProps.keyUpEvents; |
| 225 | + if (keyUpEvents != null && !event.isPropagationStopped()) { |
| 226 | + const isHandled = keyUpEvents.some( |
| 227 | + ({key, metaKey, ctrlKey, altKey, shiftKey}: HandledKeyEvent) => { |
| 228 | + return ( |
| 229 | + event.nativeEvent.key === key && |
| 230 | + Boolean(metaKey) === event.nativeEvent.metaKey && |
| 231 | + Boolean(ctrlKey) === event.nativeEvent.ctrlKey && |
| 232 | + Boolean(altKey) === event.nativeEvent.altKey && |
| 233 | + Boolean(shiftKey) === event.nativeEvent.shiftKey |
| 234 | + ); |
| 235 | + }, |
| 236 | + ); |
| 237 | + if (isHandled === true) { |
| 238 | + event.stopPropagation(); |
| 239 | + } |
| 240 | + } |
| 241 | + otherProps.onKeyUp?.(event); |
| 242 | + }; |
| 243 | + // macOS] |
| 244 | + |
201 | 245 | const _accessibilityState = |
202 | 246 | accessibilityState != null || |
203 | 247 | ariaBusy != null || |
|
0 commit comments