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

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

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

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

@@ -11,8 +11,9 @@
 
 #include <string>
 #include <functional>
-#include "JFunc_void_std__string.hpp"
+#include "JFunc_void.hpp"
 #include <NitroModules/JNICallable.hpp>
+#include "JFunc_void_std__string.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -54,9 +55,18 @@ namespace margelo::nitro::rive {
   }
 
   // Methods
-  void JHybridViewModelEnumPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelEnumPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_std__string_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 JHybridViewModelEnumPropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");

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

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

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

@@ -10,13 +10,13 @@
 // Forward declaration of `HybridRiveImageSpec` to properly resolve imports.
 namespace margelo::nitro::rive { class HybridRiveImageSpec; }
 
+#include <functional>
+#include "JFunc_void.hpp"
+#include <NitroModules/JNICallable.hpp>
 #include <memory>
 #include "HybridRiveImageSpec.hpp"
 #include <optional>
 #include "JHybridRiveImageSpec.hpp"
-#include <functional>
-#include "JFunc_void.hpp"
-#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::rive {
 
@@ -54,9 +54,18 @@ namespace margelo::nitro::rive {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JHybridRiveImageSpec::javaobject> /* image */)>("set");
     method(_javaPart, image.has_value() ? std::dynamic_pointer_cast<JHybridRiveImageSpec>(image.value())->getJavaPart() : nullptr);
   }
