From 66e4e9d677d657f83dd996cea8899361533f7cf7 Mon Sep 17 00:00:00 2001 From: Rem Helper Date: Mon, 6 Jul 2026 02:02:53 +0000 Subject: [PATCH] Fix beahviors --- apps/mobile/app/(app)/(tabs)/home/queue.tsx | 17 +++++++++++++++-- apps/mobile/app/(app)/player.tsx | 13 +++++++++++++ apps/mobile/contexts/playback.tsx | 5 ++++- apps/web/components/playback-provider.tsx | 5 ++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/apps/mobile/app/(app)/(tabs)/home/queue.tsx b/apps/mobile/app/(app)/(tabs)/home/queue.tsx index a1b4283..1a1257e 100644 --- a/apps/mobile/app/(app)/(tabs)/home/queue.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/queue.tsx @@ -1,5 +1,5 @@ import { usePaginatedQuery, useQuery } from "convex/react" -import { Stack } from "expo-router" +import { Stack, useRouter } from "expo-router" import { FlatList, Pressable, StyleSheet, Text, View } from "react-native" import { Button, LoadingView } from "@/components/ui/primitives" @@ -12,6 +12,7 @@ import { spacing, useThemeColors } from "@/lib/theme" const PAGE_SIZE = 50 export default function QueueScreen() { + const router = useRouter() const colors = useThemeColors() const { queueSongIds, @@ -42,6 +43,18 @@ export default function QueueScreen() { void reorderQueue(next) } + function handleClearQueue() { + if (router.canGoBack()) { + router.back() + setTimeout(() => { + void clearQueue() + }, 0) + return + } + + void clearQueue() + } + if (queueSongs === undefined) { return } @@ -52,7 +65,7 @@ export default function QueueScreen() { options={{ headerRight: () => queueSongIds.length > 0 ? ( -