@onekeyfe/react-native-chart-webview 3.0.96 → 3.0.99

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

@@ -7,165 +7,33 @@
 
 #include "HybridChartWebviewComponent.hpp"
 
-#include <string>
-#include <exception>
-#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>
-#include <react/renderer/components/view/ViewProps.h>
+#include <NitroModules/NitroHash.hpp>
+#include <NitroModules/ReactProp.hpp>
 
 namespace margelo::nitro::chartwebview::views {
 
+  using namespace facebook;
+
   extern const char HybridChartWebviewComponentName[] = "ChartWebview";
 
   HybridChartWebviewProps::HybridChartWebviewProps(const react::PropsParserContext& context,
                                                    const HybridChartWebviewProps& sourceProps,
                                                    const react::RawProps& rawProps):
     react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
-    uri([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("uri", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.uri;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.uri);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.uri: ") + exc.what());
-      }
-    }()),
-    localBundle([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("localBundle", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.localBundle;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.localBundle);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.localBundle: ") + exc.what());
-      }
-    }()),
-    entry([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("entry", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.entry;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.entry);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.entry: ") + exc.what());
-      }
-    }()),
-    paramsJson([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("paramsJson", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.paramsJson;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.paramsJson);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.paramsJson: ") + exc.what());
-      }
-    }()),
-    assetHost([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("assetHost", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.assetHost;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.assetHost);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.assetHost: ") + exc.what());
-      }
-    }()),
-    bridgeScript([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("bridgeScript", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.bridgeScript;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.bridgeScript);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.bridgeScript: ") + exc.what());
-      }
-    }()),
-    reuseKey([&]() -> CachedProp<std::optional<std::string>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("reuseKey", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.reuseKey;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::string>>::fromRawValue(*runtime, value, sourceProps.reuseKey);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.reuseKey: ") + exc.what());
-      }
-    }()),
-    pooled([&]() -> CachedProp<std::optional<bool>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("pooled", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.pooled;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<bool>>::fromRawValue(*runtime, value, sourceProps.pooled);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.pooled: ") + exc.what());
-      }
-    }()),
-    active([&]() -> CachedProp<std::optional<bool>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("active", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.active;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<bool>>::fromRawValue(*runtime, value, sourceProps.active);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.active: ") + exc.what());
-      }
-    }()),
-    webviewDebuggingEnabled([&]() -> CachedProp<std::optional<bool>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("webviewDebuggingEnabled", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.webviewDebuggingEnabled;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<bool>>::fromRawValue(*runtime, value, sourceProps.webviewDebuggingEnabled);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.webviewDebuggingEnabled: ") + exc.what());
-      }
-    }()),
-    onMessage([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* message */)>>> {
-      try {
-        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, PropNameIDCache::get(*runtime, "f")), sourceProps.onMessage);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.onMessage: ") + exc.what());
-      }
-    }()),
-    onLoadEnd([&]() -> CachedProp<std::optional<std::function<void()>>> {
-      try {
-        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, PropNameIDCache::get(*runtime, "f")), sourceProps.onLoadEnd);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.onLoadEnd: ") + exc.what());
-      }
-    }()),
-    onError([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* message */)>>> {
-      try {
-        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, PropNameIDCache::get(*runtime, "f")), sourceProps.onError);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.onError: ") + exc.what());
-      }
-    }()),
-    hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>> {
-      try {
-        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, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ChartWebview.hybridRef: ") + exc.what());
-      }
-    }()) { }
+    uri(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "uri", rawProps, sourceProps.uri)),
+    localBundle(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "localBundle", rawProps, sourceProps.localBundle)),
+    entry(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "entry", rawProps, sourceProps.entry)),
+    paramsJson(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "paramsJson", rawProps, sourceProps.paramsJson)),
+    assetHost(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "assetHost", rawProps, sourceProps.assetHost)),
+    bridgeScript(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "bridgeScript", rawProps, sourceProps.bridgeScript)),
+    reuseKey(nitro::ReactProp<std::optional<std::string>>::fromRawValue("ChartWebview", "reuseKey", rawProps, sourceProps.reuseKey)),
+    pooled(nitro::ReactProp<std::optional<bool>>::fromRawValue("ChartWebview", "pooled", rawProps, sourceProps.pooled)),
+    active(nitro::ReactProp<std::optional<bool>>::fromRawValue("ChartWebview", "active", rawProps, sourceProps.active)),
+    webviewDebuggingEnabled(nitro::ReactProp<std::optional<bool>>::fromRawValue("ChartWebview", "webviewDebuggingEnabled", rawProps, sourceProps.webviewDebuggingEnabled)),
+    onMessage(nitro::ReactProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue("ChartWebview", "onMessage", rawProps, sourceProps.onMessage)),
+    onLoadEnd(nitro::ReactProp<std::optional<std::function<void()>>>::fromRawValue("ChartWebview", "onLoadEnd", rawProps, sourceProps.onLoadEnd)),
+    onError(nitro::ReactProp<std::optional<std::function<void(const std::string& /* message */)>>>::fromRawValue("ChartWebview", "onError", rawProps, sourceProps.onError)),
+    hybridRef(nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>>::fromRawValue("ChartWebview", "hybridRef", rawProps, sourceProps.hybridRef)) { }
 
   bool HybridChartWebviewProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
