mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Rename "hasActiveCatalystInstance" to "hasActiveReactInstance" for clarification
Summary: Sometimes ```hasActiveCatalystInstance()``` is used to check if it's safe to access the CatalystInstance, which will still crash in Venice. Previously we mitigate this by changing ```reactContext.hasActiveCatalystInstance()``` to ```reactContext.hasActiveCatalystInstance() || reactContext.isBridgeless()```. To solve this for all and good the plan is: 1, Rename ```hasActiveCatalystInstance()``` to ```hasActiveReactInstance()``` so it won't sounds like CatalystInstance-only. 2, Implement hasActiveReactInstance() for Venice. D27343867 3, Remove previous mitigation. D27343952 This diff is the first step, by xbgs there are **58** non-generated callsites of ```hasActiveCatalystInstance()``` in code base which are all renamed in this diff. Changelog: [Android][Changed] - Rename "hasActiveCatalystInstance" to "hasActiveReactInstance" Reviewed By: mdvacca Differential Revision: D27335055 fbshipit-source-id: 5b8ff5e09b79a492e910bb8f197e70fa1360bcef
This commit is contained in:
committed by
Facebook GitHub Bot
parent
b86e52a9ec
commit
dfa8eb0558
+1
-1
@@ -56,7 +56,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec
|
||||
|
||||
@Override
|
||||
public void onChange(boolean selfChange, Uri uri) {
|
||||
if (getReactApplicationContext().hasActiveCatalystInstance()) {
|
||||
if (getReactApplicationContext().hasActiveReactInstance()) {
|
||||
AccessibilityInfoModule.this.updateAndSendReduceMotionChangeEvent();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public class AppStateModule extends NativeAppStateSpec
|
||||
// We don't gain anything interesting from logging here, and it's an extremely common
|
||||
// race condition for an AppState event to be triggered as the Catalyst instance is being
|
||||
// set up or torn down. So, just fail silently here.
|
||||
if (!reactApplicationContext.hasActiveCatalystInstance()) {
|
||||
if (!reactApplicationContext.hasActiveReactInstance()) {
|
||||
return;
|
||||
}
|
||||
reactApplicationContext.getJSModule(RCTDeviceEventEmitter.class).emit(eventName, data);
|
||||
|
||||
+2
-2
@@ -61,7 +61,7 @@ public class DatePickerDialogModule extends NativeDatePickerAndroidSpec {
|
||||
|
||||
@Override
|
||||
public void onDateSet(DatePicker view, int year, int month, int day) {
|
||||
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
|
||||
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
|
||||
WritableMap result = new WritableNativeMap();
|
||||
result.putString("action", ACTION_DATE_SET);
|
||||
result.putInt("year", year);
|
||||
@@ -74,7 +74,7 @@ public class DatePickerDialogModule extends NativeDatePickerAndroidSpec {
|
||||
|
||||
@Override
|
||||
public void onDismiss(DialogInterface dialog) {
|
||||
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
|
||||
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
|
||||
WritableMap result = new WritableNativeMap();
|
||||
result.putString("action", ACTION_DISMISSED);
|
||||
mPromise.resolve(result);
|
||||
|
||||
+1
-1
@@ -83,7 +83,7 @@ public class DeviceInfoModule extends NativeDeviceInfoSpec implements LifecycleE
|
||||
return;
|
||||
}
|
||||
|
||||
if (mReactApplicationContext.hasActiveCatalystInstance()) {
|
||||
if (mReactApplicationContext.hasActiveReactInstance()) {
|
||||
// Don't emit an event to JS if the dimensions haven't changed
|
||||
WritableNativeMap displayMetrics =
|
||||
DisplayMetricsHolder.getDisplayMetricsNativeMap(mFontScale);
|
||||
|
||||
@@ -130,7 +130,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
if (!mCallbackConsumed) {
|
||||
if (getReactApplicationContext().isBridgeless()
|
||||
|| getReactApplicationContext().hasActiveCatalystInstance()) {
|
||||
|| getReactApplicationContext().hasActiveReactInstance()) {
|
||||
mCallback.invoke(ACTION_BUTTON_CLICKED, which);
|
||||
mCallbackConsumed = true;
|
||||
}
|
||||
@@ -141,7 +141,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
|
||||
public void onDismiss(DialogInterface dialog) {
|
||||
if (!mCallbackConsumed) {
|
||||
if (getReactApplicationContext().isBridgeless()
|
||||
|| getReactApplicationContext().hasActiveCatalystInstance()) {
|
||||
|| getReactApplicationContext().hasActiveReactInstance()) {
|
||||
mCallback.invoke(ACTION_DISMISSED);
|
||||
mCallbackConsumed = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user