react-native 0.64.0-rc.4 → 0.64.3

package/React/Views/RefreshControl/RCTRefreshControl.m

@@ -41,6 +41,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 {
   [super layoutSubviews];
 
+  // Fix for bug #7976
+  if (self.backgroundColor == nil) {
+    self.backgroundColor = [UIColor clearColor];
+  }
+  
   // If the control is refreshing when mounted we need to call
   // beginRefreshing in layoutSubview or it doesn't work.
   if (_currentRefreshingState && _isInitialRender) {

package/React.podspec

@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "10.0" }
   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

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.64.0-rc.4
+VERSION_NAME=0.64.3
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp

@@ -7,7 +7,9 @@
 
 #include <../instrumentation/HermesMemoryDumper.h>
 #include <HermesExecutorFactory.h>
+#include <android/log.h>
 #include <fbjni/fbjni.h>
+#include <glog/logging.h>
 #include <hermes/Public/GCConfig.h>
 #include <hermes/Public/RuntimeConfig.h>
 #include <jni.h>
@@ -21,6 +23,13 @@
 namespace facebook {
 namespace react {
 
+static void hermesFatalHandler(const std::string &reason) {
+  LOG(ERROR) << "Hermes Fatal: " << reason << "\n";
+  __android_log_assert(nullptr, "Hermes", "%s", reason.c_str());
+}
+
+static std::once_flag flag;
+
 static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) {
   namespace vm = ::hermes::vm;
   auto gcConfigBuilder =
@@ -62,6 +71,9 @@ class HermesExecutorHolder
       jni::alias_ref<jclass>) {
     JReactMarker::setLogPerfMarkerIfNeeded();
 
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(
         std::make_unique<HermesExecutorFactory>(installBindings));
   }
@@ -71,6 +83,9 @@ class HermesExecutorHolder
       jlong heapSizeMB) {
     JReactMarker::setLogPerfMarkerIfNeeded();
     auto runtimeConfig = makeRuntimeConfig(heapSizeMB);
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(std::make_unique<HermesExecutorFactory>(
         installBindings, JSIExecutor::defaultTimeoutInvoker, runtimeConfig));
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java

@@ -8,6 +8,7 @@
 package com.facebook.react;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import androidx.annotation.Nullable;
@@ -120,6 +121,12 @@ public abstract class ReactActivity extends AppCompatActivity
     mDelegate.onWindowFocusChanged(hasFocus);
   }
 
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    mDelegate.onConfigurationChanged(newConfig);
+  }
+
   protected final ReactNativeHost getReactNativeHost() {
     return mDelegate.getReactNativeHost();
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -11,6 +11,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -154,6 +155,12 @@ public class ReactActivityDelegate {
     }
   }
 
+  public void onConfigurationChanged(Configuration newConfig) {
+    if (getReactNativeHost().hasInstance()) {
+      getReactInstanceManager().onConfigurationChanged(getContext(), newConfig);
+    }
+  }
+
   @TargetApi(Build.VERSION_CODES.M)
   public void requestPermissions(
       String[] permissions, int requestCode, PermissionListener listener) {

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -756,6 +756,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
         return;
       }
       mDeviceRotation = rotation;
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.appearance;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import androidx.annotation.Nullable;
@@ -74,7 +75,15 @@ public class AppearanceModule extends NativeAppearanceSpec {
 
   @Override
   public String getColorScheme() {
-    mColorScheme = colorSchemeForCurrentConfiguration(getReactApplicationContext());
+    // Attempt to use the Activity context first in order to get the most up to date
+    // scheme. This covers the scenario when AppCompatDelegate.setDefaultNightMode()
+    // is called directly (which can occur in Brownfield apps for example).
+    Activity activity = getCurrentActivity();
+
+    mColorScheme =
+        colorSchemeForCurrentConfiguration(
+            activity != null ? activity : getReactApplicationContext());
+
     return mColorScheme;
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 64,
-      "patch", 0,
-      "prerelease", "rc.4");
+      "patch", 3,
+      "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java

@@ -86,9 +86,18 @@ public class UIManagerHelper {
       }
     }
     CatalystInstance catalystInstance = context.getCatalystInstance();
