microsoft · amgleitman · Aug 31, 2021 · Jul 1, 2020 · Jul 1, 2020 · Jul 1, 2020
diff --git a/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh b/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
@@ -199,7 +199,7 @@ function e2e_suite() {
         return 1
       fi
 
-      echo "Starting packager server"
+      echo "Starting Metro"
       npm start >> /dev/null &
       SERVER_PID=$!
       sleep 15

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -122,7 +122,7 @@ commands:
         description: Homebrew package to install
         type: string
     steps:
-      - run: 
+      - run:
           name: "Brew: Install << parameters.package >>"
           command: HOMEBREW_NO_AUTO_UPDATE=1 brew install << parameters.package >> >/dev/null
 
@@ -410,7 +410,7 @@ jobs:
           name: Fetch CocoaPods Specs
           command: |
             curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-      - run: 
+      - run:
           name: Setup the CocoaPods environment
           command: pod setup
 
@@ -429,7 +429,7 @@ jobs:
       - when:
           condition: << parameters.run_unit_tests >>
           steps:
-            - run: 
+            - run:
                 name: "Run Tests: iOS Unit and Integration Tests"
                 command: yarn test-ios
       # Runs iOS Detox e2e tests
@@ -473,7 +473,7 @@ jobs:
     parameters:
       run_disabled_tests:
         type: boolean
-        default: false    
+        default: false
     steps:
       - restore_cache_checkout:
           checkout_type: android
@@ -606,7 +606,7 @@ jobs:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\19.2.5345600"
       - ANDROID_BUILD_VERSION: 28
-      - ANDROID_TOOLS_VERSION: 29.0.2
+      - ANDROID_TOOLS_VERSION: 29.0.3
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
       - NDK_VERSION: 19.2.5345600
     steps:
@@ -783,18 +783,18 @@ workflows:
           run_unit_tests: true
           requires:
             - setup_ios
-      - test_ios:
-          name: test_ios_detox
-          run_disabled_tests: false
-          run_detox_tests: true
-          requires:
-            - setup_ios
-      - test_ios:
-          name: test_ios_detox_frameworks
-          use_frameworks: true
-          run_detox_tests: true
-          requires:
-            - setup_ios
+      # - test_ios:
+      #     name: test_ios_detox
+      #     run_disabled_tests: false
+      #     run_detox_tests: true
+      #     requires:
+      #       - setup_ios
+      # - test_ios:
+      #     name: test_ios_detox_frameworks
+      #     use_frameworks: true
+      #     run_detox_tests: true
+      #     requires:
+      #       - setup_ios
       - test_js:
           name: test_js_prev_lts
           executor: nodeprevlts

diff --git a/.flowconfig b/.flowconfig
@@ -59,8 +59,8 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.well_formed_exports=true
-experimental.types_first=true
+well_formed_exports=true
+types_first=true
 experimental.abstract_locations=true
 
 [lints]
@@ -86,4 +86,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.127.0
+^0.129.0
diff --git a/.flowconfig.android b/.flowconfig.android
@@ -62,8 +62,8 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.well_formed_exports=true
-experimental.types_first=true
+well_formed_exports=true
+types_first=true
 experimental.abstract_locations=true
 
 [lints]
@@ -89,4 +89,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.127.0
+^0.129.0
diff --git a/.flowconfig.macos b/.flowconfig.macos
@@ -59,8 +59,8 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.well_formed_exports=true
-experimental.types_first=true
+well_formed_exports=true
+types_first=true
 experimental.abstract_locations=true
 
 [lints]
@@ -85,4 +85,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.127.0
+^0.129.0
diff --git a/Libraries/Animated/src/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js
@@ -168,7 +168,7 @@ const API = {
  * In general native animated implementation should support any numeric property that doesn't need
  * to be updated through the shadow view hierarchy (all non-layout properties).
  */
-const STYLES_WHITELIST = {
+const SUPPORTED_STYLES = {
   opacity: true,
   transform: true,
   borderRadius: true,
@@ -192,7 +192,7 @@ const STYLES_WHITELIST = {
   translateY: true,
 };
 
-const TRANSFORM_WHITELIST = {
+const SUPPORTED_TRANSFORMS = {
   translateX: true,
   translateY: true,
   scale: true,
@@ -214,11 +214,11 @@ const SUPPORTED_INTERPOLATION_PARAMS = {
 };
 
 function addWhitelistedStyleProp(prop: string): void {
-  STYLES_WHITELIST[prop] = true;
+  SUPPORTED_STYLES[prop] = true;
 }
 
 function addWhitelistedTransformProp(prop: string): void {
-  TRANSFORM_WHITELIST[prop] = true;
+  SUPPORTED_TRANSFORMS[prop] = true;
 }
 
 function addWhitelistedInterpolationParam(param: string): void {
@@ -242,7 +242,7 @@ function validateTransform(
   >,
 ): void {
   configs.forEach(config => {
-    if (!TRANSFORM_WHITELIST.hasOwnProperty(config.property)) {
+    if (!SUPPORTED_TRANSFORMS.hasOwnProperty(config.property)) {
       throw new Error(
         `Property '${config.property}' is not supported by native animated module`,
       );
@@ -252,7 +252,7 @@ function validateTransform(
 
 function validateStyles(styles: {[key: string]: ?number, ...}): void {
   for (const key in styles) {
-    if (!STYLES_WHITELIST.hasOwnProperty(key)) {
+    if (!SUPPORTED_STYLES.hasOwnProperty(key)) {
       throw new Error(
         `Style property '${key}' is not supported by native animated module`,
       );

diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
@@ -38,7 +38,7 @@ @implementation RCTBlobManager
 
 @synthesize bridge = _bridge;
 @synthesize methodQueue = _methodQueue;
-@synthesize turboModuleLookupDelegate = _turboModuleLookupDelegate;
+@synthesize turboModuleRegistry = _turboModuleRegistry;
 
 - (void)setBridge:(RCTBridge *)bridge
 {
@@ -140,7 +140,7 @@ - (void)remove:(NSString *)blobId
 
 RCT_EXPORT_METHOD(addNetworkingHandler)
 {
-  RCTNetworking *const networking = _bridge ? _bridge.networking : [_turboModuleLookupDelegate moduleForName:"RCTNetworking"];
+  RCTNetworking *const networking = _bridge ? _bridge.networking : [_turboModuleRegistry moduleForName:"RCTNetworking"];
 
   // TODO(T63516227): Why can methodQueue be nil here? 
   // We don't want to do anything when methodQueue is nil.

diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
@@ -240,7 +240,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
       focusable={focusable !== false}
       hitSlop={hitSlop}
       ref={viewRef}
-      style={typeof style === 'function' ? style({pressed}) : style}>
+      style={typeof style === 'function' ? style({pressed}) : style}
+      collapsable={false}>
       {typeof children === 'function' ? children({pressed}) : children}
       {__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}
     </View>

diff --git a/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap b/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
@@ -4,6 +4,7 @@ exports[`<Pressable /> should render as expected: should deep render when mocked
 <View
   acceptsFirstMouse={true}
   accessible={true}
+  collapsable={false}
   enableFocusRing={true}
   focusable={true}
   onBlur={[Function]}
@@ -26,6 +27,7 @@ exports[`<Pressable /> should render as expected: should deep render when not mo
 <View
   acceptsFirstMouse={true}
   accessible={true}
+  collapsable={false}
   enableFocusRing={true}
   focusable={true}
   onBlur={[Function]}

diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
@@ -20,7 +20,6 @@ const TextInputState = require('./TextInput/TextInputState');
 const UIManager = require('../ReactNative/UIManager');
 
 const invariant = require('invariant');
-const performanceNow = require('fbjs/lib/performanceNow');
 
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {PressEvent, ScrollEvent} from '../Types/CoreEventTypes';
@@ -385,7 +384,7 @@ const ScrollResponderMixin = {
    * Invoke this from an `onMomentumScrollBegin` event.
    */
   scrollResponderHandleMomentumScrollBegin: function(e: ScrollEvent) {
-    this.state.lastMomentumScrollBeginTime = performanceNow();
+    this.state.lastMomentumScrollBeginTime = global.performance.now();
     this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
   },
 
@@ -394,7 +393,7 @@ const ScrollResponderMixin = {
    */
   scrollResponderHandleMomentumScrollEnd: function(e: ScrollEvent) {
     FrameRateLogger.endScroll();
-    this.state.lastMomentumScrollEndTime = performanceNow();
+    this.state.lastMomentumScrollEndTime = global.performance.now();
     this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
   },
 
@@ -435,7 +434,7 @@ const ScrollResponderMixin = {
    * a touch has just started or ended.
    */
   scrollResponderIsAnimating: function(): boolean {
-    const now = performanceNow();
+    const now = global.performance.now();
     const timeSinceLastMomentumScrollEnd =
       now - this.state.lastMomentumScrollEndTime;
     const isAnimating =

diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
@@ -87,7 +87,7 @@ type IOSProps = $ReadOnly<{|
    *
    * @platform ios
    */
-  showHideTransition?: ?('fade' | 'slide'),
+  showHideTransition?: ?('fade' | 'slide' | 'none'),
 |}>;
 
 type Props = $ReadOnly<{|

diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -25,7 +25,6 @@ import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import requireNativeComponent from '../../ReactNative/requireNativeComponent';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
-import * as React from 'react';
 import AndroidTextInputViewConfig from './AndroidTextInputViewConfig';
 const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry');
 

diff --git a/Libraries/Components/TextInput/AndroidTextInputViewConfig.js b/Libraries/Components/TextInput/AndroidTextInputViewConfig.js
@@ -16,6 +16,36 @@ import type {ReactNativeBaseComponentViewConfig} from '../../Renderer/shims/Reac
 const AndroidTextInputViewConfig = {
   uiViewClassName: 'AndroidTextInput',
   bubblingEventTypes: {
+    topBlur: {
+      phasedRegistrationNames: {
+        bubbled: 'onBlur',
+        captured: 'onBlurCapture',
+      },
+    },
+    topEndEditing: {
+      phasedRegistrationNames: {
+        bubbled: 'onEndEditing',
+        captured: 'onEndEditingCapture',
+      },
+    },
+    topFocus: {
+      phasedRegistrationNames: {
+        bubbled: 'onFocus',
+        captured: 'onFocusCapture',
+      },
+    },
+    topKeyPress: {
+      phasedRegistrationNames: {
+        bubbled: 'onKeyPress',
+        captured: 'onKeyPressCapture',
+      },
+    },
+    topSubmitEditing: {
+      phasedRegistrationNames: {
+        bubbled: 'onSubmitEditing',
+        captured: 'onSubmitEditingCapture',
+      },
+    },
     topTextInput: {
       phasedRegistrationNames: {
         bubbled: 'onTextInput',

diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
@@ -21,7 +21,6 @@ const UIManager = require('../../ReactNative/UIManager');
 const View = require('../View/View');
 const SoundManager = require('../Sound/SoundManager');
 
-const keyMirror = require('fbjs/lib/keyMirror');
 const normalizeColor = require('../../StyleSheet/normalizeColor');
 
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
@@ -129,16 +128,16 @@ const extractSingleTouch = nativeEvent => {
  * Touchable states.
  */
 
-const States = keyMirror({
-  NOT_RESPONDER: null, // Not the responder
-  RESPONDER_INACTIVE_PRESS_IN: null, // Responder, inactive, in the `PressRect`
-  RESPONDER_INACTIVE_PRESS_OUT: null, // Responder, inactive, out of `PressRect`
-  RESPONDER_ACTIVE_PRESS_IN: null, // Responder, active, in the `PressRect`
-  RESPONDER_ACTIVE_PRESS_OUT: null, // Responder, active, out of `PressRect`
-  RESPONDER_ACTIVE_LONG_PRESS_IN: null, // Responder, active, in the `PressRect`, after long press threshold
-  RESPONDER_ACTIVE_LONG_PRESS_OUT: null, // Responder, active, out of `PressRect`, after long press threshold
-  ERROR: null,
-});
+const States = {
+  NOT_RESPONDER: 'NOT_RESPONDER', // Not the responder
+  RESPONDER_INACTIVE_PRESS_IN: 'RESPONDER_INACTIVE_PRESS_IN', // Responder, inactive, in the `PressRect`
+  RESPONDER_INACTIVE_PRESS_OUT: 'RESPONDER_INACTIVE_PRESS_OUT', // Responder, inactive, out of `PressRect`
+  RESPONDER_ACTIVE_PRESS_IN: 'RESPONDER_ACTIVE_PRESS_IN', // Responder, active, in the `PressRect`
+  RESPONDER_ACTIVE_PRESS_OUT: 'RESPONDER_ACTIVE_PRESS_OUT', // Responder, active, out of `PressRect`
+  RESPONDER_ACTIVE_LONG_PRESS_IN: 'RESPONDER_ACTIVE_LONG_PRESS_IN', // Responder, active, in the `PressRect`, after long press threshold
+  RESPONDER_ACTIVE_LONG_PRESS_OUT: 'RESPONDER_ACTIVE_LONG_PRESS_OUT', // Responder, active, out of `PressRect`, after long press threshold
+  ERROR: 'ERROR',
+};
 
 type State =
   | typeof States.NOT_RESPONDER
@@ -190,15 +189,15 @@ const IsLongPressingIn = {
 /**
  * Inputs to the state machine.
  */
-const Signals = keyMirror({
-  DELAY: null,
-  RESPONDER_GRANT: null,
-  RESPONDER_RELEASE: null,
-  RESPONDER_TERMINATED: null,
-  ENTER_PRESS_RECT: null,
-  LEAVE_PRESS_RECT: null,
-  LONG_PRESS_DETECTED: null,
-});
+const Signals = {
+  DELAY: 'DELAY',
+  RESPONDER_GRANT: 'RESPONDER_GRANT',
+  RESPONDER_RELEASE: 'RESPONDER_RELEASE',
+  RESPONDER_TERMINATED: 'RESPONDER_TERMINATED',
+  ENTER_PRESS_RECT: 'ENTER_PRESS_RECT',
+  LEAVE_PRESS_RECT: 'LEAVE_PRESS_RECT',
+  LONG_PRESS_DETECTED: 'LONG_PRESS_DETECTED',
+};
 
 type Signal =
   | typeof Signals.DELAY