Merge from upstream 0.64-stable to v0.64.0

.ado/android-pr.yml

@@ -74,10 +74,24 @@ jobs:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           githubApiToken: $(githubApiToken)
 
-      - task: CmdLine@2
-        displayName: gradlew clean
-        inputs:
-          script: ./gradlew clean
+#     In RN64 "clean" task tries to run the build again. It is reproing in 0.64-stable branch but fixed in 0.65-stable.
+#     I can't zero on the exact cause .. but turns out the issue is with rntester clean task.
+#     
+#     mganandraj@RNDroid:~/github/rnm-64$ ./gradlew :packages:rn-tester:android:app:clean --dry-run
+#     :packages:react-native-codegen:android:buildCodegenCLI SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenSchemaFromJavaScript SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:extractAARHeaders SKIPPED
+#     :ReactAndroid:extractJNIFiles SKIPPED
+#     :ReactAndroid:generateCodegenSchemaFromJavaScript SKIPPED
+#     :ReactAndroid:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:prepareBoost SKIPPED
+#     :ReactAndroid:createNativeDepsDirectories SKIPPED
+#     ..
+#      - task: CmdLine@2
+#        displayName: gradlew clean
+#        inputs:
+#          script: ./gradlew clean
 
       - task: PublishBuildArtifacts@1
         displayName: 'Publish final artifacts'

.ado/templates/android-build-office.yml

@@ -30,12 +30,29 @@ steps:
     inputs:
       script: yarn install --frozen-lockfile
 
+  # scripts/bump-oss-version.js
+  #
+  # update the following files to the commit id.
+  # package.json (-> npm package version)
+  # gradle.properties (-> aar version)
+  # gradle.properties (-> aar version)
+  #
+  # The following files are updated for runtime version checking.
+  # ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+  # React/Base/RCTVersion.m
+  # ReactCommon/cxxreact/ReactNativeVersion.h
+  # Libraries/Core/ReactNativeVersion.js
+  #
+  # --nightly => version = `0.0.0-${currentCommit.slice(0, 9)}`;
+  # When on master branch or non-stable branch.
   - task: CmdLine@2
     displayName: Bump canary package version
     inputs:
       script: node scripts/bump-oss-version.js --nightly
-    condition: eq(variables['Build.SourceBranchName'], 'master')
-
+    condition: or(eq(variables['Build.SourceBranchName'], 'master'), not(contains(variables['Build.SourceBranchName'], '-stable')))
+
+  # TODO: We don't seem to be running bump-oss-version.js for stable branches, hence we would end up publishing using the values in the repository.
+
   - task: CmdLine@2
     displayName: nuget restore
     inputs:

.ado/templates/apple-droid-node-patching.yml

@@ -5,4 +5,4 @@ steps:
   - task: CmdLine@2
     displayName: Apply Android specific patches for Office consumption
     inputs:
-      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

.circleci/config.yml

@@ -423,7 +423,7 @@ jobs:
           steps:
             - run:
                 name: Generate RNTesterPods Workspace
-                command: cd packages/rn-tester && bundle exec pod install --verbose
+                command: cd packages/rn-tester && USE_FABRIC=1 bundle exec pod install --verbose
 
       # -------------------------
       # Runs iOS unit tests
@@ -790,13 +790,15 @@ workflows:
           run_unit_tests: true
           requires:
             - setup_ios
-      - test_ios:
-          name: test_ios_unit_frameworks_hermes
-          use_hermes: true
-          use_frameworks: true
-          run_unit_tests: true
-          requires:
-            - setup_ios
+      # Hermes doesn't support dynamic frameworks right now.
+      # The following configuration will fail.
+      # - test_ios:
+      #     name: test_ios_unit_frameworks_hermes
+      #     use_hermes: true
+      #     use_frameworks: true
+      #     run_unit_tests: true
+      #     requires:
+      #       - setup_ios
       # - test_ios:
       #     name: test_ios_detox
       #     run_detox_tests: true

