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

package/nitrogen/generated/ios/RNRiveAutolinking.mm

@@ -13,15 +13,6 @@
 #include "HybridRiveSpecSwift.hpp"
 #include "HybridRiveFileFactorySpecSwift.hpp"
 #include "HybridRiveFileSpecSwift.hpp"
-#include "HybridViewModelSpecSwift.hpp"
-#include "HybridViewModelInstanceSpecSwift.hpp"
-#include "HybridViewModelNumberPropertySpecSwift.hpp"
-#include "HybridViewModelStringPropertySpecSwift.hpp"
-#include "HybridViewModelBooleanPropertySpecSwift.hpp"
-#include "HybridViewModelColorPropertySpecSwift.hpp"
-#include "HybridViewModelEnumPropertySpecSwift.hpp"
-#include "HybridViewModelTriggerPropertySpecSwift.hpp"
-#include "HybridViewModelImagePropertySpecSwift.hpp"
 #include "HybridRiveViewSpecSwift.hpp"
 #include "HybridRiveImageFactorySpecSwift.hpp"
 
@@ -55,69 +46,6 @@
       return hybridObject;
     }
   );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModel",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelSpec> hybridObject = RNRive::RNRiveAutolinking::createViewModel();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelInstance",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelInstanceSpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelInstance();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelNumberProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelNumberPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelNumberProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelStringProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelStringPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelStringProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelBooleanProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelBooleanPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelBooleanProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelColorProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelColorPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelColorProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelEnumProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelEnumPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelEnumProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelTriggerProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelTriggerPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelTriggerProperty();
-      return hybridObject;
-    }
-  );
-  HybridObjectRegistry::registerHybridObjectConstructor(
-    "ViewModelImageProperty",
-    []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridViewModelImagePropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelImageProperty();
-      return hybridObject;
-    }
-  );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "RiveView",
     []() -> std::shared_ptr<HybridObject> {

package/nitrogen/generated/ios/RNRiveAutolinking.swift

@@ -53,141 +53,6 @@ public final class RNRiveAutolinking {
     }()
   }
   
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModel`).
-   */
-  public static func createViewModel() -> bridge.std__shared_ptr_HybridViewModelSpec_ {
-    let hybridObject = HybridViewModel()
-    return { () -> bridge.std__shared_ptr_HybridViewModelSpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelInstanceSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelInstanceSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelInstance`).
-   */
-  public static func createViewModelInstance() -> bridge.std__shared_ptr_HybridViewModelInstanceSpec_ {
-    let hybridObject = HybridViewModelInstance()
-    return { () -> bridge.std__shared_ptr_HybridViewModelInstanceSpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelNumberPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelNumberPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelNumberProperty`).
-   */
-  public static func createViewModelNumberProperty() -> bridge.std__shared_ptr_HybridViewModelNumberPropertySpec_ {
-    let hybridObject = HybridViewModelNumberProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelNumberPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelStringPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelStringPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelStringProperty`).
-   */
-  public static func createViewModelStringProperty() -> bridge.std__shared_ptr_HybridViewModelStringPropertySpec_ {
-    let hybridObject = HybridViewModelStringProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelStringPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelBooleanPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelBooleanPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelBooleanProperty`).
-   */
-  public static func createViewModelBooleanProperty() -> bridge.std__shared_ptr_HybridViewModelBooleanPropertySpec_ {
-    let hybridObject = HybridViewModelBooleanProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelBooleanPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelColorPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelColorPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelColorProperty`).
-   */
-  public static func createViewModelColorProperty() -> bridge.std__shared_ptr_HybridViewModelColorPropertySpec_ {
-    let hybridObject = HybridViewModelColorProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelColorPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelEnumPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelEnumPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelEnumProperty`).
-   */
-  public static func createViewModelEnumProperty() -> bridge.std__shared_ptr_HybridViewModelEnumPropertySpec_ {
-    let hybridObject = HybridViewModelEnumProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelEnumPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelTriggerPropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelTriggerPropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelTriggerProperty`).
-   */
-  public static func createViewModelTriggerProperty() -> bridge.std__shared_ptr_HybridViewModelTriggerPropertySpec_ {
-    let hybridObject = HybridViewModelTriggerProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelTriggerPropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
-  /**
-   * Creates an instance of a Swift class that implements `HybridViewModelImagePropertySpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridViewModelImagePropertySpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridViewModelImageProperty`).
-   */
-  public static func createViewModelImageProperty() -> bridge.std__shared_ptr_HybridViewModelImagePropertySpec_ {
-    let hybridObject = HybridViewModelImageProperty()
-    return { () -> bridge.std__shared_ptr_HybridViewModelImagePropertySpec_ in
-      let __cxxWrapped = hybridObject.getCxxWrapper()
-      return __cxxWrapped.getCxxPart()
-    }()
-  }
-  
   /**
    * Creates an instance of a Swift class that implements `HybridRiveViewSpec`,
    * and wraps it in a Swift class that can directly interop with C++ (`HybridRiveViewSpec_cxx`)

package/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp

@@ -68,11 +68,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void(bool /* value */)>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void(bool /* value */)>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp

@@ -68,11 +68,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void(double /* value */)>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void(double /* value */)>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp

@@ -70,11 +70,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void(const std::string& /* value */)>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void(const std::string& /* value */)>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp

@@ -74,11 +74,13 @@ namespace margelo::nitro::rive {
         std::rethrow_exception(__result.error());
       }
     }
