From a2ca7db052c0ce20b404f6f81b691850b3318b97 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Wed, 13 Mar 2024 14:33:54 +0000 Subject: mobile: Optimistic UI updates on actions --- .../mobile/components/bookmarks/BookmarkCard.tsx | 51 ++++++++++++++++------ .../mobile/components/bookmarks/BookmarkList.tsx | 23 +++++----- 2 files changed, 49 insertions(+), 25 deletions(-) (limited to 'packages/mobile/components/bookmarks') diff --git a/packages/mobile/components/bookmarks/BookmarkCard.tsx b/packages/mobile/components/bookmarks/BookmarkCard.tsx index ae0d8a33..b3ddf302 100644 --- a/packages/mobile/components/bookmarks/BookmarkCard.tsx +++ b/packages/mobile/components/bookmarks/BookmarkCard.tsx @@ -1,10 +1,12 @@ import { ZBookmark } from "@hoarder/trpc/types/bookmarks"; import * as WebBrowser from "expo-web-browser"; -import { Star, Archive, Trash } from "lucide-react-native"; +import { Star, Archive, Trash, ArchiveRestore } from "lucide-react-native"; import { View, Text, Image, ScrollView, Pressable } from "react-native"; import Markdown from "react-native-markdown-display"; +import { ActionButton } from "../ui/ActionButton"; import { Skeleton } from "../ui/Skeleton"; +import { useToast } from "../ui/Toast"; import { api } from "@/lib/trpc"; @@ -30,20 +32,39 @@ export function isBookmarkStillLoading(bookmark: ZBookmark) { } function ActionBar({ bookmark }: { bookmark: ZBookmark }) { + const { toast } = useToast(); const apiUtils = api.useUtils(); - const { mutate: deleteBookmark } = api.bookmarks.deleteBookmark.useMutation({ - onSuccess: () => { - apiUtils.bookmarks.getBookmarks.invalidate(); - }, - }); - const { mutate: updateBookmark, variables } = - api.bookmarks.updateBookmark.useMutation({ + const { mutate: deleteBookmark, isPending: isDeletionPending } = + api.bookmarks.deleteBookmark.useMutation({ onSuccess: () => { apiUtils.bookmarks.getBookmarks.invalidate(); - apiUtils.bookmarks.getBookmark.invalidate({ bookmarkId: bookmark.id }); + }, + onError: () => { + toast({ + message: "Something went wrong", + variant: "destructive", + showProgress: false, + }); }, }); + const { + mutate: updateBookmark, + variables, + isPending: isUpdatePending, + } = api.bookmarks.updateBookmark.useMutation({ + onSuccess: () => { + apiUtils.bookmarks.getBookmarks.invalidate(); + apiUtils.bookmarks.getBookmark.invalidate({ bookmarkId: bookmark.id }); + }, + onError: () => { + toast({ + message: "Something went wrong", + variant: "destructive", + showProgress: false, + }); + }, + }); return ( @@ -61,7 +82,8 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) { )} - updateBookmark({ bookmarkId: bookmark.id, @@ -69,9 +91,10 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) { }) } > - - - : } + + deleteBookmark({ bookmarkId: bookmark.id, @@ -79,7 +102,7 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) { } > - + ); } diff --git a/packages/mobile/components/bookmarks/BookmarkList.tsx b/packages/mobile/components/bookmarks/BookmarkList.tsx index 519ec47c..af5c9de7 100644 --- a/packages/mobile/components/bookmarks/BookmarkList.tsx +++ b/packages/mobile/components/bookmarks/BookmarkList.tsx @@ -1,5 +1,6 @@ import { useEffect, useState } from "react"; -import { FlatList, Text, View } from "react-native"; +import { Text, View } from "react-native"; +import Animated, { LinearTransition } from "react-native-reanimated"; import BookmarkCard from "./BookmarkCard"; @@ -37,25 +38,25 @@ export default function BookmarkList({ apiUtils.bookmarks.getBookmark.invalidate(); }; - if (!data.bookmarks.length) { - return ( - - No Bookmarks - - ); - } - return ( - } + renderItem={(b) => } + ListEmptyComponent={ + + No Bookmarks + + } data={data.bookmarks} refreshing={refreshing} onRefresh={onRefresh} + keyExtractor={(b) => b.id} /> ); } -- cgit v1.2.3-70-g09d2