A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search
feat(mobile): add mobile sorting support. fixes #2777
Mohamed Bassemd5ea3f5aa53a
diff --git a/apps/mobile/components/bookmarks/BookmarkListHeader.tsx b/apps/mobile/components/bookmarks/BookmarkListHeader.tsxindex 0feba583..ce753044 100644--- a/apps/mobile/components/bookmarks/BookmarkListHeader.tsx+++ b/apps/mobile/components/bookmarks/BookmarkListHeader.tsx@@ -36,18 +36,48 @@ function useBookmarkListLayoutMenu(): {},],},+ {+ id: "sort",+ title: "Sort",+ image: Platform.select({ ios: "arrow.up.arrow.down" }),+ imageColor: Platform.select({ ios: menuIconColor }),+ subactions: [+ {+ id: "sort_desc",+ title: "Newest First",+ state: settings.bookmarkSortOrder === "desc" ? "on" : "off",+ image: Platform.select({ ios: "arrow.down" }),+ imageColor: Platform.select({ ios: menuIconColor }),+ },+ {+ id: "sort_asc",+ title: "Oldest First",+ state: settings.bookmarkSortOrder === "asc" ? "on" : "off",+ image: Platform.select({ ios: "arrow.up" }),+ imageColor: Platform.select({ ios: menuIconColor }),+ },+ ],+ },];const handleLayoutAction = (event: string) => {- if (event !== "card" && event !== "list") {- return false;+ if (event === "card" || event === "list") {+ setSettings({+ ...settings,+ bookmarkLayout: event,+ });+ return true;+ }++ if (event === "sort_desc" || event === "sort_asc") {+ setSettings({+ ...settings,+ bookmarkSortOrder: event === "sort_desc" ? "desc" : "asc",+ });+ return true;}- setSettings({- ...settings,- bookmarkLayout: event,- });- return true;+ return false;};return { layoutActions, handleLayoutAction, menuIconColor };diff --git a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsxindex 25be7c2d..617d2310 100644--- a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx+++ b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx@@ -1,4 +1,5 @@import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";+import useAppSettings from "@/lib/settings";import type { ZGetBookmarksRequest } from "@karakeep/shared/types/bookmarks";import { useTRPC } from "@karakeep/shared-react/trpc";@@ -12,11 +13,12 @@ export default function UpdatingBookmarkList({query,header,}: {- query: Omit<ZGetBookmarksRequest, "sortOrder" | "includeContent">; // Sort order is not supported in mobile yet+ query: Omit<ZGetBookmarksRequest, "sortOrder" | "includeContent">; // Sort order is handled by mobile settingsheader?: React.ReactElement;}) {const api = useTRPC();const queryClient = useQueryClient();+ const { settings } = useAppSettings();const {data,isPending,@@ -27,7 +29,12 @@ export default function UpdatingBookmarkList({refetch,} = useInfiniteQuery(api.bookmarks.getBookmarks.infiniteQueryOptions(- { ...query, useCursorV2: true, includeContent: false },+ {+ ...query,+ sortOrder: settings.bookmarkSortOrder,+ useCursorV2: true,+ includeContent: false,+ },{initialCursor: null,getNextPageParam: (lastPage) => lastPage.nextCursor,diff --git a/apps/mobile/lib/settings.ts b/apps/mobile/lib/settings.tsindex c7120475..b937f9ff 100644--- a/apps/mobile/lib/settings.ts+++ b/apps/mobile/lib/settings.ts@@ -45,6 +45,7 @@ const zSettingsSchema = z.object({.optional().default("reader"),bookmarkLayout: z.enum(["card", "list"]).optional().default("card"),+ bookmarkSortOrder: z.enum(["asc", "desc"]).optional().default("desc"),showNotes: z.boolean().optional().default(false),keepScreenOnWhileReading: z.boolean().optional().default(false),customHeaders: z.record(z.string(), z.string()).optional().default({}),@@ -80,6 +81,7 @@ const useSettings = create<AppSettingsState>((set, get) => ({theme: "system",defaultBookmarkView: "reader",bookmarkLayout: "card",+ bookmarkSortOrder: "desc",showNotes: false,keepScreenOnWhileReading: false,customHeaders: {},