-    inline void addListener(const std::function<void()>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void()>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelInstanceSpecSwift.hpp

@@ -26,6 +26,8 @@ namespace margelo::nitro::rive { class HybridViewModelEnumPropertySpec; }
 namespace margelo::nitro::rive { class HybridViewModelTriggerPropertySpec; }
 // Forward declaration of `HybridViewModelImagePropertySpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridViewModelImagePropertySpec; }
+// Forward declaration of `HybridViewModelListPropertySpec` to properly resolve imports.
+namespace margelo::nitro::rive { class HybridViewModelListPropertySpec; }
 
 #include <string>
 #include <memory>
@@ -37,6 +39,7 @@ namespace margelo::nitro::rive { class HybridViewModelImagePropertySpec; }
 #include "HybridViewModelEnumPropertySpec.hpp"
 #include "HybridViewModelTriggerPropertySpec.hpp"
 #include "HybridViewModelImagePropertySpec.hpp"
+#include "HybridViewModelListPropertySpec.hpp"
 
 #include "RNRive-Swift-Cxx-Umbrella.hpp"
 
@@ -141,6 +144,14 @@ namespace margelo::nitro::rive {
       auto __value = std::move(__result.value());
       return __value;
     }
+    inline std::optional<std::shared_ptr<HybridViewModelListPropertySpec>> listProperty(const std::string& path) override {
+      auto __result = _swiftPart.listProperty(path);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
 
   private:
     RNRive::HybridViewModelInstanceSpec_cxx _swiftPart;

package/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.cpp

@@ -0,0 +1,11 @@
+///
+/// HybridViewModelListPropertySpecSwift.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#include "HybridViewModelListPropertySpecSwift.hpp"
+
+namespace margelo::nitro::rive {
+} // namespace margelo::nitro::rive

package/nitrogen/generated/ios/c++/HybridViewModelListPropertySpecSwift.hpp

@@ -0,0 +1,134 @@
+///
+/// HybridViewModelListPropertySpecSwift.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include "HybridViewModelListPropertySpec.hpp"
+
+// Forward declaration of `HybridViewModelListPropertySpec_cxx` to properly resolve imports.
+namespace RNRive { class HybridViewModelListPropertySpec_cxx; }
+
+// Forward declaration of `HybridViewModelInstanceSpec` to properly resolve imports.
+namespace margelo::nitro::rive { class HybridViewModelInstanceSpec; }
+// Forward declaration of `HybridViewModelPropertySpecSwift` to properly resolve imports.
+namespace margelo::nitro::rive { class HybridViewModelPropertySpecSwift; }
+
+#include <memory>
+#include "HybridViewModelInstanceSpec.hpp"
+#include <optional>
+#include <functional>
+#include "HybridViewModelPropertySpecSwift.hpp"
+
+#include "RNRive-Swift-Cxx-Umbrella.hpp"
+
+namespace margelo::nitro::rive {
+
+  /**
+   * The C++ part of HybridViewModelListPropertySpec_cxx.swift.
+   *
+   * HybridViewModelListPropertySpecSwift (C++) accesses HybridViewModelListPropertySpec_cxx (Swift), and might
+   * contain some additional bridging code for C++ <> Swift interop.
+   *
+   * Since this obviously introduces an overhead, I hope at some point in
+   * the future, HybridViewModelListPropertySpec_cxx can directly inherit from the C++ class HybridViewModelListPropertySpec
+   * to simplify the whole structure and memory management.
+   */
+  class HybridViewModelListPropertySpecSwift: public virtual HybridViewModelListPropertySpec, public virtual HybridViewModelPropertySpecSwift {
+  public:
+    // Constructor from a Swift instance
+    explicit HybridViewModelListPropertySpecSwift(const RNRive::HybridViewModelListPropertySpec_cxx& swiftPart):
+      HybridObject(HybridViewModelListPropertySpec::TAG),
+      HybridViewModelPropertySpecSwift(swiftPart),
+      _swiftPart(swiftPart) { }
+
+  public:
+    // Get the Swift part
+    inline RNRive::HybridViewModelListPropertySpec_cxx& getSwiftPart() noexcept {
+      return _swiftPart;
+    }
+
+  public:
+    inline size_t getExternalMemorySize() noexcept override {
+      return _swiftPart.getMemorySize();
+    }
+    void dispose() noexcept override {
+      _swiftPart.dispose();
+    }
+    std::string toString() override {
+      return _swiftPart.toString();
+    }
+
+  public:
+    // Properties
+    inline double getLength() noexcept override {
+      return _swiftPart.getLength();
+    }
+
+  public:
+    // Methods
+    inline std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> getInstanceAt(double index) override {
+      auto __result = _swiftPart.getInstanceAt(std::forward<decltype(index)>(index));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
+    inline void addInstance(const std::shared_ptr<HybridViewModelInstanceSpec>& instance) override {
+      auto __result = _swiftPart.addInstance(instance);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
+    inline bool addInstanceAt(const std::shared_ptr<HybridViewModelInstanceSpec>& instance, double index) override {
+      auto __result = _swiftPart.addInstanceAt(instance, std::forward<decltype(index)>(index));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
+    inline void removeInstance(const std::shared_ptr<HybridViewModelInstanceSpec>& instance) override {
+      auto __result = _swiftPart.removeInstance(instance);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
+    inline void removeInstanceAt(double index) override {
+      auto __result = _swiftPart.removeInstanceAt(std::forward<decltype(index)>(index));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
+    inline bool swap(double index1, double index2) override {
+      auto __result = _swiftPart.swap(std::forward<decltype(index1)>(index1), std::forward<decltype(index2)>(index2));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
+    inline std::function<void()> addListener(const std::function<void()>& onChanged) override {
+      auto __result = _swiftPart.addListener(onChanged);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
+    inline void removeListeners() override {
+      auto __result = _swiftPart.removeListeners();
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
+
+  private:
+    RNRive::HybridViewModelListPropertySpec_cxx _swiftPart;
+  };
+
+} // namespace margelo::nitro::rive

package/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp

@@ -68,11 +68,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void(double /* value */)>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void(double /* value */)>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp

@@ -70,11 +70,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void(const std::string& /* value */)>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void(const std::string& /* value */)>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void removeListeners() override {
       auto __result = _swiftPart.removeListeners();

package/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp

@@ -63,11 +63,13 @@ namespace margelo::nitro::rive {
 
   public:
     // Methods
-    inline void addListener(const std::function<void()>& onChanged) override {
+    inline std::function<void()> addListener(const std::function<void()>& onChanged) override {
       auto __result = _swiftPart.addListener(onChanged);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
+      auto __value = std::move(__result.value());
+      return __value;
     }
     inline void trigger() override {
       auto __result = _swiftPart.trigger();

package/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift

@@ -14,7 +14,7 @@ public protocol HybridViewModelBooleanPropertySpec_protocol: HybridObject, Hybri
   var value: Bool { get set }
 
   // Methods
-  func addListener(onChanged: @escaping (_ value: Bool) -> Void) throws -> Void
+  func addListener(onChanged: @escaping (_ value: Bool) -> Void) throws -> () -> Void
   func removeListeners() throws -> Void
 }
 

package/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift

@@ -130,18 +130,22 @@ open class HybridViewModelBooleanPropertySpec_cxx : HybridViewModelPropertySpec_
 
   // Methods
   @inline(__always)
-  public final func addListener(onChanged: bridge.Func_void_bool) -> bridge.Result_void_ {
+  public final func addListener(onChanged: bridge.Func_void_bool) -> bridge.Result_std__function_void____ {
     do {
-      try self.__implementation.addListener(onChanged: { () -> (Bool) -> Void in
+      let __result = try self.__implementation.addListener(onChanged: { () -> (Bool) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_bool(onChanged)
         return { (__value: Bool) -> Void in
           __wrappedFunction.call(__value)
         }
       }())
-      return bridge.create_Result_void_()
+      let __resultCpp = { () -> bridge.Func_void in
+        let __closureWrapper = Func_void(__result)
+        return bridge.create_Func_void(__closureWrapper.toUnsafe())
+      }()
+      return bridge.create_Result_std__function_void____(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_void_(__exceptionPtr)
+      return bridge.create_Result_std__function_void____(__exceptionPtr)
     }
   }
   

package/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift

@@ -14,7 +14,7 @@ public protocol HybridViewModelColorPropertySpec_protocol: HybridObject, HybridV
   var value: Double { get set }
 
   // Methods
-  func addListener(onChanged: @escaping (_ value: Double) -> Void) throws -> Void
+  func addListener(onChanged: @escaping (_ value: Double) -> Void) throws -> () -> Void
   func removeListeners() throws -> Void
 }
 

package/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift

@@ -130,18 +130,22 @@ open class HybridViewModelColorPropertySpec_cxx : HybridViewModelPropertySpec_cx
 
   // Methods
   @inline(__always)
-  public final func addListener(onChanged: bridge.Func_void_double) -> bridge.Result_void_ {
+  public final func addListener(onChanged: bridge.Func_void_double) -> bridge.Result_std__function_void____ {
     do {
-      try self.__implementation.addListener(onChanged: { () -> (Double) -> Void in
+      let __result = try self.__implementation.addListener(onChanged: { () -> (Double) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_double(onChanged)
         return { (__value: Double) -> Void in
           __wrappedFunction.call(__value)
         }
       }())
-      return bridge.create_Result_void_()
+      let __resultCpp = { () -> bridge.Func_void in
+        let __closureWrapper = Func_void(__result)
+        return bridge.create_Func_void(__closureWrapper.toUnsafe())
+      }()
+      return bridge.create_Result_std__function_void____(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_void_(__exceptionPtr)
+      return bridge.create_Result_std__function_void____(__exceptionPtr)
     }
   }
   

package/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift

@@ -14,7 +14,7 @@ public protocol HybridViewModelEnumPropertySpec_protocol: HybridObject, HybridVi
   var value: String { get set }
 
   // Methods
-  func addListener(onChanged: @escaping (_ value: String) -> Void) throws -> Void
+  func addListener(onChanged: @escaping (_ value: String) -> Void) throws -> () -> Void
   func removeListeners() throws -> Void
 }
 

package/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift

@@ -130,18 +130,22 @@ open class HybridViewModelEnumPropertySpec_cxx : HybridViewModelPropertySpec_cxx
 
   // Methods
   @inline(__always)
-  public final func addListener(onChanged: bridge.Func_void_std__string) -> bridge.Result_void_ {
+  public final func addListener(onChanged: bridge.Func_void_std__string) -> bridge.Result_std__function_void____ {
     do {
-      try self.__implementation.addListener(onChanged: { () -> (String) -> Void in
+      let __result = try self.__implementation.addListener(onChanged: { () -> (String) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_std__string(onChanged)
         return { (__value: String) -> Void in
           __wrappedFunction.call(std.string(__value))
         }
       }())
-      return bridge.create_Result_void_()
+      let __resultCpp = { () -> bridge.Func_void in
+        let __closureWrapper = Func_void(__result)
+        return bridge.create_Func_void(__closureWrapper.toUnsafe())
+      }()
+      return bridge.create_Result_std__function_void____(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_void_(__exceptionPtr)
+      return bridge.create_Result_std__function_void____(__exceptionPtr)
     }
   }
   

package/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift

@@ -15,7 +15,7 @@ public protocol HybridViewModelImagePropertySpec_protocol: HybridObject, HybridV
 
   // Methods
   func set(image: (any HybridRiveImageSpec)?) throws -> Void
-  func addListener(onChanged: @escaping () -> Void) throws -> Void
+  func addListener(onChanged: @escaping () -> Void) throws -> () -> Void
   func removeListeners() throws -> Void
 }