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
@@ -170,7 +170,8 @@ public class ReactContext extends ContextWrapper {
|
||||
return Assertions.assertNotNull(mCatalystInstance);
|
||||
}
|
||||
|
||||
public boolean hasActiveCatalystInstance() {
|
||||
/** @return true if there is an non-null, alive react native instance */
|
||||
public boolean hasActiveReactInstance() {
|
||||
return mCatalystInstance != null && !mCatalystInstance.isDestroyed();
|
||||
}
|
||||
|
||||
@@ -184,7 +185,7 @@ public class ReactContext extends ContextWrapper {
|
||||
|
||||
public void addLifecycleEventListener(final LifecycleEventListener listener) {
|
||||
mLifecycleEventListeners.add(listener);
|
||||
if (hasActiveCatalystInstance() || isBridgeless()) {
|
||||
if (hasActiveReactInstance() || isBridgeless()) {
|
||||
switch (mLifecycleState) {
|
||||
case BEFORE_CREATE:
|
||||
case BEFORE_RESUME:
|
||||
@@ -452,7 +453,7 @@ public class ReactContext extends ContextWrapper {
|
||||
}
|
||||
|
||||
public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {
|
||||
if (!hasActiveCatalystInstance()) {
|
||||
if (!hasActiveReactInstance()) {
|
||||
throw new IllegalStateException(
|
||||
"Unable to retrieve a JSIModule if CatalystInstance is not active.");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user