fix: dataBindingChanged

Author: mfazekas

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

@@ -49,7 +49,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
   //region State
   override val view: RiveReactNativeView = RiveReactNativeView(context)
   private var needsReload = false
-  private var firstUpdate = true
+  private var dataBindingChanged = false
   private var registeredFile: HybridRiveFile? = null
   //endregion
 
@@ -81,7 +81,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     set(value) {
       if (field != value) {
         field = value
-        applyDataBinding()
+        dataBindingChanged = true
       }
     }
   //endregion
@@ -136,20 +136,13 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     view.getTextRunValue(name, path)
   //endregion
 
-  //region Data Binding
-  private fun applyDataBinding() {
-    view.applyDataBinding(dataBind.toBindData(), shouldRefresh = !firstUpdate)
-  }
-  //endregion
-
   //region Update
   fun refreshAfterAssetChange() {
     afterUpdate()
   }
 
   override fun afterUpdate() {
     logged(TAG, "afterUpdate") {
-      firstUpdate = false
       val hybridFile = file as? HybridRiveFile
       val riveFile = hybridFile?.riveFile ?: return@logged
 
@@ -163,14 +156,15 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
         layoutScaleFactor = layoutScaleFactor?.toFloat() ?: DefaultConfiguration.LAYOUTSCALEFACTOR,
         bindData = dataBind.toBindData()
       )
-      view.configure(config, needsReload)
+      view.configure(config, dataBindingChanged=dataBindingChanged, needsReload)
 
       if (needsReload && hybridFile != null) {
         hybridFile.registerView(this)
         registeredFile = hybridFile
       }
 
       needsReload = false
+      dataBindingChanged = false
       super.afterUpdate()
     }
   }

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

@@ -57,7 +57,7 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     return viewReadyDeferred.await()
   }
 
-  fun configure(config: ViewConfiguration, reload: Boolean = false) {
+  fun configure(config: ViewConfiguration, dataBindingChanged: Boolean, reload: Boolean = false) {
     if (reload) {
       riveAnimationView?.setRiveFile(
         config.riveFile,
@@ -76,7 +76,9 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
       riveAnimationView?.layoutScaleFactor = config.layoutScaleFactor
     }
 
-    applyDataBinding(config.bindData, shouldRefresh = false)
+    if (dataBindingChanged) {
+      applyDataBinding(config.bindData)
+    }
 
     viewReadyDeferred.complete(true)
   }
@@ -97,7 +99,7 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
-  fun applyDataBinding(bindData: BindData, shouldRefresh: Boolean = false) {
+  fun applyDataBinding(bindData: BindData) {
     val stateMachines = riveAnimationView?.controller?.stateMachines
     if (stateMachines.isNullOrEmpty()) return
 
@@ -135,10 +137,8 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
       }
     }
 
-    if (shouldRefresh) {
-      stateMachine.name.let { smName ->
-        riveAnimationView?.play(smName, isStateMachine = true)
-      }
+    stateMachine.name.let { smName ->
+      riveAnimationView?.play(smName, isStateMachine = true)
     }
   }
 

ios/HybridRiveView.swift

@@ -43,7 +43,7 @@ class HybridRiveView: HybridRiveViewSpec {
   // MARK: View Props
   var dataBind: HybridDataBindMode? = nil {
     didSet {
-      applyDataBinding()
+      dataBindingChanged = true
     }
   }
   var artboardName: String? { didSet { needsReload = true } }
@@ -120,18 +120,8 @@ class HybridRiveView: HybridRiveViewSpec {
     return riveView
   }
 
-  // MARK: Data Binding
-  private func applyDataBinding() {
-    logged(tag: "HybridRiveView", note: "applyDataBinding") {
-      guard let riveView = view as? RiveReactNativeView else { return }
-      let bindData = try dataBind.toDataBingMode()
-      riveView.applyDataBinding(bindData, refresh: !firstUpdate)
-    }
-  }
-
   // MARK: Update
   func afterUpdate() {
-    firstUpdate = false
     logged(tag: "HybridRiveView", note: "afterUpdate") {
       guard let hybridFile = file as? HybridRiveFile,
         let file = hybridFile.riveFile
@@ -149,14 +139,15 @@ class HybridRiveView: HybridRiveViewSpec {
         bindData: try dataBind.toDataBingMode()
       )
 
-      try getRiveView().configure(config, reload: needsReload)
+      try getRiveView().configure(config, dataBindingChanged: dataBindingChanged, reload: needsReload)
       needsReload = false
+      dataBindingChanged = false
     }
   }
 
   // MARK: Internal State
-  private var firstUpdate = true
   private var needsReload = false
+  private var dataBindingChanged = false
 
   // MARK: Helpers
   private func convertAlignment(_ alignment: Alignment?) -> RiveAlignment? {

ios/RiveReactNativeView.swift

@@ -32,7 +32,6 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
   private var baseViewModel: RiveViewModel?
   private var eventListeners: [(UnifiedRiveEvent) -> Void] = []
   private var viewReadyContinuation: CheckedContinuation<Void, Never>?
-  private var isFirstConfigure = true
   private var isViewReady = false
   private weak var viewSource: RiveViewSource?
 
@@ -51,7 +50,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     return true
   }
 
-  func configure(_ config: ViewConfiguration, reload: Bool = false) {
+  func configure(_ config: ViewConfiguration, dataBindingChanged: Bool = false, reload: Bool = false) {
     if reload {
       cleanup()
       let model = RiveModel(riveFile: config.riveFile)
@@ -75,7 +74,9 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       viewReadyContinuation = nil
     }
 
-    applyDataBinding(config.bindData, refresh: false)
+    if dataBindingChanged {
+      applyDataBinding(config.bindData)
+    }
   }
 
   func bindViewModelInstance(viewModelInstance: RiveDataBindingViewModel.Instance) {
@@ -86,7 +87,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     return baseViewModel?.riveModel?.stateMachine?.viewModelInstance
   }
 
-  func applyDataBinding(_ bindData: BindData, refresh: Bool = false) {
+  func applyDataBinding(_ bindData: BindData) {
     let stateMachine = baseViewModel?.riveModel?.stateMachine
     let artboard = baseViewModel?.riveModel?.artboard
 
@@ -115,9 +116,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       stateMachine?.bind(viewModelInstance: instance)
       artboard?.bind(viewModelInstance: instance)
     }
-    if refresh {
-      baseViewModel?.play()
-    }
+    baseViewModel?.play()
   }
 
   func play() {