Merge branch 'master' into amgleitman/0.64-merge-2020-10-14

acoates-ms · Oct 4, 2021 · 7414a7d · 7414a7d
2 parents a0208c7 + c1e4375
commit 7414a7d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 48 deletions.
diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
@@ -194,9 +194,9 @@ function Pressable(props: Props, forwardedRef): React.Node {
     ...restProps,
     ...android_rippleConfig?.viewProps,
     acceptsFirstMouse: acceptsFirstMouse !== false && !disabled, // [TODO(macOS GH#774)
-    enableFocusRing: enableFocusRing !== false && !disabled, // ]TODO(macOS GH#774)
+    enableFocusRing: enableFocusRing !== false && !disabled,
     accessible: accessible !== false,
-    focusable: focusable !== false,
+    focusable: focusable !== false && !disabled, // ]TODO(macOS GH#774)
     hitSlop,
   };
 

diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
@@ -175,10 +175,7 @@ class TouchableBounce extends React.Component<Props, State> {
                 !this.props.disabled,
             }
           : {
-              focusable:
-                this.props.focusable !== false &&
-                this.props.onPress !== undefined &&
-                !this.props.disabled,
+              focusable: this.props.focusable !== false && !this.props.disabled,
             })}
         // macOS]
         tooltip={this.props.tooltip} // TODO(macOS/win GH#774)

diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -332,9 +332,7 @@ class TouchableHighlight extends React.Component<Props, State> {
                 !this.props.disabled,
             }
           : {
-              focusable:
-                this.props.focusable !== false &&
-                this.props.onPress !== undefined,
+              focusable: this.props.focusable !== false && !this.props.disabled,
             })}
         // macOS]
         tooltip={this.props.tooltip} // TODO(macOS/win GH#774)

diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -286,9 +286,7 @@ class TouchableOpacity extends React.Component<Props, State> {
                 !this.props.disabled,
             }
           : {
-              focusable:
-                this.props.focusable !== false &&
-                this.props.onPress !== undefined,
+              focusable: this.props.focusable !== false && !this.props.disabled,
             })}
         // macOS]
         tooltip={this.props.tooltip} // TODO(macOS/win GH#774)

diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -166,9 +166,7 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
               this.props.acceptsKeyboardFocus === true && !this.props.disabled,
           }
         : {
-            focusable:
-              this.props.focusable !== false &&
-              this.props.onPress !== undefined,
+            focusable: this.props.focusable !== false && !this.props.disabled,
           }),
       // macOS]
       enableFocusRing:

diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -5,7 +5,7 @@ exports[`TouchableHighlight renders correctly 1`] = `
   acceptsFirstMouse={true}
   accessible={true}
   enableFocusRing={true}
-  focusable={false}
+  focusable={true}
   onClick={[Function]}
   onKeyDown={[Function]}
   onKeyUp={[Function]}

diff --git a/package.json b/package.json
@@ -49,7 +49,8 @@
     "scripts/react-native-xcode.sh",
     "template.config.js",
     "template",
-    "third-party-podspecs"
+    "third-party-podspecs",
+    "android"
   ],
   "scripts": {
     "start": "react-native start",

diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -519,7 +519,7 @@ SPEC CHECKSUMS:
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
   FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
-  glog: b0ffa5c7cbb8a2c455ee70cc920fe61694d43248
+  glog: 0dc7efada961c0793012970b60faebbd58b0decb
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: 2f2111690f1e23490285c059ca53be22fe6d6bee
   RCTRequired: 892b1fc61efc4f66a92b9c6ca85e2522e051f0e2

diff --git a/packages/rn-tester/js/examples/KeyViewLoopExample/KeyViewLoopExample.js b/packages/rn-tester/js/examples/KeyViewLoopExample/KeyViewLoopExample.js
@@ -111,30 +111,6 @@ class FocusTrapExample extends React.Component<{}> {
   }
 }
 
-class FocusRingExample extends React.Component<{}> {
-  render() {
-    return (
-      <View>
-        <View style={styles.keyView} focusable={true} enableFocusRing={true}>
-          <Text>Enabled</Text>
-        </View>
-        <View style={styles.keyView} focusable={true} enableFocusRing={false}>
-          <Text>Disabled</Text>
-        </View>
-        <View style={styles.keyView} focusable={true}>
-          <Text>Default</Text>
-        </View>
-        <View style={styles.keyView} focusable={false}>
-          <Text>Not focusable</Text>
-        </View>
-        <View style={styles.keyView} focusable={true} enableFocusRing={true}>
-          <Text>Enabled</Text>
-        </View>
-      </View>
-    );
-  }
-}
-
 var styles = StyleSheet.create({
   textInput: {
     ...Platform.select({
@@ -174,10 +150,4 @@ exports.examples = [
       return <FocusTrapExample />;
     },
   },
-  {
-    title: 'Focus Ring Example',
-    render: function(): React.Element<any> {
-      return <FocusRingExample />;
-    },
-  },
 ];