@rive-app/react-native 0.2.4 → 0.2.5

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

@@ -10,6 +10,7 @@ import com.rive.ViewConfiguration
 import app.rive.runtime.kotlin.core.Fit as RiveFit
 import app.rive.runtime.kotlin.core.Alignment as RiveAlignment
 import app.rive.runtime.kotlin.core.errors.*
+import android.util.Log
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -268,6 +269,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
       val (errorType, errorDescription) = detectErrorType(e)
       val noteString = note?.let { " $it" } ?: ""
       val errorMessage = "[RIVE] $tag$noteString $errorDescription"
+      Log.e(TAG, errorMessage, e)
       val riveError = RiveError(
         type = errorType,
         message = errorMessage

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

@@ -77,7 +77,6 @@ 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 {
@@ -104,11 +103,17 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
 
   fun configure(config: ViewConfiguration, dataBindingChanged: Boolean, reload: Boolean = false, initialUpdate: Boolean = false) {
     if (reload) {
+      val hasDataBinding = when (config.bindData) {
+        is BindData.None -> false
+        is BindData.Auto -> config.riveFile.viewModelCount > 0
+        is BindData.Instance, is BindData.ByName -> true
+      }
       riveAnimationView?.setRiveFile(
         config.riveFile,
         artboardName = config.artboardName,
         stateMachineName = config.stateMachineName,
         autoplay = config.autoPlay,
+        autoBind = hasDataBinding,
         alignment = config.alignment,
         fit = config.fit
       )
@@ -121,7 +126,7 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
 
     if (dataBindingChanged || initialUpdate || reload) {
-      applyDataBinding(config.bindData, config.autoPlay)
+      applyDataBinding(config.bindData)
     }
 
     viewReadyDeferred.complete(true)
@@ -143,20 +148,8 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
-  fun applyDataBinding(bindData: BindData, autoPlay: Boolean) {
-    val stateMachines = riveAnimationView?.controller?.stateMachines
-    if (stateMachines.isNullOrEmpty()) {
-      _pendingBindData = bindData
-      return
-    }
-
+  fun applyDataBinding(bindData: BindData) {
     bindToStateMachine(bindData)
-
-    if (autoPlay) {
-      stateMachines.first().name.let { smName ->
-        riveAnimationView?.play(smName, isStateMachine = true)
-      }
-    }
   }
 
   fun play() {
@@ -164,14 +157,6 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
       _activeStateMachineName = getSafeStateMachineName()
     }
     riveAnimationView?.play()
-    applyPendingBindData()
-  }
-
-  private fun applyPendingBindData() {
-    _pendingBindData?.let { bindData ->
-      _pendingBindData = null
-      bindToStateMachine(bindData)
-    }
   }
 
   fun pause() = riveAnimationView?.pause()

package/ios/RiveReactNativeView.swift

@@ -166,6 +166,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     try handleInput(name: name, path: path, type: .number) { (input: RiveRuntime.RiveSMINumber) in
       input.setValue(value)
     }
+    playIfNeeded()
   }
 
   func getNumberInputValue(name: String, path: String?) throws -> Float {
@@ -178,6 +179,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     try handleInput(name: name, path: path, type: .boolean) { (input: RiveRuntime.RiveSMIBool) in
       input.setValue(value)
     }
+    playIfNeeded()
   }
 
   func getBooleanInputValue(name: String, path: String?) throws -> Bool {
@@ -190,6 +192,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     try handleInput(name: name, path: path, type: .trigger) { (input: RiveRuntime.RiveSMITrigger) in
       input.fire()
     }
+    playIfNeeded()
   }
 
   func setTextRunValue(name: String, value: String, path: String?) throws {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/react-native",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Rive React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -64,8 +64,8 @@
   },
   "homepage": "https://github.com/rive-app/rive-nitro-react-native#readme",
   "runtimeVersions": {
-    "ios": "6.13.0",
-    "android": "11.1.0"
+    "ios": "6.15.2",
+    "android": "11.2.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"