@react-navigation/drawer 8.0.0-alpha.49 → 8.0.0-alpha.50

package/lib/module/views/DrawerView.js

@@ -59,8 +59,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 || prevRoute.state.routes[0]?.history?.length)) {
         navigation.dispatch({
           ...StackActions.popToTop(),
           target: prevRoute.state.key
@@ -68,7 +69,7 @@ function DrawerViewBase({
       }
     }
     previousRouteKeyRef.current = focusedRouteKey;
-  }, [descriptors, focusedRouteKey, navigation, state.routes]);
+  }, [descriptors, focusedRouteKey, navigation]);
   const {
     colors
   } = useTheme();

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

@@ -1 +1 @@
-{"version":3,"names":["getHeaderTitle","Header","ActivityView","Container","SafeAreaProviderCompat","Screen","ScreenContent","DrawerActions","StackActions","useLocale","useTheme","React","Platform","StyleSheet","Drawer","useLatestCallback","addCancelListener","DrawerPositionContext","DrawerStatusContext","getDrawerStatusFromState","DrawerContent","DrawerToggleButton","jsx","_jsx","DRAWER_BORDER_RADIUS","renderDrawerContentDefault","props","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","direction","focusedRoute","routes","index","Error","focusedRouteKey","key","focusedOptions","options","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","select","ios","default","configureGestureHandler","keyboardDismissMode","swipeEdgeWidth","swipeEnabled","OS","swipeMinDistance","overlayStyle","overlayAccessibilityLabel","loaded","setLoaded","useState","includes","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","popToTopOnBlur","prevRoute","find","route","type","dispatch","popToTop","target","colors","drawerStatus","handleDrawerOpen","openDrawer","handleDrawerClose","closeDrawer","handleGestureStart","emit","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","handleHardwareBack","isFocused","renderDrawerContent","Provider","value","children","renderSceneContent","style","styles","content","map","descriptor","lazy","isPreloaded","preloadedRouteKeys","inactiveBehavior","header","title","name","headerLeft","headerRight","headerShown","headerStatusBarHeight","headerTransparent","sceneStyle","isActive","mode","visible","absoluteFill","zIndex","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","ActivityView","Container","SafeAreaProviderCompat","Screen","ScreenContent","DrawerActions","StackActions","useLocale","useTheme","React","Platform","StyleSheet","Drawer","useLatestCallback","addCancelListener","DrawerPositionContext","DrawerStatusContext","getDrawerStatusFromState","DrawerContent","DrawerToggleButton","jsx","_jsx","DRAWER_BORDER_RADIUS","renderDrawerContentDefault","props","DrawerViewBase","state","navigation","descriptors","defaultStatus","drawerContent","direction","focusedRoute","routes","index","Error","focusedRouteKey","key","focusedOptions","options","drawerHideStatusBarOnOpen","drawerPosition","drawerStatusBarAnimation","drawerStyle","drawerType","select","ios","default","configureGestureHandler","keyboardDismissMode","swipeEdgeWidth","swipeEnabled","OS","swipeMinDistance","overlayStyle","overlayAccessibilityLabel","loaded","setLoaded","useState","includes","previousRouteKeyRef","useRef","useEffect","previousRouteKey","current","popToTopOnBlur","currentState","getState","prevRoute","find","route","type","length","history","dispatch","popToTop","target","colors","drawerStatus","handleDrawerOpen","openDrawer","handleDrawerClose","closeDrawer","handleGestureStart","emit","handleGestureEnd","handleGestureCancel","handleTransitionStart","closing","data","handleTransitionEnd","handleHardwareBack","isFocused","renderDrawerContent","Provider","value","children","renderSceneContent","style","styles","content","map","descriptor","lazy","isPreloaded","preloadedRouteKeys","inactiveBehavior","header","title","name","headerLeft","headerRight","headerShown","headerStatusBarHeight","headerTransparent","sceneStyle","isActive","mode","visible","absoluteFill","zIndex","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":";;AAAA,SAASA,cAAc,EAAEC,MAAM,QAAQ,4BAA4B;AACnE,SACEC,YAAY,EACZC,SAAS,EACTC,sBAAsB,EACtBC,MAAM,IAAIC,aAAa,QAClB,qCAAqC;AAC5C,SACEC,aAAa,EAIbC,YAAY,EACZC,SAAS,EACTC,QAAQ,QACH,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,EAAEC,UAAU,QAAQ,cAAc;AACnD,SAASC,MAAM,QAAQ,4BAA4B;AACnD,OAAOC,iBAAiB,MAAM,qBAAqB;AAUnD,SAASC,iBAAiB,QAAQ,4BAA4B;AAC9D,SAASC,qBAAqB,QAAQ,mCAAgC;AACtE,SAASC,mBAAmB,QAAQ,iCAA8B;AAClE,SAASC,wBAAwB,QAAQ,sCAAmC;AAC5E,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,kBAAkB,QAAQ,yBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAS1D,MAAMC,oBAAoB,GAAG,EAAE;AAE/B,MAAMC,0BAA0B,GAAIC,KAAkC,iBACpEH,IAAA,CAACH,aAAa;EAAA,GAAKM;AAAK,CAAG,CAC5B;AAED,SAASC,cAAcA,CAAC;EACtBC,KAAK;EACLC,UAAU;EACVC,WAAW;EACXC,aAAa;EACbC,aAAa,GAAGP;AACX,CAAC,EAAE;EACR,MAAM;IAAEQ;EAAU,CAAC,GAAGxB,SAAS,CAAC,CAAC;EAEjC,MAAMyB,YAAY,GAAGN,KAAK,CAACO,MAAM,CAACP,KAAK,CAACQ,KAAK,CAAC;EAE9C,IAAIF,YAAY,IAAI,IAAI,EAAE;IACxB,MAAM,IAAIG,KAAK,CAAC,kCAAkCT,KAAK,CAACQ,KAAK,GAAG,CAAC;EACnE;EAEA,MAAME,eAAe,GAAGJ,YAAY,CAACK,GAAG;EACxC,MAAMC,cAAuC,GAC3CV,WAAW,CAACQ,eAAe,CAAC,EAAEG,OAAO,IAAI,CAAC,CAAC;EAE7C,MAAM;IACJC,yBAAyB;IACzBC,cAAc,GAAGV,SAAS,KAAK,KAAK,GAAG,OAAO,GAAG,MAAM;IACvDW,wBAAwB;IACxBC,WAAW;IACXC,UAAU,GAAGlC,QAAQ,CAACmC,MAAM,CAAC;MAAEC,GAAG,EAAE,OAAO;MAAEC,OAAO,EAAE;IAAQ,CAAC,CAAC;IAChEC,uBAAuB;IACvBC,mBAAmB;IACnBC,cAAc;IACdC,YAAY,GAAGzC,QAAQ,CAAC0C,EAAE,KAAK,KAAK,IAClC1C,QAAQ,CAAC0C,EAAE,KAAK,SAAS,IACzB1C,QAAQ,CAAC0C,EAAE,KAAK,OAAO;IACzBC,gBAAgB;IAChBC,YAAY;IACZC;EACF,CAAC,GAAGjB,cAAc;EAElB,MAAM,CAACkB,MAAM,EAAEC,SAAS,CAAC,GAAGhD,KAAK,CAACiD,QAAQ,CAAC,CAACtB,eAAe,CAAC,CAAC;EAE7D,IAAI,CAACoB,MAAM,CAACG,QAAQ,CAACvB,eAAe,CAAC,EAAE;IACrCqB,SAAS,CAAC,CAAC,GAAGD,MAAM,EAAEpB,eAAe,CAAC,CAAC;EACzC;EAEA,MAAMwB,mBAAmB,GAAGnD,KAAK,CAACoD,MAAM,CAACzB,eAAe,CAAC;EAEzD3B,KAAK,CAACqD,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGH,mBAAmB,CAACI,OAAO;IAEpD,IACED,gBAAgB,KAAK3B,eAAe,IACpCR,WAAW,CAACmC,gBAAgB,CAAC,EAAExB,OAAO,CAAC0B,cAAc,EACrD;MACA,MAAMC,YAAY,GAAGvC,UAAU,CAACwC,QAAQ,CAAC,CAAC;MAC1C,MAAMC,SAAS,GAAGF,YAAY,CAACjC,MAAM,CAACoC,IAAI,CACvCC,KAAK,IAAKA,KAAK,CAACjC,GAAG,KAAK0B,gBAC3B,CAAC;MAED,IACEK,SAAS,EAAE1C,KAAK,EAAE6C,IAAI,KAAK,OAAO,IAClCH,SAAS,CAAC1C,KAAK,CAACW,GAAG,KAClB,CAAC+B,SAAS,CAAC1C,KAAK,CAACQ,KAAK,IAAIkC,SAAS,CAAC1C,KAAK,CAACO,MAAM,CAACuC,MAAM,GAAG,CAAC,IAAI,CAAC,IAC/DJ,SAAS,CAAC1C,KAAK,CAACO,MAAM,CAAC,CAAC,CAAC,EAAEwC,OAAO,EAAED,MAAM,CAAC,EAC7C;QACA7C,UAAU,CAAC+C,QAAQ,CAAC;UAClB,GAAGpE,YAAY,CAACqE,QAAQ,CAAC,CAAC;UAC1BC,MAAM,EAAER,SAAS,CAAC1C,KAAK,CAACW;QAC1B,CAAC,CAAC;MACJ;IACF;IAEAuB,mBAAmB,CAACI,OAAO,GAAG5B,eAAe;EAC/C,CAAC,EAAE,CAACR,WAAW,EAAEQ,eAAe,EAAET,UAAU,CAAC,CAAC;EAE9C,MAAM;IAAEkD;EAAO,CAAC,GAAGrE,QAAQ,CAAC,CAAC;EAE7B,MAAMsE,YAAY,GAAG7D,wBAAwB,CAACS,KAAK,CAAC;EAEpD,MAAMqD,gBAAgB,GAAGlE,iBAAiB,CAAC,MAAM;IAC/Cc,UAAU,CAAC+C,QAAQ,CAAC;MAClB,GAAGrE,aAAa,CAAC2E,UAAU,CAAC,CAAC;MAC7BJ,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAM4C,iBAAiB,GAAGpE,iBAAiB,CAAC,MAAM;IAChDc,UAAU,CAAC+C,QAAQ,CAAC;MAClB,GAAGrE,aAAa,CAAC6E,WAAW,CAAC,CAAC;MAC9BN,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAM8C,kBAAkB,GAAGtE,iBAAiB,CAAC,MAAM;IACjDc,UAAU,CAACyD,IAAI,CAAC;MACdb,IAAI,EAAE,cAAc;MACpBK,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMgD,gBAAgB,GAAGxE,iBAAiB,CAAC,MAAM;IAC/Cc,UAAU,CAACyD,IAAI,CAAC;MACdb,IAAI,EAAE,YAAY;MAClBK,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMiD,mBAAmB,GAAGzE,iBAAiB,CAAC,MAAM;IAClDc,UAAU,CAACyD,IAAI,CAAC;MACdb,IAAI,EAAE,eAAe;MACrBK,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMkD,qBAAqB,GAAG1E,iBAAiB,CAAE2E,OAAgB,IAAK;IACpE7D,UAAU,CAACyD,IAAI,CAAC;MACdb,IAAI,EAAE,iBAAiB;MACvBkB,IAAI,EAAE;QAAED;MAAQ,CAAC;MACjBZ,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMqD,mBAAmB,GAAG7E,iBAAiB,CAAE2E,OAAgB,IAAK;IAClE7D,UAAU,CAACyD,IAAI,CAAC;MACdb,IAAI,EAAE,eAAe;MACrBkB,IAAI,EAAE;QAAED;MAAQ,CAAC;MACjBZ,MAAM,EAAElD,KAAK,CAACW;IAChB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF5B,KAAK,CAACqD,SAAS,CAAC,MAAM;IACpB,IAAIgB,YAAY,KAAKjD,aAAa,IAAIe,UAAU,KAAK,WAAW,EAAE;MAChE;IACF;IAEA,MAAM+C,kBAAkB,GAAGA,CAAA,KAAM;MAC/B;MACA;MACA,IAAI,CAAChE,UAAU,CAACiE,SAAS,CAAC,CAAC,EAAE;QAC3B,OAAO,KAAK;MACd;MAEA,IAAI/D,aAAa,KAAK,MAAM,EAAE;QAC5BkD,gBAAgB,CAAC,CAAC;MACpB,CAAC,MAAM;QACLE,iBAAiB,CAAC,CAAC;MACrB;MAEA,OAAO,IAAI;IACb,CAAC;;IAED;IACA;IACA;IACA,OAAOnE,iBAAiB,CAAC6E,kBAAkB,CAAC;EAC9C,CAAC,EAAE,CACD9D,aAAa,EACbiD,YAAY,EACZlC,UAAU,EACVqC,iBAAiB,EACjBF,gBAAgB,EAChBpD,UAAU,CACX,CAAC;EAEF,MAAMkE,mBAAmB,GAAGA,CAAA,KAAM;IAChC,oBACExE,IAAA,CAACN,qBAAqB,CAAC+E,QAAQ;MAACC,KAAK,EAAEtD,cAAe;MAAAuD,QAAA,EACnDlE,aAAa,CAAC;QACbJ,KAAK,EAAEA,KAAK;QACZC,UAAU,EAAEA,UAAU;QACtBC,WAAW,EAAEA;MACf,CAAC;IAAC,CAC4B,CAAC;EAErC,CAAC;EAED,MAAMqE,kBAAkB,GAAGA,CAAA,KAAM;IAC/B,oBACE5E,IAAA,CAACpB,SAAS;MAACiG,KAAK,EAAEC,MAAM,CAACC,OAAQ;MAAAJ,QAAA,EAC9BtE,KAAK,CAACO,MAAM,CAACoE,GAAG,CAAC,CAAC/B,KAAK,EAAEpC,KAAK,KAAK;QAClC,MAAMoE,UAAU,GAAG1E,WAAW,CAAC0C,KAAK,CAACjC,GAAG,CAAC;QAEzC,IAAIiE,UAAU,IAAI,IAAI,EAAE;UACtB,MAAM,IAAInE,KAAK,CACb,yCAAyCmC,KAAK,CAACjC,GAAG,IACpD,CAAC;QACH;QAEA,MAAM;UAAEkE,IAAI,GAAG;QAAK,CAAC,GAAGD,UAAU,CAAC/D,OAAO;QAC1C,MAAMqD,SAAS,GAAGlE,KAAK,CAACQ,KAAK,KAAKA,KAAK;QACvC,MAAMsE,WAAW,GAAG9E,KAAK,CAAC+E,kBAAkB,CAAC9C,QAAQ,CAACW,KAAK,CAACjC,GAAG,CAAC;QAEhE,IACEkE,IAAI,IACJ,CAAC/C,MAAM,CAACG,QAAQ,CAACW,KAAK,CAACjC,GAAG,CAAC,IAC3B,CAACuD,SAAS,IACV,CAACY,WAAW,EACZ;UACA;UACA,OAAO,IAAI;QACb;QAEA,MAAM;UACJE,gBAAgB,GAAG,OAAO;UAC1BC,MAAM,GAAGA,CAAC;YAAEpE;UAA2B,CAAC,kBACtClB,IAAA,CAACtB,MAAM;YAAA,GACDwC,OAAO;YACXqE,KAAK,EAAE9G,cAAc,CAACyC,OAAO,EAAE+B,KAAK,CAACuC,IAAI,CAAE;YAC3CC,UAAU,EACRrE,cAAc,KAAK,MAAM,IAAIF,OAAO,CAACuE,UAAU,IAAI,IAAI,GAClDtF,KAAK,iBAAKH,IAAA,CAACF,kBAAkB;cAAA,GAAKK;YAAK,CAAG,CAAC,GAC5Ce,OAAO,CAACuE,UACb;YACDC,WAAW,EACTtE,cAAc,KAAK,OAAO,IAAIF,OAAO,CAACwE,WAAW,IAAI,IAAI,GACpDvF,KAAK,iBAAKH,IAAA,CAACF,kBAAkB;cAAA,GAAKK;YAAK,CAAG,CAAC,GAC5Ce,OAAO,CAACwE;UACb,CACF,CACF;UACDC,WAAW;UACXC,qBAAqB;UACrBC,iBAAiB;UACjBC;QACF,CAAC,GAAGb,UAAU,CAAC/D,OAAO;;QAEtB;QACA;QACA,MAAM6E,QAAQ,GACZV,gBAAgB,KAAK,MAAM,IAC3Bd,SAAS,IACTY,WAAW,IACVD,IAAI,KAAK,KAAK,IAAI,CAAC/C,MAAM,CAACG,QAAQ,CAACW,KAAK,CAACjC,GAAG,CAAE;QAEjD,oBACEhB,IAAA,CAACrB,YAAY;UAEXqH,IAAI,EAAEzB,SAAS,GAAG,QAAQ,GAAGwB,QAAQ,GAAG,OAAO,GAAG,QAAS;UAC3DE,OAAO,EAAE1B,SAAU;UACnBM,KAAK,EAAE;YAAE,GAAGvF,UAAU,CAAC4G,YAAY;YAAEC,MAAM,EAAE5B,SAAS,GAAG,CAAC,GAAG,CAAC;UAAE,CAAE;UAAAI,QAAA,eAElE3E,IAAA,CAACjB,aAAa;YACZqH,OAAO,EAAE7B,SAAU;YACnBtB,KAAK,EAAEgC,UAAU,CAAChC,KAAM;YACxB3C,UAAU,EAAE2E,UAAU,CAAC3E,UAAW;YAClCqF,WAAW,EAAEA,WAAY;YACzBC,qBAAqB,EAAEA,qBAAsB;YAC7CC,iBAAiB,EAAEA,iBAAkB;YACrCP,MAAM,EAAEA,MAAM,CAAC;cACbrC,KAAK,EAAEgC,UAAU,CAAChC,KAAK;cACvB3C,UAAU,EAAE2E,UAAU,CAAC3E,UAAU;cACjCY,OAAO,EAAE+D,UAAU,CAAC/D;YACtB,CAAC,CAAE;YACH2D,KAAK,EAAEiB,UAAW;YAAAnB,QAAA,EAEjBM,UAAU,CAACoB,MAAM,CAAC;UAAC,CACP;QAAC,GApBXpD,KAAK,CAACjC,GAqBC,CAAC;MAEnB,CAAC;IAAC,CACO,CAAC;EAEhB,CAAC;EAED,oBACEhB,IAAA,CAACL,mBAAmB,CAAC8E,QAAQ;IAACC,KAAK,EAAEjB,YAAa;IAAAkB,QAAA,eAChD3E,IAAA,CAACT,MAAM;MACL+G,IAAI,EAAE7C,YAAY,KAAK,QAAS;MAChC8C,MAAM,EAAE7C,gBAAiB;MACzB8C,OAAO,EAAE5C,iBAAkB;MAC3B6C,cAAc,EAAE3C,kBAAmB;MACnC4C,YAAY,EAAE1C,gBAAiB;MAC/B2C,eAAe,EAAE1C,mBAAoB;MACrC2C,iBAAiB,EAAE1C,qBAAsB;MACzC2C,eAAe,EAAExC,mBAAoB;MACrC3D,SAAS,EAAEA,SAAU;MACrBiB,uBAAuB,EAAEA,uBAAwB;MACjDG,YAAY,EAAEA,YAAa;MAC3BD,cAAc,EAAEA,cAAe;MAC/BG,gBAAgB,EAAEA,gBAAiB;MACnC8E,mBAAmB,EAAE3F,yBAA0B;MAC/C4F,kBAAkB,EAAE1F,wBAAyB;MAC7CO,mBAAmB,EAAEA,mBAAoB;MACzCL,UAAU,EAAEA,UAAW;MACvBW,yBAAyB,EAAEA,yBAA0B;MACrDd,cAAc,EAAEA,cAAe;MAC/BE,WAAW,EAAE,CACX;QAAE0F,eAAe,EAAExD,MAAM,CAACyD;MAAK,CAAC,EAChC1F,UAAU,KAAK,WAAW,KACvB,CACClC,QAAQ,CAAC0C,EAAE,KAAK,KAAK,GACjBX,cAAc,KAAK,OAAO,GACzBV,SAAS,KAAK,KAAK,IAAIU,cAAc,KAAK,OAAO,IACjDV,SAAS,KAAK,KAAK,IAAIU,cAAc,KAAK,OAAQ,IAErD;QACE8F,eAAe,EAAE1D,MAAM,CAAC2D,MAAM;QAC9BC,eAAe,EAAE9H,UAAU,CAAC+H;MAC9B,CAAC,GACD;QACEC,gBAAgB,EAAE9D,MAAM,CAAC2D,MAAM;QAC/BI,gBAAgB,EAAEjI,UAAU,CAAC+H;MAC/B,CAAC,CAAC,EAER9F,UAAU,KAAK,OAAO,KACnBH,cAAc,KAAK,MAAM,GACtB;QACEoG,oBAAoB,EAAEvH,oBAAoB;QAC1CwH,uBAAuB,EAAExH;MAC3B,CAAC,GACD;QACEyH,mBAAmB,EAAEzH,oBAAoB;QACzC0H,sBAAsB,EAAE1H;MAC1B,CAAC,CAAC,EACRqB,WAAW,CACX;MACFW,YAAY,EAAEA,YAAa;MAC3BuC,mBAAmB,EAAEA,mBAAoB;MAAAG,QAAA,EAExCC,kBAAkB,CAAC;IAAC,CACf;EAAC,CACmB,CAAC;AAEnC;AAEA,OAAO,SAASgD,UAAUA,CAAC;EAAEtH,UAAU;EAAE,GAAGuH;AAAY,CAAC,EAAE;EACzD,oBACE7H,IAAA,CAACnB,sBAAsB;IAAA8F,QAAA,eACrB3E,IAAA,CAACI,cAAc;MAACE,UAAU,EAAEA,UAAW;MAAA,GAAKuH;IAAI,CAAG;EAAC,CAC9B,CAAC;AAE7B;AAEA,MAAM/C,MAAM,GAAGxF,UAAU,CAACwI,MAAM,CAAC;EAC/B/C,OAAO,EAAE;IACPgD,IAAI,EAAE;EACR;AACF,CAAC,CAAC","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,EAExB,MAAM,aAAU,CAAC;AAQlB,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;AAoUF,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,EAExB,MAAM,aAAU,CAAC;AAQlB,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;AA0UF,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": "8.0.0-alpha.49",
+  "version": "8.0.0-alpha.50",
   "keywords": [
     "react-native-component",
     "react-component",
@@ -46,13 +46,13 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/elements": "^3.0.0-alpha.46",
-    "react-native-drawer-layout": "^5.0.0-alpha.17",
+    "@react-navigation/elements": "^3.0.0-alpha.47",
+    "react-native-drawer-layout": "^5.0.0-alpha.18",
     "use-latest-callback": "^0.3.5"
   },
   "devDependencies": {
     "@jest/globals": "^30.4.1",
-    "@react-navigation/native": "^8.0.0-alpha.42",
+    "@react-navigation/native": "^8.0.0-alpha.43",
     "@testing-library/react-native": "^14.0.0",
     "@types/react": "~19.2.17",
     "del-cli": "^7.0.0",
@@ -68,7 +68,7 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@react-navigation/native": "^8.0.0-alpha.42",
+    "@react-navigation/native": "^8.0.0-alpha.43",
     "react": ">= 19.2.0",
     "react-native": "*",
     "react-native-gesture-handler": ">= 3.0.0",
@@ -95,5 +95,5 @@
       ]
     ]
   },
-  "gitHead": "b480c645f83ee32b649ed398bb03c75576bf6547"
+  "gitHead": "73f8c2982a8999f1e1dfb1cfbeae9d8dab0c1cc2"
 }

package/src/views/DrawerView.tsx

@@ -98,11 +98,17 @@ 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 ||
+          prevRoute.state.routes[0]?.history?.length)
+      ) {
         navigation.dispatch({
           ...StackActions.popToTop(),
           target: prevRoute.state.key,
@@ -111,7 +117,7 @@ function DrawerViewBase({
     }
 
     previousRouteKeyRef.current = focusedRouteKey;
-  }, [descriptors, focusedRouteKey, navigation, state.routes]);
+  }, [descriptors, focusedRouteKey, navigation]);
 
   const { colors } = useTheme();