@react-navigation/drawer 7.13.8 → 7.13.9

package/lib/module/views/DrawerView.js

@@ -56,8 +56,9 @@ function DrawerViewBase({
   React.useEffect(() => {
     const previousRouteKey = previousRouteKeyRef.current;
     if (previousRouteKey !== focusedRouteKey && descriptors[previousRouteKey]?.options.popToTopOnBlur) {
-      const prevRoute = state.routes.find(route => route.key === previousRouteKey);
-      if (prevRoute?.state?.type === 'stack' && prevRoute.state.key) {
+      const currentState = navigation.getState();
+      const prevRoute = currentState.routes.find(route => route.key === previousRouteKey);
+      if (prevRoute?.state?.type === 'stack' && prevRoute.state.key && (prevRoute.state.index ?? prevRoute.state.routes.length - 1) > 0) {
         navigation.dispatch({
           ...StackActions.popToTop(),
           target: prevRoute.state.key
@@ -65,7 +66,7 @@ function DrawerViewBase({
       }
     }
     previousRouteKeyRef.current = focusedRouteKey;
-  }, [descriptors, focusedRouteKey, navigation, state.routes]);
+  }, [descriptors, focusedRouteKey, navigation]);
   const dimensions = useFrameSize(size => size, true);
   const {
     colors

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

@@ -1 +1 @@
-{"version":3,"names":["getHeaderTitle","Header","SafeAreaProviderCompat","Screen","useFrameSize","DrawerActions","StackActions","useLocale","useTheme","React","Platform","StyleSheet","Drawer","useLatestCallback","addCancelListener","DrawerPositionContext","DrawerStatusContext","getDrawerStatusFromState","DrawerContent","DrawerToggleButton","MaybeScreen","MaybeScreenContainer","jsx","_jsx","DRAWER_BORDER_RADIUS","renderDrawerContentDefault","props","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","detachInactiveScreens","OS","direction","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","select","ios","default","configureGestureHandler","keyboardDismissMode","overlayColor","overlayStyle","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","useState","includes","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","popToTopOnBlur","prevRoute","find","route","type","dispatch","popToTop","target","dimensions","size","colors","drawerStatus","handleDrawerOpen","openDrawer","handleDrawerClose","closeDrawer","handleGestureStart","emit","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","handleHardwareBack","isFocused","renderDrawerContent","Provider","value","children","renderSceneContent","enabled","hasTwoStates","style","styles","content","map","descriptor","lazy","isPreloaded","preloadedRouteKeys","freezeOnBlur","header","layout","title","name","headerLeft","headerRight","headerShown","headerStatusBarHeight","headerTransparent","sceneStyle","absoluteFill","zIndex","visible","shouldFreeze","focused","render","open","onOpen","onClose","onGestureStart","onGestureEnd","onGestureCancel","onTransitionStart","onTransitionEnd","hideStatusBarOnOpen","statusBarAnimation","backgroundColor","card","borderLeftColor","border","borderLeftWidth","hairlineWidth","borderRightColor","borderRightWidth","borderTopRightRadius","borderBottomRightRadius","borderTopLeftRadius","borderBottomLeftRadius","DrawerView","rest","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerView.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getHeaderTitle","Header","SafeAreaProviderCompat","Screen","useFrameSize","DrawerActions","StackActions","useLocale","useTheme","React","Platform","StyleSheet","Drawer","useLatestCallback","addCancelListener","DrawerPositionContext","DrawerStatusContext","getDrawerStatusFromState","DrawerContent","DrawerToggleButton","MaybeScreen","MaybeScreenContainer","jsx","_jsx","DRAWER_BORDER_RADIUS","renderDrawerContentDefault","props","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","detachInactiveScreens","OS","direction","focusedRouteKey","routes","index","key","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","select","ios","default","configureGestureHandler","keyboardDismissMode","overlayColor","overlayStyle","swipeEdgeWidth","swipeEnabled","swipeMinDistance","overlayAccessibilityLabel","options","loaded","setLoaded","useState","includes","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","popToTopOnBlur","currentState","getState","prevRoute","find","route","type","length","dispatch","popToTop","target","dimensions","size","colors","drawerStatus","handleDrawerOpen","openDrawer","handleDrawerClose","closeDrawer","handleGestureStart","emit","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","handleHardwareBack","isFocused","renderDrawerContent","Provider","value","children","renderSceneContent","enabled","hasTwoStates","style","styles","content","map","descriptor","lazy","isPreloaded","preloadedRouteKeys","freezeOnBlur","header","layout","title","name","headerLeft","headerRight","headerShown","headerStatusBarHeight","headerTransparent","sceneStyle","absoluteFill","zIndex","visible","shouldFreeze","focused","render","open","onOpen","onClose","onGestureStart","onGestureEnd","onGestureCancel","onTransitionStart","onTransitionEnd","hideStatusBarOnOpen","statusBarAnimation","backgroundColor","card","borderLeftColor","border","borderLeftWidth","hairlineWidth","borderRightColor","borderRightWidth","borderTopRightRadius","borderBottomRightRadius","borderTopLeftRadius","borderBottomLeftRadius","DrawerView","rest","create","flex"],"sourceRoot":"../../../src","sources":["views/DrawerView.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"DrawerView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EACjB,KAAK,aAAa,EAInB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,KAAK,EAEV,mBAAmB,EAEnB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,aAAU,CAAC;AASlB,KAAK,KAAK,GAAG,sBAAsB,GAAG;IACpC,aAAa,EAAE,YAAY,CAAC;IAC5B,KAAK,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC5C,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AA2TF,wBAAgB,UAAU,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,KAAK,qBAMxD"}
+{"version":3,"file":"DrawerView.d.ts","sourceRoot":"","sources":["../../../../src/views/DrawerView.tsx"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EACjB,KAAK,aAAa,EAInB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,KAAK,EAEV,mBAAmB,EAEnB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,aAAU,CAAC;AASlB,KAAK,KAAK,GAAG,sBAAsB,GAAG;IACpC,aAAa,EAAE,YAAY,CAAC;IAC5B,KAAK,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC5C,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAgUF,wBAAgB,UAAU,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,KAAK,qBAMxD"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/drawer",
   "description": "Integration for the drawer component from react-native-drawer-layout",
-  "version": "7.13.8",
+  "version": "7.13.9",
   "keywords": [
     "react-native-component",
     "react-component",
@@ -46,7 +46,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/elements": "^2.9.38",
+    "@react-navigation/elements": "^2.9.39",
     "color": "^4.2.3",
     "react-native-drawer-layout": "^4.2.10",
     "use-latest-callback": "^0.2.4"
@@ -55,7 +55,7 @@
     "@babel/core": "^7.29.0",
     "@jest/globals": "^30.0.0",
     "@react-native/metro-config": "0.85.3",
-    "@react-navigation/native": "^7.3.16",
+    "@react-navigation/native": "^7.3.17",
     "@testing-library/react-native": "^13.2.1",
     "@types/react": "~19.2.4",
     "del-cli": "^6.0.0",
@@ -71,7 +71,7 @@
     "typescript": "~6.0.3"
   },
   "peerDependencies": {
-    "@react-navigation/native": "^7.3.16",
+    "@react-navigation/native": "^7.3.17",
     "react": ">= 18.2.0",
     "react-native": "*",
     "react-native-gesture-handler": ">= 2.0.0",
@@ -97,5 +97,5 @@
       ]
     ]
   },
-  "gitHead": "749aaf57b5189363194d63a6b09fe29bacc6740f"
+  "gitHead": "900d2c4d80d9c1a0b5acae0740cc0716312a4126"
 }

package/src/views/DrawerView.tsx

@@ -93,11 +93,16 @@ function DrawerViewBase({
       previousRouteKey !== focusedRouteKey &&
       descriptors[previousRouteKey]?.options.popToTopOnBlur
     ) {
-      const prevRoute = state.routes.find(
+      const currentState = navigation.getState();
+      const prevRoute = currentState.routes.find(
         (route) => route.key === previousRouteKey
       );
 
-      if (prevRoute?.state?.type === 'stack' && prevRoute.state.key) {
+      if (
+        prevRoute?.state?.type === 'stack' &&
+        prevRoute.state.key &&
+        (prevRoute.state.index ?? prevRoute.state.routes.length - 1) > 0
+      ) {
         navigation.dispatch({
           ...StackActions.popToTop(),
           target: prevRoute.state.key,
@@ -106,7 +111,7 @@ function DrawerViewBase({
     }
 
     previousRouteKeyRef.current = focusedRouteKey;
-  }, [descriptors, focusedRouteKey, navigation, state.routes]);
+  }, [descriptors, focusedRouteKey, navigation]);
 
   const dimensions = useFrameSize((size) => size, true);