@@ -187,29 +55,4 @@ namespace margelo::nitro::chartwebview::views {
     }
   }
 
-  HybridChartWebviewComponentDescriptor::HybridChartWebviewComponentDescriptor(const react::ComponentDescriptorParameters& parameters)
-    : ConcreteComponentDescriptor(parameters,
-                                  react::RawPropsParser()) {}
-
-  std::shared_ptr<const react::Props> HybridChartWebviewComponentDescriptor::cloneProps(const react::PropsParserContext& context,
-                                                                                        const std::shared_ptr<const react::Props>& props,
-                                                                                        react::RawProps rawProps) const {
-    // 1. Prepare raw props parser
-    rawProps.parse(rawPropsParser_);
-    // 2. Copy props with Nitro's cached copy constructor
-    return HybridChartWebviewShadowNode::Props(context, /* & */ rawProps, props);
-  }
-
-#ifdef ANDROID
-  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 = 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
-
 } // namespace margelo::nitro::chartwebview::views

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

@@ -7,14 +7,15 @@
 
 #pragma once
 
-#include <optional>
-#include <NitroModules/NitroDefines.hpp>
-#include <NitroModules/NitroHash.hpp>
-#include <NitroModules/CachedProp.hpp>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <NitroModules/ReactProp.hpp>
+#include <NitroModules/ViewComponentDescriptor.hpp>
+#include <NitroModules/ViewPropsHolderState.hpp>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+
+#include <string>
 
 #include <string>
 #include <optional>
@@ -42,20 +43,56 @@ namespace margelo::nitro::chartwebview::views {
                             const react::RawProps& rawProps);
 
   public:
