Skip to content

fix(android): dispatch Rive events on the UI thread to avoid Reanimated deadlock/ANR #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Togetic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(android): dispatch Rive events on the UI thread to avoid Reanimated deadlock/ANR #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions android/src/main/java/com/rivereactnative/RiveReactNativeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.facebook.react.bridge.ReactContext
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.ReadableType
import com.facebook.react.bridge.UiThreadUtil
import com.facebook.react.bridge.WritableMap
import com.facebook.react.modules.core.DeviceEventManagerModule
import com.facebook.react.modules.core.ExceptionsManagerModule
Expand Down Expand Up @@ -219,8 +220,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
data.putString("animationName", animationName)
data.putBoolean("isStateMachine", isStateMachine)

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.PLAY.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.PLAY.toString(), data)
}
}

fun onPause(animationName: String, isStateMachine: Boolean = false) {
Expand All @@ -230,8 +233,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
data.putString("animationName", animationName)
data.putBoolean("isStateMachine", isStateMachine)

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.PAUSE.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.PAUSE.toString(), data)
}
}

fun onStop(animationName: String, isStateMachine: Boolean = false) {
Expand All @@ -241,8 +246,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
data.putString("animationName", animationName)
data.putBoolean("isStateMachine", isStateMachine)

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.STOP.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.STOP.toString(), data)
}
}

fun onLoopEnd(animationName: String, loopMode: RNLoopMode) {
Expand All @@ -252,8 +259,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
data.putString("animationName", animationName)
data.putString("loopMode", loopMode.toString())

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.LOOP_END.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.LOOP_END.toString(), data)
}
}

fun onStateChanged(stateMachineName: String, stateName: String) {
Expand All @@ -262,8 +271,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
data.putString("stateMachineName", stateMachineName)
data.putString("stateName", stateName)

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.STATE_CHANGED.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.STATE_CHANGED.toString(), data)
}
}

private fun convertHashMapToWritableMap(hashMap: HashMap<String, Any>): WritableMap {
Expand Down Expand Up @@ -301,8 +312,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
"riveEvent", eventProperties
)

reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.RIVE_EVENT.toString(), topLevelDict)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.RIVE_EVENT.toString(), topLevelDict)
}
}

fun play(
Expand Down Expand Up @@ -1115,8 +1128,10 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
val data = Arguments.createMap()
data.putString("type", error.toString())
data.putString("message", error.message)
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.ERROR.toString(), data)
UiThreadUtil.runOnUiThread {
reactContext.getJSModule(RCTEventEmitter::class.java)
.receiveEvent(id, Events.ERROR.toString(), data)
}
}

private fun warnForUnusedAssets() {
Expand Down