chore: add reset + fix: invoke play, pause,

Author: mfazekas

android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt

@@ -112,9 +112,12 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     return HybridViewModelInstance(viewModelInstance)
   }
 
-  override fun play() = executeOnUiThread { view.play() }
+  override fun play() = asyncExecuteOnUiThread { view.play() }
+
+  override fun pause() = asyncExecuteOnUiThread { view.pause() }
+
+  override fun reset() = asyncExecuteOnUiThread { view.reset() }
 
-  override fun pause() = executeOnUiThread { view.pause() }
 
   override fun onEventListener(onEvent: (event: UnifiedRiveEvent) -> Unit) =
     executeOnUiThread { view.addEventListener(onEvent) }
@@ -186,6 +189,20 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     }
   }
 
+  private fun asyncExecuteOnUiThread(action: () -> Unit): Promise<Unit> {
+    return Promise.async {
+      context.currentActivity?.runOnUiThread() {
+        try {
+          action()
+        } catch (e: Exception) {
+          throw Error(e.message) // TODO: Correctly handling errors (https://nitro.margelo.com/docs/errors)
+        } catch (e: Error) {
+          throw Error(e.message)
+        }
+      }
+    }
+
+  }
   private fun executeOnUiThread(action: () -> Unit) {
     context.currentActivity?.runOnUiThread() {
       try {

android/src/main/java/com/rive/RiveReactNativeView.kt

@@ -187,7 +187,10 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
 
   fun play() = riveAnimationView?.play()
 
-  fun pause() = riveAnimationView?.pause();
+  fun pause() = riveAnimationView?.pause()
+
+  fun reset() = riveAnimationView?.reset()
+
 
   fun addEventListener(onEvent: (event: RNEvent) -> Unit) {
     val eventListener = object : RiveFileController.RiveEventListener {

ios/HybridRiveView.swift

@@ -66,6 +66,24 @@ where Wrapped == HybridDataBindMode {
 }
 
 class HybridRiveView: HybridRiveViewSpec {
+  func play() throws -> NitroModules.Promise<Void> {
+    return Promise.async {
+      try await self.getRiveView().play()
+    }
+  }
+
+  func pause() throws -> NitroModules.Promise<Void> {
+    return Promise.async {
+      try await self.getRiveView().pause()
+    }
+  }
+
+  func reset() throws -> NitroModules.Promise<Void> {
+    return Promise.async {
+      try await self.getRiveView().reset()
+    }
+  }
+
   // MARK: View Props
   var dataBind: HybridDataBindMode? = nil {
     didSet {
@@ -103,10 +121,6 @@ class HybridRiveView: HybridRiveViewSpec {
     return HybridViewModelInstance(viewModelInstance: viewModelInstance)
   }
 
-  func play() throws { try getRiveView().play() }
-
-  func pause() throws { try getRiveView().pause() }
-
   func onEventListener(onEvent: @escaping (UnifiedRiveEvent) -> Void) throws {
     try getRiveView().addEventListener(onEvent)
   }

ios/RiveReactNativeView.swift

@@ -121,20 +121,22 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       stateMachine?.bind(viewModelInstance: instance)
       artboard?.bind(viewModelInstance: instance)
     }
-    baseViewModel?.play()
+    play()
   }
 
+  @MainActor
   func play() {
     baseViewModel?.play()
   }
 
+  @MainActor
   func pause() {
     baseViewModel?.pause()
   }
 
   func refreshAfterAssetChange() {
     if baseViewModel?.isPlaying == false {
-      baseViewModel?.play()
+      play()
     }
   }