+5 -6

package.json

··· 98 98 "@miblanchard/react-native-slider": "^2.6.0", 99 99 "@mozzius/expo-dynamic-app-icon": "^1.8.0", 100 100 "@react-native-async-storage/async-storage": "2.2.0", 101 101 - "@react-navigation/bottom-tabs": "^7.3.13", 102 102 - "@react-navigation/drawer": "^7.3.12", 103 103 - "@react-navigation/native": "^7.1.9", 104 104 - "@react-navigation/native-stack": "^7.3.13", 101 101 + "@react-navigation/bottom-tabs": "^7.9.0", 102 102 + "@react-navigation/native": "^7.1.26", 103 103 + "@react-navigation/native-stack": "^7.9.0", 105 104 "@sentry/react-native": "~6.20.0", 106 105 "@tanstack/query-async-storage-persister": "^5.25.0", 107 106 "@tanstack/react-query": "5.25.0", ··· 194 193 "react-native-compressor": "^1.13.0", 195 194 "react-native-date-picker": "^5.0.13", 196 195 "react-native-device-attest": "^0.1.6", 197 197 - "react-native-drawer-layout": "^4.1.8", 196 196 + "react-native-drawer-layout": "^4.2.1", 198 197 "react-native-edge-to-edge": "^1.6.0", 199 198 "react-native-gesture-handler": "~2.28.0", 200 199 "react-native-get-random-values": "~1.11.0", ··· 204 203 "react-native-qrcode-styled": "^0.3.3", 205 204 "react-native-reanimated": "^3.19.1", 206 205 "react-native-safe-area-context": "~5.6.0", 207 207 - "react-native-screens": "~4.16.0", 206 206 + "react-native-screens": "^4.19.0", 208 207 "react-native-svg": "15.12.1", 209 208 "react-native-uitextview": "^1.4.0", 210 209 "react-native-url-polyfill": "^1.3.0",

+2 -2

patches/react-native-drawer-layout+4.1.10.patch patches/react-native-drawer-layout+4.2.1.patch

