Fix passthrough props on TouchableWithoutFeedback (facebook#592)

* Fix passthrough props on TouchableWithoutFeedback Most of the macOS-specific props should be passed through, but acceptsKeyboardFocus and enableFocusRing should default to true like the other Touchable components. * Update snapshots with TouchableWithoutFeedback fix
acoates-ms · Sep 10, 2020 · 3535ba7 · 3535ba7
1 parent 6a8ff93
commit 3535ba7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap b/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
@@ -2,8 +2,10 @@
 
 exports[`TextInput tests should render as expected: should deep render when mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
+  acceptsKeyboardFocus={true}
   accessible={true}
   allowFontScaling={true}
+  enableFocusRing={true}
   focusable={true}
   forwardedRef={null}
   onBlur={[Function]}
@@ -28,8 +30,10 @@ exports[`TextInput tests should render as expected: should deep render when mock
 
 exports[`TextInput tests should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
+  acceptsKeyboardFocus={true}
   accessible={true}
   allowFontScaling={true}
+  enableFocusRing={true}
   focusable={true}
   forwardedRef={null}
   onBlur={[Function]}

diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -105,7 +105,12 @@ const PASSTHROUGH_PROPS = [
   'onFocus',
   'onLayout',
   'onMouseEnter', // [TODO(macOS ISS#2323203)
-  'onMouseLeave', // ]TODO(macOS ISS#2323203)
+  'onMouseLeave',
+  'onDragEnter',
+  'onDragLeave',
+  'onDrop',
+  'draggedTypes',
+  'tooltip', // ]TODO(macOS ISS#2323203)
   'testID',
 ];
 
@@ -190,6 +195,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
       accessible: this.props.accessible !== false,
       focusable:
         this.props.focusable !== false && this.props.onPress !== undefined,
+      acceptsKeyboardFocus:
+        this.props.acceptsKeyboardFocus !== false && !this.props.disabled, // [TODO(macOS ISS#2323203)
+      enableFocusRing:
+        this.props.enableFocusRing !== false && !this.props.disabled, // ]TODO(macOS ISS#2323203)
     };
     for (const prop of PASSTHROUGH_PROPS) {
       if (this.props[prop] !== undefined) {