Allow touches on overflowed children when overflow: visible (Android)

.buckconfig

@@ -8,7 +8,6 @@
 [maven_repositories]
   central = https://repo1.maven.org/maven2
   google = https://maven.google.com/
-  jcenter = https://jcenter.bintray.com/
 
 [alias]
   rntester = //packages/rn-tester/android/app:app

.circleci/config.yml

@@ -618,7 +618,7 @@ jobs:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
       - ANDROID_BUILD_VERSION: 30
-      - ANDROID_TOOLS_VERSION: 29.0.3
+      - ANDROID_TOOLS_VERSION: 30.0.2
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
       - NDK_VERSION: 20.1.5948944
     steps:

.editorconfig

@@ -13,6 +13,9 @@ indent_size = 2
 [*.gradle]
 indent_size = 4
 
+[*.kts]
+indent_size = 4
+
 [BUCK]
 indent_size = 4
 

Libraries/Blob/React-RCTBlob.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTBlob"

Libraries/Blob/URL.js

@@ -105,7 +105,7 @@ export class URLSearchParams {
 
 function validateBaseUrl(url: string) {
   // from this MIT-licensed gist: https://gist.github.com/dperini/729294
-  return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,}))?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(
+  return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)*(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/.test(
     url,
   );
 }

Libraries/Core/ReactNativeVersion.js

@@ -1,17 +1,17 @@
 /**
+ * @generated by scripts/bump-oss-version.js
+ *
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @generated by scripts/bump-oss-version.js
  * @flow strict
  */
 
 exports.version = {
   major: 0,
-  minor: 0,
+  minor: 65,
   patch: 0,
-  prerelease: null,
+  prerelease: 'rc.3',
 };

Libraries/Image/React-RCTImage.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTImage"

Libraries/LinkingIOS/React-RCTLinking.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTLinking"

Libraries/NativeAnimation/React-RCTAnimation.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTAnimation"

Libraries/Network/RCTHTTPRequestHandler.h

@@ -8,6 +8,11 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTURLRequestHandler.h>
 
+typedef NSURLSessionConfiguration* (^NSURLSessionConfigurationProvider)(void);
+/**
+ *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the app.
+*/
+RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider);
 /**
  * This is the default RCTURLRequestHandler implementation for HTTP requests.
  */

Libraries/Network/RCTHTTPRequestHandler.mm

@@ -18,6 +18,12 @@ @interface RCTHTTPRequestHandler () <NSURLSessionDataDelegate, RCTTurboModule>
 
 @end
 
