fix sheet padding

Author: mozzius

src/components/Dialog/index.tsx

@@ -182,6 +182,9 @@ export function Outer({
   )
 }
 
+/**
+ * @deprecated use `Dialog.ScrollableInner` instead
+ */
 export function Inner({children, style, header}: DialogInnerProps) {
   const insets = useSafeAreaInsets()
   return (
@@ -207,6 +210,7 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
   ) {
     const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
     const insets = useSafeAreaInsets()
+    const [contentSize, setContentSize] = React.useState(0)
 
     useEnableKeyboardController(isIOS)
 
@@ -225,14 +229,10 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
     let paddingBottom = 0
     if (isIOS) {
       paddingBottom += keyboardHeight / 4
-      if (isIOS26) {
-        paddingBottom += tokens.space.xl
-      } else {
-        if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
-          paddingBottom += insets.bottom + tokens.space.md
-        }
-        paddingBottom = Math.max(paddingBottom, tokens.space._2xl)
+      if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
+        paddingBottom += insets.bottom + tokens.space.md
       }
+      paddingBottom = Math.max(paddingBottom, tokens.space._2xl)
     } else {
       paddingBottom += keyboardHeight
       if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
@@ -254,11 +254,37 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
       }
     }
 
+    // iOS26 floaty sheets have this annoying extra safe area when sheets are 150px or more
+    // TODO: Remove this behaviour on the native side!! I could not figure it out -sfn
+    //
+    // fix by using a negative margin on the scrollview when the sheet is in this zone (it's fine for large sheets)
+    const IOS_MIN_HEIGHT_FOR_SAFEAREA = 151
+    const IOS_MAX_HEIGHT_FOR_SAFEAREA = 400
+    const iosAutoSafeAreaHeightAdjust = 34
+    const shouldAttemptUndoSafeArea =
+      isIOS26 &&
+      contentSize > IOS_MIN_HEIGHT_FOR_SAFEAREA &&
+      contentSize < IOS_MAX_HEIGHT_FOR_SAFEAREA
+    const adjustedSize =
+      contentSize -
+      (shouldAttemptUndoSafeArea ? iosAutoSafeAreaHeightAdjust : 0)
+    // reducing the padding obviously then makes it dip back under 150px, so we need to adjust
+    // again to ensure a minimum height of 150
+    const ensureMinHeight = Math.min(
+      0,
+      adjustedSize - IOS_MIN_HEIGHT_FOR_SAFEAREA,
+    )
+    const marginBottom = shouldAttemptUndoSafeArea
+      ? iosAutoSafeAreaHeightAdjust * -1 - ensureMinHeight
+      : 0
+
     return (
       <KeyboardAwareScrollView
+        style={[{marginBottom}]}
+        onContentSizeChange={(_width, height) => setContentSize(height)}
         contentContainerStyle={[
           a.pt_2xl,
-          a.px_xl,
+          a.px_2xl,
           {paddingBottom},
           contentContainerStyle,
         ]}

src/components/Menu/index.tsx

@@ -270,7 +270,8 @@ export function ContainerItem({
         a.align_center,
         a.gap_sm,
         a.px_md,
-        a.rounded_md,
+        a.rounded_lg,
+        a.curve_continuous,
         a.border,
         t.atoms.bg_contrast_25,
         t.atoms.border_contrast_low,
@@ -308,7 +309,8 @@ export function Group({children, style}: GroupProps) {
   return (
     <View
       style={[
-        a.rounded_md,
+        a.rounded_lg,
+        a.curve_continuous,
         a.overflow_hidden,
         a.border,
         t.atoms.border_contrast_low,