@react-navigation/bottom-tabs 8.0.0-alpha.16 → 8.0.0-alpha.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -71,7 +71,6 @@ export function BottomTabViewCustom({
71
71
  let popToTopAction;
72
72
  if (previousRouteKey && previousRouteKey !== focusedRouteKey && descriptors[previousRouteKey]?.options.popToTopOnBlur) {
73
73
  const prevRoute = state.routes.find(route => route.key === previousRouteKey);
74
- console.log('checking if we need to pop to top for route', previousRouteKey, focusedRouteKey);
75
74
  if (prevRoute?.state?.type === 'stack' && prevRoute.state.key) {
76
75
  popToTopAction = {
77
76
  ...StackActions.popToTop(),
@@ -117,8 +116,7 @@ export function BottomTabViewCustom({
117
116
  finished
118
117
  }) => {
119
118
  if (finished && popToTopAction) {
120
- console.log('dispatching pop to top action', popToTopAction);
121
- // navigation.dispatch(popToTopAction);
119
+ navigation.dispatch(popToTopAction);
122
120
  }
123
121
  if (previousRouteKey !== focusedRouteKey) {
124
122
  navigation.emit({
@@ -1 +1 @@
1
- {"version":3,"names":["ActivityView","Container","SafeAreaProviderCompat","StackActions","React","Animated","Platform","StyleSheet","FadeTransition","ShiftTransition","BottomTabAnimationContext","BottomTabBarHeightCallbackContext","BottomTabBarHeightContext","useAnimatedHashMap","useTabBarPosition","BottomTabBar","getTabBarHeight","ScreenContent","jsx","_jsx","jsxs","_jsxs","NAMED_TRANSITIONS_PRESETS","fade","shift","none","sceneStyleInterpolator","undefined","transitionSpec","animation","config","duration","useNativeDriver","OS","hasAnimation","options","Boolean","renderTabBarDefault","props","BottomTabViewCustom","tabBar","state","navigation","descriptors","routes","focusedRouteKey","index","key","loaded","setLoaded","useState","includes","lastUpdate","setLastUpdate","current","previous","tabAnims","isAnimating","setIsAnimating","previousRouteKeyRef","useRef","useEffect","previousRouteKey","popToTopAction","popToTopOnBlur","prevRoute","find","route","console","log","type","popToTop","target","timer","animateToIndex","emit","animations","map","spec","toValue","filter","anim","length","parallel","start","finished","setTimeout","clearTimeout","tabBarHeight","setTabBarHeight","dimensions","initialMetrics","frame","insets","style","tabBarStyle","tabBarElement","Provider","value","children","tabBarPosition","flexDirection","styles","screens","descriptor","render","lazy","inactiveBehavior","sceneStyle","customSceneStyle","isFocused","isPreloaded","preloadedRouteKeys","animationEnabled","content","AnimatedScreenContent","progress","absoluteFill","isAnimatingRoute","isActive","mode","visible","zIndex","interpolationProps","useMemo","View","scene","create","flex","overflow","pointerEvents"],"sourceRoot":"../../../src","sources":["views/BottomTabViewCustom.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["ActivityView","Container","SafeAreaProviderCompat","StackActions","React","Animated","Platform","StyleSheet","FadeTransition","ShiftTransition","BottomTabAnimationContext","BottomTabBarHeightCallbackContext","BottomTabBarHeightContext","useAnimatedHashMap","useTabBarPosition","BottomTabBar","getTabBarHeight","ScreenContent","jsx","_jsx","jsxs","_jsxs","NAMED_TRANSITIONS_PRESETS","fade","shift","none","sceneStyleInterpolator","undefined","transitionSpec","animation","config","duration","useNativeDriver","OS","hasAnimation","options","Boolean","renderTabBarDefault","props","BottomTabViewCustom","tabBar","state","navigation","descriptors","routes","focusedRouteKey","index","key","loaded","setLoaded","useState","includes","lastUpdate","setLastUpdate","current","previous","tabAnims","isAnimating","setIsAnimating","previousRouteKeyRef","useRef","useEffect","previousRouteKey","popToTopAction","popToTopOnBlur","prevRoute","find","route","type","popToTop","target","timer","animateToIndex","emit","animations","map","spec","toValue","filter","anim","length","parallel","start","finished","dispatch","setTimeout","clearTimeout","tabBarHeight","setTabBarHeight","dimensions","initialMetrics","frame","insets","style","tabBarStyle","tabBarElement","Provider","value","children","tabBarPosition","flexDirection","styles","screens","descriptor","render","lazy","inactiveBehavior","sceneStyle","customSceneStyle","isFocused","isPreloaded","preloadedRouteKeys","animationEnabled","content","AnimatedScreenContent","progress","absoluteFill","isAnimatingRoute","isActive","mode","visible","zIndex","interpolationProps","useMemo","View","scene","create","flex","overflow","pointerEvents"],"sourceRoot":"../../../src","sources":["views/BottomTabViewCustom.tsx"],"mappings":";;AAAA,SACEA,YAAY,EACZC,SAAS,EACTC,sBAAsB,QACjB,qCAAqC;AAC5C,SAGEC,YAAY,QAEP,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SACEC,QAAQ,EACRC,QAAQ,EAERC,UAAU,QAEL,cAAc;AAErB,SACEC,cAAc,EACdC,eAAe,QACV,2CAAwC;AAS/C,SAASC,yBAAyB,QAAQ,uCAAoC;AAC9E,SAASC,iCAAiC,QAAQ,+CAA4C;AAC9F,SAASC,yBAAyB,QAAQ,uCAAoC;AAC9E,SAASC,kBAAkB,QAAQ,gCAA6B;AAChE,SAASC,iBAAiB,QAAQ,+BAA4B;AAC9D,SAASC,YAAY,EAAEC,eAAe,QAAQ,mBAAgB;AAC9D,SAASC,aAAa,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQhD,MAAMC,yBAAyB,GAAG;EAChCC,IAAI,EAAEf,cAAc;EACpBgB,KAAK,EAAEf,eAAe;EACtBgB,IAAI,EAAE;IACJC,sBAAsB,EAAEC,SAAS;IACjCC,cAAc,EAAE;MACdC,SAAS,EAAE,QAAQ;MACnBC,MAAM,EAAE;QAAEC,QAAQ,EAAE;MAAE;IACxB;EACF;AACF,CAAU;AAEV,MAAMC,eAAe,GAAG1B,QAAQ,CAAC2B,EAAE,KAAK,KAAK;AAE7C,MAAMC,YAAY,GAAIC,OAAmC,IAAK;EAC5D,MAAM;IAAEN,SAAS;IAAED;EAAe,CAAC,GAAGO,OAAO;EAE7C,IAAIN,SAAS,EAAE;IACb,OAAOA,SAAS,KAAK,MAAM;EAC7B;EAEA,OAAOO,OAAO,CAACR,cAAc,CAAC;AAChC,CAAC;AAED,MAAMS,mBAAmB,GAAIC,KAAwB,iBACnDnB,IAAA,CAACJ,YAAY;EAAA,GAAKuB;AAAK,CAAG,CAC3B;AAED,OAAO,SAASC,mBAAmBA,CAAC;EAClCC,MAAM,GAAGH,mBAAmB;EAC5BI,KAAK;EACLC,UAAU;EACVC;AACK,CAAC,EAAE;EACR,MAAM;IAAEC;EAAO,CAAC,GAAGH,KAAK;EACxB,MAAMI,eAAe,GAAGD,MAAM,CAACH,KAAK,CAACK,KAAK,CAAC,CAACC,GAAG;EAE/C,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAG7C,KAAK,CAAC8C,QAAQ,CAAC,CAACL,eAAe,CAAC,CAAC;EAE7D,IAAI,CAACG,MAAM,CAACG,QAAQ,CAACN,eAAe,CAAC,EAAE;IACrCI,SAAS,CAAC,CAAC,GAAGD,MAAM,EAAEH,eAAe,CAAC,CAAC;EACzC;EAEA,MAAM,CAACO,UAAU,EAAEC,aAAa,CAAC,GAAGjD,KAAK,CAAC8C,QAAQ,CAG/C;IACDI,OAAO,EAAET;EACX,CAAC,CAAC;EAEF,IAAIO,UAAU,CAACE,OAAO,KAAKT,eAAe,EAAE;IAC1CQ,aAAa,CAAC;MACZC,OAAO,EAAET,eAAe;MACxBU,QAAQ,EAAEH,UAAU,CAACE;IACvB,CAAC,CAAC;EACJ;EAEA,MAAME,QAAQ,GAAG3C,kBAAkB,CAAC4B,KAAK,CAAC;EAE1C,MAAM,CAACgB,WAAW,EAAEC,cAAc,CAAC,GAAGtD,KAAK,CAAC8C,QAAQ,CAAC,KAAK,CAAC;EAE3D,MAAMS,mBAAmB,GAAGvD,KAAK,CAACwD,MAAM,CAACf,eAAe,CAAC;EAEzDzC,KAAK,CAACyD,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGH,mBAAmB,CAACL,OAAO;IAEpD,IAAIS,cAA4C;IAEhD,IACED,gBAAgB,IAChBA,gBAAgB,KAAKjB,eAAe,IACpCF,WAAW,CAACmB,gBAAgB,CAAC,EAAE3B,OAAO,CAAC6B,cAAc,EACrD;MACA,MAAMC,SAAS,GAAGxB,KAAK,CAACG,MAAM,CAACsB,IAAI,CAChCC,KAAK,IAAKA,KAAK,CAACpB,GAAG,KAAKe,gBAC3B,CAAC;MAED,IAAIG,SAAS,EAAExB,KAAK,EAAE2B,IAAI,KAAK,OAAO,IAAIH,SAAS,CAACxB,KAAK,CAACM,GAAG,EAAE;QAC7DgB,cAAc,GAAG;UACf,GAAG5D,YAAY,CAACkE,QAAQ,CAAC,CAAC;UAC1BC,MAAM,EAAEL,SAAS,CAACxB,KAAK,CAACM;QAC1B,CAAC;MACH;IACF;IAEA,IAAIwB,KAAoC;IAExC,MAAMC,cAAc,GAAGA,CAAA,KAAM;MAC3B,IAAIV,gBAAgB,KAAKjB,eAAe,EAAE;QACxCH,UAAU,CAAC+B,IAAI,CAAC;UACdL,IAAI,EAAE,iBAAiB;UACvBE,MAAM,EAAEzB;QACV,CAAC,CAAC;MACJ;MAEA,MAAM6B,UAAU,GAAGjC,KAAK,CAACG,MAAM,CAC5B+B,GAAG,CAAC,CAACR,KAAK,EAAErB,KAAK,KAAK;QACrB,MAAM;UAAEX;QAAQ,CAAC,GAAGQ,WAAW,CAACwB,KAAK,CAACpB,GAAG,CAAC;QAC1C,MAAM;UACJlB,SAAS,GAAG,MAAM;UAClBD,cAAc,GAAGN,yBAAyB,CAACO,SAAS,CAAC,CAClDD;QACL,CAAC,GAAGO,OAAO;QAEX,IAAIyC,IAAI,GAAGhD,cAAc;QAEzB,IAAIuC,KAAK,CAACpB,GAAG,KAAKe,gBAAgB,IAAIK,KAAK,CAACpB,GAAG,KAAKF,eAAe,EAAE;UACnE;UACA;UACA+B,IAAI,GAAGtD,yBAAyB,CAACG,IAAI,CAACG,cAAc;QACtD;QAEAgD,IAAI,GAAGA,IAAI,IAAItD,yBAAyB,CAACG,IAAI,CAACG,cAAc;QAE5D,MAAMiD,OAAO,GACX/B,KAAK,KAAKL,KAAK,CAACK,KAAK,GAAG,CAAC,GAAGA,KAAK,IAAIL,KAAK,CAACK,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;QAE3D,OAAOzC,QAAQ,CAACuE,IAAI,CAAC/C,SAAS,CAAC,CAAC2B,QAAQ,CAACW,KAAK,CAACpB,GAAG,CAAC,EAAE;UACnD,GAAG6B,IAAI,CAAC9C,MAAM;UACd+C,OAAO;UACP7C;QACF,CAAC,CAAC;MACJ,CAAC,CAAC,CACD8C,MAAM,CAAEC,IAAI,IAAKA,IAAI,IAAI,IAAI,CAAC;MAEjC,IAAIL,UAAU,CAACM,MAAM,EAAE;QACrB;QACAtB,cAAc,CAAC,IAAI,CAAC;MACtB;MAEArD,QAAQ,CAAC4E,QAAQ,CAACP,UAAU,CAAC,CAACQ,KAAK,CAAC,CAAC;QAAEC;MAAS,CAAC,KAAK;QACpD,IAAIA,QAAQ,IAAIpB,cAAc,EAAE;UAC9BrB,UAAU,CAAC0C,QAAQ,CAACrB,cAAc,CAAC;QACrC;QAEA,IAAID,gBAAgB,KAAKjB,eAAe,EAAE;UACxCH,UAAU,CAAC+B,IAAI,CAAC;YACdL,IAAI,EAAE,eAAe;YACrBE,MAAM,EAAEzB;UACV,CAAC,CAAC;QACJ;QAEA,IAAIsC,QAAQ,IAAIT,UAAU,CAACM,MAAM,EAAE;UACjC;UACA;UACAT,KAAK,GAAGc,UAAU,CAAC,MAAM;YACvB3B,cAAc,CAAC,KAAK,CAAC;UACvB,CAAC,EAAE,EAAE,CAAC;QACR;MACF,CAAC,CAAC;IACJ,CAAC;IAEDc,cAAc,CAAC,CAAC;IAEhBb,mBAAmB,CAACL,OAAO,GAAGT,eAAe;IAE7C,OAAO,MAAM;MACXyC,YAAY,CAACf,KAAK,CAAC;IACrB,CAAC;EACH,CAAC,EAAE,CACD5B,WAAW,EACXE,eAAe,EACfH,UAAU,EACVD,KAAK,CAACK,KAAK,EACXL,KAAK,CAACG,MAAM,EACZY,QAAQ,CACT,CAAC;EAEF,MAAM,CAAC+B,YAAY,EAAEC,eAAe,CAAC,GAAGpF,KAAK,CAAC8C,QAAQ,CAAC,MACrDlC,eAAe,CAAC;IACdyB,KAAK;IACLE,WAAW;IACX8C,UAAU,EAAEvF,sBAAsB,CAACwF,cAAc,CAACC,KAAK;IACvDC,MAAM,EAAE1F,sBAAsB,CAACwF,cAAc,CAACE,MAAM;IACpDC,KAAK,EAAElD,WAAW,CAACE,eAAe,CAAC,CAACV,OAAO,CAAC2D;EAC9C,CAAC,CACH,CAAC;EAED,MAAMC,aAAa,gBACjB5E,IAAA,CAACR,iCAAiC,CAACqF,QAAQ;IAEzCC,KAAK,EAAET,eAAgB;IAAAU,QAAA,EAEtB1D,MAAM,CAAC;MACNC,KAAK,EAAEA,KAAK;MACZE,WAAW,EAAEA,WAAW;MACxBD,UAAU,EAAEA;IACd,CAAC;EAAC,GAPE,QAQsC,CAC7C;EAED,MAAMyD,cAAc,GAAGrF,iBAAiB,CACtC6B,WAAW,CAACE,eAAe,CAAC,CAACV,OAC/B,CAAC;EAED,oBACEd,KAAA,CAACnB,sBAAsB;IACrB2F,KAAK,EAAE;MACLO,aAAa,EACXD,cAAc,KAAK,MAAM,IAAIA,cAAc,KAAK,OAAO,GACnD,KAAK,GACL;IACR,CAAE;IAAAD,QAAA,GAEDC,cAAc,KAAK,KAAK,IAAIA,cAAc,KAAK,MAAM,GAClDJ,aAAa,GACb,IAAI,eACR5E,IAAA,CAAClB,SAAS;MAAe4F,KAAK,EAAEQ,MAAM,CAACC,OAAQ;MAAAJ,QAAA,EAC5CtD,MAAM,CAAC+B,GAAG,CAAC,CAACR,KAAK,EAAErB,KAAK,KAAK;QAC5B,MAAMyD,UAAU,GAAG5D,WAAW,CAACwB,KAAK,CAACpB,GAAG,CAAC;QAEzC,MAAM;UAAEL,UAAU;UAAEP,OAAO;UAAEqE;QAAO,CAAC,GAAGD,UAAU;QAElD,MAAM;UACJE,IAAI,GAAG,IAAI;UACXC,gBAAgB,GAAG,OAAO;UAC1B7E,SAAS,GAAG,MAAM;UAClBH,sBAAsB,GAAGJ,yBAAyB,CAACO,SAAS,CAAC,CAC1DH,sBAAsB;UACzBiF,UAAU,EAAEC;QACd,CAAC,GAAGzE,OAAO;QAEX,MAAM0E,SAAS,GAAGpE,KAAK,CAACK,KAAK,KAAKA,KAAK;QACvC,MAAMgE,WAAW,GAAGrE,KAAK,CAACsE,kBAAkB,CAAC5D,QAAQ,CAACgB,KAAK,CAACpB,GAAG,CAAC;QAEhE,IACE0D,IAAI,IACJ,CAACzD,MAAM,CAACG,QAAQ,CAACgB,KAAK,CAACpB,GAAG,CAAC,IAC3B,CAAC8D,SAAS,IACV,CAACC,WAAW,EACZ;UACA;UACA,OAAO,IAAI;QACb;QAEA,MAAME,gBAAgB,GAAG9E,YAAY,CAACqE,UAAU,CAACpE,OAAO,CAAC;QAEzD,MAAM8E,OAAO,gBACX9F,IAAA,CAAC+F,qBAAqB;UAEpBC,QAAQ,EAAE3D,QAAQ,CAACW,KAAK,CAACpB,GAAG,CAAE;UAC9BiE,gBAAgB,EAAEA,gBAAiB;UACnCtF,sBAAsB,EAAEA,sBAAuB;UAC/CmE,KAAK,EAAE,CAACtF,UAAU,CAAC6G,YAAY,EAAER,gBAAgB,CAAE;UAAAV,QAAA,eAEnD/E,IAAA,CAACF,aAAa;YACZ4F,SAAS,EAAEA,SAAU;YACrB1C,KAAK,EAAEA,KAAM;YACbzB,UAAU,EAAEA,UAAW;YACvBP,OAAO,EAAEA,OAAQ;YAAA+D,QAAA,eAEjB/E,IAAA,CAACP,yBAAyB,CAACoF,QAAQ;cACjCC,KAAK,EAAEE,cAAc,KAAK,QAAQ,GAAGZ,YAAY,GAAG,CAAE;cAAAW,QAAA,EAErDM,MAAM,CAAC;YAAC,CACyB;UAAC,CACxB;QAAC,GAjBXrC,KAAK,CAACpB,GAkBU,CACxB;QAED,MAAMsE,gBAAgB,GACpB5D,WAAW,KACVL,UAAU,CAACG,QAAQ,KAAKY,KAAK,CAACpB,GAAG,IAChCK,UAAU,CAACE,OAAO,KAAKa,KAAK,CAACpB,GAAG,CAAC;;QAErC;QACA;QACA,MAAMuE,QAAQ,GACZZ,gBAAgB,KAAK,MAAM,IAC3BW,gBAAgB,IAChBP,WAAW,IACVL,IAAI,KAAK,KAAK,IAAI,CAACzD,MAAM,CAACG,QAAQ,CAACgB,KAAK,CAACpB,GAAG,CAAE;QAEjD,oBACE5B,IAAA,CAACnB,YAAY;UAEXuH,IAAI,EAAEV,SAAS,GAAG,QAAQ,GAAGS,QAAQ,GAAG,OAAO,GAAG,QAAS;UAC3DE,OAAO,EAAEX,SAAS,IAAIQ,gBAAiB;UACvCxB,KAAK,EAAE;YAAE,GAAGtF,UAAU,CAAC6G,YAAY;YAAEK,MAAM,EAAEZ,SAAS,GAAG,CAAC,GAAG,CAAC;UAAE,CAAE;UAAAX,QAAA,EAEjEe;QAAO,GALH9C,KAAK,CAACpB,GAMC,CAAC;MAEnB,CAAC;IAAC,GA5EW,SA6EJ,CAAC,EACXoD,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,OAAO,GACtDJ,aAAa,GACb,IAAI;EAAA,CACc,CAAC;AAE7B;AAEA,SAASmB,qBAAqBA,CAAC;EAC7BC,QAAQ;EACRH,gBAAgB;EAChBtF,sBAAsB;EACtBwE,QAAQ;EACRL;AAOF,CAAC,EAAE;EACD,MAAM6B,kBAAkB,GAAGtH,KAAK,CAACuH,OAAO,CAAC,MAAM;IAC7C,OAAO;MACLrE,OAAO,EAAE;QAAE6D;MAAS;IACtB,CAAC;EACH,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,MAAM;IAAER;EAAW,CAAC,GAAGjF,sBAAsB,GAAGgG,kBAAkB,CAAC,IAAI,CAAC,CAAC;EAEzE,oBACEvG,IAAA,CAACd,QAAQ,CAACuH,IAAI;IACZ/B,KAAK,EAAE,CAACQ,MAAM,CAACwB,KAAK,EAAEhC,KAAK,EAAEmB,gBAAgB,IAAIL,UAAU,CAAE;IAAAT,QAAA,eAE7D/E,IAAA,CAACT,yBAAyB,CAACsF,QAAQ;MAACC,KAAK,EAAEyB,kBAAmB;MAAAxB,QAAA,EAC3DA;IAAQ,CACyB;EAAC,CACxB,CAAC;AAEpB;AAEA,MAAMG,MAAM,GAAG9F,UAAU,CAACuH,MAAM,CAAC;EAC/BxB,OAAO,EAAE;IACPyB,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE;EACZ,CAAC;EACDH,KAAK,EAAE;IACLE,IAAI,EAAE,CAAC;IACPE,aAAa,EAAE;EACjB;AACF,CAAC,CAAC","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"BottomTabViewCustom.d.ts","sourceRoot":"","sources":["../../../../src/views/BottomTabViewCustom.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,aAAa,EAElB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAclC,OAAO,KAAK,EAEV,sBAAsB,EACtB,yBAAyB,EACzB,0BAA0B,EAG3B,MAAM,UAAU,CAAC;AASlB,KAAK,KAAK,GAAG,yBAAyB,GAAG;IACvC,KAAK,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACzC,UAAU,EAAE,0BAA0B,CAAC;IACvC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC;AA8BF,wBAAgB,mBAAmB,CAAC,EAClC,MAA4B,EAC5B,KAAK,EACL,UAAU,EACV,WAAW,GACZ,EAAE,KAAK,2CAwQP"}
1
+ {"version":3,"file":"BottomTabViewCustom.d.ts","sourceRoot":"","sources":["../../../../src/views/BottomTabViewCustom.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,aAAa,EAElB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAclC,OAAO,KAAK,EAEV,sBAAsB,EACtB,yBAAyB,EACzB,0BAA0B,EAG3B,MAAM,UAAU,CAAC;AASlB,KAAK,KAAK,GAAG,yBAAyB,GAAG;IACvC,KAAK,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACzC,UAAU,EAAE,0BAA0B,CAAC;IACvC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC;AA8BF,wBAAgB,mBAAmB,CAAC,EAClC,MAA4B,EAC5B,KAAK,EACL,UAAU,EACV,WAAW,GACZ,EAAE,KAAK,2CAiQP"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@react-navigation/bottom-tabs",
3
3
  "description": "Bottom tab navigator following iOS design guidelines",
4
- "version": "8.0.0-alpha.16",
4
+ "version": "8.0.0-alpha.17",
5
5
  "keywords": [
6
6
  "react-native-component",
7
7
  "react-component",
@@ -85,5 +85,5 @@
85
85
  ]
86
86
  ]
87
87
  },
88
- "gitHead": "20476fe1fdc272f4d3c4ffc90a95d7adab98ff3c"
88
+ "gitHead": "b1ce9ff0de8deeffa900a1521e4f4c5556416e9b"
89
89
  }
@@ -121,12 +121,6 @@ export function BottomTabViewCustom({
121
121
  (route) => route.key === previousRouteKey
122
122
  );
123
123
 
124
- console.log(
125
- 'checking if we need to pop to top for route',
126
- previousRouteKey,
127
- focusedRouteKey
128
- );
129
-
130
124
  if (prevRoute?.state?.type === 'stack' && prevRoute.state.key) {
131
125
  popToTopAction = {
132
126
  ...StackActions.popToTop(),
@@ -182,8 +176,7 @@ export function BottomTabViewCustom({
182
176
 
183
177
  Animated.parallel(animations).start(({ finished }) => {
184
178
  if (finished && popToTopAction) {
185
- console.log('dispatching pop to top action', popToTopAction);
186
- // navigation.dispatch(popToTopAction);
179
+ navigation.dispatch(popToTopAction);
187
180
  }
188
181
 
189
182
  if (previousRouteKey !== focusedRouteKey) {