-    CachedProp<std::optional<std::string>> uri;
-    CachedProp<std::optional<std::string>> localBundle;
-    CachedProp<std::optional<std::string>> entry;
-    CachedProp<std::optional<std::string>> paramsJson;
-    CachedProp<std::optional<std::string>> assetHost;
-    CachedProp<std::optional<std::string>> bridgeScript;
-    CachedProp<std::optional<std::string>> reuseKey;
-    CachedProp<std::optional<bool>> pooled;
-    CachedProp<std::optional<bool>> active;
-    CachedProp<std::optional<bool>> webviewDebuggingEnabled;
-    CachedProp<std::optional<std::function<void(const std::string& /* message */)>>> onMessage;
-    CachedProp<std::optional<std::function<void()>>> onLoadEnd;
-    CachedProp<std::optional<std::function<void(const std::string& /* message */)>>> onError;
-    CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>> hybridRef;
+    nitro::ReactProp<std::optional<std::string>> uri;
+    nitro::ReactProp<std::optional<std::string>> localBundle;
+    nitro::ReactProp<std::optional<std::string>> entry;
+    nitro::ReactProp<std::optional<std::string>> paramsJson;
+    nitro::ReactProp<std::optional<std::string>> assetHost;
+    nitro::ReactProp<std::optional<std::string>> bridgeScript;
+    nitro::ReactProp<std::optional<std::string>> reuseKey;
+    nitro::ReactProp<std::optional<bool>> pooled;
+    nitro::ReactProp<std::optional<bool>> active;
+    nitro::ReactProp<std::optional<bool>> webviewDebuggingEnabled;
+    nitro::ReactProp<std::optional<std::function<void(const std::string& /* message */)>>> onMessage;
+    nitro::ReactProp<std::optional<std::function<void()>>> onLoadEnd;
+    nitro::ReactProp<std::optional<std::function<void(const std::string& /* message */)>>> onError;
+    nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridChartWebviewSpec>& /* ref */)>>> hybridRef;
+
+    [[nodiscard]]
+    bool hasSameProps(const HybridChartWebviewProps& other) const noexcept {
+      return uri.hasSameValue(other.uri) &&
+             localBundle.hasSameValue(other.localBundle) &&
+             entry.hasSameValue(other.entry) &&
+             paramsJson.hasSameValue(other.paramsJson) &&
+             assetHost.hasSameValue(other.assetHost) &&
+             bridgeScript.hasSameValue(other.bridgeScript) &&
+             reuseKey.hasSameValue(other.reuseKey) &&
+             pooled.hasSameValue(other.pooled) &&
+             active.hasSameValue(other.active) &&
+             webviewDebuggingEnabled.hasSameValue(other.webviewDebuggingEnabled) &&
+             onMessage.hasSameValue(other.onMessage) &&
+             onLoadEnd.hasSameValue(other.onLoadEnd) &&
+             onError.hasSameValue(other.onError) &&
+             hybridRef.hasSameValue(other.hybridRef);
+    }
+
+    [[nodiscard]]
+    bool hasAnyProvidedProps() const noexcept {
+      return uri.isProvided() ||
+             localBundle.isProvided() ||
+             entry.isProvided() ||
+             paramsJson.isProvided() ||
+             assetHost.isProvided() ||
+             bridgeScript.isProvided() ||
+             reuseKey.isProvided() ||
+             pooled.isProvided() ||
+             active.isProvided() ||
+             webviewDebuggingEnabled.isProvided() ||
+             onMessage.isProvided() ||
+             onLoadEnd.isProvided() ||
+             onError.isProvided() ||
+             hybridRef.isProvided();
+    }
 
   private:
     static bool filterObjectKeys(const std::string& propName);
