@rive-app/react-native 0.2.2 → 0.2.3

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

@@ -77,6 +77,7 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
   private var eventListeners: MutableList<RiveFileController.RiveEventListener> = mutableListOf()
   private val viewReadyDeferred = CompletableDeferred<Boolean>()
   private var _activeStateMachineName: String? = null
+  private var _pendingBindData: BindData? = null
   private var willDispose = false
 
   init {
@@ -119,8 +120,8 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
       riveAnimationView?.layoutScaleFactor = config.layoutScaleFactor
     }
 
-    if (dataBindingChanged || initialUpdate) {
-      applyDataBinding(config.bindData)
+    if (dataBindingChanged || initialUpdate || reload) {
+      applyDataBinding(config.bindData, config.autoPlay)
     }
 
     viewReadyDeferred.complete(true)
@@ -142,50 +143,36 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
-  fun applyDataBinding(bindData: BindData) {
+  fun applyDataBinding(bindData: BindData, autoPlay: Boolean) {
     val stateMachines = riveAnimationView?.controller?.stateMachines
-    if (stateMachines.isNullOrEmpty()) return
+    if (stateMachines.isNullOrEmpty()) {
+      _pendingBindData = bindData
+      return
+    }
 
-    val stateMachine = stateMachines.first()
+    bindToStateMachine(bindData)
 
-    when (bindData) {
-      is BindData.None -> {
-        stateMachine.viewModelInstance = null
-      }
-      is BindData.Auto -> {
-        val artboard = riveAnimationView?.controller?.activeArtboard
-        val file = riveAnimationView?.controller?.file
-        if (artboard != null && file != null) {
-          try {
-            file.defaultViewModelForArtboard(artboard)
-          } catch (e: ViewModelException) {
-            null
-          }?.let {
-            val instance = it.createDefaultInstance()
-            stateMachine.viewModelInstance = instance
-          }
-        }
-      }
-      is BindData.Instance -> {
-        stateMachine.viewModelInstance = bindData.instance
-      }
-      is BindData.ByName -> {
-        val artboard = riveAnimationView?.controller?.activeArtboard
-        val file = riveAnimationView?.controller?.file
-        if (artboard != null && file != null) {
-          val viewModel = file.defaultViewModelForArtboard(artboard)
-          val instance = viewModel.createInstanceFromName(bindData.name)
-          stateMachine.viewModelInstance = instance
-        }
+    if (autoPlay) {
+      stateMachines.first().name.let { smName ->
+        riveAnimationView?.play(smName, isStateMachine = true)
       }
     }
+  }
 
-    stateMachine.name.let { smName ->
-      riveAnimationView?.play(smName, isStateMachine = true)
+  fun play() {
+    if (_activeStateMachineName == null) {
+      _activeStateMachineName = getSafeStateMachineName()
     }
+    riveAnimationView?.play()
+    applyPendingBindData()
   }
 
-  fun play() = riveAnimationView?.play()
+  private fun applyPendingBindData() {
+    _pendingBindData?.let { bindData ->
+      _pendingBindData = null
+      bindToStateMachine(bindData)
+    }
+  }
 
   fun pause() = riveAnimationView?.pause()
 
@@ -324,6 +311,44 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
 
   //region Internal
 
+  private fun bindToStateMachine(bindData: BindData) {
+    val stateMachines = riveAnimationView?.controller?.stateMachines
+    if (stateMachines.isNullOrEmpty()) return
+    val stateMachine = stateMachines.first()
+
+    when (bindData) {
+      is BindData.None -> {
+        stateMachine.viewModelInstance = null
+      }
+      is BindData.Auto -> {
+        val artboard = riveAnimationView?.controller?.activeArtboard
+        val file = riveAnimationView?.controller?.file
+        if (artboard != null && file != null) {
+          try {
+            file.defaultViewModelForArtboard(artboard)
+          } catch (e: ViewModelException) {
+            null
+          }?.let {
+            val instance = it.createDefaultInstance()
+            stateMachine.viewModelInstance = instance
+          }
+        }
+      }
+      is BindData.Instance -> {
+        stateMachine.viewModelInstance = bindData.instance
+      }
+      is BindData.ByName -> {
+        val artboard = riveAnimationView?.controller?.activeArtboard
+        val file = riveAnimationView?.controller?.file
+        if (artboard != null && file != null) {
+          val viewModel = file.defaultViewModelForArtboard(artboard)
+          val instance = viewModel.createInstanceFromName(bindData.name)
+          stateMachine.viewModelInstance = instance
+        }
+      }
+    }
+  }
+
   private fun convertEventProperties(properties: Map<String, Any>?): Map<String, EventPropertiesOutput>? {
     if (properties == null) return null
 
@@ -363,24 +388,17 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
-  // TODO: this is throwing when autoplay is false
-  // TODO: This is a temporary solution to get the state machine name as Android supports
+  // This is a temporary solution to get the state machine name as Android supports
   // playing multiple state machines, but in React Native we only allow playing one.
   /**
-   * Gets the name of the active state machine.
-   * @throws Error if the state machine name could not be found
-   * @return The name of the state machine that "is playing" / "will be played"
+   * Gets the name of the active state machine, or null if no state machines are loaded yet
+   * (e.g. when autoPlay is false and the state machine hasn't been started).
+   * @return The name of the state machine, or null
    */
-  private fun getSafeStateMachineName(): String {
-    try {
-      val stateMachines = riveAnimationView?.controller?.stateMachines
-      if (stateMachines.isNullOrEmpty()) {
-        throw Exception("No state machines found in the Rive file")
-      }
-      return stateMachines.first().name
-    } catch (e: Exception) {
-      throw Error(e.message)
-    }
+  private fun getSafeStateMachineName(): String? {
+    val stateMachines = riveAnimationView?.controller?.stateMachines
+    if (stateMachines.isNullOrEmpty()) return null
+    return stateMachines.first().name
   }
 
   /**

package/ios/RiveReactNativeView.swift

@@ -81,8 +81,8 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       viewReadyContinuation = nil
     }
 
-    if dataBindingChanged || initialUpdate {
-      try applyDataBinding(config.bindData)
+    if dataBindingChanged || initialUpdate || reload {
+      try applyDataBinding(config.bindData, autoPlay: config.autoPlay)
     }
   }
 
@@ -94,19 +94,28 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     return baseViewModel?.riveModel?.stateMachine?.viewModelInstance
   }
 
-  func applyDataBinding(_ bindData: BindData) throws {
+  func applyDataBinding(_ bindData: BindData, autoPlay: Bool) throws {
+    try bindToStateMachine(bindData)
+
+    if autoPlay {
+      play()
+    }
+  }
+
+  @MainActor
+  func play() {
+    baseViewModel?.play()
+  }
+
+  private func bindToStateMachine(_ bindData: BindData) throws {
     let stateMachine = baseViewModel?.riveModel?.stateMachine
     let artboard = baseViewModel?.riveModel?.artboard
 
     switch bindData {
     case .none:
       baseViewModel?.riveModel?.disableAutoBind()
-
     case .auto:
-      baseViewModel?.riveModel?.enableAutoBind { _ in
-        // Auto-bind callback
-      }
-
+      baseViewModel?.riveModel?.enableAutoBind { _ in }
     case .byName(let name):
       guard let artboard = artboard,
         let riveFile = baseViewModel?.riveModel?.riveFile,
@@ -116,20 +125,9 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
         throw NitroRiveError.instanceNotFound(message: "\(name) instance not found")
       }
       stateMachine?.bind(viewModelInstance: instance)
-      // this should be added if we support only playing artboards on their own - https://github.com/rive-app/rive-nitro-react-native/pull/23#discussion_r2534698281
-      // artboard.bind(viewModelInstance: instance)
-
     case .instance(let instance):
       stateMachine?.bind(viewModelInstance: instance)
-      // this should be added if we support only playing artboards on their own - https://github.com/rive-app/rive-nitro-react-native/pull/23#discussion_r2534698281
-      // artboard?.bind(viewModelInstance: instance)
     }
-    play()
-  }
-
-  @MainActor
-  func play() {
-    baseViewModel?.play()
   }
 
   @MainActor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/react-native",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Rive React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",