@react-navigation/drawer 8.0.0-alpha.21 → 8.0.0-alpha.23

package/lib/module/views/DrawerContentScrollView.js

@@ -2,46 +2,54 @@
 
 import { UNSTABLE_CornerInset, useLocale } from '@react-navigation/native';
 import * as React from 'react';
-import { ScrollView, StyleSheet } from 'react-native';
+import { Platform, ScrollView, StyleSheet } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { DrawerPositionContext } from "../utils/DrawerPositionContext.js";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const SPACING = 12;
-function DrawerContentScrollViewInner({
+export function DrawerContentScrollView({
+  contentInsetAdjustmentBehavior = 'automatic',
   contentContainerStyle,
   style,
   children,
+  ref,
   ...rest
-}, ref) {
+}) {
   const drawerPosition = React.use(DrawerPositionContext);
   const insets = useSafeAreaInsets();
   const {
     direction
   } = useLocale();
   const isRight = direction === 'rtl' ? drawerPosition === 'left' : drawerPosition === 'right';
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsxs(ScrollView, {
-      ...rest,
-      ref: ref,
-      contentContainerStyle: [{
-        paddingBottom: SPACING + insets.bottom,
-        paddingStart: SPACING + (!isRight ? insets.left : 0),
-        paddingEnd: SPACING + (isRight ? insets.right : 0)
-      }, contentContainerStyle],
-      style: [styles.container, style],
-      children: [/*#__PURE__*/_jsx(UNSTABLE_CornerInset, {
-        direction: "vertical",
-        edge: "top",
-        style: {
-          // We don't want to apply both safe area and corner insets
-          minHeight: insets.top,
-          marginBottom: SPACING
-        }
-      }), children]
-    })
+  return /*#__PURE__*/_jsxs(ScrollView, {
+    ...rest,
+    ref: ref,
+    contentInsetAdjustmentBehavior: contentInsetAdjustmentBehavior,
+    contentContainerStyle: [{
+      paddingTop: SPACING + Platform.select({
+        ios: 0,
+        default: insets.top
+      }),
+      paddingBottom: SPACING + Platform.select({
+        ios: 0,
+        default: insets.bottom
+      }),
+      paddingStart: SPACING + (!isRight ? Platform.select({
+        ios: 0,
+        default: insets.left
+      }) : 0),
+      paddingEnd: SPACING + (isRight ? Platform.select({
+        ios: 0,
+        default: insets.right
+      }) : 0)
+    }, contentContainerStyle],
+    style: [styles.container, style],
+    children: [Platform.OS === 'ios' && contentInsetAdjustmentBehavior !== 'never' && /*#__PURE__*/_jsx(UNSTABLE_CornerInset, {
+      direction: "vertical",
+      edge: "top"
+    }), children]
   });
 }
-export const DrawerContentScrollView = /*#__PURE__*/React.forwardRef(DrawerContentScrollViewInner);
 const styles = StyleSheet.create({
   container: {
     flex: 1

package/lib/module/views/DrawerContentScrollView.js.map

@@ -1 +1 @@
-{"version":3,"names":["UNSTABLE_CornerInset","useLocale","React","ScrollView","StyleSheet","useSafeAreaInsets","DrawerPositionContext","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","SPACING","DrawerContentScrollViewInner","contentContainerStyle","style","children","rest","ref","drawerPosition","use","insets","direction","isRight","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","edge","minHeight","top","marginBottom","DrawerContentScrollView","forwardRef","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";;AAAA,SAASA,oBAAoB,EAAEC,SAAS,QAAQ,0BAA0B;AAC1E,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,EAAwBC,UAAU,QAAQ,cAAc;AAC3E,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,qBAAqB,QAAQ,mCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA,EAAAC,QAAA,IAAAC,SAAA;AAMvE,MAAMC,OAAO,GAAG,EAAE;AAElB,SAASC,4BAA4BA,CACnC;EAAEC,qBAAqB;EAAEC,KAAK;EAAEC,QAAQ;EAAE,GAAGC;AAAY,CAAC,EAC1DC,GAA2B,EAC3B;EACA,MAAMC,cAAc,GAAGlB,KAAK,CAACmB,GAAG,CAACf,qBAAqB,CAAC;EACvD,MAAMgB,MAAM,GAAGjB,iBAAiB,CAAC,CAAC;EAClC,MAAM;IAAEkB;EAAU,CAAC,GAAGtB,SAAS,CAAC,CAAC;EAEjC,MAAMuB,OAAO,GACXD,SAAS,KAAK,KAAK,GACfH,cAAc,KAAK,MAAM,GACzBA,cAAc,KAAK,OAAO;EAEhC,oBACEZ,IAAA,CAAAI,SAAA;IAAAK,QAAA,eACEP,KAAA,CAACP,UAAU;MAAA,GACLe,IAAI;MACRC,GAAG,EAAEA,GAAI;MACTJ,qBAAqB,EAAE,CACrB;QACEU,aAAa,EAAEZ,OAAO,GAAGS,MAAM,CAACI,MAAM;QACtCC,YAAY,EAAEd,OAAO,IAAI,CAACW,OAAO,GAAGF,MAAM,CAACM,IAAI,GAAG,CAAC,CAAC;QACpDC,UAAU,EAAEhB,OAAO,IAAIW,OAAO,GAAGF,MAAM,CAACQ,KAAK,GAAG,CAAC;MACnD,CAAC,EACDf,qBAAqB,CACrB;MACFC,KAAK,EAAE,CAACe,MAAM,CAACC,SAAS,EAAEhB,KAAK,CAAE;MAAAC,QAAA,gBAEjCT,IAAA,CAACR,oBAAoB;QACnBuB,SAAS,EAAC,UAAU;QACpBU,IAAI,EAAC,KAAK;QACVjB,KAAK,EAAE;UACL;UACAkB,SAAS,EAAEZ,MAAM,CAACa,GAAG;UACrBC,YAAY,EAAEvB;QAChB;MAAE,CACH,CAAC,EACDI,QAAQ;IAAA,CACC;EAAC,CACb,CAAC;AAEP;AAEA,OAAO,MAAMoB,uBAAuB,gBAAGnC,KAAK,CAACoC,UAAU,CACrDxB,4BACF,CAAC;AAED,MAAMiB,MAAM,GAAG3B,UAAU,CAACmC,MAAM,CAAC;EAC/BP,SAAS,EAAE;IACTQ,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["UNSTABLE_CornerInset","useLocale","React","Platform","ScrollView","StyleSheet","useSafeAreaInsets","DrawerPositionContext","jsx","_jsx","jsxs","_jsxs","SPACING","DrawerContentScrollView","contentInsetAdjustmentBehavior","contentContainerStyle","style","children","ref","rest","drawerPosition","use","insets","direction","isRight","paddingTop","select","ios","default","top","paddingBottom","bottom","paddingStart","left","paddingEnd","right","styles","container","OS","edge","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerContentScrollView.tsx"],"mappings":";;AAAA,SAASA,oBAAoB,EAAEC,SAAS,QAAQ,0BAA0B;AAC1E,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SACEC,QAAQ,EACRC,UAAU,EAEVC,UAAU,QACL,cAAc;AACrB,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,qBAAqB,QAAQ,mCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAOvE,MAAMC,OAAO,GAAG,EAAE;AAElB,OAAO,SAASC,uBAAuBA,CAAC;EACtCC,8BAA8B,GAAG,WAAW;EAC5CC,qBAAqB;EACrBC,KAAK;EACLC,QAAQ;EACRC,GAAG;EACH,GAAGC;AACE,CAAC,EAAE;EACR,MAAMC,cAAc,GAAGlB,KAAK,CAACmB,GAAG,CAACd,qBAAqB,CAAC;EACvD,MAAMe,MAAM,GAAGhB,iBAAiB,CAAC,CAAC;EAClC,MAAM;IAAEiB;EAAU,CAAC,GAAGtB,SAAS,CAAC,CAAC;EAEjC,MAAMuB,OAAO,GACXD,SAAS,KAAK,KAAK,GACfH,cAAc,KAAK,MAAM,GACzBA,cAAc,KAAK,OAAO;EAEhC,oBACET,KAAA,CAACP,UAAU;IAAA,GACLe,IAAI;IACRD,GAAG,EAAEA,GAAI;IACTJ,8BAA8B,EAAEA,8BAA+B;IAC/DC,qBAAqB,EAAE,CACrB;MACEU,UAAU,EACRb,OAAO,GAAGT,QAAQ,CAACuB,MAAM,CAAC;QAAEC,GAAG,EAAE,CAAC;QAAEC,OAAO,EAAEN,MAAM,CAACO;MAAI,CAAC,CAAC;MAC5DC,aAAa,EACXlB,OAAO,GAAGT,QAAQ,CAACuB,MAAM,CAAC;QAAEC,GAAG,EAAE,CAAC;QAAEC,OAAO,EAAEN,MAAM,CAACS;MAAO,CAAC,CAAC;MAC/DC,YAAY,EACVpB,OAAO,IACN,CAACY,OAAO,GAAGrB,QAAQ,CAACuB,MAAM,CAAC;QAAEC,GAAG,EAAE,CAAC;QAAEC,OAAO,EAAEN,MAAM,CAACW;MAAK,CAAC,CAAC,GAAG,CAAC,CAAC;MACpEC,UAAU,EACRtB,OAAO,IACNY,OAAO,GAAGrB,QAAQ,CAACuB,MAAM,CAAC;QAAEC,GAAG,EAAE,CAAC;QAAEC,OAAO,EAAEN,MAAM,CAACa;MAAM,CAAC,CAAC,GAAG,CAAC;IACrE,CAAC,EACDpB,qBAAqB,CACrB;IACFC,KAAK,EAAE,CAACoB,MAAM,CAACC,SAAS,EAAErB,KAAK,CAAE;IAAAC,QAAA,GAEhCd,QAAQ,CAACmC,EAAE,KAAK,KAAK,IAAIxB,8BAA8B,KAAK,OAAO,iBAClEL,IAAA,CAACT,oBAAoB;MAACuB,SAAS,EAAC,UAAU;MAACgB,IAAI,EAAC;IAAK,CAAE,CACxD,EACAtB,QAAQ;EAAA,CACC,CAAC;AAEjB;AAEA,MAAMmB,MAAM,GAAG/B,UAAU,CAACmC,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/src/views/DrawerContentScrollView.d.ts

@@ -1,6 +1,9 @@
 import * as React from 'react';
 import { ScrollView, type ScrollViewProps } from 'react-native';
-export declare const DrawerContentScrollView: React.ForwardRefExoticComponent<ScrollViewProps & {
+type Props = ScrollViewProps & {
     children: React.ReactNode;
-} & React.RefAttributes<ScrollView>>;
+    ref?: React.Ref<ScrollView>;
+};
+export declare function DrawerContentScrollView({ contentInsetAdjustmentBehavior, contentContainerStyle, style, children, ref, ...rest }: Props): import("react/jsx-runtime").JSX.Element;
+export {};
 //# sourceMappingURL=DrawerContentScrollView.d.ts.map

package/lib/typescript/src/views/DrawerContentScrollView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawerContentScrollView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerContentScrollView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAc,MAAM,cAAc,CAAC;AAsD5E,eAAO,MAAM,uBAAuB;cAhDxB,KAAK,CAAC,SAAS;oCAkD1B,CAAC"}
+{"version":3,"file":"DrawerContentScrollView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerContentScrollView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,UAAU,EACV,KAAK,eAAe,EAErB,MAAM,cAAc,CAAC;AAKtB,KAAK,KAAK,GAAG,eAAe,GAAG;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;CAC7B,CAAC;AAIF,wBAAgB,uBAAuB,CAAC,EACtC,8BAA4C,EAC5C,qBAAqB,EACrB,KAAK,EACL,QAAQ,EACR,GAAG,EACH,GAAG,IAAI,EACR,EAAE,KAAK,2CAsCP"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/drawer",
   "description": "Integration for the drawer component from react-native-drawer-layout",
-  "version": "8.0.0-alpha.21",
+  "version": "8.0.0-alpha.23",
   "keywords": [
     "react-native-component",
     "react-component",
@@ -46,20 +46,20 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/elements": "^3.0.0-alpha.19",
-    "color": "^4.2.3",
-    "react-native-drawer-layout": "^5.0.0-alpha.5",
-    "use-latest-callback": "^0.3.2"
+    "@react-navigation/elements": "^3.0.0-alpha.21",
+    "color": "^5.0.3",
+    "react-native-drawer-layout": "^5.0.0-alpha.6",
+    "use-latest-callback": "^0.3.3"
   },
   "devDependencies": {
-    "@jest/globals": "^30.0.0",
-    "@react-navigation/native": "^8.0.0-alpha.17",
+    "@jest/globals": "^30.3.0",
+    "@react-navigation/native": "^8.0.0-alpha.18",
     "@testing-library/react-native": "^13.3.3",
     "@types/react": "~19.2.2",
-    "del-cli": "^6.0.0",
+    "del-cli": "^7.0.0",
     "react": "19.2.0",
-    "react-native": "0.83.2",
-    "react-native-builder-bob": "^0.40.12",
+    "react-native": "0.83.4",
+    "react-native-builder-bob": "^0.41.0",
     "react-native-gesture-handler": "~2.30.0",
     "react-native-reanimated": "~4.2.1",
     "react-native-safe-area-context": "~5.6.2",
@@ -69,7 +69,7 @@
     "typescript": "^6.0.2"
   },
   "peerDependencies": {
-    "@react-navigation/native": "^8.0.0-alpha.17",
+    "@react-navigation/native": "^8.0.0-alpha.18",
     "react": ">= 19.2.0",
     "react-native": "*",
     "react-native-gesture-handler": ">= 2.0.0",
@@ -96,5 +96,5 @@
       ]
     ]
   },
-  "gitHead": "71f3b00d579a18e8a67d96722862deddc876a3f7"
+  "gitHead": "18da535b07fc86a30700efc4d824ef58271d2b8f"
 }

package/src/views/DrawerContentScrollView.tsx

@@ -1,20 +1,30 @@
 import { UNSTABLE_CornerInset, useLocale } from '@react-navigation/native';
 import * as React from 'react';
-import { ScrollView, type ScrollViewProps, StyleSheet } from 'react-native';
+import {
+  Platform,
+  ScrollView,
+  type ScrollViewProps,
+  StyleSheet,
+} from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { DrawerPositionContext } from '../utils/DrawerPositionContext';
 
 type Props = ScrollViewProps & {
   children: React.ReactNode;
+  ref?: React.Ref<ScrollView>;
 };
 
 const SPACING = 12;
 
-function DrawerContentScrollViewInner(
-  { contentContainerStyle, style, children, ...rest }: Props,
-  ref?: React.Ref<ScrollView>
-) {
+export function DrawerContentScrollView({
+  contentInsetAdjustmentBehavior = 'automatic',
+  contentContainerStyle,
+  style,
+  children,
+  ref,
+  ...rest
+}: Props) {
   const drawerPosition = React.use(DrawerPositionContext);
   const insets = useSafeAreaInsets();
   const { direction } = useLocale();
@@ -25,39 +35,35 @@ function DrawerContentScrollViewInner(
       : drawerPosition === 'right';
 
   return (
-    <>
-      <ScrollView
-        {...rest}
-        ref={ref}
-        contentContainerStyle={[
-          {
-            paddingBottom: SPACING + insets.bottom,
-            paddingStart: SPACING + (!isRight ? insets.left : 0),
-            paddingEnd: SPACING + (isRight ? insets.right : 0),
-          },
-          contentContainerStyle,
-        ]}
-        style={[styles.container, style]}
-      >
-        <UNSTABLE_CornerInset
-          direction="vertical"
-          edge="top"
-          style={{
-            // We don't want to apply both safe area and corner insets
-            minHeight: insets.top,
-            marginBottom: SPACING,
-          }}
-        />
-        {children}
-      </ScrollView>
-    </>
+    <ScrollView
+      {...rest}
+      ref={ref}
+      contentInsetAdjustmentBehavior={contentInsetAdjustmentBehavior}
+      contentContainerStyle={[
+        {
+          paddingTop:
+            SPACING + Platform.select({ ios: 0, default: insets.top }),
+          paddingBottom:
+            SPACING + Platform.select({ ios: 0, default: insets.bottom }),
+          paddingStart:
+            SPACING +
+            (!isRight ? Platform.select({ ios: 0, default: insets.left }) : 0),
+          paddingEnd:
+            SPACING +
+            (isRight ? Platform.select({ ios: 0, default: insets.right }) : 0),
+        },
+        contentContainerStyle,
+      ]}
+      style={[styles.container, style]}
+    >
+      {Platform.OS === 'ios' && contentInsetAdjustmentBehavior !== 'never' && (
+        <UNSTABLE_CornerInset direction="vertical" edge="top" />
+      )}
+      {children}
+    </ScrollView>
   );
 }
 
-export const DrawerContentScrollView = React.forwardRef(
-  DrawerContentScrollViewInner
-);
-
 const styles = StyleSheet.create({
   container: {
     flex: 1,