@@ -64,32 +101,7 @@ namespace margelo::nitro::chartwebview::views {
   /**
    * State for the "ChartWebview" View.
    */
-  class HybridChartWebviewState final {
-  public:
-    HybridChartWebviewState() = default;
-    explicit HybridChartWebviewState(const std::shared_ptr<HybridChartWebviewProps>& props):
-      _props(props) {}
-
-  public:
-    [[nodiscard]]
-    const std::shared_ptr<HybridChartWebviewProps>& getProps() const {
-      return _props;
-    }
-
-  public:
-#ifdef ANDROID
-  HybridChartWebviewState(const HybridChartWebviewState& /* previousState */, folly::dynamic /* data */) {}
-  folly::dynamic getDynamic() const {
-    throw std::runtime_error("HybridChartWebviewState does not support folly!");
-  }
-  react::MapBuffer getMapBuffer() const {
-    throw std::runtime_error("HybridChartWebviewState does not support MapBuffer!");
-  };
-#endif
-
-  private:
-    std::shared_ptr<HybridChartWebviewProps> _props;
-  };
+  using HybridChartWebviewState = nitro::ViewPropsHolderState<HybridChartWebviewProps>;
 
   /**
    * The Shadow Node for the "ChartWebview" View.
@@ -102,21 +114,7 @@ namespace margelo::nitro::chartwebview::views {
   /**
    * The Component Descriptor for the "ChartWebview" View.
    */
-  class HybridChartWebviewComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridChartWebviewShadowNode> {
-  public:
-    explicit HybridChartWebviewComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
-
-  public:
-    /**
-     * A faster path for cloning props - reuses the caching logic from `HybridChartWebviewProps`.
-     */
-    std::shared_ptr<const react::Props> cloneProps(const react::PropsParserContext& context,
-                                                   const std::shared_ptr<const react::Props>& props,
-                                                   react::RawProps rawProps) const override;
-#ifdef ANDROID
-    void adopt(react::ShadowNode& shadowNode) const override;
-#endif
-  };
+  using HybridChartWebviewComponentDescriptor = nitro::ViewComponentDescriptor<HybridChartWebviewShadowNode>;
 
   /* The actual view for "ChartWebview" needs to be implemented in platform-specific code. */
 

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

@@ -15,89 +15,119 @@ namespace margelo::nitro::chartwebview::views {
 using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridChartWebviewState>;
 
-void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
-
+std::shared_ptr<const HybridChartWebviewProps> JHybridChartWebviewStateUpdater::getPropsFromStateWrapper(
+    jni::alias_ref<JStateWrapper::javaobject> stateWrapper) {
+  if (stateWrapper.get() == nullptr) {
+    return nullptr;
+  }
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
-  jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
-      throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  jobject rawStateWrapper = stateWrapper.get();
+  if (!stateWrapper->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
+    throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  }
+  auto stateWrapperImpl = jni::alias_ref<react::StateWrapperImpl::javaobject>{
+    static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)
+  };
+  std::shared_ptr<const react::State> state = stateWrapperImpl->cthis()->getState();
+  if (state == nullptr) {
+    return nullptr;
   }
-  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::static_pointer_cast<const ConcreteStateData>(state);
   const HybridChartWebviewState& data = concreteState->getData();
-  const std::shared_ptr<HybridChartWebviewProps>& props = data.getProps();
+  const std::shared_ptr<const 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!");
   }
+  return props;
+}
 
