@rive-app/react-native 0.1.1-beta.1 → 0.1.2

package/README.md

@@ -1,10 +1,21 @@
 # @rive-app/react-native
 
-Rive React Native 2.0
+[![Build](https://github.com/rive-app/rive-nitro-react-native/actions/workflows/ci.yml/badge.svg)](https://github.com/rive-app/rive-nitro-react-native/actions)
+[![NPM Version](https://img.shields.io/npm/v/@rive-app/react-native)](https://www.npmjs.com/package/@rive-app/react-native)
+[![Downloads](https://img.shields.io/npm/dm/@rive-app/react-native)](https://www.npmjs.com/package/@rive-app/react-native)
+[![React Native](https://img.shields.io/badge/React_Native-0.78+-61dafb)](https://reactnative.dev/)
+[![iOS](https://img.shields.io/badge/iOS-15.1+-blue)](#requirements)
+[![Android](https://img.shields.io/badge/Android-7.0+-green)](#requirements)
+[![Rive iOS Runtime](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Frive-app%2Frive-nitro-react-native%2Fmain%2Fpackage.json&query=%24.runtimeVersions.ios&label=Rive%20iOS%20Runtime&color=informational)](https://github.com/rive-app/rive-ios/releases)
+[![Rive Android Runtime](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Frive-app%2Frive-nitro-react-native%2Fmain%2Fpackage.json&query=%24.runtimeVersions.android&label=Rive%20Android%20Runtime&color=informational)](https://github.com/rive-app/rive-android/releases)
 
-## Development Preview
+**Rive React Native 2.0**
 
-> **⚠️ Development Preview**: This package is currently in development preview. While it's functional and actively maintained, the API may change in future releases. We recommend testing thoroughly before using in production applications. We're actively gathering feedback to improve the library. Please share your thoughts and report any issues you encounter.
+![Rive hero image](https://cdn.rive.app/rive_logo_dark_bg.png)
+
+## Early Release
+
+> **⚠️ Early Release**: This package is in active development. We recommend testing thoroughly before using in production applications. We're actively gathering feedback to improve the library. Please share your thoughts and report any issues you encounter.
 
 ## Requirements
 
@@ -23,7 +34,7 @@ Rive React Native 2.0
 ## Installation
 
 ```sh
-npm install rive-app/rive-nitro-react-native react-native-nitro-modules
+npm install @rive-app/react-native react-native-nitro-modules
 ```
 
 > `react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).
@@ -117,6 +128,7 @@ export default {
   },
 };
 ```
+
 </details>
 
 ## Error Handling
@@ -237,9 +249,9 @@ This section tracks new features and improvements planned for this runtime that
 | Feature                                                                                               | Status |
 | ----------------------------------------------------------------------------------------------------- | ------ |
 | [Reusable .riv File resources (preloading)](https://github.com/rive-app/rive-react-native/issues/260) | ✅     |
-| [Data Binding - Images](https://github.com/rive-app/rive-nitro-react-native/issues/9)                 | 🚧     |
+| [Data Binding - Images](https://github.com/rive-app/rive-nitro-react-native/issues/9)                 | ✅     |
 | [Data Binding - Artboards](https://github.com/rive-app/rive-nitro-react-native/issues/10)             | 🚧     |
-| [Data Binding - Lists](https://github.com/rive-app/rive-nitro-react-native/issues/11)                 | 🚧     |
+| [Data Binding - Lists](https://github.com/rive-app/rive-nitro-react-native/issues/11)                 | ✅     |
 | [Data Binding - Value props](https://github.com/rive-app/rive-nitro-react-native/pull/24)             | 🚧     |
 | [Suspense](https://github.com/rive-app/rive-nitro-react-native/pull/19)                               | 🚧     |
 
@@ -254,4 +266,3 @@ MIT
 ---
 
 Made with [create-react-native-library](https://github.com/callstack/react-native-builder-bob)
-

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

@@ -9,12 +9,14 @@ import kotlinx.coroutines.flow.Flow
 @Keep
 @DoNotStrip
 interface BaseHybridViewModelProperty<T> {
-    val scope: CoroutineScope?
-    val job: Job?
-    val listeners: MutableList<(T) -> Unit>
+  val scope: CoroutineScope?
+  val job: Job?
+  val listeners: MutableMap<String, (T) -> Unit>
 
-    fun ensureValueListenerJob(valueFlow: Flow<T>, drop: Int = 0)
-    fun onChanged(value: T)
-    fun removeListeners()
-    fun dispose()
+  fun ensureValueListenerJob(valueFlow: Flow<T>, drop: Int = 0)
+  fun onChanged(value: T)
+  fun addListenerInternal(callback: (T) -> Unit): () -> Unit
+  fun removeListener(id: String)
+  fun removeListeners()
+  fun dispose()
 }

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

@@ -9,42 +9,61 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.drop
+import java.lang.ref.WeakReference
+import java.util.UUID
 
 @Keep
 @DoNotStrip
 class BaseHybridViewModelPropertyImpl<T> : BaseHybridViewModelProperty<T> {
-    override var scope: CoroutineScope? = null
-    override var job: Job? = null
-    override val listeners = mutableListOf<(T) -> Unit>()
+  override var scope: CoroutineScope? = null
+  override var job: Job? = null
+  override val listeners = mutableMapOf<String, (T) -> Unit>()
 
   override fun ensureValueListenerJob(valueFlow: Flow<T>, drop: Int) {
-        if (scope == null) {
-            scope = CoroutineScope(Dispatchers.Default)
-        }
-        if (job == null) {
-            job = scope?.launch {
-                valueFlow.drop(drop).collect { value ->
-                    onChanged(value)
-                }
-            }
+    if (scope == null) {
+      scope = CoroutineScope(Dispatchers.Default)
+    }
+    if (job == null) {
+      job = scope?.launch {
+        valueFlow.drop(drop).collect { value ->
+          onChanged(value)
         }
+      }
     }
+  }
 
-    override fun onChanged(value: T) {
-        listeners.forEach { listener ->
-            listener(value)
-        }
+  override fun onChanged(value: T) {
+    listeners.values.forEach { listener ->
+      listener(value)
     }
+  }
 
-    override fun removeListeners() {
-        listeners.clear()
-        job?.cancel()
-        scope?.cancel()
-        job = null
-        scope = null
+  override fun addListenerInternal(callback: (T) -> Unit): () -> Unit {
+    val id = UUID.randomUUID().toString()
+    listeners[id] = callback
+    val weakSelf = WeakReference(this)
+    return {
+      weakSelf.get()?.removeListener(id)
     }
+  }
 
-    override fun dispose() {
-        removeListeners()
+  override fun removeListener(id: String) {
+    listeners.remove(id)
+    if (listeners.isEmpty()) {
+      job?.cancel()
+      job = null
     }
+  }
+
+  override fun removeListeners() {
+    listeners.clear()
+    job?.cancel()
+    scope?.cancel()
+    job = null
+    scope = null
+  }
+
+  override fun dispose() {
+    removeListeners()
+  }
 }

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

@@ -3,7 +3,6 @@ package com.margelo.nitro.rive
 import androidx.annotation.Keep
 import app.rive.runtime.kotlin.core.File
 import com.facebook.proguard.annotations.DoNotStrip
-import com.margelo.nitro.NitroModules
 import java.lang.ref.WeakReference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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

@@ -15,8 +15,9 @@ class HybridViewModelBooleanProperty(private val viewModelBoolean: ViewModelBool
       viewModelBoolean.value = value
     }
 
-  override fun addListener(onChanged: (value: Boolean) -> Unit) {
-    listeners.add(onChanged)
+  override fun addListener(onChanged: (value: Boolean) -> Unit): () -> Unit {
+    val remover = addListenerInternal(onChanged)
     ensureValueListenerJob(viewModelBoolean.valueFlow)
+    return remover
   }
 }

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

@@ -15,8 +15,9 @@ class HybridViewModelColorProperty(private val viewModelColor: ViewModelColorPro
       viewModelColor.value = value.toInt()
     }
 
-  override fun addListener(onChanged: (value: Double) -> Unit) {
-    listeners.add { intValue: Int -> onChanged(intValue.toDouble()) }
+  override fun addListener(onChanged: (value: Double) -> Unit): () -> Unit {
+    val remover = addListenerInternal { intValue: Int -> onChanged(intValue.toDouble()) }
     ensureValueListenerJob(viewModelColor.valueFlow)
+    return remover
   }
 }

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

@@ -15,8 +15,9 @@ class HybridViewModelEnumProperty(private val viewModelEnum: ViewModelEnumProper
       viewModelEnum.value = value
     }
 
-  override fun addListener(onChanged: (value: String) -> Unit) {
-    listeners.add(onChanged)
+  override fun addListener(onChanged: (value: String) -> Unit): () -> Unit {
+    val remover = addListenerInternal(onChanged)
     ensureValueListenerJob(viewModelEnum.valueFlow)
+    return remover
   }
 }

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

@@ -14,8 +14,9 @@ class HybridViewModelImageProperty(private val viewModelImage: ViewModelImagePro
     viewModelImage.set((image as? HybridRiveImage)?.renderImage)
   }
 
-  override fun addListener(onChanged: () -> Unit) {
-    listeners.add { _ -> onChanged() }
+  override fun addListener(onChanged: () -> Unit): () -> Unit {
+    val remover = addListenerInternal { _ -> onChanged() }
     ensureValueListenerJob(viewModelImage.valueFlow.map { })
+    return remover
   }
 }

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

@@ -11,66 +11,45 @@ class HybridViewModelInstance(val viewModelInstance: ViewModelInstance) : Hybrid
   override val instanceName: String
     get() = viewModelInstance.name
 
-  override fun numberProperty(path: String): HybridViewModelNumberPropertySpec? {
-    try {
-        val numberProper = viewModelInstance.getNumberProperty(path)
-        return HybridViewModelNumberProperty(numberProper)
+  // Returns null if ViewModelException is thrown for iOS parity
+  // (iOS SDK returns nil when property not found, Android SDK throws)
+  private inline fun <T> getPropertyOrNull(block: () -> T): T? {
+    return try {
+      block()
     } catch (e: ViewModelException) {
-      return null
+      null
     }
   }
 
-  override fun stringProperty(path: String): HybridViewModelStringPropertySpec? {
-    try {
-      val stringProperty = viewModelInstance.getStringProperty(path)
-      return HybridViewModelStringProperty(stringProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun numberProperty(path: String) = getPropertyOrNull {
+    HybridViewModelNumberProperty(viewModelInstance.getNumberProperty(path))
   }
 
-  override fun booleanProperty(path: String): HybridViewModelBooleanPropertySpec? {
-    try {
-      val booleanProperty = viewModelInstance.getBooleanProperty(path)
-      return HybridViewModelBooleanProperty(booleanProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun stringProperty(path: String) = getPropertyOrNull {
+    HybridViewModelStringProperty(viewModelInstance.getStringProperty(path))
   }
 
-  override fun colorProperty(path: String): HybridViewModelColorPropertySpec? {
-    try {
-      val colorProperty = viewModelInstance.getColorProperty(path)
-      return HybridViewModelColorProperty(colorProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun booleanProperty(path: String) = getPropertyOrNull {
+    HybridViewModelBooleanProperty(viewModelInstance.getBooleanProperty(path))
   }
 
-  override fun enumProperty(path: String): HybridViewModelEnumPropertySpec? {
-    try {
-      val enumProperty = viewModelInstance.getEnumProperty(path)
-      return HybridViewModelEnumProperty(enumProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun colorProperty(path: String) = getPropertyOrNull {
+    HybridViewModelColorProperty(viewModelInstance.getColorProperty(path))
   }
 
-  override fun triggerProperty(path: String): HybridViewModelTriggerPropertySpec? {
-    try {
-      val triggerProperty = viewModelInstance.getTriggerProperty(path)
-      return HybridViewModelTriggerProperty(triggerProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun enumProperty(path: String) = getPropertyOrNull {
+    HybridViewModelEnumProperty(viewModelInstance.getEnumProperty(path))
   }
 
-  override fun imageProperty(path: String): HybridViewModelImagePropertySpec? {
-    try {
-      val imageProperty = viewModelInstance.getImageProperty(path)
-      return HybridViewModelImageProperty(imageProperty)
-    } catch (e: ViewModelException) {
-      return null
-    }
+  override fun triggerProperty(path: String) = getPropertyOrNull {
+    HybridViewModelTriggerProperty(viewModelInstance.getTriggerProperty(path))
+  }
+
+  override fun imageProperty(path: String) = getPropertyOrNull {
+    HybridViewModelImageProperty(viewModelInstance.getImageProperty(path))
+  }
+
+  override fun listProperty(path: String) = getPropertyOrNull {
+    HybridViewModelListProperty(viewModelInstance.getListProperty(path))
   }
 }

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

@@ -0,0 +1,64 @@
+package com.margelo.nitro.rive
+
+import androidx.annotation.Keep
+import app.rive.runtime.kotlin.core.ViewModelListProperty
+import com.facebook.proguard.annotations.DoNotStrip
+import kotlinx.coroutines.flow.map
+
+@Keep
+@DoNotStrip
+class HybridViewModelListProperty(private val listProperty: ViewModelListProperty) :
+  HybridViewModelListPropertySpec(),
+  BaseHybridViewModelProperty<Unit> by BaseHybridViewModelPropertyImpl() {
+  override val length: Double
+    get() = listProperty.size.toDouble()
+
+  private fun requireHybridInstance(instance: HybridViewModelInstanceSpec): HybridViewModelInstance {
+    return instance as? HybridViewModelInstance
+      ?: throw IllegalArgumentException("Expected HybridViewModelInstance but got ${instance::class.simpleName}")
+  }
+
+  override fun getInstanceAt(index: Double): HybridViewModelInstanceSpec? {
+    val idx = index.toInt()
+    if (idx < 0 || idx >= listProperty.size) return null
+    return HybridViewModelInstance(listProperty.elementAt(idx))
+  }
+
+  override fun addInstance(instance: HybridViewModelInstanceSpec) {
+    val hybridInstance = requireHybridInstance(instance)
+    listProperty.add(hybridInstance.viewModelInstance)
+  }
+
+  override fun addInstanceAt(instance: HybridViewModelInstanceSpec, index: Double): Boolean {
+    val hybridInstance = requireHybridInstance(instance)
+    val idx = index.toInt()
+    if (idx < 0 || idx > listProperty.size) return false
+    listProperty.add(idx, hybridInstance.viewModelInstance)
+    return true
+  }
+
+  override fun removeInstance(instance: HybridViewModelInstanceSpec) {
+    val hybridInstance = requireHybridInstance(instance)
+    listProperty.remove(hybridInstance.viewModelInstance)
+  }
+
+  override fun removeInstanceAt(index: Double) {
+    listProperty.removeAt(index.toInt())
+  }
+
+  override fun swap(index1: Double, index2: Double): Boolean {
+    val idx1 = index1.toInt()
+    val idx2 = index2.toInt()
+    if (idx1 < 0 || idx1 >= listProperty.size || idx2 < 0 || idx2 >= listProperty.size) {
+      return false
+    }
+    listProperty.swap(idx1, idx2)
+    return true
+  }
+
+  override fun addListener(onChanged: () -> Unit): () -> Unit {
+    val remover = addListenerInternal { _ -> onChanged() }
+    ensureValueListenerJob(listProperty.valueFlow.map { })
+    return remover
+  }
+}

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

@@ -16,8 +16,9 @@ class HybridViewModelNumberProperty(private val viewModelNumber: ViewModelNumber
       viewModelNumber.value = value.toFloat()
     }
 
-  override fun addListener(onChanged: (value: Double) -> Unit) {
-    listeners.add(onChanged)
+  override fun addListener(onChanged: (value: Double) -> Unit): () -> Unit {
+    val remover = addListenerInternal(onChanged)
     ensureValueListenerJob(viewModelNumber.valueFlow.map { it.toDouble() })
+    return remover
   }
 }

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

@@ -15,8 +15,9 @@ class HybridViewModelStringProperty(private val viewModelString: ViewModelString
       viewModelString.value = value
     }
 
-  override fun addListener(onChanged: (value: String) -> Unit) {
-    listeners.add(onChanged)
+  override fun addListener(onChanged: (value: String) -> Unit): () -> Unit {
+    val remover = addListenerInternal(onChanged)
     ensureValueListenerJob(viewModelString.valueFlow)
+    return remover
   }
 }

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

@@ -13,9 +13,10 @@ class HybridViewModelTriggerProperty(private val viewModelTrigger: ViewModelTrig
     viewModelTrigger.trigger()
   }
 
-  override fun addListener(onChanged: () -> Unit) {
-    listeners.add { _ -> onChanged() }
+  override fun addListener(onChanged: () -> Unit): () -> Unit {
+    val remover = addListenerInternal { _ -> onChanged() }
     // We drop the first value as a trigger has no initial value
     ensureValueListenerJob(viewModelTrigger.valueFlow, 1)
+    return remover
   }
 }

package/ios/BaseHybridViewModelProperty.swift

@@ -23,6 +23,7 @@ typealias EnumPropertyType = RiveDataBindingViewModel.Instance.EnumProperty
 typealias ColorPropertyType = RiveDataBindingViewModel.Instance.ColorProperty
 typealias TriggerPropertyType = RiveDataBindingViewModel.Instance.TriggerProperty
 typealias ImagePropertyType = RiveDataBindingViewModel.Instance.ImageProperty
+typealias ListPropertyType = RiveDataBindingViewModel.Instance.ListProperty
 
 // Make all Rive property types conform to the protocol
 extension BooleanPropertyType: RivePropertyWithListeners {
@@ -56,6 +57,14 @@ extension ImagePropertyType: RivePropertyWithListeners {
   }
 }
 
+extension ListPropertyType: RivePropertyWithListeners {
+  typealias ListenerValueType = Void
+
+  func addListener(_ callback: @escaping ListenerType) -> UUID {
+    addListener { callback(()) }
+  }
+}
+
 /// Helper class for managing ViewModel property listeners
 class PropertyListenerHelper<PropertyType: RivePropertyWithListeners> {
   private var listenerIds: [UUID] = []
@@ -65,11 +74,18 @@ class PropertyListenerHelper<PropertyType: RivePropertyWithListeners> {
     self.property = property
   }
 
-  /// Adds a listener to the property and automatically tracks its ID for cleanup
-  func addListener(_ callback: @escaping (PropertyType.ListenerValueType) -> Void) {
-    guard let property = property else { return }
+  /// Adds a listener to the property and returns a removal function for cleanup
+  func addListener(_ callback: @escaping (PropertyType.ListenerValueType) -> Void) -> () -> Void {
+    guard let property = property else {
+      return {}
+    }
     let id = property.addListener(callback)
     listenerIds.append(id)
+    return { [weak self, weak property] in
+      guard let property = property else { return }
+      property.removeListener(id)
+      self?.listenerIds.removeAll { $0 == id }
+    }
   }
 
   func removeListeners() throws {
@@ -94,7 +110,7 @@ protocol ValuedPropertyProtocol<ValueType> {
   var property: PropertyType! { get }
   var helper: PropertyListenerHelper<PropertyType> { get }
 
-  func addListener(onChanged: @escaping (ValueType) -> Void) throws
+  func addListener(onChanged: @escaping (ValueType) -> Void) throws -> () -> Void
   func removeListeners() throws
   func dispose() throws
 }
@@ -112,7 +128,7 @@ extension ValuedPropertyProtocol {
 
 /// Automatic addListener() ONLY when ListenerValueType == ValueType (no conversion needed)
 extension ValuedPropertyProtocol where PropertyType.ListenerValueType == ValueType {
-  func addListener(onChanged: @escaping (ValueType) -> Void) throws {
-    helper.addListener(onChanged)  // Types match, just forward directly!
+  func addListener(onChanged: @escaping (ValueType) -> Void) throws -> () -> Void {
+    return helper.addListener(onChanged)
   }
 }

package/ios/HybridViewModel.swift

@@ -6,12 +6,7 @@ class HybridViewModel: HybridViewModelSpec {
   init(viewModel: RiveDataBindingViewModel) {
     self.viewModel = viewModel
   }
-  
-  override init() {
-    self.viewModel = nil
-    super.init()
-  }
-  
+
   var propertyCount: Double { Double(viewModel?.propertyCount ?? 0) }
   
   var instanceCount: Double { Double(viewModel?.instanceCount ?? 0) }

package/ios/HybridViewModelBooleanProperty.swift

@@ -9,15 +9,7 @@ class HybridViewModelBooleanProperty: HybridViewModelBooleanPropertySpec, Valued
     self.property = property
     super.init()
   }
-  
-  /// ⚠️ DO NOT REMOVE
-  /// Nitro requires a parameterless initializer for JS bridging.
-  /// This is invoked automatically during hybrid module construction.
-  /// Internally we always use `init(property:)`
-  override init() {
-    super.init()
-  }
-  
+
   var value: Bool {
     get {
       return property.value

package/ios/HybridViewModelColorProperty.swift

@@ -9,15 +9,7 @@ class HybridViewModelColorProperty: HybridViewModelColorPropertySpec, ValuedProp
     self.property = property
     super.init()
   }
-  
-  /// ⚠️ DO NOT REMOVE
-  /// Nitro requires a parameterless initializer for JS bridging.
-  /// This is invoked automatically during hybrid module construction.
-  /// Internally we always use `init(property:)`
-  override init() {
-    super.init()
-  }
-  
+
   var value: Double {
     get {
       return property.value.toHexDouble()
@@ -27,9 +19,8 @@ class HybridViewModelColorProperty: HybridViewModelColorPropertySpec, ValuedProp
     }
   }
   
-  // Custom addListener because we need to convert UIColor → Double
-  func addListener(onChanged: @escaping (Double) -> Void) throws {
-    helper.addListener { (color: UIColor) in
+  func addListener(onChanged: @escaping (Double) -> Void) throws -> () -> Void {
+    return helper.addListener { (color: UIColor) in
       onChanged(color.toHexDouble())
     }
   }

package/ios/HybridViewModelEnumProperty.swift

@@ -9,15 +9,7 @@ class HybridViewModelEnumProperty: HybridViewModelEnumPropertySpec, ValuedProper
     self.property = property
     super.init()
   }
-  
-  /// ⚠️ DO NOT REMOVE
-  /// Nitro requires a parameterless initializer for JS bridging.
-  /// This is invoked automatically during hybrid module construction.
-  /// Internally we always use `init(property:)`
-  override init() {
-    super.init()
-  }
-  
+
   var value: String {
     get {
       return property.value

package/ios/HybridViewModelImageProperty.swift

@@ -1,13 +1,13 @@
 import RiveRuntime
 
 class HybridViewModelImageProperty: HybridViewModelImagePropertySpec, ValuedPropertyProtocol {
-  func addListener(onChanged: @escaping () -> Void) throws {
-    try addListener(onChanged: { _ in onChanged() })
-  }
-  
   var property: ImagePropertyType!
   lazy var helper = PropertyListenerHelper(property: property!)
 
+  func addListener(onChanged: @escaping () -> Void) throws -> () -> Void {
+    return helper.addListener { _ in onChanged() }
+  }
+
   init(property: ImagePropertyType) {
     self.property = property
     super.init()

package/ios/HybridViewModelInstance.swift

@@ -6,12 +6,7 @@ class HybridViewModelInstance: HybridViewModelInstanceSpec {
   init(viewModelInstance: RiveDataBindingViewModel.Instance) {
     self.viewModelInstance = viewModelInstance
   }
-  
-  override init() {
-    self.viewModelInstance = nil
-    super.init()
-  }
-  
+
   var instanceName: String { viewModelInstance?.name ?? "" }
   
   func numberProperty(path: String) throws -> (any HybridViewModelNumberPropertySpec)? {
@@ -48,4 +43,9 @@ class HybridViewModelInstance: HybridViewModelInstanceSpec {
     guard let property = viewModelInstance?.imageProperty(fromPath: path) else { return nil }
     return HybridViewModelImageProperty(property: property)
   }
+
+  func listProperty(path: String) throws -> (any HybridViewModelListPropertySpec)? {
+    guard let property = viewModelInstance?.listProperty(fromPath: path) else { return nil }
+    return HybridViewModelListProperty(property: property)
+  }
 }