refactor(settings): restore expo-ui bottom sheet and direct clipboard (drop stale-build workarounds)

This commit is contained in:
Gauvain
2026-06-04 00:36:44 +02:00
parent 059c8bb854
commit da47ad0502
4 changed files with 36 additions and 35 deletions

View File

@@ -1,4 +1,5 @@
import * as Application from "expo-application"; import * as Application from "expo-application";
import { setStringAsync } from "expo-clipboard";
import { t } from "i18next"; import { t } from "i18next";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useState } from "react"; import { useState } from "react";
@@ -19,17 +20,9 @@ export default function AccountPage() {
const copyToken = async () => { const copyToken = async () => {
if (!token) return; if (!token) return;
try { await setStringAsync(token);
// Lazy import: expo-clipboard is a native module. Importing it at module success();
// top crashes the screen on a dev client built before it was added; the Alert.alert(t("home.settings.account.copied"));
// dynamic import defers loading until the user taps copy.
const Clipboard = await import("expo-clipboard");
await Clipboard.setStringAsync(token);
success();
Alert.alert(t("home.settings.account.copied"));
} catch {
Alert.alert(t("home.settings.account.copy_unavailable"));
}
}; };
return ( return (

View File

@@ -1,9 +1,3 @@
import {
BottomSheetBackdrop,
type BottomSheetBackdropProps,
BottomSheetModal,
BottomSheetView,
} from "@gorhom/bottom-sheet";
import { getQuickConnectApi } from "@jellyfin/sdk/lib/utils/api"; import { getQuickConnectApi } from "@jellyfin/sdk/lib/utils/api";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { import {
@@ -18,6 +12,11 @@ import { useTranslation } from "react-i18next";
import { Alert, Platform, View } from "react-native"; import { Alert, Platform, View } from "react-native";
import { useHaptic } from "@/hooks/useHaptic"; import { useHaptic } from "@/hooks/useHaptic";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import {
type BottomSheetMethods,
BottomSheetModal,
BottomSheetView,
} from "@/utils/expoUiBottomSheet";
import { Button } from "../Button"; import { Button } from "../Button";
import { Text } from "../common/Text"; import { Text } from "../common/Text";
import { PinInput } from "../inputs/PinInput"; import { PinInput } from "../inputs/PinInput";
@@ -30,7 +29,7 @@ export const QuickConnectSheet = forwardRef<QuickConnectSheetRef>(
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom); const [user] = useAtom(userAtom);
const [quickConnectCode, setQuickConnectCode] = useState<string>(); const [quickConnectCode, setQuickConnectCode] = useState<string>();
const modalRef = useRef<BottomSheetModal>(null); const modalRef = useRef<BottomSheetMethods>(null);
const successHapticFeedback = useHaptic("success"); const successHapticFeedback = useHaptic("success");
const errorHapticFeedback = useHaptic("error"); const errorHapticFeedback = useHaptic("error");
const snapPoints = useMemo( const snapPoints = useMemo(
@@ -51,17 +50,6 @@ export const QuickConnectSheet = forwardRef<QuickConnectSheetRef>(
[], [],
); );
const renderBackdrop = useCallback(
(props: BottomSheetBackdropProps) => (
<BottomSheetBackdrop
{...props}
disappearsOnIndex={-1}
appearsOnIndex={0}
/>
),
[],
);
const authorizeQuickConnect = useCallback(async () => { const authorizeQuickConnect = useCallback(async () => {
if (!quickConnectCode) return; if (!quickConnectCode) return;
try { try {
@@ -76,7 +64,7 @@ export const QuickConnectSheet = forwardRef<QuickConnectSheetRef>(
t("home.settings.quick_connect.quick_connect_autorized"), t("home.settings.quick_connect.quick_connect_autorized"),
); );
setQuickConnectCode(undefined); setQuickConnectCode(undefined);
modalRef.current?.dismiss(); modalRef.current?.close();
} else { } else {
errorHapticFeedback(); errorHapticFeedback();
Alert.alert( Alert.alert(
@@ -105,14 +93,12 @@ export const QuickConnectSheet = forwardRef<QuickConnectSheetRef>(
return ( return (
<BottomSheetModal <BottomSheetModal
ref={modalRef} ref={modalRef}
enablePanDownToClose
snapPoints={snapPoints} snapPoints={snapPoints}
handleIndicatorStyle={{ backgroundColor: "white" }} handleIndicatorStyle={{ backgroundColor: "white" }}
backgroundStyle={{ backgroundColor: "#171717" }} backgroundStyle={{ backgroundColor: "#171717" }}
backdropComponent={renderBackdrop}
keyboardBehavior={isAndroid ? "fillParent" : "interactive"} keyboardBehavior={isAndroid ? "fillParent" : "interactive"}
keyboardBlurBehavior='restore' keyboardBlurBehavior='restore'
android_keyboardInputMode='adjustResize'
topInset={isAndroid ? 0 : undefined}
> >
<BottomSheetView> <BottomSheetView>
<View className='flex flex-col space-y-4 px-4 pb-8 pt-2'> <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>

View File

@@ -146,8 +146,7 @@
"account": { "account": {
"title": "Account", "title": "Account",
"copy_token": "Copy token", "copy_token": "Copy token",
"copied": "Copied to clipboard", "copied": "Copied to clipboard"
"copy_unavailable": "Clipboard unavailable — rebuild the app to enable copy"
}, },
"playback_controls": { "playback_controls": {
"title": "Playback & Controls" "title": "Playback & Controls"

View File

@@ -0,0 +1,23 @@
import { Platform } from "react-native";
/**
* TV-safe re-exports of `@expo/ui/community/bottom-sheet`.
*
* `@expo/ui` resolves its native bridge at module load via
* `requireNativeModule('ExpoUI')`, which does not exist on tvOS — a static
* top-level import would crash the whole expo-router route tree. We `require()`
* it lazily and only off-TV; on TV the exports are undefined, which is fine
* because every call site early-returns on `Platform.isTV`.
*/
type BottomSheetMod = typeof import("@expo/ui/community/bottom-sheet");
const mod: BottomSheetMod = Platform.isTV
? ({} as BottomSheetMod)
: (require("@expo/ui/community/bottom-sheet") as BottomSheetMod);
export const BottomSheetModal = mod.BottomSheetModal;
export const BottomSheetView = mod.BottomSheetView;
export const BottomSheetScrollView = mod.BottomSheetScrollView;
export const BottomSheetTextInput = mod.BottomSheetTextInput;
export type { BottomSheetMethods } from "@expo/ui/community/bottom-sheet";