-  // Update all props if they are dirty
-  if (props->uri.isDirty) {
-    hybridView->setUri(props->uri.value);
-    props->uri.isDirty = false;
-  }
-  if (props->localBundle.isDirty) {
-    hybridView->setLocalBundle(props->localBundle.value);
-    props->localBundle.isDirty = false;
-  }
-  if (props->entry.isDirty) {
-    hybridView->setEntry(props->entry.value);
-    props->entry.isDirty = false;
-  }
-  if (props->paramsJson.isDirty) {
-    hybridView->setParamsJson(props->paramsJson.value);
-    props->paramsJson.isDirty = false;
-  }
-  if (props->assetHost.isDirty) {
-    hybridView->setAssetHost(props->assetHost.value);
-    props->assetHost.isDirty = false;
-  }
-  if (props->bridgeScript.isDirty) {
-    hybridView->setBridgeScript(props->bridgeScript.value);
-    props->bridgeScript.isDirty = false;
-  }
-  if (props->reuseKey.isDirty) {
-    hybridView->setReuseKey(props->reuseKey.value);
-    props->reuseKey.isDirty = false;
-  }
-  if (props->pooled.isDirty) {
-    hybridView->setPooled(props->pooled.value);
-    props->pooled.isDirty = false;
-  }
-  if (props->active.isDirty) {
-    hybridView->setActive(props->active.value);
-    props->active.isDirty = false;
-  }
-  if (props->webviewDebuggingEnabled.isDirty) {
-    hybridView->setWebviewDebuggingEnabled(props->webviewDebuggingEnabled.value);
-    props->webviewDebuggingEnabled.isDirty = false;
-  }
-  if (props->onMessage.isDirty) {
-    hybridView->setOnMessage(props->onMessage.value);
-    props->onMessage.isDirty = false;
-  }
-  if (props->onLoadEnd.isDirty) {
-    hybridView->setOnLoadEnd(props->onLoadEnd.value);
-    props->onLoadEnd.isDirty = false;
+void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
+                                           jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
+                                           jni::alias_ref<JStateWrapper::javaobject> newState,
+                                           jni::alias_ref<JStateWrapper::javaobject> oldState) {
+  std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
+  std::shared_ptr<const HybridChartWebviewProps> newProps = getPropsFromStateWrapper(newState);
+  std::shared_ptr<const HybridChartWebviewProps> oldProps = getPropsFromStateWrapper(oldState);
+  if (newProps == nullptr) [[unlikely]] {
+    throw std::runtime_error("Current StateWrapper doesn't contain any props!");
   }
-  if (props->onError.isDirty) {
-    hybridView->setOnError(props->onError.value);
-    props->onError.isDirty = false;
+
+  // Update only props that differ from the previous State snapshot.
+  if (oldProps == nullptr
+        ? newProps->uri.isProvided()
+        : !newProps->uri.hasSameValue(oldProps->uri)) {
+    hybridView->setUri(newProps->uri.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->localBundle.isProvided()
+        : !newProps->localBundle.hasSameValue(oldProps->localBundle)) {
+    hybridView->setLocalBundle(newProps->localBundle.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->entry.isProvided()
+        : !newProps->entry.hasSameValue(oldProps->entry)) {
+    hybridView->setEntry(newProps->entry.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->paramsJson.isProvided()
+        : !newProps->paramsJson.hasSameValue(oldProps->paramsJson)) {
+    hybridView->setParamsJson(newProps->paramsJson.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->assetHost.isProvided()
+        : !newProps->assetHost.hasSameValue(oldProps->assetHost)) {
+    hybridView->setAssetHost(newProps->assetHost.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->bridgeScript.isProvided()
+        : !newProps->bridgeScript.hasSameValue(oldProps->bridgeScript)) {
+    hybridView->setBridgeScript(newProps->bridgeScript.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->reuseKey.isProvided()
+        : !newProps->reuseKey.hasSameValue(oldProps->reuseKey)) {
+    hybridView->setReuseKey(newProps->reuseKey.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->pooled.isProvided()
+        : !newProps->pooled.hasSameValue(oldProps->pooled)) {
+    hybridView->setPooled(newProps->pooled.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->active.isProvided()
+        : !newProps->active.hasSameValue(oldProps->active)) {
+    hybridView->setActive(newProps->active.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->webviewDebuggingEnabled.isProvided()
+        : !newProps->webviewDebuggingEnabled.hasSameValue(oldProps->webviewDebuggingEnabled)) {
+    hybridView->setWebviewDebuggingEnabled(newProps->webviewDebuggingEnabled.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onMessage.isProvided()
+        : !newProps->onMessage.hasSameValue(oldProps->onMessage)) {
+    hybridView->setOnMessage(newProps->onMessage.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onLoadEnd.isProvided()
+        : !newProps->onLoadEnd.hasSameValue(oldProps->onLoadEnd)) {
+    hybridView->setOnLoadEnd(newProps->onLoadEnd.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onError.isProvided()
+        : !newProps->onError.hasSameValue(oldProps->onError)) {
+    hybridView->setOnError(newProps->onError.get());
   }
 
   // Update hybridRef if it changed
-  if (props->hybridRef.isDirty) {
+  if (oldProps == nullptr
+        ? newProps->hybridRef.isProvided()
+        : !newProps->hybridRef.hasSameValue(oldProps->hybridRef)) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props->hybridRef.value;
+    const auto& maybeFunc = newProps->hybridRef.get();
     if (maybeFunc.has_value()) {
       maybeFunc.value()(hybridView);
     }
-    props->hybridRef.isDirty = false;
   }
 }
 

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

@@ -31,7 +31,12 @@ public:
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
                               jni::alias_ref<JHybridChartWebviewSpec::JavaPart> view,
-                              jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
+                              jni::alias_ref<JStateWrapper::javaobject> newState,
+                              jni::alias_ref<JStateWrapper::javaobject> oldState);
+
+private:
+  static std::shared_ptr<const HybridChartWebviewProps> getPropsFromStateWrapper(
+      jni::alias_ref<JStateWrapper::javaobject> stateWrapper);
 
 public:
   static void registerNatives() {

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

@@ -20,6 +20,14 @@ import com.margelo.nitro.chartwebview.*
  * Represents the React Native `ViewManager` for the "ChartWebview" Nitro HybridView.
  */
 public open class HybridChartWebviewManager: SimpleViewManager<View>() {
+  /**
+   * Represents the View and its last state snapshot (mutable)
+   */
+  private class HybridViewHolder(
+    val hybridView: HybridChartWebview,
+    var lastState: StateWrapper? = null,
+  )
+
   init {
     if (RecyclableView::class.java.isAssignableFrom(HybridChartWebview::class.java)) {
       // Enable view recycling
@@ -34,33 +42,41 @@ public open class HybridChartWebviewManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridChartWebview(reactContext)
     val view = hybridView.view
-    view.setTag(associated_hybrid_view_tag, hybridView)
+    view.setTag(associated_hybrid_view_tag, HybridViewHolder(hybridView))
     return view
   }
 
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = getHybridView(view)
+    val holder = getHybridViewHolder(view)
       ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = holder.hybridView
+    val oldState = holder.lastState
+    val newState = stateWrapper
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
-    HybridChartWebviewStateUpdater.updateViewProps(hybridView, stateWrapper)
+    HybridChartWebviewStateUpdater.updateViewProps(hybridView, newState, oldState)
     hybridView.afterUpdate()
+    holder.lastState = newState
 
     // 2. Continue in base View props
-    return super.updateState(view, props, stateWrapper)
+    return super.updateState(view, props, newState)
   }
 
   override fun onDropViewInstance(view: View) {
-    val hybridView = getHybridView(view)
-    hybridView?.onDropView()
+    val holder = getHybridViewHolder(view)
+    holder?.lastState = null
+    holder?.hybridView?.onDropView()
     return super.onDropViewInstance(view)
   }
 
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
-    super.prepareToRecycleView(reactContext, view)
-    val hybridView = getHybridView(view)
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+      ?: return null
+    val holder = getHybridViewHolder(preparedView)
       ?: return null
+    val hybridView = holder.hybridView
+    holder.lastState = null
 
     @Suppress("USELESS_IS_CHECK")
     if (hybridView is RecyclableView) {
@@ -74,7 +90,7 @@ public open class HybridChartWebviewManager: SimpleViewManager<View>() {
     }
   }
 
-  private fun getHybridView(view: View): HybridChartWebview? {
-    return view.getTag(associated_hybrid_view_tag) as? HybridChartWebview
+  private fun getHybridViewHolder(view: View): HybridViewHolder? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
   }
 }

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

@@ -14,10 +14,10 @@ internal class HybridChartWebviewStateUpdater {
   companion object {
     /**
      * Updates the props for [view] through C++.
-     * The [state] prop is expected to contain [view]'s props as wrapped Fabric state.
+     * The [newState] prop is expected to contain [view]'s props as wrapped Fabric state.
      */
     @Suppress("KotlinJniMissingFunction")
     @JvmStatic
-    external fun updateViewProps(view: HybridChartWebviewSpec, state: StateWrapper)
+    external fun updateViewProps(view: HybridChartWebviewSpec, newState: StateWrapper, oldState: StateWrapper?)
   }
 }