react-native-nitro-modal 0.3.5-rc → 0.3.7-rc

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

@@ -74,6 +74,9 @@ internal class BottomSheetPresenter(
   private var lastDetentIndex = -1
   private var reportedRestingTop = Int.MIN_VALUE
 
+  /** The detent a settle we started is heading for, until it arrives; -1 otherwise. */
+  private var settlingTo = -1
+
   /** The behavior is dragging the sheet (as opposed to a nested scroll moving it). */
   private var sheetDragging = false
 
@@ -96,6 +99,8 @@ internal class BottomSheetPresenter(
         return
       }
       if (newState == BottomSheetBehavior.STATE_DRAGGING) {
+        // The user took over; the behavior picks where it settles.
+        settlingTo = -1
         sheetDragging = true
         coordinator.notifyNativeGesture(started = true)
         // A refreshing sheet follows the finger from its lowest detent.
@@ -106,6 +111,7 @@ internal class BottomSheetPresenter(
       }
       val position = states().indexOf(newState)
       if (position < 0 || isDismissing) return
+      settlingTo = -1
       presented = true
       // Hideable while entering/exiting; at rest, swipe-to-dismiss follows the prop.
       behavior.isHideable = this@BottomSheetPresenter.config.dismissOnSwipe
@@ -195,11 +201,12 @@ internal class BottomSheetPresenter(
       // Settles with the behavior's own animation, from HIDDEN on show or from
       // wherever a reversed exit got to (back to the detent it left).
       val index = if (lastDetentIndex >= 0) lastDetentIndex else config.clampedInitialDetentIndex
-      behavior.state = stateFor(index)
+      settleTo(index)
     }
   }
 
   override fun animateOut(fromBackGesture: Boolean, onEnd: () -> Unit) {
+    settlingTo = -1
     coordinator.cancelPull()
     if (behavior.state == BottomSheetBehavior.STATE_HIDDEN || !coordinator.isLaidOut) {
       onEnd()
@@ -261,11 +268,16 @@ internal class BottomSheetPresenter(
 
   override fun snapToDetent(index: Int) {
     if (!presented || isDismissing) return
-    behavior.state = stateFor(index)
+    settleTo(index)
   }
 
   override fun onTeardown() = coordinator.release()
 
+  private fun settleTo(index: Int) {
+    settlingTo = index
+    behavior.state = stateFor(index)
+  }
+
   private fun applyAppearance() {
     val radius = activity.dpToPx(config.cornerRadius ?: DEFAULT_CORNER_RADIUS_DP)
     if (radius != cornerRadiusPx) {
@@ -291,6 +303,7 @@ internal class BottomSheetPresenter(
     val bottomInset = systemInsets.bottom
     maxContentHeight = (parentHeight - systemInsets.top - bottomInset).coerceAtLeast(1)
 
+    val previousHeights = sortedDetents.map { it.height }
     val requested = config.detents.ifEmpty { listOf(Detent.FitContent) }
     val detents = requested
       .mapIndexed { index, detent -> RestingHeight(index, contentHeightFor(detent) + bottomInset) }
@@ -330,6 +343,16 @@ internal class BottomSheetPresenter(
       }
     }
 
+    // A settle heads for where its detent was when it started, and the
+    // behavior only moves a sheet at rest when its detents change: content
+    // that grows while the sheet slides in would leave it stopped short.
+    // Send the settle to where the detent is now.
+    if (heights != previousHeights && settlingTo >= 0 && !isDismissing &&
+      behavior.state == BottomSheetBehavior.STATE_SETTLING
+    ) {
+      behavior.state = stateFor(settlingTo)
+    }
+
     val availableHeight =
       if (Detent.FitContent in requested) maxContentHeight else sheetHeight - bottomInset
     val areaHeight = availableHeight -

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

@@ -42,6 +42,7 @@ class NitroModalHostView(context: ThemedReactContext) : ViewGroup(context), Reac
 
   private val measureAndLayout = Runnable {
     layoutPending = false
+    forceLayout()
     measure(
       MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
       MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
@@ -78,8 +79,15 @@ class NitroModalHostView(context: ThemedReactContext) : ViewGroup(context), Reac
   override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
     // Laid out by Fabric. A modal's children live in the modal window; an
     // inline sheet's layout fills this view.
-    val width = r - l
-    val height = b - t
+    layoutChildren(r - l, b - t)
+    if (changed) onLayoutChange?.invoke()
+    if (forcePendingLayout()) {
+      layoutChildren(r - l, b - t)
+      if (forcePendingLayout()) scheduleLayout()
+    }
+  }
+
+  private fun layoutChildren(width: Int, height: Int) {
     for (i in 0 until childCount) {
       val child = getChildAt(i)
       child.measure(
@@ -88,7 +96,22 @@ class NitroModalHostView(context: ThemedReactContext) : ViewGroup(context), Reac
       )
       child.layout(0, 0, width, height)
     }
-    if (changed) onLayoutChange?.invoke()
+  }
+
+  /**
+   * Whether a view in the sheet's layout waits for a layout pass. Marks the
+   * views above it so the next pass reaches it. The React content is laid out
+   * by Fabric, and gone views take no part in layout.
+   */
+  private fun forcePendingLayout(view: ViewGroup = this): Boolean {
+    var pending = false
+    for (i in 0 until view.childCount) {
+      val child = view.getChildAt(i)
+      if (child.visibility == GONE || child is ModalContentRoot) continue
+      if ((child is ViewGroup && forcePendingLayout(child)) || child.isLayoutRequested) pending = true
+    }
+    if (pending && view !== this) view.forceLayout()
+    return pending
   }
 
   override fun onAttachedToWindow() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modal",
-  "version": "0.3.5-rc",
+  "version": "0.3.7-rc",
   "description": "react native native modal",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",