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

package/lib/nitrogen/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.cpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewComponent.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 "HybridChartWebviewComponent.hpp"
@@ -12,6 +12,7 @@
 #include <utility>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JSIConverter.hpp>
+#include <NitroModules/PropNameIDCache.hpp>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ComponentDescriptor.h>
@@ -130,7 +131,7 @@ namespace margelo::nitro::chartwebview::views {
         const react::RawValue* rawValue = rawProps.at("onMessage", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onMessage;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMessage);
+        return CachedProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.onMessage);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("ChartWebview.onMessage: ") + exc.what());
       }
@@ -140,7 +141,7 @@ namespace margelo::nitro::chartwebview::views {
         const react::RawValue* rawValue = rawProps.at("onLoadEnd", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onLoadEnd;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void()>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onLoadEnd);
+        return CachedProp<std::optional<std::function<void()>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.onLoadEnd);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("ChartWebview.onLoadEnd: ") + exc.what());
       }
@@ -150,7 +151,7 @@ namespace margelo::nitro::chartwebview::views {
         const react::RawValue* rawValue = rawProps.at("onError", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onError;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onError);
+        return CachedProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.onError);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("ChartWebview.onError: ") + exc.what());
       }
@@ -160,29 +161,12 @@ namespace margelo::nitro::chartwebview::views {
         const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.hybridRef;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.hybridRef);
+        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("ChartWebview.hybridRef: ") + exc.what());
       }
     }()) { }
 
-  HybridChartWebviewProps::HybridChartWebviewProps(const HybridChartWebviewProps& other):
-    react::ViewProps(),
-    uri(other.uri),
-    localBundle(other.localBundle),
-    entry(other.entry),
-    paramsJson(other.paramsJson),
-    assetHost(other.assetHost),
-    bridgeScript(other.bridgeScript),
-    reuseKey(other.reuseKey),
-    pooled(other.pooled),
-    active(other.active),
-    webviewDebuggingEnabled(other.webviewDebuggingEnabled),
-    onMessage(other.onMessage),
-    onLoadEnd(other.onLoadEnd),
-    onError(other.onError),
-    hybridRef(other.hybridRef) { }
-
   bool HybridChartWebviewProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       case hashString("uri"): return true;
@@ -220,10 +204,10 @@ namespace margelo::nitro::chartwebview::views {
   void HybridChartWebviewComponentDescriptor::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after `ShadowNode` is created, cloned or in progress.
     // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
-    auto& concreteShadowNode = dynamic_cast<HybridChartWebviewShadowNode&>(shadowNode);
-    const HybridChartWebviewProps& props = concreteShadowNode.getConcreteProps();
-    HybridChartWebviewState state;
-    state.setProps(props);
+    auto& concreteShadowNode = static_cast<HybridChartWebviewShadowNode&>(shadowNode);
+    const std::shared_ptr<const HybridChartWebviewProps>& constProps = concreteShadowNode.getConcreteSharedProps();
+    const std::shared_ptr<HybridChartWebviewProps>& props = std::const_pointer_cast<HybridChartWebviewProps>(constProps);
+    HybridChartWebviewState state{props};
     concreteShadowNode.setStateData(std::move(state));
   }
 #endif

package/lib/nitrogen/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.hpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewComponent.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
@@ -37,7 +37,6 @@ namespace margelo::nitro::chartwebview::views {
   class HybridChartWebviewProps final: public react::ViewProps {
   public:
     HybridChartWebviewProps() = default;
-    HybridChartWebviewProps(const HybridChartWebviewProps&);
     HybridChartWebviewProps(const react::PropsParserContext& context,
                             const HybridChartWebviewProps& sourceProps,
                             const react::RawProps& rawProps);
@@ -68,10 +67,14 @@ namespace margelo::nitro::chartwebview::views {
   class HybridChartWebviewState final {
   public:
     HybridChartWebviewState() = default;
+    explicit HybridChartWebviewState(const std::shared_ptr<HybridChartWebviewProps>& props):
+      _props(props) {}
 
   public:
-    void setProps(const HybridChartWebviewProps& props) { _props.emplace(props); }
-    const std::optional<HybridChartWebviewProps>& getProps() const { return _props; }
+    [[nodiscard]]
+    const std::shared_ptr<HybridChartWebviewProps>& getProps() const {
+      return _props;
+    }
 
   public:
 #ifdef ANDROID
@@ -85,7 +88,7 @@ namespace margelo::nitro::chartwebview::views {
 #endif
 
   private:
-    std::optional<HybridChartWebviewProps> _props;
+    std::shared_ptr<HybridChartWebviewProps> _props;
   };
 
   /**
@@ -101,7 +104,7 @@ namespace margelo::nitro::chartwebview::views {
    */
   class HybridChartWebviewComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridChartWebviewShadowNode> {
   public:
-    HybridChartWebviewComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
+    explicit HybridChartWebviewComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
 
   public:
     /**

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