@onekeyfe/react-native-chart-webview 3.0.81 → 3.0.82

package/lib/nitrogen/generated/android/c++/JFunc_void.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -23,7 +23,7 @@ namespace margelo::nitro::chartwebview {
    */
   struct JFunc_void: public jni::JavaClass<JFunc_void> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void;";
 
   public:
     /**
@@ -59,7 +59,7 @@ namespace margelo::nitro::chartwebview {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_cxx::invoke_cxx)});
     }

package/lib/nitrogen/generated/android/c++/JFunc_void_std__string.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_std__string.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -24,7 +24,7 @@ namespace margelo::nitro::chartwebview {
    */
   struct JFunc_void_std__string: public jni::JavaClass<JFunc_void_std__string> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_std__string;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_std__string;";
 
   public:
     /**
@@ -60,7 +60,7 @@ namespace margelo::nitro::chartwebview {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_std__string_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/Func_void_std__string_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_cxx::invoke_cxx)});
     }

package/lib/nitrogen/generated/android/c++/JHybridChartWebviewSpec.cpp

@@ -2,7 +2,7 @@
 /// JHybridChartWebviewSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridChartWebviewSpec.hpp"
@@ -18,125 +18,126 @@
 
 namespace margelo::nitro::chartwebview {
 
-  jni::local_ref<JHybridChartWebviewSpec::jhybriddata> JHybridChartWebviewSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridChartWebviewSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridChartWebviewSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridChartWebviewSpec> JHybridChartWebviewSpec::JavaPart::getJHybridChartWebviewSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridChartWebviewSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridChartWebviewSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridChartWebviewSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridChartWebviewSpec::CxxPart::jhybriddata> JHybridChartWebviewSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridChartWebviewSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridChartWebviewSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridChartWebviewSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridChartWebviewSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridChartWebviewSpec>(castJavaPart);
   }
 
-  std::string JHybridChartWebviewSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridChartWebviewSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridChartWebviewSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   std::optional<std::string> JHybridChartWebviewSpec::getUri() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getUri");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getUri");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setUri(const std::optional<std::string>& uri) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* uri */)>("setUri");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* uri */)>("setUri");
     method(_javaPart, uri.has_value() ? jni::make_jstring(uri.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getLocalBundle() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getLocalBundle");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getLocalBundle");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setLocalBundle(const std::optional<std::string>& localBundle) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* localBundle */)>("setLocalBundle");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* localBundle */)>("setLocalBundle");
     method(_javaPart, localBundle.has_value() ? jni::make_jstring(localBundle.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getEntry() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getEntry");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getEntry");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setEntry(const std::optional<std::string>& entry) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* entry */)>("setEntry");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* entry */)>("setEntry");
     method(_javaPart, entry.has_value() ? jni::make_jstring(entry.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getParamsJson() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getParamsJson");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getParamsJson");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setParamsJson(const std::optional<std::string>& paramsJson) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* paramsJson */)>("setParamsJson");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* paramsJson */)>("setParamsJson");
     method(_javaPart, paramsJson.has_value() ? jni::make_jstring(paramsJson.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getAssetHost() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getAssetHost");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getAssetHost");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setAssetHost(const std::optional<std::string>& assetHost) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* assetHost */)>("setAssetHost");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* assetHost */)>("setAssetHost");
     method(_javaPart, assetHost.has_value() ? jni::make_jstring(assetHost.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getBridgeScript() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getBridgeScript");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getBridgeScript");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setBridgeScript(const std::optional<std::string>& bridgeScript) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* bridgeScript */)>("setBridgeScript");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* bridgeScript */)>("setBridgeScript");
     method(_javaPart, bridgeScript.has_value() ? jni::make_jstring(bridgeScript.value()) : nullptr);
   }
   std::optional<std::string> JHybridChartWebviewSpec::getReuseKey() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getReuseKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getReuseKey");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setReuseKey(const std::optional<std::string>& reuseKey) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* reuseKey */)>("setReuseKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* reuseKey */)>("setReuseKey");
     method(_javaPart, reuseKey.has_value() ? jni::make_jstring(reuseKey.value()) : nullptr);
   }
   std::optional<bool> JHybridChartWebviewSpec::getPooled() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getPooled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getPooled");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setPooled(std::optional<bool> pooled) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* pooled */)>("setPooled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* pooled */)>("setPooled");
     method(_javaPart, pooled.has_value() ? jni::JBoolean::valueOf(pooled.value()) : nullptr);
   }
   std::optional<bool> JHybridChartWebviewSpec::getActive() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getActive");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getActive");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setActive(std::optional<bool> active) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* active */)>("setActive");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* active */)>("setActive");
     method(_javaPart, active.has_value() ? jni::JBoolean::valueOf(active.value()) : nullptr);
   }
   std::optional<bool> JHybridChartWebviewSpec::getWebviewDebuggingEnabled() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getWebviewDebuggingEnabled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getWebviewDebuggingEnabled");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setWebviewDebuggingEnabled(std::optional<bool> webviewDebuggingEnabled) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* webviewDebuggingEnabled */)>("setWebviewDebuggingEnabled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* webviewDebuggingEnabled */)>("setWebviewDebuggingEnabled");
     method(_javaPart, webviewDebuggingEnabled.has_value() ? jni::JBoolean::valueOf(webviewDebuggingEnabled.value()) : nullptr);
   }
   std::optional<std::function<void(const std::string& /* message */)>> JHybridChartWebviewSpec::getOnMessage() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnMessage_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnMessage_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* message */)> {
       if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
@@ -149,11 +150,11 @@ namespace margelo::nitro::chartwebview {
     }()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setOnMessage(const std::optional<std::function<void(const std::string& /* message */)>>& onMessage) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onMessage */)>("setOnMessage_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onMessage */)>("setOnMessage_cxx");
     method(_javaPart, onMessage.has_value() ? JFunc_void_std__string_cxx::fromCpp(onMessage.value()) : nullptr);
   }
   std::optional<std::function<void()>> JHybridChartWebviewSpec::getOnLoadEnd() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>()>("getOnLoadEnd_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>()>("getOnLoadEnd_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void()> {
       if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
@@ -166,11 +167,11 @@ namespace margelo::nitro::chartwebview {
     }()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setOnLoadEnd(const std::optional<std::function<void()>>& onLoadEnd) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onLoadEnd */)>("setOnLoadEnd_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onLoadEnd */)>("setOnLoadEnd_cxx");
     method(_javaPart, onLoadEnd.has_value() ? JFunc_void_cxx::fromCpp(onLoadEnd.value()) : nullptr);
   }
   std::optional<std::function<void(const std::string& /* message */)>> JHybridChartWebviewSpec::getOnError() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnError_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnError_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* message */)> {
       if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
@@ -183,21 +184,21 @@ namespace margelo::nitro::chartwebview {
     }()) : std::nullopt;
   }
   void JHybridChartWebviewSpec::setOnError(const std::optional<std::function<void(const std::string& /* message */)>>& onError) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onError */)>("setOnError_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onError */)>("setOnError_cxx");
     method(_javaPart, onError.has_value() ? JFunc_void_std__string_cxx::fromCpp(onError.value()) : nullptr);
   }
 
   // Methods
   void JHybridChartWebviewSpec::postMessage(const std::string& message) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* message */)>("postMessage");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* message */)>("postMessage");
     method(_javaPart, jni::make_jstring(message));
   }
   void JHybridChartWebviewSpec::reload() {
-    static const auto method = javaClassStatic()->getMethod<void()>("reload");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("reload");
     method(_javaPart);
   }
   void JHybridChartWebviewSpec::clearSnapshot() {
-    static const auto method = javaClassStatic()->getMethod<void()>("clearSnapshot");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("clearSnapshot");
     method(_javaPart);
   }
 

