Merge branch 'master' into mateuuszzzzz/fix-memory-leaks

Author: oblador

packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java

@@ -136,14 +136,6 @@ public String getName() {
         return PERFORMANCE_MODULE;
     }
 
-    public void addListener(String eventName) {
-
-    }
-
-    public void removeListeners(double count) {
-
-    }
-
     private void emitNativeStartupTime() {
         safelyEmitMark(new PerformanceMark("nativeLaunchStart", StartTimeProvider.getStartTime()));
         safelyEmitMark(new PerformanceMark("nativeLaunchEnd", StartTimeProvider.getEndTime()));
@@ -196,7 +188,7 @@ private void emit(PerformanceMetric metric) {
             WritableMap map = Arguments.fromBundle(metric.getDetail());
             params.putMap("detail", map);
         }
-        if (getReactApplicationContext().hasActiveCatalystInstance()) {
+        if (getReactApplicationContext().hasActiveReactInstance()) {
             getReactApplicationContext()
                     .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                     .emit("metric", params);
@@ -211,9 +203,11 @@ private void emit(PerformanceMark mark) {
             WritableMap map = Arguments.fromBundle(mark.getDetail());
             params.putMap("detail", map);
         }
-        getReactApplicationContext()
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit("mark", params);
+        if (getReactApplicationContext().hasActiveReactInstance()) {
+            getReactApplicationContext()
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit("mark", params);
+        }
     }
 
     @Override
@@ -229,4 +223,13 @@ public void invalidate() {
         RNPerformance.getInstance().removeListener(this);
         ReactMarker.removeListener(contentAppearedListener);
     }
+
+    // Fix new arch runtime error
+    public void addListener(String eventName) {
+
+    }
+
+    public void removeListeners(double count) {
+
+    }
 }

packages/react-native-performance/src/index.ts

@@ -1,5 +1,4 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import { createPerformance } from './performance';
 import {
   PerformanceReactNativeMark,
   PerformanceMetric,
@@ -8,11 +7,15 @@ import {
   installResourceLogger,
   uninstallResourceLogger,
 } from './resource-logger';
-const { PerformanceObserver, addEntry, performance } = createPerformance();
+import { PerformanceObserver, addEntry, performance } from './instance';
 
-declare const global: { __turboModuleProxy: null | {} };
+declare const global: {
+  __turboModuleProxy: null | {};
+  RN$Bridgeless?: boolean;
+};
 
-const isTurboModuleEnabled = global.__turboModuleProxy != null;
+const isTurboModuleEnabled =
+  global.RN$Bridgeless || global.__turboModuleProxy != null;
 
 const RNPerformanceManager = isTurboModuleEnabled
   ? require('./NativeRNPerformanceManager').default

packages/react-native-performance/src/instance.ts

@@ -0,0 +1,3 @@
+import { createPerformance } from './performance';
+export const { PerformanceObserver, addEntry, performance } =
+  createPerformance();