Merge remote-tracking branch 'upstream/main'

2026-09-09 00:01:25 +00:00
parent 54ed2be8f3 007c893de1
commit 0c15d06baf
1 changed files with 5 additions and 0 deletions
@@ -182,6 +182,11 @@ function BottomSheetNativeComponentInner({
          },
          maxHeight != null && {maxHeight},
          Platform.OS === 'android' && {
+            /*
+             * The native canvas is sized after the first layout. Allow content
+             * measured without a height constraint to shrink to that canvas.
+             */
+            flexShrink: 1,
            borderTopLeftRadius: cornerRadius,
            borderTopRightRadius: cornerRadius,
            overflow: 'hidden',