package/lib/nitrogen/generated/android/c++/JHybridChartWebviewSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::chartwebview {
 
   using namespace facebook;
 
-  class JHybridChartWebviewSpec: public jni::HybridClass<JHybridChartWebviewSpec, JHybridObject>,
-                                 public virtual HybridChartWebviewSpec {
+  class JHybridChartWebviewSpec: public virtual HybridChartWebviewSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/HybridChartWebviewSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridChartWebviewSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridChartWebviewSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/HybridChartWebviewSpec;";
+      std::shared_ptr<JHybridChartWebviewSpec> getJHybridChartWebviewSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/HybridChartWebviewSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridChartWebviewSpec(const jni::local_ref<JHybridChartWebviewSpec::JavaPart>& javaPart):
+      HybridObject(HybridChartWebviewSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridChartWebviewSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridChartWebviewSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridChartWebviewSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -84,9 +84,7 @@ namespace margelo::nitro::chartwebview {
     void clearSnapshot() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridChartWebviewSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridChartWebviewSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::chartwebview

package/lib/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.cpp

@@ -2,12 +2,13 @@
 /// JHybridChartWebviewStateUpdater.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridChartWebviewStateUpdater.hpp"
 #include "views/HybridChartWebviewComponent.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace margelo::nitro::chartwebview::views {
 
@@ -15,89 +16,88 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridChartWebviewState>;
 
 void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridChartWebviewSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridChartWebviewSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
+  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
       throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
   }
   auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
             static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-
   std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
-  auto concreteState = std::dynamic_pointer_cast<const ConcreteStateData>(state);
+  auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const HybridChartWebviewState& data = concreteState->getData();
-  const std::optional<HybridChartWebviewProps>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<HybridChartWebviewProps>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("HybridChartWebviewState's data doesn't contain any props!");
   }
-  const HybridChartWebviewProps& props = maybeProps.value();
-  if (props.uri.isDirty) {
-    view->setUri(props.uri.value);
-    // TODO: Set isDirty = false
+
+  // Update all props if they are dirty
+  if (props->uri.isDirty) {
+    hybridView->setUri(props->uri.value);
+    props->uri.isDirty = false;
   }
-  if (props.localBundle.isDirty) {
-    view->setLocalBundle(props.localBundle.value);
-    // TODO: Set isDirty = false
+  if (props->localBundle.isDirty) {
+    hybridView->setLocalBundle(props->localBundle.value);
+    props->localBundle.isDirty = false;
   }
-  if (props.entry.isDirty) {
-    view->setEntry(props.entry.value);
-    // TODO: Set isDirty = false
+  if (props->entry.isDirty) {
+    hybridView->setEntry(props->entry.value);
+    props->entry.isDirty = false;
   }
-  if (props.paramsJson.isDirty) {
-    view->setParamsJson(props.paramsJson.value);
-    // TODO: Set isDirty = false
+  if (props->paramsJson.isDirty) {
+    hybridView->setParamsJson(props->paramsJson.value);
+    props->paramsJson.isDirty = false;
   }
-  if (props.assetHost.isDirty) {
-    view->setAssetHost(props.assetHost.value);
-    // TODO: Set isDirty = false
+  if (props->assetHost.isDirty) {
+    hybridView->setAssetHost(props->assetHost.value);
+    props->assetHost.isDirty = false;
   }
-  if (props.bridgeScript.isDirty) {
-    view->setBridgeScript(props.bridgeScript.value);
-    // TODO: Set isDirty = false
+  if (props->bridgeScript.isDirty) {
+    hybridView->setBridgeScript(props->bridgeScript.value);
+    props->bridgeScript.isDirty = false;
   }
-  if (props.reuseKey.isDirty) {
-    view->setReuseKey(props.reuseKey.value);
-    // TODO: Set isDirty = false
+  if (props->reuseKey.isDirty) {
+    hybridView->setReuseKey(props->reuseKey.value);
+    props->reuseKey.isDirty = false;
   }
-  if (props.pooled.isDirty) {
-    view->setPooled(props.pooled.value);
-    // TODO: Set isDirty = false
+  if (props->pooled.isDirty) {
+    hybridView->setPooled(props->pooled.value);
+    props->pooled.isDirty = false;
   }
-  if (props.active.isDirty) {
-    view->setActive(props.active.value);
-    // TODO: Set isDirty = false
+  if (props->active.isDirty) {
+    hybridView->setActive(props->active.value);
+    props->active.isDirty = false;
   }
-  if (props.webviewDebuggingEnabled.isDirty) {
-    view->setWebviewDebuggingEnabled(props.webviewDebuggingEnabled.value);
-    // TODO: Set isDirty = false
+  if (props->webviewDebuggingEnabled.isDirty) {
+    hybridView->setWebviewDebuggingEnabled(props->webviewDebuggingEnabled.value);
+    props->webviewDebuggingEnabled.isDirty = false;
   }
-  if (props.onMessage.isDirty) {
-    view->setOnMessage(props.onMessage.value);
-    // TODO: Set isDirty = false
+  if (props->onMessage.isDirty) {
+    hybridView->setOnMessage(props->onMessage.value);
+    props->onMessage.isDirty = false;
   }
-  if (props.onLoadEnd.isDirty) {
-    view->setOnLoadEnd(props.onLoadEnd.value);
-    // TODO: Set isDirty = false
+  if (props->onLoadEnd.isDirty) {
+    hybridView->setOnLoadEnd(props->onLoadEnd.value);
+    props->onLoadEnd.isDirty = false;
   }
-  if (props.onError.isDirty) {
-    view->setOnError(props.onError.value);
-    // TODO: Set isDirty = false
+  if (props->onError.isDirty) {
+    hybridView->setOnError(props->onError.value);
+    props->onError.isDirty = false;
   }
 
   // Update hybridRef if it changed
-  if (props.hybridRef.isDirty) {
+  if (props->hybridRef.isDirty) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props.hybridRef.value;
+    const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
-      std::shared_ptr<JHybridChartWebviewSpec> shared = javaView->cthis()->shared_cast<JHybridChartWebviewSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }
 

package/lib/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.hpp

@@ -2,7 +2,7 @@
 /// JHybridChartWebviewStateUpdater.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -12,8 +12,8 @@
 #endif
 
 #include <fbjni/fbjni.h>
-#include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>
+#include <react/fabric/StateWrapperImpl.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JStateWrapper.hpp>
@@ -24,13 +24,13 @@ namespace margelo::nitro::chartwebview::views {
 
 using namespace facebook;
 
-class JHybridChartWebviewStateUpdater: public jni::JavaClass<JHybridChartWebviewStateUpdater> {
+class JHybridChartWebviewStateUpdater final: public jni::JavaClass<JHybridChartWebviewStateUpdater> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater;";
 
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridChartWebviewSpec::javaobject> view,
+                              jni::alias_ref<JHybridChartWebviewSpec::JavaPart> view,
                               jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
 
 public:

package/lib/nitrogen/generated/android/chartwebview+autolinking.cmake

@@ -2,7 +2,7 @@
 # chartwebview+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/lib/nitrogen/generated/android/chartwebview+autolinking.gradle

@@ -2,7 +2,7 @@
 /// chartwebview+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/lib/nitrogen/generated/android/chartwebviewOnLoad.cpp

@@ -2,7 +2,7 @@
 /// chartwebviewOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_CHARTWEBVIEW_WITH_GENERATED_CMAKE_PROJECT
@@ -24,27 +24,37 @@
 namespace margelo::nitro::chartwebview {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::chartwebview::registerAllNatives();
+  });
+}
+
+struct JHybridChartWebviewSpecImpl: public jni::JavaClass<JHybridChartWebviewSpecImpl, JHybridChartWebviewSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/HybridChartWebview;";
+  static std::shared_ptr<JHybridChartWebviewSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridChartWebviewSpecImpl::javaobject()>();
+    jni::local_ref<JHybridChartWebviewSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridChartWebviewSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::chartwebview;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::chartwebview::JHybridChartWebviewSpec::registerNatives();
-    margelo::nitro::chartwebview::JFunc_void_std__string_cxx::registerNatives();
-    margelo::nitro::chartwebview::JFunc_void_cxx::registerNatives();
-    margelo::nitro::chartwebview::views::JHybridChartWebviewStateUpdater::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ChartWebview",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridChartWebviewSpec::javaobject> object("com/margelo/nitro/chartwebview/HybridChartWebview");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::chartwebview::JHybridChartWebviewSpec::CxxPart::registerNatives();
+  margelo::nitro::chartwebview::JFunc_void_std__string_cxx::registerNatives();
+  margelo::nitro::chartwebview::JFunc_void_cxx::registerNatives();
+  margelo::nitro::chartwebview::views::JHybridChartWebviewStateUpdater::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "ChartWebview",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridChartWebviewSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::chartwebview