@react-navigation/drawer 6.5.4 → 6.5.6

package/lib/typescript/src/views/modern/Overlay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Overlay.d.ts","sourceRoot":"","sources":["../../../../../src/views/modern/Overlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,QAGN,MAAM,yBAAyB,CAAC;AASjC,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAJD,SAAS,WAAW,CAAC,MAAM,CAAC;aAC7B,MAAM,IAAI;uCAoCnB,CAAC;AAsBH,eAAe,OAAO,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/drawer",
   "description": "Drawer navigator component with animated transitions and gesturess",
-  "version": "6.5.4",
+  "version": "6.5.6",
   "keywords": [
     "react-native-component",
     "react-component",
@@ -41,19 +41,19 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/elements": "^1.3.10",
+    "@react-navigation/elements": "^1.3.12",
     "color": "^4.2.3",
     "warn-once": "^0.1.0"
   },
   "devDependencies": {
-    "@react-navigation/native": "^6.1.0",
+    "@react-navigation/native": "^6.1.1",
     "@testing-library/react-native": "^11.5.0",
     "@types/react": "~18.0.0",
     "@types/react-native": "~0.69.1",
     "del-cli": "^3.0.1",
     "react": "18.0.0",
     "react-native": "0.69.5",
-    "react-native-builder-bob": "^0.18.1",
+    "react-native-builder-bob": "^0.20.3",
     "react-native-gesture-handler": "~2.5.0",
     "react-native-reanimated": "~2.9.1",
     "react-native-safe-area-context": "4.3.1",
@@ -83,5 +83,5 @@
       ]
     ]
   },
-  "gitHead": "f7a9b1d102e5ff04ce3f726b934019ddbdd0550c"
+  "gitHead": "8f8bf02bb77c85cd7a6451533642451954301a94"
 }

package/src/views/modern/Drawer.tsx

@@ -30,6 +30,12 @@ import Overlay from './Overlay';
 const SWIPE_DISTANCE_MINIMUM = 5;
 const DEFAULT_DRAWER_WIDTH = '80%';
 
+type ToggleOptions = {
+  open: boolean;
+  isUserInitiated: boolean;
+  velocity?: number;
+};
+
 const minmax = (value: number, start: number, end: number) => {
   'worklet';
 
@@ -148,7 +154,7 @@ export default function Drawer({
   const gestureState = useSharedValue<GestureState>(GestureState.UNDETERMINED);
 
   const toggleDrawer = React.useCallback(
-    (open: boolean, velocity?: number) => {
+    ({ open, isUserInitiated, velocity }: ToggleOptions) => {
       'worklet';
 
       const translateX = getDrawerTranslationX(open);
@@ -165,6 +171,10 @@ export default function Drawer({
         restSpeedThreshold: 0.01,
       });
 
+      if (!isUserInitiated) {
+        return;
+      }
+
       if (open) {
         runOnJS(onOpen)();
       } else {
@@ -174,7 +184,10 @@ export default function Drawer({
     [getDrawerTranslationX, onClose, onOpen, touchStartX, touchX, translationX]
   );
 
-  React.useEffect(() => toggleDrawer(open), [open, toggleDrawer]);
+  React.useEffect(
+    () => toggleDrawer({ open, isUserInitiated: false }),
+    [open, toggleDrawer]
+  );
 
   const onGestureEvent = useAnimatedGestureHandler<
     PanGestureHandlerGestureEvent,
@@ -213,7 +226,11 @@ export default function Drawer({
               (event.velocityX === 0 ? event.translationX : event.velocityX) < 0
           : open;
 
-      toggleDrawer(nextOpen, event.velocityX);
+      toggleDrawer({
+        open: nextOpen,
+        isUserInitiated: true,
+        velocity: event.velocityX,
+      });
     },
     onFinish: () => {
       runOnJS(onGestureFinish)();
@@ -357,7 +374,9 @@ export default function Drawer({
             {drawerType !== 'permanent' ? (
               <Overlay
                 progress={progress}
-                onPress={() => toggleDrawer(false)}
+                onPress={() =>
+                  toggleDrawer({ open: false, isUserInitiated: true })
+                }
                 style={overlayStyle}
               />
             ) : null}

package/src/views/modern/Overlay.tsx

@@ -63,6 +63,7 @@ const styles = StyleSheet.create({
   },
   pressable: {
     flex: 1,
+    pointerEvents: 'auto',
   },
 });