diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java index 9080f60d265..69d0e1c8a8a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java @@ -48,6 +48,9 @@ public class EventEmitterWrapper { * @param params {@link WritableMap} payload of the event */ public void invoke(@NonNull String eventName, @Nullable WritableMap params) { + if (!isValid()) { + return; + } NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params; invokeEvent(eventName, payload); } @@ -61,6 +64,9 @@ public class EventEmitterWrapper { */ public void invokeUnique( @NonNull String eventName, @Nullable WritableMap params, int customCoalesceKey) { + if (!isValid()) { + return; + } NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params; invokeUniqueEvent(eventName, payload, customCoalesceKey); } @@ -70,4 +76,11 @@ public class EventEmitterWrapper { mHybridData.resetNative(); } } + + private boolean isValid() { + if (mHybridData != null) { + return mHybridData.isValid(); + } + return false; + } }