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

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/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/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

@@ -65,11 +65,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 +101,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 +119,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)? {

package/ios/HybridViewModelNumberProperty.swift

@@ -9,14 +9,6 @@ class HybridViewModelNumberProperty: HybridViewModelNumberPropertySpec, ValuedPr
     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 Double(property.value)
@@ -26,10 +18,7 @@ class HybridViewModelNumberProperty: HybridViewModelNumberPropertySpec, ValuedPr
     }
   }
 
-  // Custom addListener needed because ListenerValueType (Float) != ValueType (Double)
-  func addListener(onChanged: @escaping (Double) -> Void) throws {
-    helper.addListener { (value: Float) in
-      onChanged(Double(value))
-    }
+  func addListener(onChanged: @escaping (Double) -> Void) throws -> () -> Void {
+    return helper.addListener({ floatValue in onChanged(Double(floatValue)) })
   }
 }

package/ios/HybridViewModelStringProperty.swift

@@ -9,15 +9,7 @@ class HybridViewModelStringProperty: HybridViewModelStringPropertySpec, ValuedPr
     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/HybridViewModelTriggerProperty.swift

@@ -4,27 +4,18 @@ import RiveRuntime
 class HybridViewModelTriggerProperty: HybridViewModelTriggerPropertySpec, ValuedPropertyProtocol {
   internal var property: TriggerPropertyType!
   lazy var helper = PropertyListenerHelper(property: property!)
-
   private var listenerIds: [UUID] = []
 
-  func addListener(onChanged: @escaping () -> Void) throws {
-    try addListener(onChanged: { _ in onChanged() })
-  }
-
   init(property: TriggerPropertyType) {
     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()
-  }
-  
+
   func trigger() {
     property.trigger()
   }
+
+  func addListener(onChanged: @escaping () -> Void) throws -> () -> Void {
+    try addListener(onChanged: { _ in onChanged() })
+  }
 }

package/ios/RiveReactNativeView.swift

@@ -58,6 +58,8 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
   func configure(_ config: ViewConfiguration, dataBindingChanged: Bool = false, reload: Bool = false, initialUpdate: Bool = false) throws {
     if reload {
       cleanup()
+      try validateConfiguration(config)
+
       let model = RiveModel(riveFile: config.riveFile)
       baseViewModel = RiveViewModel(model, stateMachineName: config.stateMachineName, autoPlay: config.autoPlay, artboardName: config.artboardName)
       createViewFromViewModel()
@@ -322,4 +324,38 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
 
     return try onSuccess(input)
   }
+
+  private func validateConfiguration(_ config: ViewConfiguration) throws {
+    try validateArtboardName(config.artboardName, in: config.riveFile)
+    try validateStateMachineName(config.stateMachineName, artboardName: config.artboardName, in: config.riveFile)
+  }
+
+  private func validateArtboardName(_ artboardName: String?, in riveFile: RiveFile) throws {
+    guard let artboardName = artboardName else { return }
+    let artboardNames = riveFile.artboardNames()
+    if !artboardNames.contains(artboardName) {
+      throw NSError(
+        domain: RiveErrorDomain,
+        code: Int(RiveErrorCode.noArtboardFound.rawValue),
+        userInfo: [NSLocalizedDescriptionKey: "Artboard '\(artboardName)' not found. Available: \(artboardNames.joined(separator: ", "))"]
+      )
+    }
+  }
+
+  private func validateStateMachineName(_ stateMachineName: String?, artboardName: String?, in riveFile: RiveFile) throws {
+    guard let stateMachineName = stateMachineName else { return }
+    let artboard = artboardName != nil
+      ? try? riveFile.artboard(fromName: artboardName!)
+      : try? riveFile.artboard()
+
+    guard let artboard = artboard else { return }
+    let stateMachineNames = artboard.stateMachineNames()
+    if !stateMachineNames.contains(stateMachineName) {
+      throw NSError(
+        domain: RiveErrorDomain,
+        code: Int(RiveErrorCode.noStateMachineFound.rawValue),
+        userInfo: [NSLocalizedDescriptionKey: "State machine '\(stateMachineName)' not found. Available: \(stateMachineNames.joined(separator: ", "))"]
+      )
+    }
+  }
 }

package/lib/typescript/src/specs/ViewModel.nitro.d.ts

