pyrox.dev / witchsky
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix pwi at 1300px (#8238)

authored by

Samuel Newman and committed by
GitHub b6a6b1ba 686f15a6

+14 -13
+13 -12
src/view/shell/createNativeStackNavigatorWithAuth.tsx
··· 5 5 // Copyright (c) 2017 React Navigation Contributors 6 6 import { 7 7 createNavigatorFactory, 8 - EventArg, 9 - ParamListBase, 10 - StackActionHelpers, 8 + type EventArg, 9 + type ParamListBase, 10 + type StackActionHelpers, 11 11 StackActions, 12 - StackNavigationState, 12 + type StackNavigationState, 13 13 StackRouter, 14 - StackRouterOptions, 14 + type StackRouterOptions, 15 15 useNavigationBuilder, 16 16 } from '@react-navigation/native' 17 - import type { 18 - NativeStackNavigationEventMap, 19 - NativeStackNavigationOptions, 17 + import { 18 + type NativeStackNavigationEventMap, 19 + type NativeStackNavigationOptions, 20 20 } from '@react-navigation/native-stack' 21 21 import {NativeStackView} from '@react-navigation/native-stack' 22 - import type {NativeStackNavigatorProps} from '@react-navigation/native-stack/src/types' 22 + import {type NativeStackNavigatorProps} from '@react-navigation/native-stack/src/types' 23 23 24 24 import {PWI_ENABLED} from '#/lib/build-flags' 25 25 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' ··· 35 35 import {Onboarding} from '#/screens/Onboarding' 36 36 import {SignupQueued} from '#/screens/SignupQueued' 37 37 import {Takendown} from '#/screens/Takendown' 38 - import {atoms as a} from '#/alf' 38 + import {atoms as a, useLayoutBreakpoints} from '#/alf' 39 39 import {BottomBarWeb} from './bottom-bar/BottomBarWeb' 40 40 import {DesktopLeftNav} from './desktop/LeftNav' 41 41 import {DesktopRightNav} from './desktop/RightNav' ··· 101 101 const onboardingState = useOnboardingState() 102 102 const {showLoggedOut} = useLoggedOutView() 103 103 const {setShowLoggedOut} = useLoggedOutViewControls() 104 - const {isMobile, isTabletOrMobile} = useWebMediaQueries() 104 + const {isMobile} = useWebMediaQueries() 105 + const {leftNavMinimal} = useLayoutBreakpoints() 105 106 if (!hasSession && (!PWI_ENABLED || activeRouteRequiresAuth || isNative)) { 106 107 return <LoggedOut /> 107 108 } ··· 138 139 139 140 // Show the bottom bar if we have a session only on mobile web. If we don't have a session, we want to show it 140 141 // on both tablet and mobile web so that we see the create account CTA. 141 - const showBottomBar = hasSession ? isMobile : isTabletOrMobile 142 + const showBottomBar = hasSession ? isMobile : leftNavMinimal 142 143 143 144 return ( 144 145 <NavigationContent>
+1 -1
src/view/shell/desktop/LeftNav.tsx
··· 571 571 ]}> 572 572 {hasSession ? ( 573 573 <ProfileCard /> 574 - ) : isDesktop ? ( 574 + ) : !leftNavMinimal ? ( 575 575 <View style={[a.pt_xl]}> 576 576 <NavSignupCard /> 577 577 </View>