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

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

@@ -2,24 +2,33 @@
 /// chartwebviewOnLoad.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
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::chartwebview {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of chartwebview, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of chartwebview, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::chartwebview::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all chartwebview HybridObjects
+   *     margelo::nitro::chartwebview::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::chartwebview

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void.kt

@@ -2,7 +2,7 @@
 /// Func_void.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void_std__string.kt

@@ -2,7 +2,7 @@
 /// Func_void_std__string.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/HybridChartWebviewSpec.kt

@@ -2,7 +2,7 @@
 /// HybridChartWebviewSpec.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview
@@ -10,6 +10,7 @@ package com.margelo.nitro.chartwebview
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
 
 /**
@@ -24,23 +25,6 @@ import com.margelo.nitro.views.HybridView
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridChartWebviewSpec: HybridView() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject ChartWebview]"
-  }
-
   // Properties
   @get:DoNotStrip
   @get:Keep
@@ -157,7 +141,21 @@ abstract class HybridChartWebviewSpec: HybridView() {
   @Keep
   abstract fun clearSnapshot(): Unit
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject ChartWebview]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridChartWebviewSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridChartWebviewSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridChartWebviewSpec"

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/chartwebviewOnLoad.kt

@@ -2,7 +2,7 @@
 /// chartwebviewOnLoad.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewManager.kt

@@ -2,7 +2,7 @@
 /// HybridChartWebviewManager.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview.views
@@ -12,13 +12,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.views.RecyclableView
 import com.margelo.nitro.chartwebview.*
 
 /**
  * Represents the React Native `ViewManager` for the "ChartWebview" Nitro HybridView.
  */
-open class HybridChartWebviewManager: SimpleViewManager<View>() {
-  private val views = hashMapOf<View, HybridChartWebview>()
+public open class HybridChartWebviewManager: SimpleViewManager<View>() {
+  init {
+    if (RecyclableView::class.java.isAssignableFrom(HybridChartWebview::class.java)) {
+      // Enable view recycling
+      super.setupViewRecycling()
+    }
+  }
 
   override fun getName(): String {
     return "ChartWebview"
@@ -27,17 +34,13 @@ open class HybridChartWebviewManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridChartWebview(reactContext)
     val view = hybridView.view
-    views[view] = hybridView
+    view.setTag(associated_hybrid_view_tag, hybridView)
     return view
   }
 
-  override fun onDropViewInstance(view: View) {
-    super.onDropViewInstance(view)
-    views.remove(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = getHybridView(view)
+      ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
@@ -47,4 +50,31 @@ open class HybridChartWebviewManager: SimpleViewManager<View>() {
     // 2. Continue in base View props
     return super.updateState(view, props, stateWrapper)
   }
+
+  override fun onDropViewInstance(view: View) {
+    val hybridView = getHybridView(view)
+    hybridView?.onDropView()
+    return super.onDropViewInstance(view)
+  }
+
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    super.prepareToRecycleView(reactContext, view)
+    val hybridView = getHybridView(view)
+      ?: return null
+
+    @Suppress("USELESS_IS_CHECK")
+    if (hybridView is RecyclableView) {
+      // Recycle in it's implementation
+      hybridView.prepareForRecycle()
+
+      // Maybe update the view if it changed
+      return hybridView.view
+    } else {
+      return null
+    }
+  }
+
+  private fun getHybridView(view: View): HybridChartWebview? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridChartWebview
+  }
 }

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater.kt

@@ -2,7 +2,7 @@
 /// HybridChartWebviewStateUpdater.kt
 /// 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
 ///
 
 package com.margelo.nitro.chartwebview.views

package/lib/nitrogen/generated/ios/ChartWebview+autolinking.rb

@@ -2,7 +2,7 @@
 # ChartWebview+autolinking.rb
 # 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 Ruby script that adds all files generated by Nitrogen
@@ -52,7 +52,7 @@ def add_nitrogen_files(spec)
   spec.pod_target_xcconfig = current_pod_target_xcconfig.merge({
     # Use C++ 20
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    # Enables C++ <-> Swift interop (by default it's only C)
+    # Enables C++ <-> Swift interop (by default it's only ObjC)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",

package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.cpp

@@ -2,7 +2,7 @@
 /// ChartWebview-Swift-Cxx-Bridge.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 "ChartWebview-Swift-Cxx-Bridge.hpp"

package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.hpp

@@ -2,7 +2,7 @@
 /// ChartWebview-Swift-Cxx-Bridge.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
@@ -42,7 +42,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
     return optional.has_value();
   }
   inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<bool>
@@ -57,7 +57,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
     return optional.has_value();
   }
   inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::function<void(const std::string& /* message */)>
@@ -94,7 +94,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
     return optional.has_value();
   }
   inline std::function<void(const std::string& /* message */)> get_std__optional_std__function_void_const_std__string_____message______(const std::optional<std::function<void(const std::string& /* message */)>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::function<void()>
@@ -131,7 +131,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
     return optional.has_value();
   }
   inline std::function<void()> get_std__optional_std__function_void____(const std::optional<std::function<void()>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridChartWebviewSpec>

package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Umbrella.hpp

@@ -2,7 +2,7 @@
 /// ChartWebview-Swift-Cxx-Umbrella.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

package/lib/nitrogen/generated/ios/ChartWebviewAutolinking.mm

@@ -2,7 +2,7 @@
 /// ChartWebviewAutolinking.mm
 /// 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
 ///
 
 #import <Foundation/Foundation.h>

package/lib/nitrogen/generated/ios/ChartWebviewAutolinking.swift

@@ -2,19 +2,16 @@
 /// ChartWebviewAutolinking.swift
 /// 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
 ///
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class ChartWebviewAutolinking {
   public typealias bridge = margelo.nitro.chartwebview.bridge.swift
 
-  /**
-   * Creates an instance of a Swift class that implements `HybridChartWebviewSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridChartWebviewSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridChartWebview`).
-   */
   public static func createChartWebview() -> bridge.std__shared_ptr_HybridChartWebviewSpec_ {
     let hybridObject = HybridChartWebview()
     return { () -> bridge.std__shared_ptr_HybridChartWebviewSpec_ in
@@ -22,4 +19,8 @@ public final class ChartWebviewAutolinking {
       return __cxxWrapped.getCxxPart()
     }()
   }
+  
+  public static func isChartWebviewRecyclable() -> Bool {
+    return HybridChartWebview.self is any RecyclableView.Type
+  }
 }

package/lib/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.cpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewSpecSwift.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 "HybridChartWebviewSpecSwift.hpp"

package/lib/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.hpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewSpecSwift.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
@@ -49,6 +49,12 @@ namespace margelo::nitro::chartwebview {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridChartWebviewSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }

package/lib/nitrogen/generated/ios/c++/views/HybridChartWebviewComponent.mm

@@ -2,7 +2,7 @@
 /// HybridChartWebviewComponent.mm
 /// 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
 ///
 
 #import "HybridChartWebviewComponent.hpp"
@@ -17,6 +17,13 @@
 #import "HybridChartWebviewSpecSwift.hpp"
 #import "ChartWebview-Swift-Cxx-Umbrella.hpp"
 
+#if __has_include(<cxxreact/ReactNativeVersion.h>)
+#include <cxxreact/ReactNativeVersion.h>
+#if REACT_NATIVE_VERSION_MINOR >= 82
+#define ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+#endif
+#endif
+
 using namespace facebook;
 using namespace margelo::nitro::chartwebview;
 using namespace margelo::nitro::chartwebview::views;
@@ -25,6 +32,7 @@ using namespace margelo::nitro::chartwebview::views;
  * Represents the React Native View holder for the Nitro "ChartWebview" HybridView.
  */
 @interface HybridChartWebviewComponent: RCTViewComponentView
++ (BOOL)shouldBeRecycled;
 @end
 
 @implementation HybridChartWebviewComponent {
@@ -153,4 +161,22 @@ using namespace margelo::nitro::chartwebview::views;
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return ChartWebview::ChartWebviewAutolinking::isChartWebviewRecyclable();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  ChartWebview::HybridChartWebviewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
+#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+- (void)invalidate {
+  ChartWebview::HybridChartWebviewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  [super invalidate];
+}
+#endif
+
 @end

package/lib/nitrogen/generated/ios/swift/Func_void.swift

@@ -2,10 +2,9 @@
 /// Func_void.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/lib/nitrogen/generated/ios/swift/Func_void_std__string.swift

@@ -2,10 +2,9 @@
 /// Func_void_std__string.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/lib/nitrogen/generated/ios/swift/HybridChartWebviewSpec.swift

@@ -2,10 +2,9 @@
 /// HybridChartWebviewSpec.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridChartWebviewSpec``
@@ -44,14 +43,14 @@ open class HybridChartWebviewSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridChartWebviewSpec_cxx {
   #if DEBUG
-    guard self is HybridChartWebviewSpec else {
+    guard self is any HybridChartWebviewSpec else {
       fatalError("`self` is not a `HybridChartWebviewSpec`! Did you accidentally inherit from `HybridChartWebviewSpec_base` instead of `HybridChartWebviewSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridChartWebviewSpec_cxx(self as! HybridChartWebviewSpec)
+      let cxxWrapper = HybridChartWebviewSpec_cxx(self as! any HybridChartWebviewSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }

package/lib/nitrogen/generated/ios/swift/HybridChartWebviewSpec_cxx.swift

@@ -2,10 +2,9 @@
 /// HybridChartWebviewSpec_cxx.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -96,6 +95,14 @@ open class HybridChartWebviewSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridChartWebviewSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -495,4 +502,13 @@ open class HybridChartWebviewSpec_cxx {
   public final func afterUpdate() {
     __implementation.afterUpdate()
   }
+  
+  public final func maybePrepareForRecycle() {
+    guard let recyclable = __implementation as? any RecyclableView else { return }
+    recyclable.prepareForRecycle()
+  }
+  
+  public final func onDropView() {
+    __implementation.onDropView()
+  }
 }

package/lib/nitrogen/generated/shared/c++/HybridChartWebviewSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridChartWebviewSpec.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 "HybridChartWebviewSpec.hpp"

package/lib/nitrogen/generated/shared/c++/HybridChartWebviewSpec.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

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