react-native-nitro-modal 0.3.0-rc → 0.3.1-rc

package/README.md

@@ -19,7 +19,7 @@
 
 - 📄 **Native bottom sheets** with multiple detents (`small`, `medium`, `large`, `fitContent` or a height) and swipe-to-dismiss
 - 📌 **Inline sheets** — a persistent sheet that is part of your screen, with the views behind it still usable
-- 🔄 **Pull to refresh** — pulling a sheet down past its lowest detent
+- 🔄 **Pull to refresh** — pulling a sheet down past its lowest detent, with a native activity indicator
 - 🪟 **Centered popups** with native `scale` / `fade` transitions
 - 📏 **Content-sized sheets** — `fitContent` measures your React content and grows with it
 - ⌨️ **Keyboard aware** — the sheet or card follows the keyboard animation (`pan` or `resize`)
@@ -126,6 +126,7 @@ Detents are listed smallest first. `initialDetentIndex` selects where the sheet
     presentation="inline"
     style={{ top: headerHeight }}
     detents={[320, 'large']}
+    refreshing={isRefreshing}
     onPullToRefresh={refresh}
   >
     <FlatList data={rows} renderItem={renderRow} nestedScrollEnabled />
@@ -142,6 +143,7 @@ A sheet hands drags off to the scroll view under the finger:
 - Dragging up expands the sheet first, then scrolls the content.
 - Dragging down scrolls the content back to its top. Once the content has scrolled during a drag, that drag never moves the sheet; the next drag collapses it.
 - With `onPullToRefresh` set, a drag that starts with the sheet resting on its lowest detent can pull it further down. Letting go past the threshold calls `onPullToRefresh` (with haptic feedback when it is crossed). This needs a sheet that can't be swiped away: inline, or `dismissOnSwipe={false}`.
+- With `refreshing` set too, an activity indicator shows in the gap the pull uncovers, and the sheet stays pulled down while `refreshing` is `true`, like `RefreshControl`. Set it to `true` in `onPullToRefresh` and back to `false` when the refresh is done. Setting it to `true` yourself shows the indicator without a pull.
 
 On Android, scrollable content takes part through nested scrolling, so set `nestedScrollEnabled` on it.
 
@@ -217,6 +219,8 @@ const sheet = useRef<NitroModalRef>(null);
 | `backgroundColor`        | `ColorValue`                                         | system surface     | Background of the sheet/card.                                                                     |
 | `keyboardBehavior`       | `'pan' \| 'resize' \| 'none'`                        | `'pan'`            | How the modal reacts to the software keyboard.                                                    |
 | `popupAnimation`         | `'scale' \| 'fade' \| 'none'`                        | `'scale'`          | Enter/exit transition of a popup.                                                                 |
