@onekeyfe/react-native-chart-webview 3.0.95 → 3.0.98

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

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-chart-webview",
-  "version": "3.0.95",
+  "version": "3.0.98",
   "description": "react-native-chart-webview",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -77,12 +77,12 @@
     "eslint-plugin-prettier": "^5.5.4",
     "jest": "^29.7.0",
     "lefthook": "^2.0.3",
-    "nitrogen": "0.36.5",
+    "nitrogen": "0.37.0",
     "prettier": "^2.8.8",
     "react": "19.2.3",
     "react-native": "patch:react-native@npm%3A0.86.2#~/.yarn/patches/react-native-npm-0.86.2-c9d546616f.patch",
     "react-native-builder-bob": "^0.40.13",
-    "react-native-nitro-modules": "0.36.5",
+    "react-native-nitro-modules": "0.37.0",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",
     "typescript": "^5.9.2"
@@ -90,7 +90,7 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "0.36.5"
+    "react-native-nitro-modules": "0.37.0"
   },
   "packageManager": "yarn@4.11.0",
   "react-native-builder-bob": {