diff options
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/createNativeStackNavigatorWithAuth.tsx | 3 | ||||
-rw-r--r-- | src/view/shell/desktop/Feeds.tsx | 4 | ||||
-rw-r--r-- | src/view/shell/desktop/RightNav.tsx | 24 |
3 files changed, 22 insertions, 9 deletions
diff --git a/src/view/shell/createNativeStackNavigatorWithAuth.tsx b/src/view/shell/createNativeStackNavigatorWithAuth.tsx index 43dc28159..9fea6e49f 100644 --- a/src/view/shell/createNativeStackNavigatorWithAuth.tsx +++ b/src/view/shell/createNativeStackNavigatorWithAuth.tsx @@ -124,6 +124,7 @@ function NativeStackNavigator({ }, } } + return ( <NavigationContent> <NativeStackView @@ -136,7 +137,7 @@ function NativeStackNavigator({ {isWeb && !isMobile && ( <> <DesktopLeftNav /> - <DesktopRightNav /> + <DesktopRightNav routeName={activeRoute.name} /> </> )} </NavigationContent> diff --git a/src/view/shell/desktop/Feeds.tsx b/src/view/shell/desktop/Feeds.tsx index 93b96e704..a8f5f1c66 100644 --- a/src/view/shell/desktop/Feeds.tsx +++ b/src/view/shell/desktop/Feeds.tsx @@ -21,7 +21,7 @@ export function DesktopFeeds() { }) return ( - <View style={[styles.container, pal.view, pal.border]}> + <View style={[styles.container, pal.view]}> <FeedItem href="/" title="Following" current={route.name === 'Home'} /> {feeds .filter(f => f.displayName !== 'Following') @@ -91,7 +91,5 @@ const styles = StyleSheet.create({ width: 300, paddingHorizontal: 12, paddingVertical: 18, - borderTopWidth: 1, - borderBottomWidth: 1, }, }) diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 8d9961a5f..02b742dc9 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -16,7 +16,7 @@ import {Plural, Trans, msg, plural} from '@lingui/macro' import {useSession} from '#/state/session' import {useInviteCodesQuery} from '#/state/queries/invites' -export function DesktopRightNav() { +export function DesktopRightNav({routeName}: {routeName: string}) { const pal = usePalette('default') const palError = usePalette('error') const {_} = useLingui() @@ -30,12 +30,20 @@ export function DesktopRightNav() { return ( <View style={[styles.rightNav, pal.view]}> <View style={{paddingVertical: 20}}> - <DesktopSearch /> - - {hasSession && ( - <View style={{paddingTop: 18, marginBottom: 18}}> + {routeName === 'Search' ? ( + <View style={{marginBottom: 18}}> <DesktopFeeds /> </View> + ) : ( + <> + <DesktopSearch /> + + {hasSession && ( + <View style={[pal.border, styles.desktopFeedsContainer]}> + <DesktopFeeds /> + </View> + )} + </> )} <View @@ -196,4 +204,10 @@ const styles = StyleSheet.create({ marginRight: 6, flexShrink: 0, }, + desktopFeedsContainer: { + borderTopWidth: 1, + borderBottomWidth: 1, + marginTop: 18, + marginBottom: 18, + }, }) |