+| `refreshing`             | `boolean`                                            | —                  | A refresh is in progress: the sheet stays pulled down with an activity indicator. See [pull to refresh](#scrolling-content-and-pull-to-refresh). |
+| `refreshIndicatorColor`  | `ColorValue`                                         | platform default   | Color of the refresh indicator.                                                                   |
 | `contentContainerStyle`  | `StyleProp<ViewStyle>`                               | —                  | Style of the view that wraps `children` inside the modal.                                         |
 | `testID`                 | `string`                                             | —                  | Applied to the content container.                                                                 |
 | `ref`                    | `Ref<NitroModalRef>`                                 | —                  | Imperative handle.                                                                                |

package/android/src/main/java/com/margelo/nitro/nitromodal/BottomSheetPresenter.kt

@@ -4,6 +4,7 @@ import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Outline
 import android.graphics.drawable.GradientDrawable
@@ -18,7 +19,9 @@ import android.view.ViewOutlineProvider
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.PathInterpolator
 import android.widget.FrameLayout
+import android.widget.ProgressBar
 import androidx.activity.BackEventCompat
+import androidx.core.animation.doOnEnd
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
@@ -56,6 +59,7 @@ internal class BottomSheetPresenter(
   private val coordinator = SheetLayout(activity)
   private val sheet = FrameLayout(activity)
   private val grabber = View(activity)
+  private val refreshIndicator = ProgressBar(activity)
   private val behavior = SheetBehavior()
   private val sheetBackground = GradientDrawable()
   private var cornerRadiusPx = 0f
@@ -72,6 +76,11 @@ internal class BottomSheetPresenter(
 
   /** How far the sheet is pulled below its lowest detent, in px. */
   private var pullOffset = 0f
+  private var pullAnimator: ValueAnimator? = null
+  private val refreshThreshold = activity.dpToPx(REFRESH_THRESHOLD_DP)
+
+  /** The sheet rests below its lowest detent, the indicator spinning above it. */
+  private var refreshing = config.refreshing ?: false
 
   /** A predictive back gesture was committed; the behavior is sliding the sheet out. */
   private var committingBack = false
@@ -86,6 +95,8 @@ internal class BottomSheetPresenter(
       if (newState == BottomSheetBehavior.STATE_DRAGGING) {
         sheetDragging = true
         coordinator.notifyNativeGesture(started = true)
+        // A refreshing sheet follows the finger from its lowest detent.
+        animatePullOffset(0f)
       } else if (sheetDragging) {
         sheetDragging = false
         coordinator.notifyNativeGesture(started = false)
@@ -97,6 +108,7 @@ internal class BottomSheetPresenter(
       behavior.isHideable = this@BottomSheetPresenter.config.dismissOnSwipe
       notifyPresented()
       reportRestingTop()
+      animatePullOffset(restingPullOffset())
       val index = sortedDetents.getOrNull(position)?.index ?: return
       if (index != lastDetentIndex) {
         lastDetentIndex = index
@@ -107,6 +119,7 @@ internal class BottomSheetPresenter(
     override fun onSlide(bottomSheet: View, slideOffset: Float) {
       // slideOffset is -1 when hidden and 0 at the lowest detent.
       backdrop.alpha = (1f + slideOffset).coerceIn(0f, 1f)
+      layoutRefreshIndicator()
     }
   }
 
@@ -117,8 +130,20 @@ internal class BottomSheetPresenter(
       if (r - l != oldR - oldL || b - t != oldB - oldT) coordinator.post { updateDetents() }
       // Detent heights can move the resting sheet without a state change.
       reportRestingTop()
+      layoutRefreshIndicator()
     }
 
+    // Behind the sheet, which uncovers it as it's pulled down.
+    refreshIndicator.isIndeterminate = true
+    refreshIndicator.visibility = View.INVISIBLE
+    refreshIndicator.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+    coordinator.addView(
+      refreshIndicator,
+      CoordinatorLayout.LayoutParams(dp(REFRESH_INDICATOR_SIZE_DP), dp(REFRESH_INDICATOR_SIZE_DP)).apply {
+        gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
+      },
+    )
+
     sheet.background = sheetBackground
     sheet.outlineProvider = object : ViewOutlineProvider() {
       override fun getOutline(view: View, outline: Outline) {
@@ -207,6 +232,8 @@ internal class BottomSheetPresenter(
 
   override fun onConfigChanged(previous: ModalConfig) {
     applyAppearance()
+    if (previous.refreshing != config.refreshing) setRefreshing(config.refreshing ?: false)
+    layoutRefreshIndicator()
     if (presented && !isDismissing) behavior.isHideable = config.dismissOnSwipe
     if (previous.detents != config.detents || previous.keyboardBehavior != config.keyboardBehavior) {
       updateDetents()
@@ -245,6 +272,7 @@ internal class BottomSheetPresenter(
       cornerRadius = activity.dpToPx(2f)
       setColor(Color.argb(0x66, 0x80, 0x80, 0x80))
     }
+    refreshIndicator.indeterminateTintList = config.refreshIndicatorColor?.let(ColorStateList::valueOf)
   }
 
   /** Recomputes detent heights and maps them onto the behavior's states. */
@@ -364,6 +392,43 @@ internal class BottomSheetPresenter(
   private fun setPullOffset(offset: Float) {
     pullOffset = offset
     applyTranslation()
+    layoutRefreshIndicator()
+  }
+
+  private fun animatePullOffset(target: Float) {
+    if (coordinator.isPulling) return
+    if (pullAnimator == null && pullOffset == target) return
+    pullAnimator?.cancel()
+    pullAnimator = ValueAnimator.ofFloat(pullOffset, target).apply {
+      duration = PULL_RELEASE_DURATION
+      interpolator = DecelerateInterpolator()
+      addUpdateListener { setPullOffset(it.animatedValue as Float) }
+      doOnEnd { if (pullAnimator === it) pullAnimator = null }
+      start()
+    }
+  }
+
+  /** Where the sheet rests below its lowest detent: held there while refreshing. */
+  private fun restingPullOffset(): Float =
+    if (refreshing && behavior.state == states().firstOrNull()) refreshThreshold else 0f
+
+  private fun setRefreshing(value: Boolean) {
+    if (value == refreshing) return
+    refreshing = value
+    if (presented && !isDismissing) animatePullOffset(restingPullOffset())
+  }
+
+  /**
+   * Centered in the gap a pull uncovers below the lowest detent, fading in
+   * as the pull nears the threshold.
+   */
+  private fun layoutRefreshIndicator() {
+    val size = refreshIndicator.layoutParams?.height ?: return
+    refreshIndicator.translationY = sheet.top + sheet.translationY - (refreshThreshold + size) / 2
+    val progress = if (config.refreshing == null || isDismissing) 0f else (pullOffset / refreshThreshold).coerceIn(0f, 1f)
+    refreshIndicator.alpha = progress
+    // Hidden, the indeterminate animation stops.
+    refreshIndicator.visibility = if (progress > 0f) View.VISIBLE else View.INVISIBLE
   }
 
   /**
@@ -435,14 +500,15 @@ internal class BottomSheetPresenter(
   @SuppressLint("ViewConstructor")
   private inner class SheetLayout(context: Context) : CoordinatorLayout(context), ReactPointerEventsView {
     private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
-    private val refreshThreshold = context.dpToPx(REFRESH_THRESHOLD_DP)
     private var lastEvent: MotionEvent? = null
     private var downX = 0f
     private var downY = 0f
     private var canPull = false
     private var pulling = false
     private var armed = false
-    private var pullAnimator: ValueAnimator? = null
+
+    val isPulling: Boolean
+      get() = pulling
 
     override val pointerEvents: PointerEvents
       get() = PointerEvents.BOX_NONE
@@ -513,7 +579,7 @@ internal class BottomSheetPresenter(
      */
     private fun canStartPull(x: Float, y: Float): Boolean {
       if (!config.pullToRefreshEnabled || config.dismissOnSwipe || !presented || isDismissing) return false
-      if (pullOffset != 0f || behavior.state != states().firstOrNull()) return false
+      if (refreshing || pullOffset != 0f || behavior.state != states().firstOrNull()) return false
       val top = sheet.top + sheet.translationY
       if (y < top || x < sheet.left || x >= sheet.right) return false
       return !canScrollUpAt(sheet, x - sheet.left, y - top)
@@ -524,12 +590,9 @@ internal class BottomSheetPresenter(
       armed = false
       canPull = false
       notifyNativeGesture(started = false, event = ev)
-      pullAnimator = ValueAnimator.ofFloat(pullOffset, 0f).apply {
-        duration = PULL_RELEASE_DURATION
-        interpolator = DecelerateInterpolator()
-        addUpdateListener { setPullOffset(it.animatedValue as Float) }
-        start()
-      }
+      // Settles on the refreshing position; React confirms or ends it.
+      if (refresh && config.refreshing != null) refreshing = true
+      animatePullOffset(restingPullOffset())
       if (refresh) listener.onPullToRefresh()
     }
 
@@ -572,6 +635,7 @@ internal class BottomSheetPresenter(
 
     /** How far below its lowest detent the sheet must be pulled to refresh. */
     private const val REFRESH_THRESHOLD_DP = 56f
+    private const val REFRESH_INDICATOR_SIZE_DP = 32f
     private const val PULL_RELEASE_DURATION = 300L
     private val THRESHOLD_FEEDBACK =
       if (Build.VERSION.SDK_INT >= 34) {

package/android/src/main/java/com/margelo/nitro/nitromodal/HybridNitroModal.kt

@@ -52,6 +52,8 @@ class HybridNitroModal(private val reactContext: ThemedReactContext) :
   override var keyboardBehavior: KeyboardBehavior = KeyboardBehavior.PAN
   override var popupAnimation: PopupAnimation = PopupAnimation.SCALE
   override var pullToRefreshEnabled: Boolean = false
+  override var refreshing: Boolean? = null
+  override var refreshIndicatorColor: Double? = null
 
   override var onPresent: (() -> Unit)? = null
   override var onDismiss: ((reason: DismissReason) -> Unit)? = null
@@ -337,6 +339,8 @@ class HybridNitroModal(private val reactContext: ThemedReactContext) :
       keyboardBehavior = keyboardBehavior,
       popupAnimation = popupAnimation,
       pullToRefreshEnabled = pullToRefreshEnabled,
+      refreshing = refreshing,
+      refreshIndicatorColor = refreshIndicatorColor?.toProcessedColor(),
     )
   }
 

package/android/src/main/java/com/margelo/nitro/nitromodal/ModalConfig.kt

@@ -49,6 +49,10 @@ internal data class ModalConfig(
   val keyboardBehavior: KeyboardBehavior = KeyboardBehavior.PAN,
   val popupAnimation: PopupAnimation = PopupAnimation.SCALE,
   val pullToRefreshEnabled: Boolean = false,
+  /** A refresh is in progress; `null` shows no refresh indicator. */
+  val refreshing: Boolean? = null,
+  /** `null` uses the platform default. */
+  val refreshIndicatorColor: Int? = null,
 ) {
   /** A `bottomSheet` living in the host view's bounds. Popups are always modal. */
   val isInline: Boolean

package/ios/HybridNitroModal.swift

@@ -47,6 +47,8 @@ final class HybridNitroModal: HybridNitroModalSpec {
   var keyboardBehavior: KeyboardBehavior = .pan
   var popupAnimation: PopupAnimation = .scale
   var pullToRefreshEnabled = false
+  var refreshing: Bool?
+  var refreshIndicatorColor: Double?
 
   var onPresent: (() -> Void)?
   var onDismiss: ((DismissReason) -> Void)?
@@ -326,7 +328,9 @@ final class HybridNitroModal: HybridNitroModalSpec {
       contentBackgroundColor: contentBackgroundColor.map(UIColor.init(processedColor:)) ?? .systemBackground,
       keyboardBehavior: keyboardBehavior,
       popupAnimation: popupAnimation,
-      pullToRefreshEnabled: pullToRefreshEnabled
+      pullToRefreshEnabled: pullToRefreshEnabled,
+      refreshing: refreshing,
+      refreshIndicatorColor: refreshIndicatorColor.map(UIColor.init(processedColor:))
     )
   }
 

package/ios/ModalConfig.swift

@@ -53,6 +53,10 @@ struct ModalConfig: Equatable {
   var keyboardBehavior: KeyboardBehavior = .pan
   var popupAnimation: PopupAnimation = .scale
   var pullToRefreshEnabled = false
+  /// A refresh is in progress; `nil` shows no refresh indicator.
+  var refreshing: Bool?
+  /// `nil` uses the platform default.
+  var refreshIndicatorColor: UIColor?
 
   /// A `bottomSheet` living in the host view's bounds. Popups are always modal.
   var isInline: Bool {

package/ios/SheetView.swift

@@ -27,7 +27,8 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
   private static let defaultCornerRadius: CGFloat = 16
   private static let regularMaxWidth: CGFloat = 704
   private static let grabberSize = CGSize(width: 36, height: 5)
-  /// How far below its lowest detent the sheet must be pulled to refresh.
+  /// How far below its lowest detent the sheet must be pulled to refresh,
+  /// and where it rests while refreshing.
   private static let refreshThreshold: CGFloat = 56
   private static let touchHandlerClass: AnyClass? = NSClassFromString("RCTSurfaceTouchHandler")
 
@@ -36,6 +37,7 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
   private let backdrop = BackdropView()
   private let sheetView = UIView()
   private let grabber = UIView()
+  private let refreshIndicator = UIActivityIndicatorView(style: .medium)
   private var config: ModalConfig
   private var selectedIndex: Int
   private var keyboardHeight: CGFloat = 0
@@ -49,6 +51,8 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
   private var releaseVelocity: CGFloat = 0
   private var reportedRestingTop: CGFloat?
   private var refreshFeedback: UIImpactFeedbackGenerator?
+  /// The sheet rests below its lowest detent, the indicator spinning above it.
+  private var isRefreshing = false
 
   private var lockedScrollView: UIScrollView?
   private var lockedOffsetY: CGFloat = 0
@@ -78,6 +82,7 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     self.config = config
     self.isInline = isInline
     selectedIndex = config.clampedInitialDetentIndex
+    isRefreshing = config.refreshing ?? false
     super.init(frame: .zero)
     backgroundColor = .clear
 
@@ -104,6 +109,12 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     grabber.backgroundColor = .tertiaryLabel
     grabber.layer.cornerRadius = Self.grabberSize.height / 2
     sheetView.addSubview(grabber)
+
+    // Behind the sheet, which uncovers it as it's pulled down.
+    refreshIndicator.hidesWhenStopped = false
+    refreshIndicator.isUserInteractionEnabled = false
+    refreshIndicator.alpha = 0
+    addSubview(refreshIndicator)
     addSubview(sheetView)
 
     let pan = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
@@ -138,8 +149,12 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
   // MARK: Presentation
 
   func apply(_ newConfig: ModalConfig) {
+    let refreshingChanged = newConfig.refreshing != config.refreshing
     config = newConfig
     selectedIndex = min(selectedIndex, max(detents.count - 1, 0))
+    if refreshingChanged {
+      setRefreshing(newConfig.refreshing ?? false)
+    }
     applyAppearance()
     animateToRest()
   }
@@ -181,7 +196,10 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
       damping: offscreen ? 1 : 0.88,
       duration: duration,
       animations: { self.layoutSheet() },
-      completion: completion
+      completion: {
+        self.stopRefreshIndicatorIfHidden()
+        completion()
+      }
     )
   }
 
@@ -227,9 +245,21 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     detents.indices.map(restingTop(for:))
   }
 
+  /// Where the sheet settles on `detents[index]`: held below the lowest
+  /// detent while refreshing.
+  private func settledTop(for index: Int) -> CGFloat {
+    let top = restingTop(for: index)
+    guard isRefreshing, let lowest = detentTops.max(), abs(top - lowest) < 1 else { return top }
+    return top + Self.refreshThreshold
+  }
+
+  private var settledTops: [CGFloat] {
+    detents.indices.map(settledTop(for:))
+  }
+
   private var currentTop: CGFloat {
     if isOffscreen { return bounds.height }
-    return dragTop ?? restingTop(for: selectedIndex)
+    return dragTop ?? settledTop(for: selectedIndex)
   }
 
   private func layoutSheet() {
@@ -243,9 +273,42 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
       size: Self.grabberSize
     )
     backdrop.alpha = backdropAlpha(forTop: top)
+    layoutRefreshIndicator(sheetTop: top)
     reportRestingTop()
   }
 
+  /// Centered in the gap a pull uncovers below the lowest detent, fading in
+  /// as the pull nears the threshold.
+  private func layoutRefreshIndicator(sheetTop top: CGFloat) {
+    let size = refreshIndicator.intrinsicContentSize
+    refreshIndicator.bounds = CGRect(origin: .zero, size: size)
+    refreshIndicator.center = CGPoint(x: bounds.midX, y: top - Self.refreshThreshold / 2)
+    guard config.refreshing != nil, !isOffscreen, let lowest = detentTops.max() else {
+      refreshIndicator.alpha = 0
+      return
+    }
+    let progress = min(max((top - lowest) / Self.refreshThreshold, 0), 1)
+    refreshIndicator.alpha = progress
+    if progress > 0, !refreshIndicator.isAnimating {
+      refreshIndicator.startAnimating()
+    }
+  }
+
+  /// Called once the sheet settles, so a fading indicator keeps spinning.
+  private func stopRefreshIndicatorIfHidden() {
+    if drag == nil, refreshIndicator.alpha == 0 {
+      refreshIndicator.stopAnimating()
+    }
+  }
+
+  private func setRefreshing(_ refreshing: Bool) {
+    guard refreshing != isRefreshing else { return }
+    isRefreshing = refreshing
+    if refreshing, !isOffscreen, config.refreshing != nil {
+      refreshIndicator.startAnimating()
+    }
+  }
+
   /// Fully dimmed at every detent; fades out below the lowest one.
   private func backdropAlpha(forTop top: CGFloat) -> CGFloat {
     let bottom = bounds.height
@@ -259,15 +322,18 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     sheetView.backgroundColor = config.contentBackgroundColor
     sheetView.layer.cornerRadius = config.cornerRadius ?? Self.defaultCornerRadius
     grabber.isHidden = !config.grabberVisible
+    refreshIndicator.color = config.refreshIndicatorColor
   }
 
   private func animateToRest() {
     guard drag == nil, !isOffscreen else { return }
     dragTop = nil
-    UIView.animate(withDuration: 0.3, delay: 0, options: [.beginFromCurrentState, .allowUserInteraction]) {
+    UIView.animate(withDuration: 0.3, delay: 0, options: [.beginFromCurrentState, .allowUserInteraction], animations: {
       self.setNeedsLayout()
       self.layoutIfNeeded()
-    }
+    }, completion: { _ in
+      self.stopRefreshIndicatorIfHidden()
+    })
   }
 
   private func animate(
@@ -372,7 +438,7 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
       if let scrollView = state.scrollView {
         lockedOffsetY = scrollView.contentOffset.y
       }
-      if config.pullToRefreshEnabled, !config.dismissOnSwipe, isSettled,
+      if config.pullToRefreshEnabled, !config.dismissOnSwipe, !isRefreshing, isSettled,
          let lowest = detentTops.max(), abs(top - lowest) < 1 {
         state.canRefresh = true
         refreshFeedback = UIImpactFeedbackGenerator(style: .medium)
@@ -430,8 +496,13 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
       drag = nil
       refreshFeedback = nil
       let velocity = state.sheetDrove ? pan.velocity(in: self).y : 0
+      let refresh = state.refreshArmed && pan.state == .ended
+      if refresh {
+        // Settles on the refreshing position; React confirms or ends it.
+        setRefreshing(config.refreshing != nil)
+      }
       endDrag(at: dragTop ?? currentTop, velocity: velocity, holdingScroll: state.sheetDrove)
-      if state.refreshArmed, pan.state == .ended {
+      if refresh {
         delegate?.modalPresentationDidPullToRefresh()
       }
 
@@ -444,7 +515,7 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     if !holdingScroll {
       unlockScroll()
     }
-    let tops = detentTops
+    let tops = settledTops
     guard let lowest = tops.max() else { return }
     // Where a fling of this velocity would come to rest.
     let projected = top + velocity * 0.2
@@ -465,16 +536,17 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     if changed {
       delegate?.modalPresentationDidChangeDetent(index)
     }
-    animate(distance: restingTop(for: index) - top, velocity: velocity, animations: { self.layoutSheet() }) { [weak self] in
+    animate(distance: settledTop(for: index) - top, velocity: velocity, animations: { self.layoutSheet() }) { [weak self] in
       guard let self, self.drag == nil else { return }
       self.unlockScroll()
+      self.stopRefreshIndicatorIfHidden()
     }
   }
 
   /// Rubber-bands above the tallest detent, and below the lowest one when
   /// swiping cannot dismiss.
   private func constrained(_ top: CGFloat) -> CGFloat {
-    let tops = detentTops
+    let tops = settledTops
     guard let minTop = tops.min(), let maxTop = tops.max() else { return top }
     let dimension = max(bounds.height, 1)
     if top < minTop {

package/lib/module/NitroModal.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { processColor, StyleSheet, useWindowDimensions, View } from 'react-native';
 import { callback, NitroModalView } from './NitroModalView';
 
@@ -49,6 +49,8 @@ export function NitroModal({
   onBackdropPress,
   onBackButtonPress,
   onPullToRefresh,
+  refreshing,
+  refreshIndicatorColor,
   children,
   testID,
   ref
@@ -72,12 +74,21 @@ export function NitroModal({
   // is laid out there so `measure()`, which presses rely on, matches the
   // screen; native cancels the offset out on screen.
   const [restingTop, setRestingTop] = useState(0);
+  // Native starts refreshing as soon as a pull is released. Reporting `true`
+  // for the render that follows, then `refreshing` again, stops it if the
+  // handler didn't start a refresh (unchanged props never reach native).
+  const isRefreshControlled = refreshing !== undefined;
+  const [pullPending, setPullPending] = useState(false);
+  useEffect(() => {
+    if (pullPending) setPullPending(false);
+  }, [pullPending]);
   const hybridRef = useRef(null);
 
   // Native callbacks are created once (stable props, no native updates on
   // re-render) and read the latest handlers from this ref.
   const latest = useRef({
     isControlled,
+    isRefreshControlled,
     onPresent,
     onDismiss,
     onDetentChange,
@@ -88,6 +99,7 @@ export function NitroModal({
   useLayoutEffect(() => {
     latest.current = {
       isControlled,
+      isRefreshControlled,
       onPresent,
       onDismiss,
       onDetentChange,
@@ -119,6 +131,7 @@ export function NitroModal({
       latest.current.onBackButtonPress?.();
     }),
     onPullToRefresh: callback(() => {
+      if (latest.current.isRefreshControlled) setPullPending(true);
       latest.current.onPullToRefresh?.();
     }),
     onRestingTopChange: callback(top => {
@@ -188,6 +201,8 @@ export function NitroModal({
     keyboardBehavior: keyboardBehavior,
     popupAnimation: popupAnimation,
     pullToRefreshEnabled: onPullToRefresh != null,
+    refreshing: isRefreshControlled ? refreshing || pullPending : undefined,
+    refreshIndicatorColor: toNativeColor(refreshIndicatorColor),
     ...nativeCallbacks,
     children: renderContent ? /*#__PURE__*/_jsx(View, {
       collapsable: false,

package/lib/module/NitroModal.js.map

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useState","processColor","StyleSheet","useWindowDimensions","View","callback","NitroModalView","jsx","_jsx","DEFAULT_DETENTS","BLACK","parseDetent","value","points","Number","isFinite","toNativeColor","color","undefined","processed","NitroModal","isOpen","mode","presentation","style","detents","initialDetentIndex","backdropColor","backdropOpacity","backdropBlur","dismissOnBackdropPress","dismissOnSwipe","dismissOnBackButton","showGrabber","cornerRadius","backgroundColor","keyboardBehavior","popupAnimation","contentContainerStyle","onPresent","onDismiss","onDetentChange","onBackdropPress","onBackButtonPress","onPullToRefresh","children","testID","ref","isControlled","isInline","internalOpen","setInternalOpen","open","sessionActive","setSessionActive","prevOpen","setPrevOpen","renderContent","area","setArea","restingTop","setRestingTop","hybridRef","latest","current","nativeCallbacks","instance","reason","index","onRestingTopChange","top","onContentAreaChange","next","width","height","present","console","warn","dismiss","snapToDetent","detentsKey","join","nativeDetents","Set","split","map","windowSize","contentArea","containerStyle","maxWidth","maxHeight","includes","absoluteFill","styles","host","pointerEvents","backdropBlurRadius","grabberVisible","contentBackgroundColor","pullToRefreshEnabled","collapsable","container","create","position","left"],"sourceRoot":"../../src","sources":["NitroModal.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useImperativeHandle","useLayoutEffect","useMemo","useRef","useState","processColor","StyleSheet","useWindowDimensions","View","callback","NitroModalView","jsx","_jsx","DEFAULT_DETENTS","BLACK","parseDetent","value","points","Number","isFinite","toNativeColor","color","undefined","processed","NitroModal","isOpen","mode","presentation","style","detents","initialDetentIndex","backdropColor","backdropOpacity","backdropBlur","dismissOnBackdropPress","dismissOnSwipe","dismissOnBackButton","showGrabber","cornerRadius","backgroundColor","keyboardBehavior","popupAnimation","contentContainerStyle","onPresent","onDismiss","onDetentChange","onBackdropPress","onBackButtonPress","onPullToRefresh","refreshing","refreshIndicatorColor","children","testID","ref","isControlled","isInline","internalOpen","setInternalOpen","open","sessionActive","setSessionActive","prevOpen","setPrevOpen","renderContent","area","setArea","restingTop","setRestingTop","isRefreshControlled","pullPending","setPullPending","hybridRef","latest","current","nativeCallbacks","instance","reason","index","onRestingTopChange","top","onContentAreaChange","next","width","height","present","console","warn","dismiss","snapToDetent","detentsKey","join","nativeDetents","Set","split","map","windowSize","contentArea","containerStyle","maxWidth","maxHeight","includes","absoluteFill","styles","host","pointerEvents","backdropBlurRadius","grabberVisible","contentBackgroundColor","pullToRefreshEnabled","collapsable","container","create","position","left"],"sourceRoot":"../../src","sources":["NitroModal.tsx"],"mappings":"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","ignoreList":[]}