Skip to content

Commit b09a86d

Browse files
committed
fix(mobile): simplify header back button interactions
- Remove redundant TouchableOpacity wrapping for DefaultHeaderBackButton - Directly render DefaultHeaderBackButton in multiple components - Improve header navigation component simplicity Signed-off-by: Innei <tukon479@gmail.com>
1 parent 39b3b48 commit b09a86d

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

apps/mobile/src/components/ui/icon/feed-icon.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ export function FeedIcon({
6060
}
6161
}, [fallback, feed, siteUrl])
6262

63+
if (!src) {
64+
return null
65+
}
6366
return (
6467
<ProxiedImage
6568
proxy={{

apps/mobile/src/modules/entry-content/EntryTitle.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { useTypeScriptHappyCallback } from "@follow/hooks"
22
import { useHeaderHeight } from "@react-navigation/elements"
33
import { useQuery } from "@tanstack/react-query"
4-
import { router } from "expo-router"
54
import { useCallback, useContext, useEffect, useState } from "react"
6-
import { Text, TouchableOpacity, useWindowDimensions, View } from "react-native"
5+
import { Text, useWindowDimensions, View } from "react-native"
76
import type { SharedValue } from "react-native-reanimated"
87
import Animated, {
98
interpolate,
@@ -204,9 +203,7 @@ const EntryLeftGroup = ({ canGoBack, entryId, titleOpacityShareValue }: EntryLef
204203
})
205204
return (
206205
<View className="flex-row items-center justify-center">
207-
<TouchableOpacity hitSlop={10} onPress={() => router.back()}>
208-
<DefaultHeaderBackButton canGoBack={canGoBack} />
209-
</TouchableOpacity>
206+
<DefaultHeaderBackButton canGoBack={canGoBack} />
210207

211208
{!hideRecentReader && (
212209
<Animated.View style={animatedOpacity} className="absolute left-[32px] z-10 flex-row gap-2">

apps/mobile/src/modules/screen/TimelineSelectorProvider.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { router, useLocalSearchParams } from "expo-router"
1+
import { useLocalSearchParams } from "expo-router"
22
import { useMemo } from "react"
3-
import { Share, TouchableOpacity, useAnimatedValue, View } from "react-native"
3+
import { Share, useAnimatedValue, View } from "react-native"
44
import { useColor } from "react-native-uikit-colors"
55

66
import { DefaultHeaderBackButton } from "@/src/components/layouts/header/NavigationHeader"
@@ -44,9 +44,7 @@ export function TimelineSelectorProvider({ children }: { children: React.ReactNo
4444
)
4545
: () => (
4646
<View style={{ width: HEADER_ACTIONS_GROUP_WIDTH }}>
47-
<TouchableOpacity hitSlop={10} onPress={() => router.back()}>
48-
<DefaultHeaderBackButton canGoBack={true} />
49-
</TouchableOpacity>
47+
<DefaultHeaderBackButton canGoBack={true} />
5048
</View>
5149
),
5250
[isTimeline, isSubscriptions],

0 commit comments

Comments
 (0)