+static NSURLSessionConfigurationProvider urlSessionConfigurationProvider;
+
+void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider provider) {
+  urlSessionConfigurationProvider = provider;
+}
+
 @implementation RCTHTTPRequestHandler
 {
   NSMapTable *_delegates;
@@ -75,14 +81,20 @@ - (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request
     NSOperationQueue *callbackQueue = [NSOperationQueue new];
     callbackQueue.maxConcurrentOperationCount = 1;
     callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
-    NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
-    // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
-    if (useWifiOnly) {
-      configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+    NSURLSessionConfiguration *configuration;
+    if (urlSessionConfigurationProvider) {
+      configuration = urlSessionConfigurationProvider();
+    } else {
+      configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+      // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
+      if (useWifiOnly) {
+        configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+      }
+      [configuration setHTTPShouldSetCookies:YES];
+      [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
+      [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
     }
-    [configuration setHTTPShouldSetCookies:YES];
-    [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-    [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
+    assert(configuration != nil);
     _session = [NSURLSession sessionWithConfiguration:configuration
                                              delegate:self
                                         delegateQueue:callbackQueue];

Libraries/Network/React-RCTNetwork.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTNetwork"

Libraries/NewAppScreen/components/HermesBadge.js

@@ -15,6 +15,9 @@ import Colors from './Colors';
 
 const HermesBadge = (): Node => {
   const isDarkMode = useColorScheme() === 'dark';
+  const version =
+    global.HermesInternal?.getRuntimeProperties?.()['OSS Release Version'] ??
+    '';
   return global.HermesInternal ? (
     <View style={styles.badge}>
       <Text
@@ -24,7 +27,7 @@ const HermesBadge = (): Node => {
             color: isDarkMode ? Colors.light : Colors.dark,
           },
         ]}>
-        Engine: Hermes
+        {`Engine: Hermes ${version}`}
       </Text>
     </View>
   ) : null;

Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTPushNotification"

Libraries/ReactNative/AppContainer.js

@@ -14,8 +14,11 @@ import StyleSheet from '../StyleSheet/StyleSheet';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import {RootTagContext, createRootTag} from './RootTag';
 import type {RootTag} from './RootTag';
+import PropTypes from 'prop-types';
 import * as React from 'react';
 
+type Context = {rootTag: number | RootTag, ...};
+
 type Props = $ReadOnly<{|
   children?: React.Node,
   fabric?: boolean,
@@ -43,6 +46,18 @@ class AppContainer extends React.Component<Props, State> {
 
   static getDerivedStateFromError: any = undefined;
 
+  static childContextTypes:
+    | any
+    | {|rootTag: React$PropType$Primitive<number>|} = {
+    rootTag: PropTypes.number,
+  };
+
+  getChildContext(): Context {
+    return {
+      rootTag: this.props.rootTag,
+    };
+  }
+
   componentDidMount(): void {
     if (__DEV__) {
       if (!global.__RCTProfileIsProfiling) {

Libraries/ReactNative/I18nManager.js

@@ -13,12 +13,17 @@ import NativeI18nManager from './NativeI18nManager';
 const i18nConstants: {|
   doLeftAndRightSwapInRTL: boolean,
   isRTL: boolean,
+  localeIdentifier?: ?string,
 |} = getI18nManagerConstants();
 
 function getI18nManagerConstants() {
   if (NativeI18nManager) {
-    const {isRTL, doLeftAndRightSwapInRTL} = NativeI18nManager.getConstants();
-    return {isRTL, doLeftAndRightSwapInRTL};
+    const {
+      isRTL,
+      doLeftAndRightSwapInRTL,
+      localeIdentifier,
+    } = NativeI18nManager.getConstants();
+    return {isRTL, doLeftAndRightSwapInRTL, localeIdentifier};
   }
 
   return {
@@ -28,7 +33,11 @@ function getI18nManagerConstants() {
 }
 
 module.exports = {
-  getConstants: (): {|doLeftAndRightSwapInRTL: boolean, isRTL: boolean|} => {
+  getConstants: (): {|
+    doLeftAndRightSwapInRTL: boolean,
+    isRTL: boolean,
+    localeIdentifier: ?string,
+  |} => {
     return i18nConstants;
   },
 

Libraries/Settings/React-RCTSettings.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTSettings"

Libraries/StyleSheet/PlatformColorValueTypes.ios.js

@@ -16,6 +16,8 @@ export opaque type NativeColorValue = {
   dynamic?: {
     light: ?(ColorValue | ProcessedColorValue),
     dark: ?(ColorValue | ProcessedColorValue),
+    highContrastLight?: ?(ColorValue | ProcessedColorValue),
+    highContrastDark?: ?(ColorValue | ProcessedColorValue),
   },
 };
 
@@ -26,12 +28,21 @@ export const PlatformColor = (...names: Array<string>): ColorValue => {
 export type DynamicColorIOSTuplePrivate = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOSPrivate = (
   tuple: DynamicColorIOSTuplePrivate,
 ): ColorValue => {
-  return {dynamic: {light: tuple.light, dark: tuple.dark}};
+  return {
+    dynamic: {
+      light: tuple.light,
+      dark: tuple.dark,
+      highContrastLight: tuple.highContrastLight,
+      highContrastDark: tuple.highContrastDark,
+    },
+  };
 };
 
 export const normalizeColorObject = (
@@ -49,6 +60,8 @@ export const normalizeColorObject = (
       dynamic: {
         light: normalizeColor(dynamic.light),
         dark: normalizeColor(dynamic.dark),
+        highContrastLight: normalizeColor(dynamic.highContrastLight),
+        highContrastDark: normalizeColor(dynamic.highContrastDark),
       },
     };
     return dynamicColor;
@@ -67,6 +80,8 @@ export const processColorObject = (
       dynamic: {
         light: processColor(dynamic.light),
         dark: processColor(dynamic.dark),
+        highContrastLight: processColor(dynamic.highContrastLight),
+        highContrastDark: processColor(dynamic.highContrastDark),
       },
     };
     return dynamicColor;

Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js

@@ -14,8 +14,15 @@ import {DynamicColorIOSPrivate} from './PlatformColorValueTypes';
 export type DynamicColorIOSTuple = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOS = (tuple: DynamicColorIOSTuple): ColorValue => {
-  return DynamicColorIOSPrivate({light: tuple.light, dark: tuple.dark});
+  return DynamicColorIOSPrivate({
+    light: tuple.light,
+    dark: tuple.dark,
+    highContrastLight: tuple.highContrastLight,
+    highContrastDark: tuple.highContrastDark,
+  });
 };

Libraries/StyleSheet/PlatformColorValueTypesIOS.js

@@ -13,6 +13,8 @@ import type {ColorValue} from './StyleSheet';
 export type DynamicColorIOSTuple = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOS = (tuple: DynamicColorIOSTuple): ColorValue => {

Libraries/StyleSheet/__tests__/normalizeColor-test.js

@@ -43,6 +43,25 @@ describe('iOS', () => {
       expect(normalizedColor).toEqual(expectedColor);
     });
 
+    it('should normalize iOS Dynamic colors with accessible colors', () => {
+      const color = DynamicColorIOS({
+        light: 'black',
+        dark: 'white',
+        highContrastLight: 'red',
+        highContrastDark: 'blue',
+      });
+      const normalizedColor = normalizeColor(color);
+      const expectedColor = {
+        dynamic: {
+          light: 'black',
+          dark: 'white',
+          highContrastLight: 'red',
+          highContrastDark: 'blue',
+        },
+      };
+      expect(normalizedColor).toEqual(expectedColor);
+    });
+
     it('should normalize iOS Dynamic colors with PlatformColor colors', () => {
       const color = DynamicColorIOS({
         light: PlatformColor('systemBlackColor'),

Libraries/Text/Text.js

@@ -34,6 +34,8 @@ const Text: React.AbstractComponent<
     ellipsizeMode,
     onLongPress,
     onPress,
+    onPressIn,
+    onPressOut,
     onResponderGrant,
     onResponderMove,
     onResponderRelease,
@@ -64,9 +66,11 @@ const Text: React.AbstractComponent<
             onPress,
             onPressIn(event) {
               setHighlighted(!suppressHighlighting);
+              onPressIn?.(event);
             },
             onPressOut(event) {
               setHighlighted(false);
+              onPressOut?.(event);
             },
             onResponderTerminationRequest_DEPRECATED: onResponderTerminationRequest,
             onStartShouldSetResponder_DEPRECATED: onStartShouldSetResponder,
@@ -78,6 +82,8 @@ const Text: React.AbstractComponent<
       pressRetentionOffset,
       onLongPress,
       onPress,
+      onPressIn,
+      onPressOut,
       onResponderTerminationRequest,
       onStartShouldSetResponder,
       suppressHighlighting,

Libraries/Text/TextProps.js

@@ -122,6 +122,8 @@ export type TextProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/text.html#onpress
    */
   onPress?: ?(event: PressEvent) => mixed,
+  onPressIn?: ?(event: PressEvent) => mixed,
+  onPressOut?: ?(event: PressEvent) => mixed,
   onResponderGrant?: ?(event: PressEvent) => void,
   onResponderMove?: ?(event: PressEvent) => void,
   onResponderRelease?: ?(event: PressEvent) => void,