-  void JHybridViewModelImagePropertySpec::addListener(const std::function<void()>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelImagePropertySpec::addListener(const std::function<void()>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_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 JHybridViewModelImagePropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");

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

@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
   public:
     // Methods
     void set(const std::optional<std::shared_ptr<HybridRiveImageSpec>>& image) override;
-    void addListener(const std::function<void()>& onChanged) override;
+    std::function<void()> addListener(const std::function<void()>& onChanged) override;
     void removeListeners() override;
 
   private:

package/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.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 JHybridViewModelNumberPropertySpec::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()> JHybridViewModelNumberPropertySpec::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 JHybridViewModelNumberPropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");

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

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

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

@@ -11,8 +11,9 @@
 
 #include <string>
 #include <functional>
-#include "JFunc_void_std__string.hpp"
+#include "JFunc_void.hpp"
 #include <NitroModules/JNICallable.hpp>
+#include "JFunc_void_std__string.hpp"
 
 namespace margelo::nitro::rive {
 
@@ -54,9 +55,18 @@ namespace margelo::nitro::rive {
   }
 
   // Methods
-  void JHybridViewModelStringPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelStringPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_std__string_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 JHybridViewModelStringPropertySpec::removeListeners() {
     static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");

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

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

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

@@ -45,9 +45,18 @@ namespace margelo::nitro::rive {
   
 
   // Methods
-  void JHybridViewModelTriggerPropertySpec::addListener(const std::function<void()>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
-    method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
+  std::function<void()> JHybridViewModelTriggerPropertySpec::addListener(const std::function<void()>& onChanged) {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
+    auto __result = method(_javaPart, JFunc_void_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 JHybridViewModelTriggerPropertySpec::trigger() {
     static const auto method = javaClassStatic()->getMethod<void()>("trigger");

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

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

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelBooleanPropertySpec: HybridViewModelPropertySpec()
   abstract var value: Boolean
 
   // Methods
-  abstract fun addListener(onChanged: (value: Boolean) -> Unit): Unit
+  abstract fun addListener(onChanged: (value: Boolean) -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void_bool): Unit {
+  private fun addListener_cxx(onChanged: Func_void_bool): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelColorPropertySpec: HybridViewModelPropertySpec() {
   abstract var value: Double
 
   // Methods
-  abstract fun addListener(onChanged: (value: Double) -> Unit): Unit
+  abstract fun addListener(onChanged: (value: Double) -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void_double): Unit {
+  private fun addListener_cxx(onChanged: Func_void_double): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelEnumPropertySpec: HybridViewModelPropertySpec() {
   abstract var value: String
 
   // Methods
-  abstract fun addListener(onChanged: (value: String) -> Unit): Unit
+  abstract fun addListener(onChanged: (value: String) -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void_std__string): Unit {
+  private fun addListener_cxx(onChanged: Func_void_std__string): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelImagePropertySpec: HybridViewModelPropertySpec() {
   @Keep
   abstract fun set(image: HybridRiveImageSpec?): Unit
   
-  abstract fun addListener(onChanged: () -> Unit): Unit
+  abstract fun addListener(onChanged: () -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void): Unit {
+  private fun addListener_cxx(onChanged: Func_void): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelNumberPropertySpec: HybridViewModelPropertySpec()
   abstract var value: Double
 
   // Methods
-  abstract fun addListener(onChanged: (value: Double) -> Unit): Unit
+  abstract fun addListener(onChanged: (value: Double) -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void_double): Unit {
+  private fun addListener_cxx(onChanged: Func_void_double): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt

@@ -49,13 +49,13 @@ abstract class HybridViewModelStringPropertySpec: HybridViewModelPropertySpec()
   abstract var value: String
 
   // Methods
-  abstract fun addListener(onChanged: (value: String) -> Unit): Unit
+  abstract fun addListener(onChanged: (value: String) -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void_std__string): Unit {
+  private fun addListener_cxx(onChanged: Func_void_std__string): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt

@@ -45,13 +45,13 @@ abstract class HybridViewModelTriggerPropertySpec: HybridViewModelPropertySpec()
   
 
   // Methods
-  abstract fun addListener(onChanged: () -> Unit): Unit
+  abstract fun addListener(onChanged: () -> Unit): () -> Unit
   
   @DoNotStrip
   @Keep
-  private fun addListener_cxx(onChanged: Func_void): Unit {
+  private fun addListener_cxx(onChanged: Func_void): Func_void {
     val __result = addListener(onChanged)
-    return __result
+    return Func_void_java(__result)
   }
   
   @DoNotStrip

package/nitrogen/generated/android/riveOnLoad.cpp

@@ -28,6 +28,7 @@
 #include "JHybridViewModelInstanceSpec.hpp"
 #include "JHybridViewModelPropertySpec.hpp"
 #include "JHybridViewModelNumberPropertySpec.hpp"
+#include "JFunc_void.hpp"
 #include "JFunc_void_double.hpp"
 #include "JHybridViewModelStringPropertySpec.hpp"
 #include "JFunc_void_std__string.hpp"
@@ -36,7 +37,6 @@
 #include "JHybridViewModelColorPropertySpec.hpp"
 #include "JHybridViewModelEnumPropertySpec.hpp"
 #include "JHybridViewModelTriggerPropertySpec.hpp"
-#include "JFunc_void.hpp"
 #include "JHybridViewModelImagePropertySpec.hpp"
 #include <NitroModules/DefaultConstructableObject.hpp>
 
@@ -62,6 +62,7 @@ int initialize(JavaVM* vm) {
     margelo::nitro::rive::JHybridViewModelInstanceSpec::registerNatives();
     margelo::nitro::rive::JHybridViewModelPropertySpec::registerNatives();
     margelo::nitro::rive::JHybridViewModelNumberPropertySpec::registerNatives();
+    margelo::nitro::rive::JFunc_void_cxx::registerNatives();
     margelo::nitro::rive::JFunc_void_double_cxx::registerNatives();
     margelo::nitro::rive::JHybridViewModelStringPropertySpec::registerNatives();
     margelo::nitro::rive::JFunc_void_std__string_cxx::registerNatives();
@@ -70,7 +71,6 @@ int initialize(JavaVM* vm) {
     margelo::nitro::rive::JHybridViewModelColorPropertySpec::registerNatives();
     margelo::nitro::rive::JHybridViewModelEnumPropertySpec::registerNatives();
     margelo::nitro::rive::JHybridViewModelTriggerPropertySpec::registerNatives();
-    margelo::nitro::rive::JFunc_void_cxx::registerNatives();
     margelo::nitro::rive::JHybridViewModelImagePropertySpec::registerNatives();
 
     // Register Nitro Hybrid Objects
@@ -98,78 +98,6 @@ int initialize(JavaVM* vm) {
         return instance->cthis()->shared();
       }
     );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModel",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelSpec::javaobject> object("com/margelo/nitro/rive/HybridViewModel");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelInstance",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelInstanceSpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelInstance");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelNumberProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelNumberPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelNumberProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelStringProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelStringPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelStringProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelBooleanProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelBooleanPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelBooleanProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelColorProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelColorPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelColorProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelEnumProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelEnumPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelEnumProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelTriggerProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelTriggerPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelTriggerProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ViewModelImageProperty",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridViewModelImagePropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelImageProperty");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
     HybridObjectRegistry::registerHybridObjectConstructor(
       "RiveView",
       []() -> std::shared_ptr<HybridObject> {

package/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp

@@ -1155,6 +1155,15 @@ namespace margelo::nitro::rive::bridge::swift {
     return Func_void_double_Wrapper(std::move(value));
   }
   
+  // pragma MARK: Result<std::function<void()>>
+  using Result_std__function_void____ = Result<std::function<void()>>;
+  inline Result_std__function_void____ create_Result_std__function_void____(const std::function<void()>& value) noexcept {
+    return Result<std::function<void()>>::withValue(value);
+  }
+  inline Result_std__function_void____ create_Result_std__function_void____(const std::exception_ptr& error) noexcept {
+    return Result<std::function<void()>>::withError(error);
+  }
+  
   // pragma MARK: std::function<void(const std::string& /* value */)>
   /**
    * Specialized version of `std::function<void(const std::string&)>`.

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