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

package/README.md

@@ -142,8 +142,9 @@ 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.
+- A sheet that can't be swiped away (inline, or `dismissOnSwipe={false}`) and has no `onPullToRefresh` stops at its lowest detent. Dragging down further pulls the scrollable content instead, so a `RefreshControl` on it works, with its indicator inside the sheet (iOS and Android).
 - 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.
+- With `refreshing` set too, the sheet stays on its lowest detent and its content moves down inside it, uncovering an activity indicator at the top of the sheet. The content 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.
 
@@ -216,6 +217,8 @@ const sheet = useRef<NitroModalRef>(null);
 | `dismissOnBackButton`    | `boolean`                                            | `true`             | The Android back button/gesture (Escape on web) closes the modal.                                 |
 | `showGrabber`            | `boolean`                                            | `false`            | Shows the drag handle on a bottom sheet.                                                          |
 | `cornerRadius`           | `number`                                             | platform default   | Corner radius of the sheet/card.                                                                  |
+| `borderWidth`            | `number`                                             | `0`                | Width of a border around the sheet/card, drawn above the content.                                 |
+| `borderColor`            | `ColorValue`                                         | `'transparent'`    | Color of the border.                                                                              |
 | `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.                                                                 |

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

@@ -8,6 +8,7 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Outline
 import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.InsetDrawable
 import android.os.Build
 import android.view.Gravity
 import android.view.HapticFeedbackConstants
@@ -62,6 +63,8 @@ internal class BottomSheetPresenter(
   private val refreshIndicator = ProgressBar(activity)
   private val behavior = SheetBehavior()
   private val sheetBackground = GradientDrawable()
+  /** The border, as the sheet's foreground so the content can't cover it. */
+  private val sheetBorder = GradientDrawable()
   private var cornerRadiusPx = 0f
 
   /** Resting detents sorted by height; position i maps to [states][i]. */
@@ -133,18 +136,9 @@ internal class BottomSheetPresenter(
       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
+    // Extends past the bottom edge so only the top and sides show.
+    sheet.foreground = InsetDrawable(sheetBorder, 0, 0, 0, -dp(BORDER_OVERHANG_DP))
     sheet.outlineProvider = object : ViewOutlineProvider() {
       override fun getOutline(view: View, outline: Outline) {
         // Extends past the bottom edge so only the top corners round. A round
@@ -155,6 +149,18 @@ internal class BottomSheetPresenter(
       }
     }
     sheet.clipToOutline = true
+    // Inside the sheet, behind the content, which uncovers it as it's pulled down.
+    refreshIndicator.isIndeterminate = true
+    refreshIndicator.visibility = View.INVISIBLE
+    refreshIndicator.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+    sheet.addView(
+      refreshIndicator,
+      FrameLayout.LayoutParams(
+        dp(REFRESH_INDICATOR_SIZE_DP),
+        dp(REFRESH_INDICATOR_SIZE_DP),
+        Gravity.TOP or Gravity.CENTER_HORIZONTAL,
+      ),
+    )
     sheet.addView(contentRoot, FrameLayout.LayoutParams(MATCH, MATCH))
     sheet.addView(
       grabber,
@@ -233,6 +239,7 @@ internal class BottomSheetPresenter(
   override fun onConfigChanged(previous: ModalConfig) {
     applyAppearance()
     if (previous.refreshing != config.refreshing) setRefreshing(config.refreshing ?: false)
+    applyTranslation()
     layoutRefreshIndicator()
     if (presented && !isDismissing) behavior.isHideable = config.dismissOnSwipe
     if (previous.detents != config.detents || previous.keyboardBehavior != config.keyboardBehavior) {
@@ -264,9 +271,11 @@ internal class BottomSheetPresenter(
     if (radius != cornerRadiusPx) {
       cornerRadiusPx = radius
       sheetBackground.cornerRadii = floatArrayOf(radius, radius, radius, radius, 0f, 0f, 0f, 0f)
+      sheetBorder.cornerRadii = sheetBackground.cornerRadii
       sheet.invalidateOutline()
     }
     sheetBackground.setColor(config.surfaceColor(activity))
+    sheetBorder.setStroke(ceil(activity.dpToPx(config.borderWidth)).toInt(), config.borderColor)
     grabber.visibility = if (config.grabberVisible) View.VISIBLE else View.GONE
     grabber.background = GradientDrawable().apply {
       cornerRadius = activity.dpToPx(2f)
@@ -386,7 +395,11 @@ internal class BottomSheetPresenter(
       val headroom = (sheet.top - systemInsets.top).coerceAtLeast(0)
       keyboardOverlap.coerceAtMost(headroom)
     }
-    sheet.translationY = pullOffset - lift
+    // With a refresh indicator, the sheet stays on its lowest detent and the
+    // content moves down inside it, uncovering the indicator.
+    val pullsContent = config.refreshing != null
+    sheet.translationY = (if (pullsContent) 0f else pullOffset) - lift
+    contentRoot.translationY = if (pullsContent) pullOffset else 0f
   }
 
   private fun setPullOffset(offset: Float) {
@@ -419,12 +432,12 @@ internal class BottomSheetPresenter(
   }
 
   /**
-   * Centered in the gap a pull uncovers below the lowest detent, fading in
-   * as the pull nears the threshold.
+   * Centered in the gap a pull uncovers above the content, 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
+    refreshIndicator.translationY = (pullOffset - size) / 2
     val progress = if (config.refreshing == null || isDismissing) 0f else (pullOffset / refreshThreshold).coerceIn(0f, 1f)
     refreshIndicator.alpha = progress
     // Hidden, the indeterminate animation stops.
@@ -636,6 +649,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 BORDER_OVERHANG_DP = 8f
     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

@@ -1,5 +1,6 @@
 package com.margelo.nitro.nitromodal
 
+import android.graphics.Color
 import android.os.Handler
 import android.os.Looper
 import android.view.WindowManager
@@ -48,6 +49,8 @@ class HybridNitroModal(private val reactContext: ThemedReactContext) :
   override var dismissOnBackButton: Boolean = true
   override var grabberVisible: Boolean = false
   override var cornerRadius: Double = -1.0
+  override var borderWidth: Double = 0.0
+  override var borderColor: Double? = null
   override var contentBackgroundColor: Double? = null
   override var keyboardBehavior: KeyboardBehavior = KeyboardBehavior.PAN
   override var popupAnimation: PopupAnimation = PopupAnimation.SCALE
@@ -335,6 +338,8 @@ class HybridNitroModal(private val reactContext: ThemedReactContext) :
       dismissOnBackButton = dismissOnBackButton && !inline,
       grabberVisible = grabberVisible,
       cornerRadius = cornerRadius.takeIf { it >= 0 }?.toFloat(),
+      borderWidth = borderWidth.takeIf { it.isFinite() && it > 0 }?.toFloat() ?: 0f,
+      borderColor = borderColor?.toProcessedColor() ?: Color.TRANSPARENT,
       contentBackgroundColor = contentBackgroundColor?.toProcessedColor(),
       keyboardBehavior = keyboardBehavior,
       popupAnimation = popupAnimation,

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

@@ -44,6 +44,9 @@ internal data class ModalConfig(
   val grabberVisible: Boolean = false,
   /** dp, `null` uses the platform default. */
   val cornerRadius: Float? = null,
+  /** dp, drawn above the content around the sheet/card. */
+  val borderWidth: Float = 0f,
+  val borderColor: Int = Color.TRANSPARENT,
   /** `null` uses the system surface color. */
   val contentBackgroundColor: Int? = null,
   val keyboardBehavior: KeyboardBehavior = KeyboardBehavior.PAN,

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

@@ -12,6 +12,7 @@ import android.widget.FrameLayout
 import androidx.activity.BackEventCompat
 import androidx.core.graphics.Insets
 import com.facebook.react.uimanager.ThemedReactContext
+import kotlin.math.ceil
 
 /**
  * `popup` mode: a centered card over the backdrop. Enter/exit are
@@ -33,12 +34,15 @@ internal class PopupPresenter(
   private val cardFrame = FrameLayout(activity)
   private val card = FrameLayout(activity)
   private val cardBackground = GradientDrawable()
+  /** The border, as the card's foreground so the content can't cover it. */
+  private val cardBorder = GradientDrawable()
   private var started = false
   private var backPreview = false
 
   override fun createLayout(): ViewGroup {
     root.addView(backdrop, FrameLayout.LayoutParams(MATCH, MATCH))
     card.background = cardBackground
+    card.foreground = cardBorder
     card.outlineProvider = ViewOutlineProvider.BACKGROUND
     card.clipToOutline = true
     card.addView(contentRoot, FrameLayout.LayoutParams(MATCH, MATCH))
@@ -166,6 +170,8 @@ internal class PopupPresenter(
   private fun applyAppearance() {
     cardBackground.cornerRadius = activity.dpToPx(config.cornerRadius ?: DEFAULT_CORNER_RADIUS_DP)
     cardBackground.setColor(config.surfaceColor(activity))
+    cardBorder.cornerRadius = cardBackground.cornerRadius
+    cardBorder.setStroke(ceil(activity.dpToPx(config.borderWidth)).toInt(), config.borderColor)
   }
 
   private fun updateCardSize() {

package/ios/HybridNitroModal.swift

@@ -43,6 +43,8 @@ final class HybridNitroModal: HybridNitroModalSpec {
   var dismissOnBackButton = true
   var grabberVisible = false
   var cornerRadius: Double = -1
+  var borderWidth: Double = 0
+  var borderColor: Double?
   var contentBackgroundColor: Double?
   var keyboardBehavior: KeyboardBehavior = .pan
   var popupAnimation: PopupAnimation = .scale
@@ -325,6 +327,8 @@ final class HybridNitroModal: HybridNitroModalSpec {
       dismissOnSwipe: dismissOnSwipe && !inline,
       grabberVisible: grabberVisible,
       cornerRadius: cornerRadius >= 0 ? CGFloat(cornerRadius) : nil,
+      borderWidth: borderWidth.isFinite ? max(CGFloat(borderWidth), 0) : 0,
+      borderColor: borderColor.map(UIColor.init(processedColor:)) ?? .clear,
       contentBackgroundColor: contentBackgroundColor.map(UIColor.init(processedColor:)) ?? .systemBackground,
       keyboardBehavior: keyboardBehavior,
       popupAnimation: popupAnimation,

package/ios/ModalConfig.swift

@@ -49,6 +49,9 @@ struct ModalConfig: Equatable {
   var grabberVisible = false
   /// `nil` uses the platform default.
   var cornerRadius: CGFloat?
+  /// Border around the sheet/card, drawn above the content.
+  var borderWidth: CGFloat = 0
+  var borderColor: UIColor = .clear
   var contentBackgroundColor: UIColor = .systemBackground
   var keyboardBehavior: KeyboardBehavior = .pan
   var popupAnimation: PopupAnimation = .scale

package/ios/PopupViewController.swift

@@ -125,6 +125,8 @@ final class PopupViewController: UIViewController, ModalPresenting, UIViewContro
     backdrop.configure(color: config.backdropColor, opacity: config.backdropOpacity, blurRadius: config.backdropBlurRadius)
     card.backgroundColor = config.contentBackgroundColor
     card.layer.cornerRadius = config.cornerRadius ?? Self.defaultCornerRadius
+    card.layer.borderWidth = config.borderWidth
+    card.layer.borderColor = config.borderColor.cgColor
   }
 
   /// Area a card may occupy inside `bounds`, keeping clear of the safe area.

package/ios/SheetView.swift

@@ -110,11 +110,11 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     grabber.layer.cornerRadius = Self.grabberSize.height / 2
     sheetView.addSubview(grabber)
 
-    // Behind the sheet, which uncovers it as it's pulled down.
+    // Inside the sheet, behind the content, which uncovers it as it's pulled down.
     refreshIndicator.hidesWhenStopped = false
     refreshIndicator.isUserInteractionEnabled = false
     refreshIndicator.alpha = 0
-    addSubview(refreshIndicator)
+    sheetView.insertSubview(refreshIndicator, belowSubview: contentView)
     addSubview(sheetView)
 
     let pan = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
@@ -180,7 +180,7 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
 
   /// Slides the sheet in or out; a swipe dismissal keeps its release velocity.
   func animateTransition(toOffscreen offscreen: Bool, animated: Bool, duration: TimeInterval, completion: @escaping () -> Void) {
-    let from = sheetView.frame.minY
+    let from = sheetView.frame.minY + contentView.frame.minY
     let velocity = offscreen ? releaseVelocity : 0
     releaseVelocity = 0
     isOffscreen = offscreen
@@ -262,32 +262,41 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     return dragTop ?? settledTop(for: selectedIndex)
   }
 
+  /// With a refresh indicator, a pull below the lowest detent keeps the sheet
+  /// there and moves the content down inside it instead, uncovering the
+  /// indicator at the top of the sheet.
+  private var pullsContent: Bool {
+    config.refreshing != nil && config.pullToRefreshEnabled && !config.dismissOnSwipe
+  }
+
+  /// Splits a sheet top into where the sheet goes and how far its content is pulled down.
+  private func split(_ top: CGFloat) -> (sheetTop: CGFloat, pull: CGFloat) {
+    guard pullsContent, !isOffscreen, let lowest = detentTops.max(), top > lowest else { return (top, 0) }
+    return (lowest, top - lowest)
+  }
+
   private func layoutSheet() {
     let width = sheetWidth
-    let top = currentTop
+    let (top, pull) = split(currentTop)
     backdrop.frame = bounds
     sheetView.frame = CGRect(x: (bounds.width - width) / 2, y: top, width: width, height: bounds.height + Self.overscroll)
-    contentView.frame = CGRect(x: 0, y: 0, width: width, height: maximumDetentValue)
+    contentView.frame = CGRect(x: 0, y: pull, width: width, height: maximumDetentValue)
     grabber.frame = CGRect(
       origin: CGPoint(x: (width - Self.grabberSize.width) / 2, y: 5),
       size: Self.grabberSize
     )
     backdrop.alpha = backdropAlpha(forTop: top)
-    layoutRefreshIndicator(sheetTop: top)
+    layoutRefreshIndicator(width: width, pull: pull)
     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) {
+  /// Centered in the gap a pull uncovers above the content, fading in as the
+  /// pull nears the threshold.
+  private func layoutRefreshIndicator(width: CGFloat, pull: 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.center = CGPoint(x: width / 2, y: pull / 2)
+    let progress = min(max(pull / Self.refreshThreshold, 0), 1)
     refreshIndicator.alpha = progress
     if progress > 0, !refreshIndicator.isAnimating {
       refreshIndicator.startAnimating()
@@ -321,6 +330,9 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     backdrop.configure(color: config.backdropColor, opacity: config.backdropOpacity, blurRadius: config.backdropBlurRadius)
     sheetView.backgroundColor = config.contentBackgroundColor
     sheetView.layer.cornerRadius = config.cornerRadius ?? Self.defaultCornerRadius
+    // Drawn above the sublayers, so the content can't cover it.
+    sheetView.layer.borderWidth = config.borderWidth
+    sheetView.layer.borderColor = config.borderColor.cgColor
     grabber.isHidden = !config.grabberVisible
     refreshIndicator.color = config.refreshIndicatorColor
   }
@@ -425,9 +437,14 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     switch pan.state {
     case .began:
       // Grab the sheet where it is, even mid-animation.
-      let isSettled = sheetView.layer.animationKeys()?.isEmpty ?? true
-      let top = sheetView.layer.presentation()?.frame.minY ?? sheetView.frame.minY
+      let isSettled = (sheetView.layer.animationKeys()?.isEmpty ?? true)
+        && (contentView.layer.animationKeys()?.isEmpty ?? true)
+      let sheetTop = sheetView.layer.presentation()?.frame.minY ?? sheetView.frame.minY
+      let pull = contentView.layer.presentation()?.frame.minY ?? contentView.frame.minY
+      let top = sheetTop + pull
       sheetView.layer.removeAllAnimations()
+      contentView.layer.removeAllAnimations()
+      refreshIndicator.layer.removeAllAnimations()
       backdrop.layer.removeAllAnimations()
       let translation = pan.translation(in: sheetView)
       let location = pan.location(in: sheetView)
@@ -449,17 +466,20 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
       layoutSheet()
 
     case .changed:
-      guard var state = drag, let minTop = detentTops.min() else { return }
+      guard var state = drag, let minTop = detentTops.min(), let maxTop = settledTops.max() else { return }
       let translation = pan.translation(in: self).y
       let delta = translation - state.lastTranslation
       state.lastTranslation = translation
 
       if let scrollView = state.scrollView {
-        // Up: expand the sheet before scrolling. Down: scroll back to the top
-        // before collapsing the sheet, in a separate gesture.
+        // Up: expand the sheet before scrolling, once content pulled past its
+        // top is back. Down: scroll back to the top before collapsing the
+        // sheet, in a separate gesture. A sheet that stops at its lowest
+        // detent leaves the pull to the content there (bounce, RefreshControl).
         let drive = delta < 0
-          ? state.rawTop > minTop + 0.5
+          ? state.rawTop > minTop + 0.5 && !scrollView.isPulledDown
           : !state.contentScrolled && scrollView.isScrolledToTop
+            && (canDragBelowLowestDetent || state.rawTop < maxTop - 0.5)
         if drive {
           state.rawTop = max(state.rawTop + delta, minTop)
           lockScroll(scrollView, at: delta < 0 ? lockedOffsetY : scrollView.topOffsetY)
@@ -475,6 +495,9 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
         state.rawTop += delta
         state.sheetDrove = true
       }
+      if !canDragBelowLowestDetent {
+        state.rawTop = min(state.rawTop, maxTop)
+      }
       let top = constrained(state.rawTop)
       if state.sheetDrove, isInline, !state.cancelledReactTouches {
         state.cancelledReactTouches = true
@@ -543,6 +566,13 @@ final class SheetView: UIView, UIGestureRecognizerDelegate {
     }
   }
 
+  /// Whether a drag can take the sheet below its lowest detent: to dismiss it
+  /// or to pull to refresh. Otherwise it stops there, like Android's
+  /// `BottomSheetBehavior`.
+  private var canDragBelowLowestDetent: Bool {
+    config.dismissOnSwipe || config.pullToRefreshEnabled
+  }
+
   /// Rubber-bands above the tallest detent, and below the lowest one when
   /// swiping cannot dismiss.
   private func constrained(_ top: CGFloat) -> CGFloat {
@@ -640,6 +670,11 @@ private extension UIScrollView {
     contentOffset.y <= topOffsetY + 0.5
   }
 
+  /// Pulled down past its top, bouncing or revealing a refresh control.
+  var isPulledDown: Bool {
+    contentOffset.y < topOffsetY - 0.5
+  }
+
   var canScrollVertically: Bool {
     alwaysBounceVertical
       || contentSize.height + adjustedContentInset.top + adjustedContentInset.bottom > bounds.height + 0.5

package/lib/module/NitroModal.js

@@ -39,6 +39,8 @@ export function NitroModal({
   dismissOnBackButton = true,
   showGrabber = false,
   cornerRadius,
+  borderWidth = 0,
+  borderColor,
   backgroundColor,
   keyboardBehavior = 'pan',
   popupAnimation = 'scale',
@@ -197,6 +199,8 @@ export function NitroModal({
     dismissOnBackButton: dismissOnBackButton,
     grabberVisible: showGrabber,
     cornerRadius: cornerRadius ?? -1,
+    borderWidth: borderWidth,
+    borderColor: toNativeColor(borderColor),
     contentBackgroundColor: toNativeColor(backgroundColor),
     keyboardBehavior: keyboardBehavior,
     popupAnimation: popupAnimation,

package/lib/module/NitroModal.js.map

@@ -1 +1 @@
-{"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":[]}
+{"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","borderWidth","borderColor","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":[]}

package/lib/module/NitroModalView.web.js

@@ -34,6 +34,7 @@ function WebNitroModalView(props) {
   const surface = useRef(null);
   const content = useRef(null);
   const grabber = useRef(null);
+  const border = useRef(null);
   const refreshIndicator = useRef(null);
   const refreshSpinner = useRef(null);
   useLayoutEffect(() => {
@@ -54,6 +55,7 @@ function WebNitroModalView(props) {
       surface: surface.current,
       content: content.current,
       grabber: grabber.current,
+      border: border.current,
       refreshIndicator: refreshIndicator.current,
       refreshSpinner: refreshSpinner.current
     });
@@ -84,18 +86,18 @@ function WebNitroModalView(props) {
       ref: backdrop,
       "aria-hidden": true,
       style: styles.backdrop
-    }), /*#__PURE__*/_jsx("div", {
-      ref: refreshIndicator,
-      "aria-hidden": true,
-      style: styles.refreshIndicator,
-      children: /*#__PURE__*/_jsx("div", {
-        ref: refreshSpinner,
-        style: styles.refreshSpinner
-      })
     }), /*#__PURE__*/_jsxs("div", {
       ref: surface,
       style: styles.surface,
       children: [/*#__PURE__*/_jsx("div", {
+        ref: refreshIndicator,
+        "aria-hidden": true,
+        style: styles.refreshIndicator,
+        children: /*#__PURE__*/_jsx("div", {
+          ref: refreshSpinner,
+          style: styles.refreshSpinner
+        })
+      }), /*#__PURE__*/_jsx("div", {
         ref: content,
         style: styles.content,
         children: children
@@ -103,6 +105,10 @@ function WebNitroModalView(props) {
         ref: grabber,
         "aria-hidden": true,
         style: styles.grabber
+      }), /*#__PURE__*/_jsx("div", {
+        ref: border,
+        "aria-hidden": true,
+        style: styles.border
       })]
     })]
   }) : null;
@@ -166,6 +172,16 @@ const styles = {
     backgroundColor: 'rgba(127, 127, 127, 0.4)',
     pointerEvents: 'none'
   },
+  // Sized by the presenter's border width; follows the surface's corners.
+  border: {
+    position: 'absolute',
+    inset: 0,
+    boxSizing: 'border-box',
+    borderStyle: 'solid',
+    borderWidth: 0,
+    borderRadius: 'inherit',
+    pointerEvents: 'none'
+  },
   refreshIndicator: {
     position: 'absolute',
     left: 0,

package/lib/module/NitroModalView.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useLayoutEffect","useRef","useState","Modal","View","clipOverflow","REFRESH_INDICATOR_SIZE","ModalController","jsx","_jsx","jsxs","_jsxs","callback","func","WebNitroModalView","props","hybridRef","children","isInline","mode","mounted","setMounted","controller","overlay","backdrop","surface","content","grabber","refreshIndicator","refreshSpinner","attach","detach","methods","update","undefined","elementsDidMount","current","elementsWillUnmount","contentDidRender","hostRef","node","hostDidChange","HTMLElement","layer","ref","tabIndex","style","styles","inlineOverlay","overflow","pointerEvents","visible","transparent","animationType","onRequestClose","handleBackPress","position","inset","outline","touchAction","left","top","boxSizing","willChange","width","height","marginLeft","borderRadius","backgroundColor","opacity","border","borderTopColor","NitroModalView"],"sourceRoot":"../../src","sources":["NitroModalView.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useLayoutEffect","useRef","useState","Modal","View","clipOverflow","REFRESH_INDICATOR_SIZE","ModalController","jsx","_jsx","jsxs","_jsxs","callback","func","WebNitroModalView","props","hybridRef","children","isInline","mode","mounted","setMounted","controller","overlay","backdrop","surface","content","grabber","border","refreshIndicator","refreshSpinner","attach","detach","methods","update","undefined","elementsDidMount","current","elementsWillUnmount","contentDidRender","hostRef","node","hostDidChange","HTMLElement","layer","ref","tabIndex","style","styles","inlineOverlay","overflow","pointerEvents","visible","transparent","animationType","onRequestClose","handleBackPress","position","inset","outline","touchAction","left","top","boxSizing","willChange","width","height","marginLeft","borderRadius","backgroundColor","borderStyle","borderWidth","opacity","borderTopColor","NitroModalView"],"sourceRoot":"../../src","sources":["NitroModalView.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/web/ModalConfig.js

@@ -18,6 +18,8 @@ export function makeConfig(props) {
     dismissOnBackButton: props.dismissOnBackButton && !isInline,
     grabberVisible: props.grabberVisible,
     cornerRadius: props.cornerRadius >= 0 ? props.cornerRadius : null,
+    borderWidth: Number.isFinite(props.borderWidth) && props.borderWidth > 0 ? props.borderWidth : 0,
+    borderColor: props.borderColor ?? null,
     contentBackgroundColor: props.contentBackgroundColor ?? null,
     keyboardBehavior: props.keyboardBehavior,
     popupAnimation: props.popupAnimation,

package/lib/module/web/ModalConfig.js.map

@@ -1 +1 @@
-{"version":3,"names":["makeConfig","props","isInline","mode","detents","initialDetentIndex","Number","isFinite","Math","trunc","backdropColor","backdropOpacity","backdropBlurRadius","dismissOnBackdropPress","dismissOnSwipe","dismissOnBackButton","grabberVisible","cornerRadius","contentBackgroundColor","keyboardBehavior","popupAnimation","pullToRefreshEnabled","refreshing","refreshIndicatorColor","isSameConfig","a","b","Object","keys","every","key","join"],"sourceRoot":"../../../src","sources":["web/ModalConfig.ts"],"mappings":";;AAQA;;AA+BA,OAAO,SAASA,UAAUA,CAACC,KAAsB,EAAe;EAC9D;EACA,MAAMC,QAAQ,GAAGD,KAAK,CAACC,QAAQ,IAAID,KAAK,CAACE,IAAI,KAAK,aAAa;EAC/D,OAAO;IACLA,IAAI,EAAEF,KAAK,CAACE,IAAI;IAChBD,QAAQ;IACRE,OAAO,EAAEH,KAAK,CAACG,OAAO;IACtBC,kBAAkB,EAAEC,MAAM,CAACC,QAAQ,CAACN,KAAK,CAACI,kBAAkB,CAAC,GACzDG,IAAI,CAACC,KAAK,CAACR,KAAK,CAACI,kBAAkB,CAAC,GACpC,CAAC;IACLK,aAAa,EAAET,KAAK,CAACS,aAAa;IAClCC,eAAe,EAAEV,KAAK,CAACU,eAAe;IACtCC,kBAAkB,EAAEX,KAAK,CAACW,kBAAkB;IAC5CC,sBAAsB,EAAEZ,KAAK,CAACY,sBAAsB,IAAI,CAACX,QAAQ;IACjEY,cAAc,EAAEb,KAAK,CAACa,cAAc,IAAI,CAACZ,QAAQ;IACjDa,mBAAmB,EAAEd,KAAK,CAACc,mBAAmB,IAAI,CAACb,QAAQ;IAC3Dc,cAAc,EAAEf,KAAK,CAACe,cAAc;IACpCC,YAAY,EAAEhB,KAAK,CAACgB,YAAY,IAAI,CAAC,GAAGhB,KAAK,CAACgB,YAAY,GAAG,IAAI;IACjEC,sBAAsB,EAAEjB,KAAK,CAACiB,sBAAsB,IAAI,IAAI;IAC5DC,gBAAgB,EAAElB,KAAK,CAACkB,gBAAgB;IACxCC,cAAc,EAAEnB,KAAK,CAACmB,cAAc;IACpCC,oBAAoB,EAAEpB,KAAK,CAACoB,oBAAoB;IAChDC,UAAU,EAAErB,KAAK,CAACqB,UAAU,IAAI,IAAI;IACpCC,qBAAqB,EAAEtB,KAAK,CAACsB,qBAAqB,IAAI;EACxD,CAAC;AACH;AAEA,OAAO,SAASC,YAAYA,CAACC,CAAc,EAAEC,CAAc,EAAW;EACpE,OAAQC,MAAM,CAACC,IAAI,CAACH,CAAC,CAAC,CAA2BI,KAAK,CAAEC,GAAG,IACzDA,GAAG,KAAK,SAAS,GACbL,CAAC,CAACrB,OAAO,CAAC2B,IAAI,CAAC,CAAC,KAAKL,CAAC,CAACtB,OAAO,CAAC2B,IAAI,CAAC,CAAC,GACrCN,CAAC,CAACK,GAAG,CAAC,KAAKJ,CAAC,CAACI,GAAG,CACtB,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["makeConfig","props","isInline","mode","detents","initialDetentIndex","Number","isFinite","Math","trunc","backdropColor","backdropOpacity","backdropBlurRadius","dismissOnBackdropPress","dismissOnSwipe","dismissOnBackButton","grabberVisible","cornerRadius","borderWidth","borderColor","contentBackgroundColor","keyboardBehavior","popupAnimation","pullToRefreshEnabled","refreshing","refreshIndicatorColor","isSameConfig","a","b","Object","keys","every","key","join"],"sourceRoot":"../../../src","sources":["web/ModalConfig.ts"],"mappings":";;AAQA;;AAmCA,OAAO,SAASA,UAAUA,CAACC,KAAsB,EAAe;EAC9D;EACA,MAAMC,QAAQ,GAAGD,KAAK,CAACC,QAAQ,IAAID,KAAK,CAACE,IAAI,KAAK,aAAa;EAC/D,OAAO;IACLA,IAAI,EAAEF,KAAK,CAACE,IAAI;IAChBD,QAAQ;IACRE,OAAO,EAAEH,KAAK,CAACG,OAAO;IACtBC,kBAAkB,EAAEC,MAAM,CAACC,QAAQ,CAACN,KAAK,CAACI,kBAAkB,CAAC,GACzDG,IAAI,CAACC,KAAK,CAACR,KAAK,CAACI,kBAAkB,CAAC,GACpC,CAAC;IACLK,aAAa,EAAET,KAAK,CAACS,aAAa;IAClCC,eAAe,EAAEV,KAAK,CAACU,eAAe;IACtCC,kBAAkB,EAAEX,KAAK,CAACW,kBAAkB;IAC5CC,sBAAsB,EAAEZ,KAAK,CAACY,sBAAsB,IAAI,CAACX,QAAQ;IACjEY,cAAc,EAAEb,KAAK,CAACa,cAAc,IAAI,CAACZ,QAAQ;IACjDa,mBAAmB,EAAEd,KAAK,CAACc,mBAAmB,IAAI,CAACb,QAAQ;IAC3Dc,cAAc,EAAEf,KAAK,CAACe,cAAc;IACpCC,YAAY,EAAEhB,KAAK,CAACgB,YAAY,IAAI,CAAC,GAAGhB,KAAK,CAACgB,YAAY,GAAG,IAAI;IACjEC,WAAW,EACTZ,MAAM,CAACC,QAAQ,CAACN,KAAK,CAACiB,WAAW,CAAC,IAAIjB,KAAK,CAACiB,WAAW,GAAG,CAAC,GACvDjB,KAAK,CAACiB,WAAW,GACjB,CAAC;IACPC,WAAW,EAAElB,KAAK,CAACkB,WAAW,IAAI,IAAI;IACtCC,sBAAsB,EAAEnB,KAAK,CAACmB,sBAAsB,IAAI,IAAI;IAC5DC,gBAAgB,EAAEpB,KAAK,CAACoB,gBAAgB;IACxCC,cAAc,EAAErB,KAAK,CAACqB,cAAc;IACpCC,oBAAoB,EAAEtB,KAAK,CAACsB,oBAAoB;IAChDC,UAAU,EAAEvB,KAAK,CAACuB,UAAU,IAAI,IAAI;IACpCC,qBAAqB,EAAExB,KAAK,CAACwB,qBAAqB,IAAI;EACxD,CAAC;AACH;AAEA,OAAO,SAASC,YAAYA,CAACC,CAAc,EAAEC,CAAc,EAAW;EACpE,OAAQC,MAAM,CAACC,IAAI,CAACH,CAAC,CAAC,CAA2BI,KAAK,CAAEC,GAAG,IACzDA,GAAG,KAAK,SAAS,GACbL,CAAC,CAACvB,OAAO,CAAC6B,IAAI,CAAC,CAAC,KAAKL,CAAC,CAACxB,OAAO,CAAC6B,IAAI,CAAC,CAAC,GACrCN,CAAC,CAACK,GAAG,CAAC,KAAKJ,CAAC,CAACI,GAAG,CACtB,CAAC;AACH","ignoreList":[]}

package/lib/module/web/ModalPresenter.js

@@ -188,6 +188,11 @@ export class ModalPresenter {
     backdrop.style.setProperty('-webkit-backdrop-filter', blur);
     // `Canvas` follows the page's `color-scheme`, like a system background.
     surface.style.backgroundColor = config.contentBackgroundColor != null ? toCSSColor(config.contentBackgroundColor) : 'Canvas';
+    const {
+      border
+    } = this.elements;
+    border.style.borderWidth = `${config.borderWidth}px`;
+    border.style.borderColor = config.borderColor != null ? toCSSColor(config.borderColor) : 'transparent';
   }
 
   /** Inline, only the surface takes input; the rest reaches the page. */