-    return uiManagerType == FABRIC
-        ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
-        : catalystInstance.getNativeModule(UIManagerModule.class);
+    try {
+      return uiManagerType == FABRIC
+          ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
+          : catalystInstance.getNativeModule(UIManagerModule.class);
+    } catch (IllegalArgumentException ex) {
+      // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode
+      ReactSoftException.logSoftException(
+          "UIManagerHelper",
+          new ReactNoCrashSoftException(
+              "Cannot get UIManager for UIManagerType: " + uiManagerType));
+      return catalystInstance.getNativeModule(UIManagerModule.class);
+    }
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -419,11 +419,10 @@ public class ReactEditText extends AppCompatEditText
   @Override
   public void setInputType(int type) {
     Typeface tf = super.getTypeface();
-    // Input type password defaults to monospace font, so we need to re-apply the font
-    super.setTypeface(tf);
-
     super.setInputType(type);
     mStagedInputType = type;
+    // Input type password defaults to monospace font, so we need to re-apply the font
+    super.setTypeface(tf);
 
     /**
      * If set forces multiline on input, because of a restriction on Android source that enables

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 64;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "rc.4";
+  int32_t Patch = 3;
+  std::string_view Prerelease = "";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3-javadoc.jar.md5

@@ -0,0 +1 @@
+72d6a6b364bfe42709f701c11690b4d3

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3-javadoc.jar.sha1

@@ -0,0 +1 @@
+642a7df62ed900cf62f369776e512575f9d38158

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3-sources.jar.md5

@@ -0,0 +1 @@
+5e29dde11cfa8efa02db8824bb240067

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3-sources.jar.sha1

@@ -0,0 +1 @@
+db3abca58136782da3a093c5b9eaa625be5637bd

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3.aar.md5

@@ -0,0 +1 @@
+9250c1f87e25c2824138f039450d9b17

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3.aar.sha1

@@ -0,0 +1 @@
+654ef2ffdf7482e57c8699b3a0f8217d4050e581

package/android/com/facebook/react/react-native/{0.64.0-rc.4/react-native-0.64.0-rc.4.pom → 0.64.3/react-native-0.64.3.pom}

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.64.0-rc.4</version>
+  <version>0.64.3</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3.pom.md5

@@ -0,0 +1 @@
+83a7a81248847a9b98c3158d74119496

package/android/com/facebook/react/react-native/0.64.3/react-native-0.64.3.pom.sha1

@@ -0,0 +1 @@
+2e42f2fe647d72ab193cb92ea94b5ac9ea258bd0

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <release>0.64.0-rc.4</release>
+    <release>0.64.3</release>
     <versions>
-      <version>0.64.0-rc.4</version>
+      <version>0.64.3</version>
     </versions>
-    <lastUpdated>20210301194623</lastUpdated>
+    <lastUpdated>20211104212221</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-e1db36338d56ae54c79930054315902b
+e293d1fe02f2adb7a9e27084ab808332

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-520c1ed955799023b46aa0cd89a207f68f81a751
+986a21d91084f453cc9a13e853a9bbb8c362fd72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.64.0-rc.4",
+  "version": "0.64.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -84,9 +84,9 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^26.5.0",
-    "@react-native-community/cli": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-android": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-ios": "^5.0.1-alpha.0",
+    "@react-native-community/cli": "^5.0.1-alpha.1",
+    "@react-native-community/cli-platform-android": "^5.0.1-alpha.1",
+    "@react-native-community/cli-platform-ios": "^5.0.1-alpha.1",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",

package/react.gradle

@@ -28,17 +28,11 @@ def detectCliPath(config) {
     if (config.cliPath) {
         return config.cliPath
     }
-
-    def cliPath = ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim()
-
-    if (cliPath) {
-        return cliPath
-    } else if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
+    if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
         return "${projectDir}/../../node_modules/react-native/cli.js"
-    } else {
-        throw new Exception("Couldn't determine CLI location. " +
-            "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
     }
+    throw new Exception("Couldn't determine CLI location. " +
+             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
 }
 
 def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"

package/scripts/find-node.sh

@@ -28,4 +28,10 @@ if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
   if [[ "$(anyenv envs | grep -c ndenv )" -eq 1 ]]; then
     eval "$(anyenv init -)"
   fi
-fi
+fi
+
+# Support Homebrew on M1
+HOMEBREW_M1_BIN=/opt/homebrew/bin
+if [[ -d $HOMEBREW_M1_BIN && ! $PATH =~ $HOMEBREW_M1_BIN ]]; then
+  export PATH="$HOMEBREW_M1_BIN:$PATH"
+fi

package/scripts/react_native_pods.rb

@@ -71,7 +71,7 @@ end
 def use_flipper!(versions = {}, configurations: ['Debug'])
   versions['Flipper'] ||= '~> 0.75.1'
   versions['Flipper-DoubleConversion'] ||= '1.1.7'
-  versions['Flipper-Folly'] ||= '~> 2.5'
+  versions['Flipper-Folly'] ||= '~> 2.5.3'
   versions['Flipper-Glog'] ||= '0.3.6'
   versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
   versions['Flipper-RSocket'] ||= '~> 1.3'
@@ -138,10 +138,26 @@ def exclude_architectures(installer)
 end
 
 def react_native_post_install(installer)
+  pods_prefix = File.dirname(installer.pods_project.path)
+
   if has_pod(installer, 'Flipper')
     flipper_post_install(installer)
   end
 
+  ## Fix for RTC-Folly on iOS 14.5 - makes Hermes work again
+  find_and_replace(
+    "#{pods_prefix}/RCT-Folly/folly/synchronization/DistributedMutex-inl.h",
+    'atomic_notify_one(state)',
+    'folly::atomic_notify_one(state)'
+  )
+
+  find_and_replace(
+    "#{pods_prefix}Pods/RCT-Folly/folly/synchronization/DistributedMutex-inl.h",
+    'atomic_wait_until(&state, previous | data, deadline)',
+    'folly::atomic_wait_until(&state, previous | data, deadline)'
+  )
+
+  ## Exclude `i386` from valid architectures when building with Hermes on iOS
   exclude_architectures(installer)
 end
 
@@ -199,3 +215,18 @@ def use_react_native_codegen!(spec, options={})
 
   spec.prepare_command = "#{mkdir_command} && touch #{generated_files.reduce() { |str, file| str + " " + file }}"
 end
+
+# Local method for the Xcode 12.5 fix
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+    text = File.read(name)
+    replace = text.gsub(findstr, replacestr)
+    replaced = text.index(replacestr)
+    next if !replaced.nil? || text == replace
+
+    puts "Patching #{name}"
+    File.open(name, 'w') { |file| file.puts replace }
+    $stdout.flush
+  end
+  Dir["#{dir}*/"].each(&method(:find_and_replace))
+end

package/template/_editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

package/template/_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

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.1",
-    "react-native": "0.64.0-rc.4"
+    "react-native": "0.64.3"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4-javadoc.jar.md5

@@ -1 +0,0 @@
-2f9d9c437a32e6cb435a7d82ca22d498

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4-javadoc.jar.sha1

@@ -1 +0,0 @@
-d6fe67ffc150b4d6da0438ae7526fe87271a193f

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4-sources.jar.md5

@@ -1 +0,0 @@
-30916c4ffd6eba56855fdb2ed6d454e8

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4-sources.jar.sha1

@@ -1 +0,0 @@
-cc5e334a2c98773aa3f8deb25279b1ed14dcf4ec

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4.aar.md5

@@ -1 +0,0 @@
-0bba93a4348f044730d774c848d64c96

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4.aar.sha1

@@ -1 +0,0 @@
-7278d5546c6900172c98d52aeb11a63ce0b6da94

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4.pom.md5

@@ -1 +0,0 @@
-573ccaf8abeeb31d664b9144ecf39305

package/android/com/facebook/react/react-native/0.64.0-rc.4/react-native-0.64.0-rc.4.pom.sha1

@@ -1 +0,0 @@
-fe57ec2ab544150abd8e4250cc825e7baf3f0683