mirror of
https://github.com/streamyfin/streamyfin.git
synced 2026-07-15 00:43:08 +01:00
Compare commits
4 Commits
fix/i18n-m
...
fix/nav-do
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f7d24d63f | ||
|
|
7b15b15af3 | ||
|
|
f8b8cddbfa | ||
|
|
3bd7507462 |
@@ -1,6 +1,6 @@
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { BlurView, type BlurViewProps } from "expo-blur";
|
||||
import { Platform } from "react-native";
|
||||
import { Keyboard, Platform } from "react-native";
|
||||
import { Pressable, type PressableProps } from "react-native-gesture-handler";
|
||||
import useRouter from "@/hooks/useAppRouter";
|
||||
|
||||
@@ -16,10 +16,17 @@ export const HeaderBackButton: React.FC<Props> = ({
|
||||
}) => {
|
||||
const router = useRouter();
|
||||
|
||||
// Dismiss the keyboard before navigating — otherwise it lingers over the
|
||||
// previous screen (e.g. leaving the Jellyseerr login while typing).
|
||||
const handleBack = () => {
|
||||
Keyboard.dismiss();
|
||||
router.back();
|
||||
};
|
||||
|
||||
if (Platform.OS === "ios") {
|
||||
return (
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
onPress={handleBack}
|
||||
className='flex items-center justify-center w-9 h-9'
|
||||
{...pressableProps}
|
||||
>
|
||||
@@ -30,7 +37,7 @@ export const HeaderBackButton: React.FC<Props> = ({
|
||||
|
||||
if (background === "transparent" && Platform.OS !== "android")
|
||||
return (
|
||||
<Pressable onPress={() => router.back()} {...pressableProps}>
|
||||
<Pressable onPress={handleBack} {...pressableProps}>
|
||||
<BlurView
|
||||
{...props}
|
||||
intensity={100}
|
||||
@@ -48,7 +55,7 @@ export const HeaderBackButton: React.FC<Props> = ({
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
onPress={handleBack}
|
||||
className=' rounded-full p-2'
|
||||
{...pressableProps}
|
||||
>
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
// Imported from expo-router's bundled copy, NOT "@react-navigation/*": as of
|
||||
// SDK 56 expo-router's Metro check rejects direct @react-navigation imports.
|
||||
import { useRouter } from "expo-router";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { NavigationContext } from "expo-router/react-navigation";
|
||||
import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
|
||||
import { useOfflineMode } from "@/providers/OfflineModeProvider";
|
||||
|
||||
/**
|
||||
* Drop-in replacement for expo-router's useRouter that automatically
|
||||
* preserves offline state across navigation.
|
||||
* preserves offline state across navigation and guards against duplicate
|
||||
* screens from rapid taps.
|
||||
*
|
||||
* - For object-form navigation, automatically adds offline=true when in offline context
|
||||
* - For string URLs, passes through unchanged (caller handles offline param)
|
||||
* - push() is a no-op while the source screen is not focused, so taps fired
|
||||
* before the pushed screen has rendered (slow devices) can't stack duplicates
|
||||
*
|
||||
* @example
|
||||
* import useRouter from "@/hooks/useAppRouter";
|
||||
@@ -19,8 +25,36 @@ export function useAppRouter() {
|
||||
const router = useRouter();
|
||||
const isOffline = useOfflineMode();
|
||||
|
||||
// Optional: undefined when used outside a navigator (root layout, providers).
|
||||
// When present it reflects the focus state of the screen this hook lives in.
|
||||
const navigation = useContext(NavigationContext);
|
||||
|
||||
// Synchronous re-entry guard for TV: a single remote "select" on Android TV
|
||||
// can fire onPress more than once within the same JS batch
|
||||
// (react-native-tvos#110/#138), BEFORE react-navigation commits the pushed
|
||||
// route — so isFocused() still reads true for the duplicate. The ref flips
|
||||
// synchronously on the first push and resets when the screen regains focus.
|
||||
const pushInFlightRef = useRef(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!navigation) return;
|
||||
return navigation.addListener("focus", () => {
|
||||
pushInFlightRef.current = false;
|
||||
});
|
||||
}, [navigation]);
|
||||
|
||||
const push = useCallback(
|
||||
(href: Parameters<typeof router.push>[0]) => {
|
||||
// Rapid-push guard: a push blurs the source screen synchronously in the
|
||||
// navigation state (only the native render is slow). Any further push from
|
||||
// this screen — duplicate or not — is dropped until focus returns, so taps
|
||||
// fired before the pushed screen renders can't stack screens.
|
||||
// No navigation context => nothing to guard (deep-link pushes from root).
|
||||
if (navigation) {
|
||||
if (navigation.isFocused?.() === false || pushInFlightRef.current)
|
||||
return;
|
||||
pushInFlightRef.current = true;
|
||||
}
|
||||
if (typeof href === "string") {
|
||||
router.push(href as any);
|
||||
} else {
|
||||
@@ -36,7 +70,7 @@ export function useAppRouter() {
|
||||
} as any);
|
||||
}
|
||||
},
|
||||
[router, isOffline],
|
||||
[router, isOffline, navigation],
|
||||
);
|
||||
|
||||
const replace = useCallback(
|
||||
|
||||
Reference in New Issue
Block a user