@@ -55,49 +55,49 @@ export interface ViewModelProperty extends HybridObject<{
 }> {
 }
 export interface ObservableProperty {
-    /** Remove all listeners from the view model number property */
+    /** Remove all listeners from the property */
     removeListeners(): void;
 }
 export interface ViewModelNumberProperty extends ViewModelProperty, ObservableProperty {
     /** The value of the view model number property */
     value: number;
-    /** Add a listener to the view model number property */
-    addListener(onChanged: (value: number) => void): void;
+    /** Add a listener to the view model number property. Returns a function to remove the listener. */
+    addListener(onChanged: (value: number) => void): () => void;
 }
 export interface ViewModelStringProperty extends ViewModelProperty, ObservableProperty {
     /** The value of the view model string property */
     value: string;
-    /** Add a listener to the view model string property */
-    addListener(onChanged: (value: string) => void): void;
+    /** Add a listener to the view model string property. Returns a function to remove the listener. */
+    addListener(onChanged: (value: string) => void): () => void;
 }
 export interface ViewModelBooleanProperty extends ViewModelProperty, ObservableProperty {
     /** The value of the view model boolean property */
     value: boolean;
-    /** Add a listener to the view model boolean property */
-    addListener(onChanged: (value: boolean) => void): void;
+    /** Add a listener to the view model boolean property. Returns a function to remove the listener. */
+    addListener(onChanged: (value: boolean) => void): () => void;
 }
 export interface ViewModelColorProperty extends ViewModelProperty, ObservableProperty {
     /** The value of the view model color property */
     value: number;
-    /** Add a listener to the view model color property */
-    addListener(onChanged: (value: number) => void): void;
+    /** Add a listener to the view model color property. Returns a function to remove the listener. */
+    addListener(onChanged: (value: number) => void): () => void;
 }
 export interface ViewModelEnumProperty extends ViewModelProperty, ObservableProperty {
     /** The value of the view model enum property */
     value: string;
-    /** Add a listener to the view model enum property */
-    addListener(onChanged: (value: string) => void): void;
+    /** Add a listener to the view model enum property. Returns a function to remove the listener. */
+    addListener(onChanged: (value: string) => void): () => void;
 }
 export interface ViewModelTriggerProperty extends ViewModelProperty, ObservableProperty {
-    /** Add a listener to the view model trigger property */
-    addListener(onChanged: () => void): void;
+    /** Add a listener to the view model trigger property. Returns a function to remove the listener. */
+    addListener(onChanged: () => void): () => void;
     /** Trigger the view model trigger property */
     trigger(): void;
 }
 export interface ViewModelImageProperty extends ViewModelProperty, ObservableProperty {
     /** Set the image property value */
     set(image: RiveImage | undefined): void;
-    /** Add a listener to the view model image property */
-    addListener(onChanged: () => void): void;
+    /** Add a listener to the view model image property. Returns a function to remove the listener. */
+    addListener(onChanged: () => void): () => void;
 }
 //# sourceMappingURL=ViewModel.nitro.d.ts.map

package/lib/typescript/src/specs/ViewModel.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewModel.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/ViewModel.nitro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ViewModel.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/ViewModel.nitro.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp

@@ -10,8 +10,9 @@
 
 
 #include <functional>
-#include "JFunc_void_bool.hpp"
+#include "JFunc_void.hpp"
 #include <NitroModules/JNICallable.hpp>
+#include "JFunc_void_bool.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -53,9 +54,18 @@ namespace margelo::nitro::rive {
   }
 
   // Methods
-  void JHybridViewModelBooleanPropertySpec::addListener(const std::function<void(bool /* value */)>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_bool_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelBooleanPropertySpec::addListener(const std::function<void(bool /* value */)>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_bool::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_bool_cxx::fromCpp(onChanged));
+    return [&]() -> std::function<void()> {
+      if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return JNICallable<JFunc_void, void()>(std::move(__resultRef));
+      }
+    }();
   }
   void JHybridViewModelBooleanPropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");

package/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp

@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    void addListener(const std::function<void(bool /* value */)>& onChanged) override;
+    std::function<void()> addListener(const std::function<void(bool /* value */)>& onChanged) override;
     void removeListeners() override;
 
   private:

package/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp

@@ -10,8 +10,9 @@
 
 
 #include <functional>
-#include "JFunc_void_double.hpp"
+#include "JFunc_void.hpp"
 #include <NitroModules/JNICallable.hpp>
+#include "JFunc_void_double.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -53,9 +54,18 @@ namespace margelo::nitro::rive {
   }
 
   // Methods
-  void JHybridViewModelColorPropertySpec::addListener(const std::function<void(double /* value */)>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_double_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelColorPropertySpec::addListener(const std::function<void(double /* value */)>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_double::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_double_cxx::fromCpp(onChanged));
+    return [&]() -> std::function<void()> {
+      if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return JNICallable<JFunc_void, void()>(std::move(__resultRef));
+      }
+    }();
   }
   void JHybridViewModelColorPropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");