[react-events] Keyboard: fix callback return types (#16693)

Nicolas Gallagher · web-flow · commit f26fe8c0a795 · 2019-09-09T09:07:42.000-07:00
diff --git a/packages/react-events/src/dom/Keyboard.js b/packages/react-events/src/dom/Keyboard.js
@@ -20,8 +20,8 @@ type KeyboardEventType = 'keydown' | 'keyup';
 
 type KeyboardProps = {
 disabled: boolean,
- onKeyDown: (e: KeyboardEvent) => void,
- onKeyUp: (e: KeyboardEvent) => void,
+ onKeyDown: (e: KeyboardEvent) => ?boolean,
+ onKeyUp: (e: KeyboardEvent) => ?boolean,
 preventKeys: Array<string>,
 };
 
@@ -162,7 +162,7 @@ function createKeyboardEvent(
 
 function dispatchKeyboardEvent(
 event: ReactDOMResponderEvent,
- listener: KeyboardEvent => void,
+ listener: KeyboardEvent => ?boolean,
 context: ReactDOMResponderContext,
 type: KeyboardEventType,
 defaultPrevented: boolean,
@@ -209,9 +209,11 @@ const keyboardResponderImpl = {
 const config = ((preventKey[1]: any): Object);
 for (let s = 0; s < modifiers.length; s++) {
 const modifier = modifiers[s];
+ const configModifier = config[modifier];
+ const eventModifier = nativeEvent[modifier];
 if (
- (config[modifier] && !nativeEvent[modifier]) ||
- (!config[modifier] && nativeEvent[modifier])
+ (configModifier && !eventModifier) ||
+ (!configModifier && eventModifier)
 ) {
 continue preventKeyLoop;
 }

-Original file line number
+Diff line change
 typeKeyboardProps={
 disabled: boolean,
 -onKeyDown: (e: KeyboardEvent)=>void,
 -onKeyUp: (e: KeyboardEvent)=>void,
 +onKeyDown: (e: KeyboardEvent)=>?boolean,
 +onKeyUp: (e: KeyboardEvent)=>?boolean,
 preventKeys: Array<string>,
 };
 functiondispatchKeyboardEvent(
 event: ReactDOMResponderEvent,
 -listener: KeyboardEvent=>void,
 +listener: KeyboardEvent=>?boolean,
 context: ReactDOMResponderContext,
 type: KeyboardEventType,
 defaultPrevented: boolean,
 constconfig=((preventKey[1]: any): Object);
 for(lets=0;s<modifiers.length;s++){
 constmodifier=modifiers[s];
 +constconfigModifier=config[modifier];
 +consteventModifier=nativeEvent[modifier];
 if(
 -(config[modifier]&&!nativeEvent[modifier])||
 -(!config[modifier]&&nativeEvent[modifier])
 +(configModifier&&!eventModifier)||
 +(!configModifier&&eventModifier)
 ){
 continue preventKeyLoop;
+}