Clamp scroll callback offset to content size maximum (#2334)

cashapp · Sep 26, 2024 · a2e645f · a2e645f
1 parent 501ad05
commit a2e645f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/redwood-layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/YogaUIView.kt b/redwood-layout-uiview/src/commonMain/kotlin/app/cash/redwood/layout/uiview/YogaUIView.kt
@@ -139,9 +139,12 @@ internal class YogaUIView(
   override fun scrollViewDidScroll(scrollView: UIScrollView) {
     val onScroll = onScroll
     if (onScroll != null) {
+      val max = scrollView.contentSize.useContents {
+        if (isColumn()) height else width
+      }
       val offset = scrollView.contentOffset.useContents {
         if (isColumn()) y else x
-      }.coerceAtLeast(0.0)
+      }.coerceIn(minimumValue = 0.0, maximumValue = max)
       onScroll(Px(offset))
     }
   }