··· 1 1 diff --git a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 2 2 - index efa71f9..a23c624 100644 2 2 + index 40fdcdb..770fd67 100644 3 3 --- a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 4 4 +++ b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js 5 5 @@ -124,15 +124,21 @@ export function Drawer({ ··· 31 31 - }, finished => runOnJS(onAnimationEnd)(open, finished)); 32 32 + }, finished => { 33 33 + animatingTo.value = null; 34 34 - + runOnJS(onAnimationEnd)(open, finished) 34 34 + + runOnJS(onAnimationEnd)(open, finished); 35 35 + }); 36 36 if (open) { 37 37 runOnJS(onOpen)();

-326

patches/react-native-screens+4.16.0.patch

··· 1 1 - diff --git a/node_modules/react-native-screens/ios/RNSScreen.mm b/node_modules/react-native-screens/ios/RNSScreen.mm 2 2 - index b62a2e2..cb469db 100644 3 3 - --- a/node_modules/react-native-screens/ios/RNSScreen.mm 4 4 - +++ b/node_modules/react-native-screens/ios/RNSScreen.mm 5 5 - @@ -729,9 +729,26 @@ - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingFor 6 6 - #endif 7 7 - } 8 8 - 9 9 - -#if !RCT_NEW_ARCH_ENABLED 10 10 - +- (void)willMoveToWindow:(UIWindow *)newWindow 11 11 - +{ 12 12 - + if (@available(iOS 26, *)) { 13 13 - + // In iOS 26, as soon as another screen appears in transition, it is interactable 14 14 - + // To avoid glitches resulting from clicking buttons mid transition, we temporarily disable all interactions 15 15 - + // Disabling interactions for parent navigation controller won't be enough in case of nested stack 16 16 - + // Furthermore, a stack put inside a modal will exist in an entirely different hierarchy 17 17 - + // To be sure, we block interactions on the whole window. 18 18 - + // Note that newWindows is nil when moving from instead of moving to, and Obj-C handles nil correctly 19 19 - + newWindow.userInteractionEnabled = false; 20 20 - + } 21 21 - +} 22 22 - + 23 23 - - (void)presentationControllerWillDismiss:(UIPresentationController *)presentationController 24 24 - { 25 25 - + if (@available(iOS 26, *)) { 26 26 - + // Disable interactions to disallow multiple modals dismissed at once; see willMoveToWindow 27 27 - + presentationController.containerView.window.userInteractionEnabled = false; 28 28 - + } 29 29 - +#if !RCT_NEW_ARCH_ENABLED 30 30 - // On Paper, we need to call both "cancel" and "reset" here because RN's gesture 31 31 - // recognizer does not handle the scenario when it gets cancelled by other top 32 32 - // level gesture recognizer. In this case by the modal dismiss gesture. 33 33 - @@ -744,8 +761,8 @@ - (void)presentationControllerWillDismiss:(UIPresentationController *)presentati 34 34 - // down. 35 35 - [_touchHandler cancel]; 36 36 - [_touchHandler reset]; 37 37 - -} 38 38 - #endif // !RCT_NEW_ARCH_ENABLED 39 39 - +} 40 40 - 41 41 - - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presentationController 42 42 - { 43 43 - @@ -757,6 +774,10 @@ - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presenta 44 44 - 45 45 - - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)presentationController 46 46 - { 47 47 - + if (@available(iOS 26, *)) { 48 48 - + // Reenable interactions; see presentationControllerWillDismiss 49 49 - + presentationController.containerView.window.userInteractionEnabled = true; 50 50 - + } 51 51 - // NOTE(kkafar): We should consider depracating the use of gesture cancel here & align 52 52 - // with usePreventRemove API of react-navigation v7. 53 53 - [self notifyGestureCancel]; 54 54 - @@ -767,6 +788,11 @@ - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)pr 55 55 - 56 56 - - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController 57 57 - { 58 58 - + if (@available(iOS 26, *)) { 59 59 - + // Reenable interactions; see presentationControllerWillDismiss 60 60 - + // Dismissed screen doesn't hold a reference to window, but presentingViewController.view does 61 61 - + presentationController.presentingViewController.view.window.userInteractionEnabled = true; 62 62 - + } 63 63 - if ([_reactSuperview respondsToSelector:@selector(presentationControllerDidDismiss:)]) { 64 64 - [_reactSuperview performSelector:@selector(presentationControllerDidDismiss:) withObject:presentationController]; 65 65 - } 66 66 - @@ -1518,6 +1544,10 @@ - (void)viewWillDisappear:(BOOL)animated 67 67 - 68 68 - - (void)viewDidAppear:(BOOL)animated 69 69 - { 70 70 - + if (@available(iOS 26, *)) { 71 71 - + // Reenable interactions, see willMoveToWindow 72 72 - + self.view.window.userInteractionEnabled = true; 73 73 - + } 74 74 - [super viewDidAppear:animated]; 75 75 - if (!_isSwiping || _shouldNotify) { 76 76 - // we are going forward or dismissing without swipe 77 77 - diff --git a/node_modules/react-native-screens/ios/RNSScreenStack.mm b/node_modules/react-native-screens/ios/RNSScreenStack.mm 78 78 - index 229dc58..10b365b 100644 79 79 - --- a/node_modules/react-native-screens/ios/RNSScreenStack.mm 80 80 - +++ b/node_modules/react-native-screens/ios/RNSScreenStack.mm 81 81 - @@ -62,26 +62,6 @@ @interface RNSScreenStackView () < 82 82 - 83 83 - @implementation RNSNavigationController 84 84 - 85 85 - -#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) 86 86 - -- (void)viewDidLoad 87 87 - -{ 88 88 - - // iOS 26 introduces new gesture recognizer which replaces our RNSPanGestureRecognizer. 89 89 - - // The problem is that we are not able to handle it here for various reasons: 90 90 - - // - the new recognizer comes with its own delegate and our current approach is to wire 91 91 - - // all recognizers to RNSScreenStackView; to be 100% sure we don't break the logic, 92 92 - - // we would have to decorate its delegate and call it after our code, which would 93 93 - - // break other recognizers that the stack view is the delegate for 94 94 - - // - when RNSScreenStackView.setupGestureHandler method is called, the recognizer hasn't been 95 95 - - // loaded yet and there is no other place to configure in a not "hacky" way 96 96 - - // - the official docs warn us to not use it for anything other than "setting up failure requirements with it" 97 97 - - // - we expose fullScreenGestureEnabled prop to enable/disable the feature, 98 98 - - // so we need control over the delegate 99 99 - - if (@available(iOS 26.0, *)) { 100 100 - - self.interactiveContentPopGestureRecognizer.enabled = NO; 101 101 - - } 102 102 - -} 103 103 - -#endif // iOS 26 104 104 - - 105 105 - #if !TARGET_OS_TV 106 106 - - (UIViewController *)childViewControllerForStatusBarStyle 107 107 - { 108 108 - @@ -219,50 +199,6 @@ - (bool)onRepeatedTabSelectionOfTabScreenController:(RNSTabsScreenViewController 109 109 - return false; 110 110 - } 111 111 - 112 112 - -#pragma mark - UINavigationBarDelegate 113 113 - - 114 114 - -#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) 115 115 - -- (BOOL)navigationBar:(UINavigationBar *)navigationBar shouldPopItem:(UINavigationItem *)item 116 116 - -{ 117 117 - - if (@available(iOS 26, *)) { 118 118 - - // To prevent popping multiple screens when back button is pressed repeatedly, 119 119 - - // We allow for pop operation to proceed only if no transition is in progress, 120 120 - - // which we check indirectly by checking if transitionCoordinator is set. 121 121 - - // If it's not, we are safe to proceed. 122 122 - - if (self.transitionCoordinator == nil) { 123 123 - - // We still need to disable interactions for back button so click effects are not applied, 124 124 - - // and there is unfortunately no better place for it currently 125 125 - - UIView *button = [navigationBar rnscreens_findBackButtonWrapperView]; 126 126 - - if (button != nil) { 127 127 - - button.userInteractionEnabled = false; 128 128 - - } 129 129 - - 130 130 - - return true; 131 131 - - } 132 132 - - 133 133 - - return false; 134 134 - - } 135 135 - - 136 136 - - return true; 137 137 - -} 138 138 - - 139 139 - -- (void)navigationBar:(UINavigationBar *)navigationBar didPopItem:(UINavigationItem *)item 140 140 - -{ 141 141 - - if (@available(iOS 26, *)) { 142 142 - - // Reset interactions on back button -> see navigationBar:shouldPopItem 143 143 - - // IMPORTANT: This reset won't execute when preventNativeDismiss is on. 144 144 - - // However, on iOS 26, unlike in previous versions, the back button instance changes 145 145 - - // when handling preventNativeDismiss and userIteractionEnabled is reset. 146 146 - - // The instance also changes when regular screen pop happens, but in that case 147 147 - - // the value of userInteractionEnabled is carried on, and we reset it here. 148 148 - - UIView *button = [navigationBar rnscreens_findBackButtonWrapperView]; 149 149 - - if (button != nil) { 150 150 - - button.userInteractionEnabled = true; 151 151 - - } 152 152 - - } 153 153 - -} 154 154 - -#endif // Check for iOS >= 26 155 155 - - 156 156 - #pragma mark - RNSFrameCorrectionProvider 157 157 - 158 158 - #ifdef RNS_GAMMA_ENABLED 159 159 - @@ -327,7 +263,7 @@ @implementation RNSScreenStackView { 160 160 - UINavigationController *_controller; 161 161 - NSMutableArray<RNSScreenView *> *_reactSubviews; 162 162 - BOOL _invalidated; 163 163 - - BOOL _isFullWidthSwiping; 164 164 - + BOOL _isFullWidthSwipingWithPanGesture; // used only for content swipe with RNSPanGestureRecognizer 165 165 - RNSPercentDrivenInteractiveTransition *_interactionController; 166 166 - __weak RNSScreenStackManager *_manager; 167 167 - BOOL _updateScheduled; 168 168 - @@ -522,6 +458,11 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller 169 169 - [self addSubview:controller.view]; 170 170 - #if !TARGET_OS_TV 171 171 - _controller.interactivePopGestureRecognizer.delegate = self; 172 172 - + #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) 173 173 - + if (@available(iOS 26, *)) { 174 174 - + _controller.interactiveContentPopGestureRecognizer.delegate = self; 175 175 - + } 176 176 - +#endif // Check for iOS >= 26.0 177 177 - #endif 178 178 - [controller didMoveToParentViewController:parentView.reactViewController]; 179 179 - // On iOS pre 12 we observed that `willShowViewController` delegate method does not always 180 180 - @@ -943,7 +884,7 @@ - (void)dismissOnReload 181 181 - // when preventing the native dismiss with back button, we have to return the animator. 182 182 - // Also, we need to return the animator when full width swiping even if the animation is not custom, 183 183 - // otherwise the screen will be just popped immediately due to no animation 184 184 - - ((operation == UINavigationControllerOperationPop && shouldCancelDismiss) || _isFullWidthSwiping || 185 185 - + ((operation == UINavigationControllerOperationPop && shouldCancelDismiss) || _isFullWidthSwipingWithPanGesture || 186 186 - [RNSScreenStackAnimator isCustomAnimation:screen.stackAnimation] || _customAnimation)) { 187 187 - return [[RNSScreenStackAnimator alloc] initWithOperation:operation]; 188 188 - } 189 189 - @@ -967,23 +908,39 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer 190 190 - } 191 191 - RNSScreenView *topScreen = _reactSubviews.lastObject; 192 192 - 193 193 - + BOOL customAnimationOnSwipePropSetAndSelectedAnimationIsCustom = 194 194 - + topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation]; 195 195 - + 196 196 - #if TARGET_OS_TV || TARGET_OS_VISION 197 197 - [self cancelTouchesInParent]; 198 198 - return YES; 199 199 - #else 200 200 - - // RNSPanGestureRecognizer will receive events iff topScreen.fullScreenSwipeEnabled == YES; 201 201 - - // Events are filtered in gestureRecognizer:shouldReceivePressOrTouchEvent: method 202 202 - if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) { 203 203 - - if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) { 204 204 - - _isFullWidthSwiping = YES; 205 205 - - [self cancelTouchesInParent]; 206 206 - - return YES; 207 207 - + // On iOS < 26, we have a custom full screen swipe recognizer that functions similarily 208 208 - + // to interactiveContentPopGestureRecognizer introduced in iOS 26. 209 209 - + // On iOS >= 26, we want to use the native one, but we are unable to handle custom animations 210 210 - + // with native interactiveContentPopGestureRecognizer, so we have to fallback to the old implementation. 211 211 - + // In this case, the old one should behave as close as the new native one, having only the difference 212 212 - + // in animation, and without any customization that is exclusive for it (e.g. gestureResponseDistance). 213 213 - + if (@available(iOS 26, *)) { 214 214 - + if (customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) { 215 215 - + _isFullWidthSwipingWithPanGesture = YES; 216 216 - + [self cancelTouchesInParent]; 217 217 - + return YES; 218 218 - + } 219 219 - + return NO; 220 220 - + } else { 221 221 - + if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) { 222 222 - + _isFullWidthSwipingWithPanGesture = YES; 223 223 - + [self cancelTouchesInParent]; 224 224 - + return YES; 225 225 - + } 226 226 - + return NO; 227 227 - } 228 228 - - return NO; 229 229 - } 230 230 - 231 231 - // Now we're dealing with RNSScreenEdgeGestureRecognizer (or _UIParallaxTransitionPanGestureRecognizer) 232 232 - - if (topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation]) { 233 233 - + if (customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) { 234 234 - if ([gestureRecognizer isKindOfClass:[RNSScreenEdgeGestureRecognizer class]]) { 235 235 - UIRectEdge edges = ((RNSScreenEdgeGestureRecognizer *)gestureRecognizer).edges; 236 236 - BOOL isRTL = _controller.view.semanticContentAttribute == UISemanticContentAttributeForceRightToLeft; 237 237 - @@ -1028,7 +985,9 @@ - (void)setupGestureHandlers 238 238 - rightEdgeSwipeGestureRecognizer.delegate = self; 239 239 - [self addGestureRecognizer:rightEdgeSwipeGestureRecognizer]; 240 240 - 241 241 - - // gesture recognizer for full width swipe gesture 242 242 - + // Starting from iOS 26, RNSPanGestureRecognizer has been mostly replaced by native 243 243 - + // interactiveContentPopGestureRecognizer. It still needs to handle custom dismiss animations, 244 244 - + // which we are not able to handle with the latter. 245 245 - RNSPanGestureRecognizer *panRecognizer = [[RNSPanGestureRecognizer alloc] initWithTarget:self 246 246 - action:@selector(handleSwipe:)]; 247 247 - panRecognizer.delegate = self; 248 248 - @@ -1091,7 +1050,7 @@ - (void)handleSwipe:(UIPanGestureRecognizer *)gestureRecognizer 249 249 - [_interactionController cancelInteractiveTransition]; 250 250 - } 251 251 - _interactionController = nil; 252 252 - - _isFullWidthSwiping = NO; 253 253 - + _isFullWidthSwipingWithPanGesture = NO; 254 254 - } 255 255 - default: { 256 256 - break; 257 257 - @@ -1225,14 +1184,6 @@ - (BOOL)isScrollViewPanGestureRecognizer:(UIGestureRecognizer *)gestureRecognize 258 258 - // Be careful when adding another type of gesture recognizer. 259 259 - - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePressOrTouchEvent:(NSObject *)event 260 260 - { 261 261 - - if (@available(iOS 26, *)) { 262 262 - - // in iOS 26, you can swipe to pop screen before the previous one finished transitioning; 263 263 - - // this prevents from registering the second gesture 264 264 - - if ([self isTransitionInProgress]) { 265 265 - - return NO; 266 266 - - } 267 267 - - } 268 268 - - 269 269 - RNSScreenView *topScreen = _reactSubviews.lastObject; 270 270 - 271 271 - for (RNSScreenView *s in _reactSubviews.reverseObjectEnumerator) { 272 272 - @@ -1249,10 +1200,30 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive 273 273 - return NO; 274 274 - } 275 275 - 276 276 - + BOOL customAnimationOnSwipePropSetAndSelectedAnimationIsCustom = 277 277 - + topScreen.customAnimationOnSwipe && [RNSScreenStackAnimator isCustomAnimation:topScreen.stackAnimation]; 278 278 - +#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) 279 279 - + if (@available(iOS 26, *)) { 280 280 - + // On iOS 26, fullScreenSwipeEnabled takes no effect, and depending on whether custom animations are on, 281 281 - + // we select either interactiveContentPopGestureRecognizer or RNSPanGestureRecognizer 282 282 - + if (([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]] && 283 283 - + !customAnimationOnSwipePropSetAndSelectedAnimationIsCustom) || 284 284 - + (gestureRecognizer == _controller.interactiveContentPopGestureRecognizer && 285 285 - + customAnimationOnSwipePropSetAndSelectedAnimationIsCustom)) { 286 286 - + return NO; 287 287 - + } 288 288 - + } else { 289 289 - + // We want to pass events to RNSPanGestureRecognizer iff full screen swipe is enabled. 290 290 - + if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) { 291 291 - + return topScreen.fullScreenSwipeEnabled; 292 292 - + } 293 293 - + } 294 294 - +#else // check for iOS >= 26 295 295 - // We want to pass events to RNSPanGestureRecognizer iff full screen swipe is enabled. 296 296 - if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) { 297 297 - return topScreen.fullScreenSwipeEnabled; 298 298 - } 299 299 - +#endif // check for iOS >= 26 300 300 - 301 301 - // RNSScreenEdgeGestureRecognizer || _UIParallaxTransitionPanGestureRecognizer 302 302 - return YES; 303 303 - @@ -1268,15 +1239,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive 304 304 - return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:touch]; 305 305 - } 306 306 - 307 307 - -- (BOOL)isTransitionInProgress 308 308 - -{ 309 309 - - if (_controller.transitionCoordinator != nil) { 310 310 - - return YES; 311 311 - - } 312 312 - - 313 313 - - return NO; 314 314 - -} 315 315 - - 316 316 - - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer 317 317 - shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer 318 318 - { 319 319 - @@ -1289,7 +1251,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer 320 320 - if (gestureRecognizer.state == UIGestureRecognizerStateBegan || isBackGesture) { 321 321 - return NO; 322 322 - } 323 323 - - 324 324 - return YES; 325 325 - } 326 326 - return NO;

+4 -2

src/Navigation.tsx

··· 5 5 import {msg} from '@lingui/macro' 6 6 import { 7 7 type BottomTabBarProps, 8 8 + type BottomTabNavigatorProps, 8 9 createBottomTabNavigator, 9 10 } from '@react-navigation/bottom-tabs' 10 11 import { ··· 636 637 * The TabsNavigator is used by native mobile to represent the routes 637 638 * in 3 distinct tab-stacks with a different root screen on each. 638 639 */ 639 639 - function TabsNavigator() { 640 640 + function TabsNavigator({layout}: {layout: BottomTabNavigatorProps['layout']}) { 640 641 const tabBar = useCallback( 641 642 (props: JSX.IntrinsicAttributes & BottomTabBarProps) => ( 642 643 <BottomBar {...props} /> ··· 649 650 initialRouteName="HomeTab" 650 651 backBehavior="initialRoute" 651 652 screenOptions={{headerShown: false, lazy: true}} 652 652 - tabBar={tabBar}> 653 653 + tabBar={tabBar} 654 654 + layout={layout}> 653 655 <Tab.Screen name="HomeTab" getComponent={() => HomeTabNavigator} /> 654 656 <Tab.Screen name="SearchTab" getComponent={() => SearchTabNavigator} /> 655 657 <Tab.Screen

+5 -1

src/view/shell/createNativeStackNavigatorWithAuth.tsx

··· 50 50 function NativeStackNavigator({ 51 51 id, 52 52 initialRouteName, 53 53 + UNSTABLE_routeNamesChangeBehavior, 53 54 children, 54 55 layout, 55 56 screenListeners, 56 57 screenOptions, 57 58 screenLayout, 59 59 + UNSTABLE_router, 58 60 ...rest 59 61 }: NativeStackNavigatorProps) { 60 62 // --- this is copy and pasted from the original native stack navigator --- ··· 68 70 >(StackRouter, { 69 71 id, 70 72 initialRouteName, 73 73 + UNSTABLE_routeNamesChangeBehavior, 71 74 children, 72 75 layout, 73 76 screenListeners, 74 77 screenOptions, 75 78 screenLayout, 79 79 + UNSTABLE_router, 76 80 }) 77 81 78 82 React.useEffect( ··· 169 173 170 174 export function createNativeStackNavigatorWithAuth< 171 175 const ParamList extends ParamListBase, 172 172 - const NavigatorID extends string | undefined = undefined, 176 176 + const NavigatorID extends string | undefined = string | undefined, 173 177 const TypeBag extends NavigatorTypeBagBase = { 174 178 ParamList: ParamList 175 179 NavigatorID: NavigatorID

+8 -3

src/view/shell/index.tsx

··· 91 91 } 92 92 }, [dedupe, navigation]) 93 93 94 94 + const drawerLayout = useCallback( 95 95 + ({children}: {children: React.ReactNode}) => ( 96 96 + <DrawerLayout>{children}</DrawerLayout> 97 97 + ), 98 98 + [], 99 99 + ) 100 100 + 94 101 return ( 95 102 <> 96 103 <View style={[a.h_full]}> 97 104 <ErrorBoundary 98 105 style={{paddingTop: insets.top, paddingBottom: insets.bottom}}> 99 99 - <DrawerLayout> 100 100 - <TabsNavigator /> 101 101 - </DrawerLayout> 106 106 + <TabsNavigator layout={drawerLayout} /> 102 107 </ErrorBoundary> 103 108 </View> 104 109

+54 -53

yarn.lock

··· 6549 6549 invariant "^2.2.4" 6550 6550 nullthrows "^1.1.1" 6551 6551 6552 6552 - "@react-navigation/bottom-tabs@^7.3.13": 6553 6553 - version "7.3.14" 6554 6554 - resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.3.14.tgz#9ee02baea86ab24abe267726665bc69c6df0bf4c" 6555 6555 - integrity sha512-s2qinJggS2HYZdCOey9A+fN+bNpWeEKwiL/FjAVOTcv+uofxPWN6CtEZUZGPEjfRjis/srURBmCmpNZSI6sQ9Q== 6552 6552 + "@react-navigation/bottom-tabs@^7.9.0": 6553 6553 + version "7.9.0" 6554 6554 + resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.9.0.tgz#b546adb0cedd72a1f0179e00b74039b3c8abb6bd" 6555 6555 + integrity sha512-024FWdHp3ZsE5rP8tmGI4vh+1z3wg8u8E9Frep8eeGoYo1h9rQhvgofQDGxknmrKsb7t8o8Dim+IZSvl57cPFQ== 6556 6556 dependencies: 6557 6557 - "@react-navigation/elements" "^2.4.3" 6557 6557 + "@react-navigation/elements" "^2.9.3" 6558 6558 color "^4.2.3" 6559 6559 + sf-symbols-typescript "^2.1.0" 6559 6560 6560 6560 - "@react-navigation/core@^7.10.0": 6561 6561 - version "7.10.0" 6562 6562 - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-7.10.0.tgz#8205ea6b84ce34b2fc2c196701b4cd9b434211b9" 6563 6563 - integrity sha512-qZBA5gGm+9liT4+EHk+kl9apwvqh7HqhLF1XeX6SQRmC/n2QI0u1B8OevKc+EPUDEM9Od15IuwT/GRbSs7/Umw== 6561 6561 + "@react-navigation/core@^7.13.7": 6562 6562 + version "7.13.7" 6563 6563 + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-7.13.7.tgz#1263903a703b5f183a08c22dfc5c3735ac4ef91c" 6564 6564 + integrity sha512-k2ABo3250vq1ovOh/iVwXS6Hwr5PVRGXoPh/ewVFOOuEKTvOx9i//OBzt8EF+HokBxS2HBRlR2b+aCOmscRqBw== 6564 6565 dependencies: 6565 6565 - "@react-navigation/routers" "^7.4.0" 6566 6566 + "@react-navigation/routers" "^7.5.3" 6566 6567 escape-string-regexp "^4.0.0" 6568 6568 + fast-deep-equal "^3.1.3" 6567 6569 nanoid "^3.3.11" 6568 6570 query-string "^7.1.3" 6569 6571 react-is "^19.1.0" 6570 6570 - use-latest-callback "^0.2.3" 6572 6572 + use-latest-callback "^0.2.4" 6571 6573 use-sync-external-store "^1.5.0" 6572 6574 6573 6573 - "@react-navigation/drawer@^7.3.12": 6574 6574 - version "7.4.1" 6575 6575 - resolved "https://registry.yarnpkg.com/@react-navigation/drawer/-/drawer-7.4.1.tgz#50517d8c57f09cdbfc20a485c47016066b918e76" 6576 6576 - integrity sha512-kj5wL31smDLw/6l+0KPR5cjaOZg6oHJCl3RPQonFPuYolUPZBVnuS++uvlifWcD/mqdGmhl3rgLTircRH4vQ7Q== 6575 6575 + "@react-navigation/elements@^2.9.3": 6576 6576 + version "2.9.3" 6577 6577 + resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.9.3.tgz#505ae38af347a0bc5326155318a3d9a54e2071e3" 6578 6578 + integrity sha512-3+eyvWiVPIEf6tN9UdduhOEHcTuNe3R5WovgiVkfH9+jApHMTZDc2loePTpY/i2HDJhObhhChpJzO6BVjrpdYQ== 6577 6579 dependencies: 6578 6578 - "@react-navigation/elements" "^2.4.3" 6579 6580 color "^4.2.3" 6580 6580 - react-native-drawer-layout "^4.1.10" 6581 6581 - use-latest-callback "^0.2.3" 6581 6581 + use-latest-callback "^0.2.4" 6582 6582 + use-sync-external-store "^1.5.0" 6582 6583 6583 6583 - "@react-navigation/elements@^2.4.3": 6584 6584 - version "2.4.3" 6585 6585 - resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.4.3.tgz#cc1dde4c98739d35a0c9c23872316063962cfaee" 6586 6586 - integrity sha512-psoNmnZ0DQIt9nxxPITVLtYW04PGCAfnmd/Pcd3yhiBs93aj+HYKH+SDZDpUnXMf3BN7Wvo4+jPI+/Xjqb+m9w== 6584 6584 + "@react-navigation/native-stack@^7.9.0": 6585 6585 + version "7.9.0" 6586 6586 + resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.9.0.tgz#4fcd08a403ff86c465a908f3b49f86ab3f66d06a" 6587 6587 + integrity sha512-C/mNPhI0Pnerl7C2cB+6fAkdgSmfKECMERrbyfjx3P6JmEuTC54o+GV1c62FUmlRaRUassVHbtw4EeaY2uLh0g== 6587 6588 dependencies: 6589 6589 + "@react-navigation/elements" "^2.9.3" 6588 6590 color "^4.2.3" 6589 6589 - 6590 6590 - "@react-navigation/native-stack@^7.3.13": 6591 6591 - version "7.3.14" 6592 6592 - resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.3.14.tgz#d1c90f2e50cd13bbced923991cf2faee8083f725" 6593 6593 - integrity sha512-45Sf7ReqSCIySXS5nrKtLGmNlFXm5x+u32YQMwKDONCqVGOBCfo4ryKqeQq1EMJ7Py6IDyOwHMhA+jhNOxnfPw== 6594 6594 - dependencies: 6595 6595 - "@react-navigation/elements" "^2.4.3" 6591 6591 + sf-symbols-typescript "^2.1.0" 6596 6592 warn-once "^0.1.1" 6597 6593 6598 6598 - "@react-navigation/native@^7.1.9": 6599 6599 - version "7.1.10" 6600 6600 - resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-7.1.10.tgz#768f674f7c09b6a57215762052aa62a7dc107402" 6601 6601 - integrity sha512-Ug4IML0DkAxZTMF/E7lyyLXSclkGAYElY2cxZWITwfBjtlVeda0NjsdnTWY5EGjnd7bwvhTIUC+CO6qSlrDn5A== 6594 6594 + "@react-navigation/native@^7.1.26": 6595 6595 + version "7.1.26" 6596 6596 + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-7.1.26.tgz#220672e115f39014b95ca3ce8f2c37076a0e74f4" 6597 6597 + integrity sha512-RhKmeD0E2ejzKS6z8elAfdfwShpcdkYY8zJzvHYLq+wv183BBcElTeyMLcIX6wIn7QutXeI92Yi21t7aUWfqNQ== 6602 6598 dependencies: 6603 6603 - "@react-navigation/core" "^7.10.0" 6599 6599 + "@react-navigation/core" "^7.13.7" 6604 6600 escape-string-regexp "^4.0.0" 6605 6601 fast-deep-equal "^3.1.3" 6606 6602 nanoid "^3.3.11" 6607 6607 - use-latest-callback "^0.2.3" 6603 6603 + use-latest-callback "^0.2.4" 6608 6604 6609 6609 - "@react-navigation/routers@^7.4.0": 6610 6610 - version "7.4.0" 6611 6611 - resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-7.4.0.tgz#5bace799713ac163310c18711b98dfbe418c6b36" 6612 6612 - integrity sha512-th5THnuWKJlmr7GGHiicy979di11ycDWub9iIXbEDvQwmwmsRzppmVbfs2nD8bC/MgyMgqWu/gxfys+HqN+kcw== 6605 6605 + "@react-navigation/routers@^7.5.3": 6606 6606 + version "7.5.3" 6607 6607 + resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-7.5.3.tgz#8002930ef5f62351be2475d0dffde3ffaee174d7" 6608 6608 + integrity sha512-1tJHg4KKRJuQ1/EvJxatrMef3NZXEPzwUIUZ3n1yJ2t7Q97siwRtbynRpQG9/69ebbtiZ8W3ScOZF/OmhvM4Rg== 6613 6609 dependencies: 6614 6610 nanoid "^3.3.11" 6615 6611 ··· 17055 17051 dependencies: 17056 17052 dotenv "^16.4.5" 17057 17053 17058 17058 - react-native-drawer-layout@^4.1.10, react-native-drawer-layout@^4.1.8: 17059 17059 - version "4.1.10" 17060 17060 - resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.10.tgz#9007cb747767ca8e1c9c3337671ad35ed95ad4d9" 17061 17061 - integrity sha512-wejQo0F+EffCkOkRh+DP6ENWMB+aWEHkXV8Pd564PmtoySZLUsV/ksYrh/mrufh7T7EuvGT8+fNHz7mMRYftWg== 17054 17054 + react-native-drawer-layout@^4.2.1: 17055 17055 + version "4.2.1" 17056 17056 + resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.2.1.tgz#5c89425662c9b5216a227dbc87bc7f38c4ec8719" 17057 17057 + integrity sha512-liwRJ7ynRU/ogRlUdiK1Yoi1VzUSq2Vu/RU+UgqlMB3XduslZ1DZg/mTX0f1uCEV2dJ4ec+1fRa3OlIierfyZg== 17062 17058 dependencies: 17063 17063 - use-latest-callback "^0.2.3" 17059 17059 + color "^4.2.3" 17060 17060 + use-latest-callback "^0.2.4" 17064 17061 17065 17062 react-native-edge-to-edge@^1.6.0: 17066 17063 version "1.6.0" ··· 17149 17146 resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.6.1.tgz#cb4d249ef1a6f7e8fd0cfdfa9764838dffda26b6" 17150 17147 integrity sha512-/wJE58HLEAkATzhhX1xSr+fostLsK8Q97EfpfMDKo8jlOc1QKESSX/FQrhk7HhQH/2uSaox4Y86sNaI02kteiA== 17151 17148 17152 17152 - react-native-screens@~4.16.0: 17153 17153 - version "4.16.0" 17154 17154 - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.16.0.tgz#efa42e77a092aa0b5277c9ae41391ea0240e0870" 17155 17155 - integrity sha512-yIAyh7F/9uWkOzCi1/2FqvNvK6Wb9Y1+Kzn16SuGfN9YFJDTbwlzGRvePCNTOX0recpLQF3kc2FmvMUhyTCH1Q== 17149 17149 + react-native-screens@^4.19.0: 17150 17150 + version "4.19.0" 17151 17151 + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.19.0.tgz#d00f2ec070d7426204eaf34ef6c64396a6871e1d" 17152 17152 + integrity sha512-qSDAO3AL5bti0Ri7KZRSVmWlhDr8MV86N5GruiKVQfEL7Zx2nUi3Dl62lqHUAD/LnDvOPuDDsMHCfIpYSv3hPQ== 17156 17153 dependencies: 17157 17154 react-freeze "^1.0.0" 17158 17158 - react-native-is-edge-to-edge "^1.2.1" 17159 17155 warn-once "^0.1.0" 17160 17156 17161 17157 react-native-svg@15.12.1: ··· 18128 18124 version "1.2.0" 18129 18125 resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" 18130 18126 integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== 18127 18127 + 18128 18128 + sf-symbols-typescript@^2.1.0: 18129 18129 + version "2.2.0" 18130 18130 + resolved "https://registry.yarnpkg.com/sf-symbols-typescript/-/sf-symbols-typescript-2.2.0.tgz#926d6e0715e3d8784cadf7658431e36581254208" 18131 18131 + integrity sha512-TPbeg0b7ylrswdGCji8FRGFAKuqbpQlLbL8SOle3j1iHSs5Ob5mhvMAxWN2UItOjgALAB5Zp3fmMfj8mbWvXKw== 18131 18132 18132 18133 shallow-equal@^3.1.0: 18133 18134 version "3.1.0" ··· 19630 19631 resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" 19631 19632 integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== 19632 19633 19633 19633 - use-latest-callback@^0.2.3: 19634 19634 - version "0.2.3" 19635 19635 - resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.2.3.tgz#2d644d3063040b9bc2d4c55bb525a13ae3de9e16" 19636 19636 - integrity sha512-7vI3fBuyRcP91pazVboc4qu+6ZqM8izPWX9k7cRnT8hbD5svslcknsh3S9BUhaK11OmgTV4oWZZVSeQAiV53SQ== 19634 19634 + use-latest-callback@^0.2.4: 19635 19635 + version "0.2.6" 19636 19636 + resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.2.6.tgz#e5ea752808c86219acc179ace0ae3c1203255e77" 19637 19637 + integrity sha512-FvRG9i1HSo0wagmX63Vrm8SnlUU3LMM3WyZkQ76RnslpBrX694AdG4A0zQBx2B3ZifFA0yv/BaEHGBnEax5rZg== 19637 19638 19638 19639 use-latest@^1.2.1: 19639 19640 version "1.2.1"