refator: simplify changes

Author: mfazekas

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

@@ -136,47 +136,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
 
   //region Data Binding
   private fun applyDataBinding() {
-    val stateMachines = view.riveAnimationView?.controller?.stateMachines
-    if (stateMachines.isNullOrEmpty()) return
-
-    val bindData = dataBind.toBindData()
-    val stateMachine = stateMachines.first()
-
-    when (bindData) {
-      is BindData.None -> {
-        // Unbind by setting to null
-        stateMachine.viewModelInstance = null
-      }
-      is BindData.Auto -> {
-        // Get the default view model and create default instance
-        val artboard = view.riveAnimationView?.controller?.activeArtboard
-        val file = view.riveAnimationView?.controller?.file
-        if (artboard != null && file != null) {
-          val viewModel = file.defaultViewModelForArtboard(artboard)
-          val instance =  viewModel.createDefaultInstance()
-          stateMachine.viewModelInstance = instance
-        }
-      }
-      is BindData.Instance -> {
-        stateMachine.viewModelInstance = bindData.instance
-      }
-      is BindData.ByName -> {
-        val artboard = view.riveAnimationView?.controller?.activeArtboard
-        val file = view.riveAnimationView?.controller?.file
-        if (artboard != null && file != null) {
-          val viewModel = file.defaultViewModelForArtboard(artboard)
-          val instance = viewModel.createInstanceFromName(bindData.name)
-          stateMachine.viewModelInstance = instance
-        }
-      }
-    }
-
-    // Only play on subsequent updates, not first
-    if (!firstUpdate) {
-      view.riveAnimationView?.controller?.stateMachines?.first()?.name?.let { smName ->
-        view.riveAnimationView?.play(smName, isStateMachine = true)
-      }
-    }
+    view.applyDataBinding(dataBind.toBindData(), shouldRefresh = !firstUpdate)
   }
   //endregion
 

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

@@ -45,7 +45,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 isFirstConfigure = true
 
   init {
     riveAnimationView = RiveAnimationView(context)
@@ -58,8 +57,6 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
   }
 
   fun configure(config: ViewConfiguration, reload: Boolean = false) {
-    val wasFirstConfigure = isFirstConfigure
-
     if (reload) {
       riveAnimationView?.setRiveFile(
         config.riveFile,
@@ -71,47 +68,14 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
         fit = config.fit
       )
       _activeStateMachineName = getSafeStateMachineName()
-
-      // Play state machine after reload (but not on first configure)
-      if (!wasFirstConfigure) {
-        _activeStateMachineName?.let { smName ->
-          riveAnimationView?.play(smName, isStateMachine = true)
-        }
-      }
-
-      isFirstConfigure = false
     } else {
       riveAnimationView?.alignment = config.alignment
       riveAnimationView?.fit = config.fit
       // TODO: this seems to require a reload for the view to take the new value (bug on Android)
       riveAnimationView?.layoutScaleFactor = config.layoutScaleFactor
     }
 
-    val stateMachines = riveAnimationView?.controller?.stateMachines
-    when (val bindData = config.bindData) {
-      is BindData.None -> {
-        // No binding
-      }
-      is BindData.Auto -> {
-        // Auto-binding handled by setRiveFile above
-      }
-      is BindData.Instance -> {
-        if (!stateMachines.isNullOrEmpty()) {
-          stateMachines.first().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)
-          if (!stateMachines.isNullOrEmpty()) {
-            stateMachines.first().viewModelInstance = instance
-          }
-        }
-      }
-    }
+    applyDataBinding(config.bindData, shouldRefresh = false)
 
     viewReadyDeferred.complete(true)
   }
@@ -132,6 +96,46 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
+  fun applyDataBinding(bindData: BindData, shouldRefresh: Boolean = false) {
+    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) {
+          val viewModel = file.defaultViewModelForArtboard(artboard)
+          val instance = viewModel.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 (shouldRefresh) {
+      stateMachine.name.let { smName ->
+        riveAnimationView?.play(smName, isStateMachine = true)
+      }
+    }
+  }
+
   fun play() = riveAnimationView?.play()
 
   fun pause() = riveAnimationView?.pause();

ios/RiveReactNativeView.swift

@@ -74,30 +74,8 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       viewReadyContinuation?.resume()
       viewReadyContinuation = nil
     }
-    
-    let stateMachine = baseViewModel?.riveModel?.stateMachine
-    let artboard = baseViewModel?.riveModel?.artboard
-    switch config.bindData {
-    case .none:
-      baseViewModel?.riveModel?.disableAutoBind()
-
-    case .auto:
-      baseViewModel?.riveModel?.enableAutoBind { [weak self] instance in
-        // Callback invoked when default instance is auto-bound
-      }
-
-    case .byName(let name):
-      guard let artboard = artboard,
-            let riveFile = baseViewModel?.riveModel?.riveFile,
-            let viewModel = riveFile.defaultViewModel(for: artboard),
-            let instance = viewModel.createInstance(fromName: name) else {
-        break
-      }
-      stateMachine?.bind(viewModelInstance: instance)
 
-    case .instance(let instance):
-      stateMachine?.bind(viewModelInstance: instance)
-    }
+    applyDataBinding(config.bindData, refresh: false)
   }
 
   func bindViewModelInstance(viewModelInstance: RiveDataBindingViewModel.Instance) {