.editorconfig

@@ -15,3 +15,7 @@ indent_size = 4
 
 [BUCK]
 indent_size = 4
+
+# Windows files
+[*.bat]
+end_of_line = crlf

.gitattributes

@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.gitignore

@@ -94,9 +94,9 @@ package-lock.json
 
 # Libs that shouldn't have Xcode project
 /Libraries/FBLazyVector/**/*.xcodeproj
-/Libraries/FBReactNativeSpec/**/*.xcodeproj
 /Libraries/RCTRequired/**/*.xcodeproj
 /React/CoreModules/**/*.xcodeproj
+/React/FBReactNativeSpec/**/*.xcodeproj
 /packages/react-native-codegen/**/*.xcodeproj
 
 # CocoaPods
@@ -109,10 +109,8 @@ package-lock.json
 !/packages/rn-tester/Pods/__offline_mirrors__
 
 # react-native-codegen
-/Libraries/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
-/ReactCommon/fabric/components/rncore/
-/schema-rncore.json
+/ReactCommon/react/renderer/components/rncore/
 
 # Visual studio
 .vscode

Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -33,6 +33,7 @@ const ActionSheetIOS = {
    * - `destructiveButtonIndex` (int or array of ints) - index or indices of destructive buttons in `options`
    * - `title` (string) - a title to show above the action sheet
    * - `message` (string) - a message to show below the title
+   * - `disabledButtonIndices` (array of numbers) - a list of button indices which should be disabled
    *
    * The 'callback' function takes one parameter, the zero-based index
    * of the selected item.
@@ -49,6 +50,7 @@ const ActionSheetIOS = {
       +anchor?: ?number,
       +tintColor?: ColorValue | ProcessedColorValue,
       +userInterfaceStyle?: string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) {

Libraries/ActionSheetIOS/NativeActionSheetManager.js

@@ -25,6 +25,7 @@ export interface Spec extends TurboModule {
       +anchor?: ?number,
       +tintColor?: ?number,
       +userInterfaceStyle?: ?string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) => void;

Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -97,13 +97,16 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   };
 
   _onLayout = (event: ViewLayoutEvent) => {
+    const wasFrameNull = this._frame == null;
     this._frame = event.nativeEvent.layout;
     if (!this._initialFrameHeight) {
       // save the initial frame height, before the keyboard is visible
       this._initialFrameHeight = this._frame.height;
     }
 
-    this._updateBottomIfNecesarry();
+    if (wasFrameNull) {
+      this._updateBottomIfNecesarry();
+    }
   };
 
   _updateBottomIfNecesarry = () => {

Libraries/Components/ScrollResponder.js

@@ -186,7 +186,7 @@ const ScrollResponderMixin = {
 
     if (
       this.props.keyboardShouldPersistTaps === 'handled' &&
-      currentlyFocusedInput != null &&
+      this.scrollResponderKeyboardIsDismissible() &&
       e.target !== currentlyFocusedInput
     ) {
       return true;
@@ -223,7 +223,6 @@ const ScrollResponderMixin = {
     // and a new touch starts with a non-textinput target (in which case the
     // first tap should be sent to the scroll view and dismiss the keyboard,
     // then the second tap goes to the actual interior view)
-    const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
     const {keyboardShouldPersistTaps} = this.props;
     const keyboardNeverPersistTaps =
       !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
@@ -240,7 +239,7 @@ const ScrollResponderMixin = {
 
     if (
       keyboardNeverPersistTaps &&
-      currentlyFocusedTextInput != null &&
+      this.scrollResponderKeyboardIsDismissible() &&
       e.target != null &&
       !TextInputState.isTextInput(e.target)
     ) {
@@ -250,6 +249,31 @@ const ScrollResponderMixin = {
     return false;
   },
 
+  /**
+   * Do we consider there to be a dismissible soft-keyboard open?
+   */
+  scrollResponderKeyboardIsDismissible: function(): boolean {
+    const currentlyFocusedInput = TextInputState.currentlyFocusedInput();
+
+    // We cannot dismiss the keyboard without an input to blur, even if a soft
+    // keyboard is open (e.g. when keyboard is open due to a native component
+    // not participating in TextInputState). It's also possible that the
+    // currently focused input isn't a TextInput (such as by calling ref.focus
+    // on a non-TextInput).
+    const hasFocusedTextInput =
+      currentlyFocusedInput != null &&
+      TextInputState.isTextInput(currentlyFocusedInput);
+
+    // Even if an input is focused, we may not have a keyboard to dismiss. E.g
+    // when using a physical keyboard. Ensure we have an event for an opened
+    // keyboard, except on Android where setting windowSoftInputMode to
+    // adjustNone leads to missing keyboard events.
+    const softKeyboardMayBeOpen =
+      this.keyboardWillOpenTo != null || Platform.OS === 'android';
+
+    return hasFocusedTextInput && softKeyboardMayBeOpen;
+  },
+
   /**
    * Invoke this from an `onResponderReject` event.
    *
@@ -324,7 +348,7 @@ const ScrollResponderMixin = {
     if (
       this.props.keyboardShouldPersistTaps !== true &&
       this.props.keyboardShouldPersistTaps !== 'always' &&
-      currentlyFocusedTextInput != null &&
+      this.scrollResponderKeyboardIsDismissible() &&
       e.target !== currentlyFocusedTextInput &&
       !this.state.observedScrollSinceBecomingResponder &&
       !this.state.becameResponderWhileAnimating

Libraries/Components/TextInput/TextInput.js

@@ -874,6 +874,8 @@ function InternalTextInput(props: Props): React.Node {
   // Therefore, we ignore selections and pass them through until the selection event has
   // been sent.
   // Note that this mitigation is NOT needed for Fabric.
+  // discovered when upgrading react-hooks
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   let selection: ?Selection =
     props.selection == null
       ? null

Libraries/Core/ReactNativeVersion.js

@@ -11,7 +11,7 @@
 
 exports.version = {
   major: 0,
-  minor: 63,
-  patch: 3,
+  minor: 64,
+  patch: 0,
   prerelease: null,
 };

Libraries/Modal/RCTModalHostViewNativeComponent.js

@@ -91,7 +91,7 @@ type NativeProps = $ReadOnly<{|
    * The `onDismiss` prop allows passing a function that will be called once
    * the modal has been dismissed.
    *
-   * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
+   * See https://reactnative.dev/docs/modal.html#ondismiss
    */
   onDismiss?: ?BubblingEventHandler<null>,
 

React-Core.podspec

@@ -57,6 +57,7 @@ Pod::Spec.new do |s|
     ss.exclude_files          = "React/CoreModules/**/*",
                                 "React/DevSupport/**/*",
                                 "React/Fabric/**/*",
+                                "React/FBReactNativeSpec/**/*",
                                 "React/Inspector/**/*",
                                 "React/Tests/**/*",
                                 "React/CxxBridge/HermesExecutorFactory.*" # TODO(macOS GH#214)

React.podspec

@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
   s.source                 = source
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.cocoapods_version      = ">= 1.2.0"
+  s.cocoapods_version      = ">= 1.10.1"
 
   s.dependency "React-Core", version
   s.dependency "React-Core/DevSupport", version

React/Base/RCTVersion.m

@@ -22,8 +22,8 @@
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(63),
-                  RCTVersionPatch: @(3),
+                  RCTVersionMinor: @(64),
+                  RCTVersionPatch: @(0),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

React/CoreModules/RCTActionSheetManager.mm

@@ -91,9 +91,15 @@ - (void)presentViewController:(UIViewController *)alertController
   NSArray<NSString *> *buttons = RCTConvertOptionalVecToArray(options.options(), ^id(NSString *element) {
     return element;
   });
+  NSArray<NSNumber *> *disabledButtonIndices;
   NSInteger cancelButtonIndex =
       options.cancelButtonIndex() ? [RCTConvert NSInteger:@(*options.cancelButtonIndex())] : -1;
   NSArray<NSNumber *> *destructiveButtonIndices;
+  if (options.disabledButtonIndices()) {
+    disabledButtonIndices = RCTConvertVecToArray(*options.disabledButtonIndices(), ^id(double element) {
+      return @(element);
+    });
+  }
   if (options.destructiveButtonIndices()) {
     destructiveButtonIndices = RCTConvertVecToArray(*options.destructiveButtonIndices(), ^id(double element) {
       return @(element);
@@ -120,6 +126,7 @@ - (void)presentViewController:(UIViewController *)alertController
       @"destructiveButtonIndices" : destructiveButtonIndices,
       @"anchor" : anchor,
       @"tintColor" : tintColor,
+      @"disabledButtonIndices" : disabledButtonIndices,
     });
     return;
   }
@@ -155,6 +162,17 @@ - (void)presentViewController:(UIViewController *)alertController
     index++;
   }
 
+  if (disabledButtonIndices) {
+    for (NSNumber *disabledButtonIndex in disabledButtonIndices) {
+      if ([disabledButtonIndex integerValue] < buttons.count) {
+        [alertController.actions[[disabledButtonIndex integerValue]] setEnabled:false];
+      } else {
+        RCTLogError(@"Index %@ from `disabledButtonIndices` is out of bounds. Maximum index value is %@.", @([disabledButtonIndex integerValue]), @(buttons.count - 1));
+        return;
+      }
+    }
+  }
+
   alertController.view.tintColor = tintColor;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0

Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec → React/FBReactNativeSpec/FBReactNativeSpec.podspec

@@ -10,23 +10,13 @@ package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
-codegen_path_prefix = ".."
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip
-  codegen_path_prefix = "packages"
 else
   source[:tag] = "v#{version}"
 end
 
-react_native_path = File.join(__dir__, "..", "..")
-srcs_dir = File.join(__dir__, "..")
-codegen_script_path = File.join(react_native_path, "scripts", "generate-native-modules-specs.sh")
-codegen_path = File.join(react_native_path, codegen_path_prefix, "react-native-codegen")
-output_dir = File.join(__dir__, "FBReactNativeSpec")
-generated_files = [File.join(output_dir, "FBReactNativeSpec.h"), File.join(output_dir, "FBReactNativeSpec-generated.mm")]
-codegen_command = "CODEGEN_PATH=#{codegen_path} sh '#{codegen_script_path}' | tee \"${SCRIPT_OUTPUT_FILE_0}\""
-
 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'
 
@@ -46,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Libraries/FBReactNativeSpec\" \"$(PODS_ROOT)/RCT-Folly\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/FBReactNativeSpec\" \"$(PODS_ROOT)/RCT-Folly\""
                              }
 
   s.dependency "RCT-Folly", folly_version
@@ -56,12 +46,5 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "ReactCommon/turbomodule/core", version
 
-  s.prepare_command = "mkdir -p #{output_dir} && touch #{generated_files.reduce() { |str, file| str + " " + file }}"
-  s.script_phase = {
-    :name => 'Generate Native Modules Code',
-    :input_files => [srcs_dir],
-    :output_files => ["$(DERIVED_FILE_DIR)/FBReactNativeSpec-codegen.log"],
-    :script => codegen_command,
-    :execution_position => :before_compile
-  }
+  use_react_native_codegen! (s)
 end

React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm

@@ -13,7 +13,7 @@
 #import <react/renderer/components/rncore/EventEmitters.h>
 #import <react/renderer/components/rncore/Props.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;