@onekeyfe/react-native-segment-slider 3.0.95 → 3.0.98

package/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.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 <functional>
@@ -42,28 +43,80 @@ namespace margelo::nitro::segmentslider::views {
                              const react::RawProps& rawProps);
 
   public:
-    CachedProp<double> defaultValue;
-    CachedProp<double> min;
-    CachedProp<double> max;
-    CachedProp<double> segments;
-    CachedProp<double> sliderHeight;
-    CachedProp<bool> disabled;
-    CachedProp<bool> showBubble;
-    CachedProp<bool> centerOrigin;
-    CachedProp<bool> snapTapToSegment;
-    CachedProp<std::string> fillColor;
-    CachedProp<std::string> trackColor;
-    CachedProp<std::string> thumbColor;
-    CachedProp<std::string> thumbBorderColor;
-    CachedProp<std::string> markActiveColor;
-    CachedProp<std::string> markInactiveColor;
-    CachedProp<std::string> markBorderColor;
-    CachedProp<std::string> bubbleColor;
-    CachedProp<std::string> bubbleTextColor;
-    CachedProp<std::optional<std::function<void(double /* value */)>>> onChange;
-    CachedProp<std::optional<std::function<void()>>> onSlideStart;
-    CachedProp<std::optional<std::function<void()>>> onSlideComplete;
-    CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridSegmentSliderSpec>& /* ref */)>>> hybridRef;
+    nitro::ReactProp<double> defaultValue;
+    nitro::ReactProp<double> min;
+    nitro::ReactProp<double> max;
+    nitro::ReactProp<double> segments;
+    nitro::ReactProp<double> sliderHeight;
+    nitro::ReactProp<bool> disabled;
+    nitro::ReactProp<bool> showBubble;
+    nitro::ReactProp<bool> centerOrigin;
+    nitro::ReactProp<bool> snapTapToSegment;
+    nitro::ReactProp<std::string> fillColor;
+    nitro::ReactProp<std::string> trackColor;
+    nitro::ReactProp<std::string> thumbColor;
+    nitro::ReactProp<std::string> thumbBorderColor;
+    nitro::ReactProp<std::string> markActiveColor;
+    nitro::ReactProp<std::string> markInactiveColor;
+    nitro::ReactProp<std::string> markBorderColor;
+    nitro::ReactProp<std::string> bubbleColor;
+    nitro::ReactProp<std::string> bubbleTextColor;
+    nitro::ReactProp<std::optional<std::function<void(double /* value */)>>> onChange;
+    nitro::ReactProp<std::optional<std::function<void()>>> onSlideStart;
+    nitro::ReactProp<std::optional<std::function<void()>>> onSlideComplete;
+    nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridSegmentSliderSpec>& /* ref */)>>> hybridRef;
+
+    [[nodiscard]]
+    bool hasSameProps(const HybridSegmentSliderProps& other) const noexcept {
+      return defaultValue.hasSameValue(other.defaultValue) &&
+             min.hasSameValue(other.min) &&
+             max.hasSameValue(other.max) &&
+             segments.hasSameValue(other.segments) &&
+             sliderHeight.hasSameValue(other.sliderHeight) &&
+             disabled.hasSameValue(other.disabled) &&
+             showBubble.hasSameValue(other.showBubble) &&
+             centerOrigin.hasSameValue(other.centerOrigin) &&
+             snapTapToSegment.hasSameValue(other.snapTapToSegment) &&
+             fillColor.hasSameValue(other.fillColor) &&
+             trackColor.hasSameValue(other.trackColor) &&
+             thumbColor.hasSameValue(other.thumbColor) &&
+             thumbBorderColor.hasSameValue(other.thumbBorderColor) &&
+             markActiveColor.hasSameValue(other.markActiveColor) &&
+             markInactiveColor.hasSameValue(other.markInactiveColor) &&
+             markBorderColor.hasSameValue(other.markBorderColor) &&
+             bubbleColor.hasSameValue(other.bubbleColor) &&
+             bubbleTextColor.hasSameValue(other.bubbleTextColor) &&
+             onChange.hasSameValue(other.onChange) &&
+             onSlideStart.hasSameValue(other.onSlideStart) &&
+             onSlideComplete.hasSameValue(other.onSlideComplete) &&
+             hybridRef.hasSameValue(other.hybridRef);
+    }
+
+    [[nodiscard]]
+    bool hasAnyProvidedProps() const noexcept {
+      return defaultValue.isProvided() ||
+             min.isProvided() ||
+             max.isProvided() ||
+             segments.isProvided() ||
+             sliderHeight.isProvided() ||
+             disabled.isProvided() ||
+             showBubble.isProvided() ||
+             centerOrigin.isProvided() ||
+             snapTapToSegment.isProvided() ||
+             fillColor.isProvided() ||
+             trackColor.isProvided() ||
+             thumbColor.isProvided() ||
+             thumbBorderColor.isProvided() ||
+             markActiveColor.isProvided() ||
+             markInactiveColor.isProvided() ||
+             markBorderColor.isProvided() ||
+             bubbleColor.isProvided() ||
+             bubbleTextColor.isProvided() ||
+             onChange.isProvided() ||
+             onSlideStart.isProvided() ||
+             onSlideComplete.isProvided() ||
+             hybridRef.isProvided();
+    }
 
   private:
     static bool filterObjectKeys(const std::string& propName);
@@ -72,32 +125,7 @@ namespace margelo::nitro::segmentslider::views {
   /**
    * State for the "SegmentSlider" View.
    */
-  class HybridSegmentSliderState final {
-  public:
-    HybridSegmentSliderState() = default;
-    explicit HybridSegmentSliderState(const std::shared_ptr<HybridSegmentSliderProps>& props):
-      _props(props) {}
-
-  public:
-    [[nodiscard]]
-    const std::shared_ptr<HybridSegmentSliderProps>& getProps() const {
-      return _props;
-    }
-
-  public:
-#ifdef ANDROID
-  HybridSegmentSliderState(const HybridSegmentSliderState& /* previousState */, folly::dynamic /* data */) {}
-  folly::dynamic getDynamic() const {
-    throw std::runtime_error("HybridSegmentSliderState does not support folly!");
-  }
-  react::MapBuffer getMapBuffer() const {
-    throw std::runtime_error("HybridSegmentSliderState does not support MapBuffer!");
-  };
-#endif
-
-  private:
-    std::shared_ptr<HybridSegmentSliderProps> _props;
-  };
+  using HybridSegmentSliderState = nitro::ViewPropsHolderState<HybridSegmentSliderProps>;
 
   /**
    * The Shadow Node for the "SegmentSlider" View.
@@ -110,21 +138,7 @@ namespace margelo::nitro::segmentslider::views {
   /**
    * The Component Descriptor for the "SegmentSlider" View.
    */
-  class HybridSegmentSliderComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridSegmentSliderShadowNode> {
-  public:
-    explicit HybridSegmentSliderComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
-
-  public:
-    /**
-     * A faster path for cloning props - reuses the caching logic from `HybridSegmentSliderProps`.
-     */
-    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 HybridSegmentSliderComponentDescriptor = nitro::ViewComponentDescriptor<HybridSegmentSliderShadowNode>;
 
   /* The actual view for "SegmentSlider" needs to be implemented in platform-specific code. */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-segment-slider",
-  "version": "3.0.95",
+  "version": "3.0.98",
   "description": "react-native-segment-slider",
   "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": {