@onekeyfe/react-native-segment-slider 3.0.46 → 3.0.48

package/android/src/main/java/com/margelo/nitro/segmentslider/HybridSegmentSlider.kt

@@ -67,6 +67,16 @@ class HybridSegmentSlider(val context: ThemedReactContext) : HybridSegmentSlider
   // Segment node the thumb currently sits on (-1 = none). Drives the halo +
   // a light haptic tick fired once each time the thumb enters a new node.
   private var hoverMarkIndex = -1
+  // Tap-vs-drag tracking for `snapTapToSegment`. A gesture starts as a tap
+  // candidate; once the finger travels past `tapMoveThresholdPx` it becomes a
+  // drag and the release no longer snaps.
+  private var touchStartX = 0f
+  private var lastTouchX = 0f
+  private var hasDragged = false
+  private val tapMoveThresholdPx = 8f * density
+  // A tap only snaps when it's quick. Holding longer (without dragging) is a
+  // long-press and does nothing — matching the competitor's tap window.
+  private val tapMaxDurationMs = 300L
 
   override val view: View = object : View(context) {
     override fun onDraw(canvas: Canvas) {
@@ -78,19 +88,40 @@ class HybridSegmentSlider(val context: ThemedReactContext) : HybridSegmentSlider
       when (event.action) {
         MotionEvent.ACTION_DOWN -> {
           isDragging = true
+          hasDragged = false
+          touchStartX = event.x
+          lastTouchX = event.x
           onSlideStart?.invoke()
           animateThumbScale(1.15f)
-          commitDragValue(valueFromX(event.x))
+          // Tap-snap mode: defer the value commit until we know this is a tap or
+          // a drag, so a tap never jumps to the raw touch point first.
+          if (!snapTapsActive) commitDragValue(valueFromX(event.x))
           parent?.requestDisallowInterceptTouchEvent(true)
           return true
         }
         MotionEvent.ACTION_MOVE -> {
-          if (isDragging) commitDragValue(valueFromX(event.x))
+          if (isDragging) {
+            lastTouchX = event.x
+            if (!hasDragged && Math.abs(event.x - touchStartX) > tapMoveThresholdPx) {
+              hasDragged = true
+            }
+            // Still a tap candidate in snap mode → keep the thumb put.
+            if (!(snapTapsActive && !hasDragged)) commitDragValue(valueFromX(event.x))
+          }
           return true
         }
         MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
           if (isDragging) {
             isDragging = false
+            // A quick tap (no drag) lands directly on the nearest segment node
+            // in a single move — no detour through the raw touch point. A long
+            // press (held past tapMaxDurationMs without dragging) does nothing.
+            // A drag keeps its free value.
+            if (snapTapsActive && !hasDragged &&
+              (event.eventTime - event.downTime) <= tapMaxDurationMs
+            ) {
+              commitDragValue(snapValueToNearestMark(valueFromX(lastTouchX)))
+            }
             hoverMarkIndex = -1
             animateThumbScale(1f)
             view.invalidate()
@@ -153,6 +184,11 @@ class HybridSegmentSlider(val context: ThemedReactContext) : HybridSegmentSlider
     get() = field
     set(v) { field = v; invalidateIfAlive() }
 
+  // Gates tap snapping only; no visual change on its own.
+  override var snapTapToSegment: Boolean = false
+    get() = field
+    set(v) { field = v }
+
   override var epoch: Double = 0.0
     get() = field
     set(v) { field = v }
@@ -209,6 +245,9 @@ class HybridSegmentSlider(val context: ThemedReactContext) : HybridSegmentSlider
   private val rangeSafe: Double get() = (max - min).let { if (it == 0.0) 1.0 else it }
   private val markCount: Int get() = if (segments >= 1) segments.toInt() + 1 else 0
 
+  /** True when tap-snapping should defer the value commit: enabled with marks to snap to. */
+  private val snapTapsActive: Boolean get() = snapTapToSegment && markCount > 1
+
   private fun valueToFrac(v: Double): Float {
     val clamped = v.coerceIn(min, max)
     return ((clamped - min) / rangeSafe).toFloat()
@@ -222,6 +261,14 @@ class HybridSegmentSlider(val context: ThemedReactContext) : HybridSegmentSlider
     return min + frac * (max - min)
   }
 
+  /** Snaps a value to the value of the nearest segment mark. Caller guarantees `markCount > 1`. */
+  private fun snapValueToNearestMark(v: Double): Double {
+    val frac = valueToFrac(v).toDouble()
+    val idx = Math.round(frac * (markCount - 1)).toDouble()
+    val snappedFrac = idx / (markCount - 1)
+    return min + snappedFrac * (max - min)
+  }
+
   private fun commitDragValue(raw: Double) {
     val rounded = raw.coerceIn(min, max).let { Math.round(it).toDouble() }
     currentValue = rounded

package/ios/HybridSegmentSlider.swift

@@ -44,6 +44,17 @@ final class HybridSegmentSlider: HybridSegmentSliderSpec {
   private var lastEmitted: Double = .nan
   private var isDragging = false
   private var hasLaidOut = false
+  // Tap-vs-drag tracking for `snapTapToSegment`. A gesture starts as a tap
+  // candidate; once the finger travels past `tapMoveThreshold` it becomes a
+  // drag and the release no longer snaps.
+  private var touchStartX: CGFloat = 0
+  private var lastTouchX: CGFloat = 0
+  private var touchStartTime: CFTimeInterval = 0
+  private var hasDragged = false
+  private let tapMoveThreshold: CGFloat = 8
+  // A tap only snaps when it's quick. Holding longer (without dragging) is a
+  // long-press and does nothing — matching the competitor's tap window.
+  private let tapMaxDuration: CFTimeInterval = 0.3
   // Segment node the thumb currently sits on (-1 = none). Drives the halo +
   // a light haptic tick fired once each time the thumb enters a new node.
   private var hoverMarkIndex = -1
@@ -73,6 +84,8 @@ final class HybridSegmentSlider: HybridSegmentSliderSpec {
   }
   var showBubble: Bool = true { didSet { scheduleLayout() } }
   var centerOrigin: Bool = false { didSet { scheduleLayout() } }
+  // Gates tap snapping only; no visual change on its own, so no didSet.
+  var snapTapToSegment: Bool = false
   var epoch: Double = 0 { didSet { scheduleLayout() } }
 
   var fillColor: String = "" {
@@ -360,24 +373,52 @@ final class HybridSegmentSlider: HybridSegmentSliderSpec {
   }
 
   // MARK: - Touch handling
+  /// True when tap-snapping should defer the value commit: enabled and there
+  /// are marks to snap to.
+  private var snapTapsActive: Bool { snapTapToSegment && markCount > 1 }
+
   private func handleTouchBegan(_ x: CGFloat) {
     guard !disabled else { return }
     isDragging = true
+    hasDragged = false
+    touchStartX = x
+    lastTouchX = x
+    touchStartTime = CACurrentMediaTime()
     haptic.prepare()
     onSlideStart?()
     animateThumbScale(1.15)
     setBubbleVisible(true)
-    setValue(valueFromX(x))
+    // Tap-snap mode: defer any value change until we know this is a tap or a
+    // drag, so a tap never jumps to the raw touch point first.
+    if !snapTapsActive {
+      setValue(valueFromX(x))
+    }
   }
 
   private func handleTouchMoved(_ x: CGFloat) {
     guard isDragging else { return }
+    lastTouchX = x
+    if !hasDragged, abs(x - touchStartX) > tapMoveThreshold {
+      hasDragged = true
+    }
+    // Still a tap candidate in snap mode → keep the thumb put.
+    if snapTapsActive, !hasDragged { return }
     setValue(valueFromX(x))
   }
 
   private func handleTouchEnded() {
     guard isDragging else { return }
     isDragging = false
+    // A quick tap (no drag) lands directly on the nearest segment node in a
+    // single move — no detour through the raw touch point. A long press (held
+    // past tapMaxDuration without dragging) does nothing. A drag keeps its
+    // free value.
+    if snapTapsActive, !hasDragged {
+      let pressDuration = CACurrentMediaTime() - touchStartTime
+      if pressDuration <= tapMaxDuration {
+        setValue(snapValueToNearestMark(valueFromX(lastTouchX)))
+      }
+    }
     hoverMarkIndex = -1
     setHalo(visible: false, index: 0)
     animateThumbScale(1.0)
@@ -385,6 +426,15 @@ final class HybridSegmentSlider: HybridSegmentSliderSpec {
     onSlideComplete?()
   }
 
+  /// Snaps a value to the value of the nearest segment mark. Caller guarantees
+  /// `markCount > 1`.
+  private func snapValueToNearestMark(_ v: Double) -> Double {
+    let frac = Double(valueToFrac(v))
+    let idx = (frac * Double(markCount - 1)).rounded()
+    let snappedFrac = idx / Double(markCount - 1)
+    return min + snappedFrac * (max - min)
+  }
+
   private func setValue(_ raw: Double) {
     let clamped = Swift.max(min, Swift.min(max, raw))
     let rounded = clamped.rounded()

package/lib/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.cpp

@@ -117,6 +117,15 @@ namespace margelo::nitro::segmentslider {
     static const auto method = javaClassStatic()->getMethod<void(jboolean /* centerOrigin */)>("setCenterOrigin");
     method(_javaPart, centerOrigin);
   }
+  bool JHybridSegmentSliderSpec::getSnapTapToSegment() {
+    static const auto method = javaClassStatic()->getMethod<jboolean()>("getSnapTapToSegment");
+    auto __result = method(_javaPart);
+    return static_cast<bool>(__result);
+  }
+  void JHybridSegmentSliderSpec::setSnapTapToSegment(bool snapTapToSegment) {
+    static const auto method = javaClassStatic()->getMethod<void(jboolean /* snapTapToSegment */)>("setSnapTapToSegment");
+    method(_javaPart, snapTapToSegment);
+  }
   double JHybridSegmentSliderSpec::getEpoch() {
     static const auto method = javaClassStatic()->getMethod<double()>("getEpoch");
     auto __result = method(_javaPart);

package/lib/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.hpp

@@ -66,6 +66,8 @@ namespace margelo::nitro::segmentslider {
     void setShowBubble(bool showBubble) override;
     bool getCenterOrigin() override;
     void setCenterOrigin(bool centerOrigin) override;
+    bool getSnapTapToSegment() override;
+    void setSnapTapToSegment(bool snapTapToSegment) override;
     double getEpoch() override;
     void setEpoch(double epoch) override;
     std::string getFillColor() override;

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

@@ -68,6 +68,10 @@ void JHybridSegmentSliderStateUpdater::updateViewProps(jni::alias_ref<jni::JClas
     view->setCenterOrigin(props.centerOrigin.value);
     // TODO: Set isDirty = false
   }
+  if (props.snapTapToSegment.isDirty) {
+    view->setSnapTapToSegment(props.snapTapToSegment.value);
+    // TODO: Set isDirty = false
+  }
   if (props.epoch.isDirty) {
     view->setEpoch(props.epoch.value);
     // TODO: Set isDirty = false

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/HybridSegmentSliderSpec.kt

@@ -90,6 +90,12 @@ abstract class HybridSegmentSliderSpec: HybridView() {
   @set:Keep
   abstract var centerOrigin: Boolean
   
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var snapTapToSegment: Boolean
+  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

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

@@ -106,6 +106,12 @@ namespace margelo::nitro::segmentslider {
     inline void setCenterOrigin(bool centerOrigin) noexcept override {
       _swiftPart.setCenterOrigin(std::forward<decltype(centerOrigin)>(centerOrigin));
     }
+    inline bool getSnapTapToSegment() noexcept override {
+      return _swiftPart.getSnapTapToSegment();
+    }
+    inline void setSnapTapToSegment(bool snapTapToSegment) noexcept override {
+      _swiftPart.setSnapTapToSegment(std::forward<decltype(snapTapToSegment)>(snapTapToSegment));
+    }
     inline double getEpoch() noexcept override {
       return _swiftPart.getEpoch();
     }

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

@@ -111,6 +111,11 @@ using namespace margelo::nitro::segmentslider::views;
     swiftPart.setCenterOrigin(newViewProps.centerOrigin.value);
     newViewProps.centerOrigin.isDirty = false;
   }
+  // snapTapToSegment: boolean
+  if (newViewProps.snapTapToSegment.isDirty) {
+    swiftPart.setSnapTapToSegment(newViewProps.snapTapToSegment.value);
+    newViewProps.snapTapToSegment.isDirty = false;
+  }
   // epoch: number
   if (newViewProps.epoch.isDirty) {
     swiftPart.setEpoch(newViewProps.epoch.value);

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

@@ -19,6 +19,7 @@ public protocol HybridSegmentSliderSpec_protocol: HybridObject, HybridView {
   var disabled: Bool { get set }
   var showBubble: Bool { get set }
   var centerOrigin: Bool { get set }
+  var snapTapToSegment: Bool { get set }
   var epoch: Double { get set }
   var fillColor: String { get set }
   var trackColor: String { get set }

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

@@ -202,6 +202,17 @@ open class HybridSegmentSliderSpec_cxx {
     }
   }
   
+  public final var snapTapToSegment: Bool {
+    @inline(__always)
+    get {
+      return self.__implementation.snapTapToSegment
+    }
+    @inline(__always)
+    set {
+      self.__implementation.snapTapToSegment = newValue
+    }
+  }
+  
   public final var epoch: Double {
     @inline(__always)
     get {

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

@@ -30,6 +30,8 @@ namespace margelo::nitro::segmentslider {
       prototype.registerHybridSetter("showBubble", &HybridSegmentSliderSpec::setShowBubble);
       prototype.registerHybridGetter("centerOrigin", &HybridSegmentSliderSpec::getCenterOrigin);
       prototype.registerHybridSetter("centerOrigin", &HybridSegmentSliderSpec::setCenterOrigin);
+      prototype.registerHybridGetter("snapTapToSegment", &HybridSegmentSliderSpec::getSnapTapToSegment);
+      prototype.registerHybridSetter("snapTapToSegment", &HybridSegmentSliderSpec::setSnapTapToSegment);
       prototype.registerHybridGetter("epoch", &HybridSegmentSliderSpec::getEpoch);
       prototype.registerHybridSetter("epoch", &HybridSegmentSliderSpec::setEpoch);
       prototype.registerHybridGetter("fillColor", &HybridSegmentSliderSpec::getFillColor);

package/lib/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.hpp

@@ -62,6 +62,8 @@ namespace margelo::nitro::segmentslider {
       virtual void setShowBubble(bool showBubble) = 0;
       virtual bool getCenterOrigin() = 0;
       virtual void setCenterOrigin(bool centerOrigin) = 0;
+      virtual bool getSnapTapToSegment() = 0;
+      virtual void setSnapTapToSegment(bool snapTapToSegment) = 0;
       virtual double getEpoch() = 0;
       virtual void setEpoch(double epoch) = 0;
       virtual std::string getFillColor() = 0;

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

@@ -105,6 +105,16 @@ namespace margelo::nitro::segmentslider::views {
         throw std::runtime_error(std::string("SegmentSlider.centerOrigin: ") + exc.what());
       }
     }()),
+    snapTapToSegment([&]() -> CachedProp<bool> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("snapTapToSegment", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.snapTapToSegment;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<bool>::fromRawValue(*runtime, value, sourceProps.snapTapToSegment);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("SegmentSlider.snapTapToSegment: ") + exc.what());
+      }
+    }()),
     epoch([&]() -> CachedProp<double> {
       try {
         const react::RawValue* rawValue = rawProps.at("epoch", nullptr, nullptr);
@@ -256,6 +266,7 @@ namespace margelo::nitro::segmentslider::views {
     disabled(other.disabled),
     showBubble(other.showBubble),
     centerOrigin(other.centerOrigin),
+    snapTapToSegment(other.snapTapToSegment),
     epoch(other.epoch),
     fillColor(other.fillColor),
     trackColor(other.trackColor),
@@ -281,6 +292,7 @@ namespace margelo::nitro::segmentslider::views {
       case hashString("disabled"): return true;
       case hashString("showBubble"): return true;
       case hashString("centerOrigin"): return true;
+      case hashString("snapTapToSegment"): return true;
       case hashString("epoch"): return true;
       case hashString("fillColor"): return true;
       case hashString("trackColor"): return true;

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

@@ -51,6 +51,7 @@ namespace margelo::nitro::segmentslider::views {
     CachedProp<bool> disabled;
     CachedProp<bool> showBubble;
     CachedProp<bool> centerOrigin;
+    CachedProp<bool> snapTapToSegment;
     CachedProp<double> epoch;
     CachedProp<std::string> fillColor;
     CachedProp<std::string> trackColor;

package/lib/nitrogen/generated/shared/json/SegmentSliderConfig.json

@@ -12,6 +12,7 @@
     "disabled": true,
     "showBubble": true,
     "centerOrigin": true,
+    "snapTapToSegment": true,
     "epoch": true,
     "fillColor": true,
     "trackColor": true,

package/lib/typescript/src/SegmentSlider.nitro.d.ts

@@ -35,6 +35,13 @@ export interface SegmentSliderProps extends HybridViewProps {
     showBubble: boolean;
     /** When true the fill grows from the value-0 origin instead of the left. */
     centerOrigin: boolean;
+    /**
+     * When true, a tap (a press that does not turn into a drag) snaps the value to
+     * the nearest segment mark on release; a drag still moves freely to any value.
+     * No-op when `segments` is 0 (no marks to snap to). Default false, so existing
+     * callers keep the free-tap behavior.
+     */
+    snapTapToSegment: boolean;
     /**
      * Monotonic token. Bump from JS on coin / leverage reset so the native view
      * snaps to the new value WITHOUT animating the thumb scale. Mirrors the

package/lib/typescript/src/SegmentSlider.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SegmentSlider.nitro.d.ts","sourceRoot":"","sources":["../../../src/SegmentSlider.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,QAAQ,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,UAAU,EAAE,OAAO,CAAC;IACpB,4EAA4E;IAC5E,YAAY,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAGd,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,gBAAgB,EAAE,MAAM,CAAC;IACzB,6DAA6D;IAC7D,eAAe,EAAE,MAAM,CAAC;IACxB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,MAAM,CAAC;IAExB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;CAAG;AAElE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"SegmentSlider.nitro.d.ts","sourceRoot":"","sources":["../../../src/SegmentSlider.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EACjB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,QAAQ,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,UAAU,EAAE,OAAO,CAAC;IACpB,4EAA4E;IAC5E,YAAY,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAGd,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,gBAAgB,EAAE,MAAM,CAAC;IACzB,6DAA6D;IAC7D,eAAe,EAAE,MAAM,CAAC;IACxB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,MAAM,CAAC;IAExB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;CAAG;AAElE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC"}

package/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.cpp

@@ -117,6 +117,15 @@ namespace margelo::nitro::segmentslider {
     static const auto method = javaClassStatic()->getMethod<void(jboolean /* centerOrigin */)>("setCenterOrigin");
     method(_javaPart, centerOrigin);
   }
+  bool JHybridSegmentSliderSpec::getSnapTapToSegment() {
+    static const auto method = javaClassStatic()->getMethod<jboolean()>("getSnapTapToSegment");
+    auto __result = method(_javaPart);
+    return static_cast<bool>(__result);
+  }
+  void JHybridSegmentSliderSpec::setSnapTapToSegment(bool snapTapToSegment) {
+    static const auto method = javaClassStatic()->getMethod<void(jboolean /* snapTapToSegment */)>("setSnapTapToSegment");
+    method(_javaPart, snapTapToSegment);
+  }
   double JHybridSegmentSliderSpec::getEpoch() {
     static const auto method = javaClassStatic()->getMethod<double()>("getEpoch");
     auto __result = method(_javaPart);

package/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.hpp

@@ -66,6 +66,8 @@ namespace margelo::nitro::segmentslider {
     void setShowBubble(bool showBubble) override;
     bool getCenterOrigin() override;
     void setCenterOrigin(bool centerOrigin) override;
+    bool getSnapTapToSegment() override;
+    void setSnapTapToSegment(bool snapTapToSegment) override;
     double getEpoch() override;
     void setEpoch(double epoch) override;
     std::string getFillColor() override;

package/nitrogen/generated/android/c++/views/JHybridSegmentSliderStateUpdater.cpp

@@ -68,6 +68,10 @@ void JHybridSegmentSliderStateUpdater::updateViewProps(jni::alias_ref<jni::JClas
     view->setCenterOrigin(props.centerOrigin.value);
     // TODO: Set isDirty = false
   }
+  if (props.snapTapToSegment.isDirty) {
+    view->setSnapTapToSegment(props.snapTapToSegment.value);
+    // TODO: Set isDirty = false
+  }
   if (props.epoch.isDirty) {
     view->setEpoch(props.epoch.value);
     // TODO: Set isDirty = false

package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/HybridSegmentSliderSpec.kt

@@ -90,6 +90,12 @@ abstract class HybridSegmentSliderSpec: HybridView() {
   @set:Keep
   abstract var centerOrigin: Boolean
   
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var snapTapToSegment: Boolean
+  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

package/nitrogen/generated/ios/c++/HybridSegmentSliderSpecSwift.hpp

@@ -106,6 +106,12 @@ namespace margelo::nitro::segmentslider {
     inline void setCenterOrigin(bool centerOrigin) noexcept override {
       _swiftPart.setCenterOrigin(std::forward<decltype(centerOrigin)>(centerOrigin));
     }
+    inline bool getSnapTapToSegment() noexcept override {
+      return _swiftPart.getSnapTapToSegment();
+    }
+    inline void setSnapTapToSegment(bool snapTapToSegment) noexcept override {
+      _swiftPart.setSnapTapToSegment(std::forward<decltype(snapTapToSegment)>(snapTapToSegment));
+    }
     inline double getEpoch() noexcept override {
       return _swiftPart.getEpoch();
     }

package/nitrogen/generated/ios/c++/views/HybridSegmentSliderComponent.mm

@@ -111,6 +111,11 @@ using namespace margelo::nitro::segmentslider::views;
     swiftPart.setCenterOrigin(newViewProps.centerOrigin.value);
     newViewProps.centerOrigin.isDirty = false;
   }
+  // snapTapToSegment: boolean
+  if (newViewProps.snapTapToSegment.isDirty) {
+    swiftPart.setSnapTapToSegment(newViewProps.snapTapToSegment.value);
+    newViewProps.snapTapToSegment.isDirty = false;
+  }
   // epoch: number
   if (newViewProps.epoch.isDirty) {
     swiftPart.setEpoch(newViewProps.epoch.value);

package/nitrogen/generated/ios/swift/HybridSegmentSliderSpec.swift

@@ -19,6 +19,7 @@ public protocol HybridSegmentSliderSpec_protocol: HybridObject, HybridView {
   var disabled: Bool { get set }
   var showBubble: Bool { get set }
   var centerOrigin: Bool { get set }
+  var snapTapToSegment: Bool { get set }
   var epoch: Double { get set }
   var fillColor: String { get set }
   var trackColor: String { get set }

package/nitrogen/generated/ios/swift/HybridSegmentSliderSpec_cxx.swift

@@ -202,6 +202,17 @@ open class HybridSegmentSliderSpec_cxx {
     }
   }
   
+  public final var snapTapToSegment: Bool {
+    @inline(__always)
+    get {
+      return self.__implementation.snapTapToSegment
+    }
+    @inline(__always)
+    set {
+      self.__implementation.snapTapToSegment = newValue
+    }
+  }
+  
   public final var epoch: Double {
     @inline(__always)
     get {

package/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.cpp

@@ -30,6 +30,8 @@ namespace margelo::nitro::segmentslider {
       prototype.registerHybridSetter("showBubble", &HybridSegmentSliderSpec::setShowBubble);
       prototype.registerHybridGetter("centerOrigin", &HybridSegmentSliderSpec::getCenterOrigin);
       prototype.registerHybridSetter("centerOrigin", &HybridSegmentSliderSpec::setCenterOrigin);
+      prototype.registerHybridGetter("snapTapToSegment", &HybridSegmentSliderSpec::getSnapTapToSegment);
+      prototype.registerHybridSetter("snapTapToSegment", &HybridSegmentSliderSpec::setSnapTapToSegment);
       prototype.registerHybridGetter("epoch", &HybridSegmentSliderSpec::getEpoch);
       prototype.registerHybridSetter("epoch", &HybridSegmentSliderSpec::setEpoch);
       prototype.registerHybridGetter("fillColor", &HybridSegmentSliderSpec::getFillColor);

package/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.hpp

@@ -62,6 +62,8 @@ namespace margelo::nitro::segmentslider {
       virtual void setShowBubble(bool showBubble) = 0;
       virtual bool getCenterOrigin() = 0;
       virtual void setCenterOrigin(bool centerOrigin) = 0;
+      virtual bool getSnapTapToSegment() = 0;
+      virtual void setSnapTapToSegment(bool snapTapToSegment) = 0;
       virtual double getEpoch() = 0;
       virtual void setEpoch(double epoch) = 0;
       virtual std::string getFillColor() = 0;

package/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.cpp

@@ -105,6 +105,16 @@ namespace margelo::nitro::segmentslider::views {
         throw std::runtime_error(std::string("SegmentSlider.centerOrigin: ") + exc.what());
       }
     }()),
+    snapTapToSegment([&]() -> CachedProp<bool> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("snapTapToSegment", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.snapTapToSegment;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<bool>::fromRawValue(*runtime, value, sourceProps.snapTapToSegment);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("SegmentSlider.snapTapToSegment: ") + exc.what());
+      }
+    }()),
     epoch([&]() -> CachedProp<double> {
       try {
         const react::RawValue* rawValue = rawProps.at("epoch", nullptr, nullptr);
@@ -256,6 +266,7 @@ namespace margelo::nitro::segmentslider::views {
     disabled(other.disabled),
     showBubble(other.showBubble),
     centerOrigin(other.centerOrigin),
+    snapTapToSegment(other.snapTapToSegment),
     epoch(other.epoch),
     fillColor(other.fillColor),
     trackColor(other.trackColor),
@@ -281,6 +292,7 @@ namespace margelo::nitro::segmentslider::views {
       case hashString("disabled"): return true;
       case hashString("showBubble"): return true;
       case hashString("centerOrigin"): return true;
+      case hashString("snapTapToSegment"): return true;
       case hashString("epoch"): return true;
       case hashString("fillColor"): return true;
       case hashString("trackColor"): return true;

package/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.hpp

@@ -51,6 +51,7 @@ namespace margelo::nitro::segmentslider::views {
     CachedProp<bool> disabled;
     CachedProp<bool> showBubble;
     CachedProp<bool> centerOrigin;
+    CachedProp<bool> snapTapToSegment;
     CachedProp<double> epoch;
     CachedProp<std::string> fillColor;
     CachedProp<std::string> trackColor;

package/nitrogen/generated/shared/json/SegmentSliderConfig.json

@@ -12,6 +12,7 @@
     "disabled": true,
     "showBubble": true,
     "centerOrigin": true,
+    "snapTapToSegment": true,
     "epoch": true,
     "fillColor": true,
     "trackColor": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-segment-slider",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "description": "react-native-segment-slider",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -35,7 +35,7 @@
   ],
   "scripts": {
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
-    "prepare": "bob build && cp -r nitrogen lib/nitrogen",
+    "prepare": "bob build && rm -rf lib/nitrogen && cp -r nitrogen lib/nitrogen",
     "nitrogen": "nitrogen",
     "typecheck": "tsc",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",

package/src/SegmentSlider.nitro.ts

@@ -40,6 +40,13 @@ export interface SegmentSliderProps extends HybridViewProps {
   showBubble: boolean;
   /** When true the fill grows from the value-0 origin instead of the left. */
   centerOrigin: boolean;
+  /**
+   * When true, a tap (a press that does not turn into a drag) snaps the value to
+   * the nearest segment mark on release; a drag still moves freely to any value.
+   * No-op when `segments` is 0 (no marks to snap to). Default false, so existing
+   * callers keep the free-tap behavior.
+   */
+  snapTapToSegment: boolean;
   /**
    * Monotonic token. Bump from JS on coin / leverage reset so the native view
    * snaps to the new value WITHOUT animating the thumb scale. Mirrors the