react-native 0.73.3 → 0.73.4

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 73,
-  patch: 3,
+  patch: 4,
   prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
-                  RCTVersionPatch: @(3),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/React/Modules/RCTUIManager.m

@@ -179,15 +179,20 @@ RCT_EXPORT_MODULE()
       _componentDataByName[componentData.name] = componentData;
     }
   }
-
+  // Preload the a11yManager as the RCTUIManager needs it to listen for notification
+  // By eagerly preloading it in the setBridge method, we make sure that the manager is
+  // properly initialized in the Main Thread and that we do not incur in any race condition
+  // or concurrency problem.
+  id<RCTBridgeModule> a11yManager = [self->_bridge moduleForName:@"AccessibilityManager"
+                                           lazilyLoadIfNecessary:YES];
+  __weak NSObject * a11yManagerWeakObject = a11yManager;
   // This dispatch_async avoids a deadlock while configuring native modules
-  dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0), ^{
-    id a11yManager = [self->_bridge moduleForName:@"AccessibilityManager"
-                                             lazilyLoadIfNecessary:YES];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    __strong NSObject * a11yManagerStrongObject = a11yManagerWeakObject;
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didReceiveNewContentSizeMultiplier)
                                                  name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
-                                               object:a11yManager];
+                                               object:a11yManagerStrongObject];
   });
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(namedOrientationDidChange)

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.3
+VERSION_NAME=0.73.4
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java

@@ -10,6 +10,8 @@ package com.facebook.react.bridge.queue;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
 
 /** Handler that can catch and dispatch Exceptions to an Exception handler. */
 public class MessageQueueThreadHandler extends Handler {
@@ -26,6 +28,15 @@ public class MessageQueueThreadHandler extends Handler {
     try {
       super.dispatchMessage(msg);
     } catch (Exception e) {
+      if (e instanceof NullPointerException) {
+        FLog.e(
+            ReactConstants.TAG,
+            "Caught NullPointerException when dispatching message in MessageQueueThreadHandler. This is likely caused by runnable"
+                + "(msg.callback) being nulled in Android Handler after dispatching and before handling (see T170239922 for more details)."
+                + "Currently we observe that it only happen once which is during initialisation. Due to fixing probably involve Android "
+                + "System code, we decide to ignore here for now and print an error message for debugging purpose in case this cause more serious issues in future.");
+        return;
+      }
       mExceptionHandler.handleException(e);
     }
   }

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", 73,
-      "patch", 3,
+      "patch", 4,
       "prerelease", null);
 }

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

@@ -206,7 +206,15 @@ import java.util.Set;
     }
     for (String oldKey : keysToNormalize) {
       Object value = events.get(oldKey);
-      String newKey = "top" + oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      String baseKey = "";
+      if (oldKey.startsWith("on")) {
+        // Drop "on" prefix.
+        baseKey = oldKey.substring(2);
+      } else {
+        // Capitalize first letter.
+        baseKey = oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      }
+      String newKey = "top" + baseKey;
       events.put(newKey, value);
     }
   }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 73;
-  int32_t Patch = 3;
+  int32_t Patch = 4;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/ReactCommon/react/renderer/core/EventEmitter.cpp

@@ -16,18 +16,26 @@
 
 namespace facebook::react {
 
+static bool hasPrefix(const std::string& str, const std::string& prefix) {
+  return str.compare(0, prefix.length(), prefix) == 0;
+}
+
 // TODO(T29874519): Get rid of "top" prefix once and for all.
 /*
- * Capitalizes the first letter of the event type and adds "top" prefix if
- * necessary (e.g. "layout" becames "topLayout").
+ * Replaces "on" with "top" if present. Or capitalizes the first letter and adds
+ * "top" prefix. E.g. "eventName" becomes "topEventName", "onEventName" also
+ * becomes "topEventName".
  */
 static std::string normalizeEventType(std::string type) {
   auto prefixedType = std::move(type);
-  if (prefixedType.find("top", 0) != 0) {
-    prefixedType.insert(0, "top");
-    prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
+  if (facebook::react::hasPrefix(prefixedType, "top")) {
+    return prefixedType;
+  }
+  if (facebook::react::hasPrefix(prefixedType, "on")) {
+    return "top" + prefixedType.substr(2);
   }
-  return prefixedType;
+  prefixedType[0] = static_cast<char>(toupper(prefixedType[0]));
+  return "top" + prefixedType;
 }
 
 std::mutex& EventEmitter::DispatchMutex() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.73.3",
+  "version": "0.73.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -97,8 +97,8 @@
     "@react-native-community/cli-platform-android": "12.3.2",
     "@react-native-community/cli-platform-ios": "12.3.2",
     "@react-native/assets-registry": "0.73.1",
-    "@react-native/community-cli-plugin": "0.73.14",
-    "@react-native/codegen": "0.73.2",
+    "@react-native/community-cli-plugin": "0.73.16",
+    "@react-native/codegen": "0.73.3",
     "@react-native/gradle-plugin": "0.73.4",
     "@react-native/js-polyfills": "0.73.1",
     "@react-native/normalize-colors": "0.73.2",

package/template/package.json

@@ -11,15 +11,15 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.3"
+    "react-native": "0.73.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "0.73.20",
+    "@react-native/babel-preset": "0.73.21",
     "@react-native/eslint-config": "0.73.2",
-    "@react-native/metro-config": "0.73.4",
+    "@react-native/metro-config": "0.73.5",
     "@react-native/typescript-config": "0.73.1",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",