Fix UIView scroll offset max clamping

Take the view's bounds into effect when clamping the maximum offset value
cashapp · Oct 28, 2024 · b889519 · b889519
1 parent efe412e
commit b889519
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
@@ -140,12 +140,15 @@ internal class YogaUIView : UIScrollView(cValue { CGRectZero }), UIScrollViewDel
   override fun scrollViewDidScroll(scrollView: UIScrollView) {
     val onScroll = onScroll
     if (onScroll != null) {
+      val size = scrollView.bounds.useContents {
+        if (isColumn()) size.height else size.width
+      }
       val max = scrollView.contentSize.useContents {
         if (isColumn()) height else width
       }
       val offset = scrollView.contentOffset.useContents {
         if (isColumn()) y else x
-      }.coerceIn(minimumValue = 0.0, maximumValue = max)
+      }.coerceIn(minimumValue = 0.0, maximumValue = max - size)
       onScroll(Px(offset))
     }
   }