Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

feat(mobile): iOS 26 header compatibility and header icon fixes (#2523)

Evan Simkowitze71681deeccc
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
index 619ea629..cf24e6cf 100644
--- a/apps/mobile/app/_layout.tsx
+++ b/apps/mobile/app/_layout.tsx
@@ -12,6 +12,7 @@ import { ShareIntentProvider, useShareIntent } from "expo-share-intent";
import { StatusBar } from "expo-status-bar";
import { StyledStack } from "@/components/navigation/stack";
import SplashScreenController from "@/components/SplashScreenController";
+import { isIOS26 } from "@/lib/ios";
import { Providers } from "@/lib/providers";
import { useColorScheme, useInitialAndroidBarSync } from "@/lib/useColorScheme";
import { cn } from "@/lib/utils";
@@ -70,7 +71,7 @@ export default Sentry.wrap(function RootLayout() {
...Platform.select({
ios: {
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitle: true,
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
diff --git a/apps/mobile/app/dashboard/(tabs)/(highlights)/_layout.tsx b/apps/mobile/app/dashboard/(tabs)/(highlights)/_layout.tsx
index d0dfafdc..07359aea 100644
--- a/apps/mobile/app/dashboard/(tabs)/(highlights)/_layout.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(highlights)/_layout.tsx
@@ -1,5 +1,6 @@
import { Platform } from "react-native";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
export default function Layout() {
return (
@@ -9,7 +10,7 @@ export default function Layout() {
ios: {
headerLargeTitle: true,
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
},
diff --git a/apps/mobile/app/dashboard/(tabs)/(home)/_layout.tsx b/apps/mobile/app/dashboard/(tabs)/(home)/_layout.tsx
index b4cb655f..6ef07b9f 100644
--- a/apps/mobile/app/dashboard/(tabs)/(home)/_layout.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(home)/_layout.tsx
@@ -1,5 +1,6 @@
import { Platform } from "react-native";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
export default function Layout() {
return (
@@ -9,7 +10,7 @@ export default function Layout() {
ios: {
headerLargeTitle: true,
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
},
diff --git a/apps/mobile/app/dashboard/(tabs)/(home)/index.tsx b/apps/mobile/app/dashboard/(tabs)/(home)/index.tsx
index 11f7bd8f..eeee0877 100644
--- a/apps/mobile/app/dashboard/(tabs)/(home)/index.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(home)/index.tsx
@@ -8,6 +8,7 @@ import { TailwindResolver } from "@/components/TailwindResolver";
import { Text } from "@/components/ui/Text";
import useAppSettings from "@/lib/settings";
import { useUploadAsset } from "@/lib/upload";
+import { useColorScheme } from "@/lib/useColorScheme";
import { useMenuIconColors } from "@/lib/useMenuIconColors";
import { MenuView } from "@react-native-menu/menu";
import { Plus, Search } from "lucide-react-native";
@@ -19,6 +20,7 @@ function HeaderRight({
openNewBookmarkModal: () => void;
}) {
const { settings } = useAppSettings();
+ const { colors } = useColorScheme();
const { menuIconColor } = useMenuIconColors();
const uploadToastIdRef = useRef<string | number | null>(null);
const { uploadAsset } = useUploadAsset(settings, {
@@ -99,9 +101,9 @@ function HeaderRight({
]}
shouldOpenOnLongPress={false}
>
- <View className="my-auto px-4">
+ <View className="my-auto">
<Plus
- color="rgb(0, 122, 255)"
+ color={colors.foreground}
onPress={() => Haptics.selectionAsync()}
/>
</View>
diff --git a/apps/mobile/app/dashboard/(tabs)/(lists)/_layout.tsx b/apps/mobile/app/dashboard/(tabs)/(lists)/_layout.tsx
index 64deea59..659c0735 100644
--- a/apps/mobile/app/dashboard/(tabs)/(lists)/_layout.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(lists)/_layout.tsx
@@ -1,5 +1,6 @@
import { Platform } from "react-native";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
export default function Layout() {
return (
@@ -9,7 +10,7 @@ export default function Layout() {
ios: {
headerLargeTitle: true,
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
},
diff --git a/apps/mobile/app/dashboard/(tabs)/(lists)/index.tsx b/apps/mobile/app/dashboard/(tabs)/(lists)/index.tsx
index 9ffc5a2f..fde79afd 100644
--- a/apps/mobile/app/dashboard/(tabs)/(lists)/index.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(lists)/index.tsx
@@ -16,15 +16,16 @@ import { useTRPC } from "@karakeep/shared-react/trpc";
import { ZBookmarkListTreeNode } from "@karakeep/shared/utils/listUtils";
function HeaderRight({ openNewListModal }: { openNewListModal: () => void }) {
+ const { colors } = useColorScheme();
return (
<Pressable
- className="my-auto px-4"
+ className="my-auto"
onPress={() => {
Haptics.selectionAsync();
openNewListModal();
}}
>
- <Plus color="rgb(0, 122, 255)" />
+ <Plus color={colors.foreground} />
</Pressable>
);
}
diff --git a/apps/mobile/app/dashboard/(tabs)/(settings)/_layout.tsx b/apps/mobile/app/dashboard/(tabs)/(settings)/_layout.tsx
index 7bbb7774..f51c168e 100644
--- a/apps/mobile/app/dashboard/(tabs)/(settings)/_layout.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(settings)/_layout.tsx
@@ -1,5 +1,6 @@
import { Platform } from "react-native";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
export default function Layout() {
return (
@@ -9,7 +10,7 @@ export default function Layout() {
ios: {
headerLargeTitle: true,
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
},
diff --git a/apps/mobile/app/dashboard/(tabs)/(tags)/_layout.tsx b/apps/mobile/app/dashboard/(tabs)/(tags)/_layout.tsx
index e97bcc4d..e9509ed5 100644
--- a/apps/mobile/app/dashboard/(tabs)/(tags)/_layout.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(tags)/_layout.tsx
@@ -1,5 +1,6 @@
import { Platform } from "react-native";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
export default function Layout() {
return (
@@ -9,7 +10,7 @@ export default function Layout() {
ios: {
headerLargeTitle: true,
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
},
diff --git a/apps/mobile/app/dashboard/_layout.tsx b/apps/mobile/app/dashboard/_layout.tsx
index 66d17514..cd0b210d 100644
--- a/apps/mobile/app/dashboard/_layout.tsx
+++ b/apps/mobile/app/dashboard/_layout.tsx
@@ -3,6 +3,7 @@ import { useEffect } from "react";
import { AppState, Platform } from "react-native";
import { useRouter } from "expo-router";
import { Stack } from "expo-router/stack";
+import { isIOS26 } from "@/lib/ios";
import { useIsLoggedIn } from "@/lib/session";
import { focusManager } from "@tanstack/react-query";
@@ -34,7 +35,7 @@ export default function Dashboard() {
...Platform.select({
ios: {
headerTransparent: true,
- headerBlurEffect: "systemMaterial",
+ headerBlurEffect: isIOS26 ? undefined : "systemMaterial",
headerLargeTitle: true,
headerLargeTitleShadowVisible: false,
headerLargeStyle: { backgroundColor: "transparent" },
diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
index 7ca853c3..524ef9a7 100644
--- a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
+++ b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
@@ -11,6 +11,7 @@ import BookmarkTextView from "@/components/bookmarks/BookmarkTextView";
import BottomActions from "@/components/bookmarks/BottomActions";
import FullPageError from "@/components/FullPageError";
import FullPageSpinner from "@/components/ui/FullPageSpinner";
+import { isIOS26 } from "@/lib/ios";
import useAppSettings from "@/lib/settings";
import { useQuery } from "@tanstack/react-query";
import { Settings } from "lucide-react-native";
@@ -95,14 +96,16 @@ export default function BookmarkView() {
headerTintColor: isDark ? "#fff" : "#000",
headerRight: () =>
bookmark.content.type === BookmarkTypes.LINK ? (
- <View className="flex-row items-center gap-3 px-4">
+ <View
+ className={`flex-row items-center gap-3${isIOS26 ? " px-2" : ""}`}
+ >
{bookmarkLinkType === "reader" && (
<Pressable
onPress={() =>
router.push("/dashboard/settings/reader-settings")
}
>
- <Settings size={20} color="gray" />
+ <Settings size={20} color={isDark ? "#fff" : "#000"} />
</Pressable>
)}
<BookmarkLinkTypeSelector
diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx
index 6a6a4498..3e13d0da 100644
--- a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx
+++ b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx
@@ -400,7 +400,11 @@ const ViewBookmarkPage = () => {
headerTransparent: false,
headerTitle: "Edit Bookmark",
headerRight: () => (
- <Pressable onPress={onDone} disabled={isEditPending}>
+ <Pressable
+ onPress={onDone}
+ disabled={isEditPending}
+ className="px-2"
+ >
{isEditPending ? (
<ActivityIndicator size="small" />
) : (
diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx
index 2198ae9c..172a6a3b 100644
--- a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx
+++ b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx
@@ -185,7 +185,7 @@ const TagPickerPage = () => {
<Pressable
onPress={clearAllTags}
disabled={optimisticTags.length === 0}
- className={optimisticTags.length === 0 ? "opacity-50" : ""}
+ className={`px-2 ${optimisticTags.length === 0 ? "opacity-50" : ""}`}
>
<Text className="text-primary">Clear</Text>
</Pressable>
diff --git a/apps/mobile/app/dashboard/lists/[slug]/index.tsx b/apps/mobile/app/dashboard/lists/[slug]/index.tsx
index a3ced73b..88ab1a0d 100644
--- a/apps/mobile/app/dashboard/lists/[slug]/index.tsx
+++ b/apps/mobile/app/dashboard/lists/[slug]/index.tsx
@@ -5,6 +5,7 @@ import UpdatingBookmarkList from "@/components/bookmarks/UpdatingBookmarkList";
import FullPageError from "@/components/FullPageError";
import FullPageSpinner from "@/components/ui/FullPageSpinner";
import { useArchiveFilter } from "@/lib/hooks";
+import { useColorScheme } from "@/lib/useColorScheme";
import { useMenuIconColors } from "@/lib/useMenuIconColors";
import { MenuView } from "@react-native-menu/menu";
import { useMutation, useQuery } from "@tanstack/react-query";
@@ -61,6 +62,7 @@ function ListActionsMenu({
role: ZBookmarkList["userRole"];
}) {
const api = useTRPC();
+ const { colors } = useColorScheme();
const { menuIconColor, destructiveMenuIconColor } = useMenuIconColors();
const { mutate: deleteList } = useMutation(
api.lists.delete.mutationOptions({
@@ -167,8 +169,11 @@ function ListActionsMenu({
}}
shouldOpenOnLongPress={false}
>
- <View className="my-auto px-4">
- <Ellipsis onPress={() => Haptics.selectionAsync()} color="gray" />
+ <View className="my-auto">
+ <Ellipsis
+ onPress={() => Haptics.selectionAsync()}
+ color={colors.foreground}
+ />
</View>
</MenuView>
);
diff --git a/apps/mobile/lib/ios.ts b/apps/mobile/lib/ios.ts
new file mode 100644
index 00000000..4054cedd
--- /dev/null
+++ b/apps/mobile/lib/ios.ts
@@ -0,0 +1,4 @@
+import { Platform } from "react-native";
+
+export const isIOS26 =
+ Platform.OS === "ios" && parseInt(Platform.Version as string, 10) >= 26;
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 293d3578..60db217a 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -66,12 +66,12 @@
"react-native-css-interop": "0.2.1",
"react-native-gesture-handler": "~2.28.0",
"react-native-image-viewing": "^0.2.2",
- "react-native-keyboard-controller": "^1.18.5",
+ "react-native-keyboard-controller": "^1.21.0",
"react-native-markdown-display": "^7.0.2",
"react-native-pdf": "7.0.3",
"react-native-reanimated": "~4.1.1",
"react-native-safe-area-context": "~5.6.0",
- "react-native-screens": "~4.16.0",
+ "react-native-screens": "~4.19.0",
"react-native-svg": "15.12.1",
"react-native-web": "^0.21.0",
"react-native-webview": "13.15.0",
diff --git a/package.json b/package.json
index 168a51ac..1c8638e3 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
"pnpm": {
"patchedDependencies": {
}
}
}
diff --git a/patches/[email protected] b/patches/[email protected]
new file mode 100644
index 00000000..3c89df43
--- /dev/null
+++ b/patches/[email protected]
@@ -0,0 +1,31 @@
+diff --git a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/View.kt b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/View.kt
+index 8cf1ff5..30ec8e3 100644
+--- a/android/src/main/java/com/reactnativekeyboardcontroller/extensions/View.kt
++++ b/android/src/main/java/com/reactnativekeyboardcontroller/extensions/View.kt
+@@ -76,7 +76,12 @@ fun View.replaceStatusBarInsets(
+ val sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ val navBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+ val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+- val adjustedTop = if (isStatusBarTranslucent) 0 else sysBars.top
++ // Always pass through the real status bar inset so downstream native views
++ // (e.g. react-native-screens' CustomToolbar) can apply proper padding.
++ // The content margin in setupWindowInsets() already handles the layout offset
++ // (0 when translucent, sysBars.top when not).
++ // Upstream issue: https://github.com/kirillzyusko/react-native-keyboard-controller/issues/1013
++ val adjustedTop = sysBars.top
+ // pick bottom: use IME if present, otherwise nav bar bottom (respect translucency)
+ val bottomFromImeOrNav = if (ime.bottom > 0) ime.bottom else navBars.bottom
+ val adjustedInsets =
+@@ -91,9 +96,11 @@ fun View.replaceStatusBarInsets(
+ } else {
+ val defaultInsets = ViewCompat.onApplyWindowInsets(this, insets)
+
++ // Always pass through the real status bar inset (see comment above)
++ // Upstream issue: https://github.com/kirillzyusko/react-native-keyboard-controller/issues/1013
+ return defaultInsets.replaceSystemWindowInsets(
+ defaultInsets.systemWindowInsetLeft,
+- if (isStatusBarTranslucent) 0 else defaultInsets.systemWindowInsetTop,
++ defaultInsets.systemWindowInsetTop,
+ defaultInsets.systemWindowInsetRight,
+ defaultInsets.systemWindowInsetBottom,
+ )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f9c58ed0..66910b9d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ patchedDependencies:
hash: 7nc6rwxl5vjub4hxnqupqavqpi
path: patches/[email protected]
+ hash: mll5oyhkqm56zxzq7xq7wr3qeu
+ path: patches/[email protected]
hash: kvggi4abfe6iel7wt6iiemonyq
path: patches/[email protected]
@@ -388,7 +391,7 @@ importers:
expo-router:
specifier: ~6.0.21
- version: 6.0.21(u3mgpy5shjayybfocx2oysp5pq)
+ version: 6.0.21(7t34nlbkhxtrasqzchlt64bzna)
expo-secure-store:
specifier: ~15.0.8
version: 15.0.8([email protected])
@@ -435,8 +438,8 @@ importers:
specifier: ^0.2.2
react-native-keyboard-controller:
- specifier: ^1.18.5
+ specifier: ^1.21.0
react-native-markdown-display:
specifier: ^7.0.2
@@ -450,8 +453,8 @@ importers:
specifier: ~5.6.0
react-native-screens:
- specifier: ~4.16.0
+ specifier: ~4.19.0
react-native-svg:
specifier: 15.12.1
@@ -466,7 +469,7 @@ importers:
sonner-native:
specifier: ^0.22.2
tailwind-merge:
specifier: ^2.2.1
version: 2.2.1
@@ -14123,8 +14126,8 @@ packages:
react: '*'
react-native: '*'
- resolution: {integrity: sha512-wbYN6Tcu3G5a05dhRYBgjgd74KqoYWuUmroLpigRg9cXy5uYo7prTMIvMgvLtARQtUF7BOtFggUnzgoBOgk0TQ==}
+ resolution: {integrity: sha512-j1bS2ZKo+ahexnhTYJ+GxXWeMHUylY7AM0h3i0y+XgxcCHW05DpJJQcSvMCmDtMrMhRUtalLZRDCGvuh/aUPZQ==}
peerDependencies:
react: '*'
react-native: '*'
@@ -14164,8 +14167,8 @@ packages:
react: '*'
react-native: '*'
- resolution: {integrity: sha512-yIAyh7F/9uWkOzCi1/2FqvNvK6Wb9Y1+Kzn16SuGfN9YFJDTbwlzGRvePCNTOX0recpLQF3kc2FmvMUhyTCH1Q==}
+ resolution: {integrity: sha512-qSDAO3AL5bti0Ri7KZRSVmWlhDr8MV86N5GruiKVQfEL7Zx2nUi3Dl62lqHUAD/LnDvOPuDDsMHCfIpYSv3hPQ==}
peerDependencies:
react: '*'
react-native: '*'
@@ -20666,7 +20669,7 @@ snapshots:
wrap-ansi: 7.0.0
ws: 8.18.3
optionalDependencies:
- expo-router: 6.0.21(u3mgpy5shjayybfocx2oysp5pq)
+ expo-router: 6.0.21(7t34nlbkhxtrasqzchlt64bzna)
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
transitivePeerDependencies:
- bufferutil
@@ -22876,7 +22879,7 @@ snapshots:
optionalDependencies:
'@types/react': 19.2.14
dependencies:
@@ -22884,7 +22887,7 @@ snapshots:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
react-native-safe-area-context: 5.6.2([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
sf-symbols-typescript: 2.2.0
transitivePeerDependencies:
- '@react-native-masked-view/masked-view'
@@ -22911,7 +22914,7 @@ snapshots:
use-latest-callback: 0.2.6([email protected])
use-sync-external-store: 1.5.0([email protected])
dependencies:
@@ -22919,7 +22922,7 @@ snapshots:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
react-native-safe-area-context: 5.6.2([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
sf-symbols-typescript: 2.2.0
warn-once: 0.1.1
transitivePeerDependencies:
@@ -27219,15 +27222,15 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected](u3mgpy5shjayybfocx2oysp5pq):
+ [email protected](7t34nlbkhxtrasqzchlt64bzna):
dependencies:
'@expo/schema-utils': 0.1.8
'@radix-ui/react-slot': 1.2.0(@types/[email protected])([email protected])
client-only: 0.0.1
debug: 4.4.3
escape-string-regexp: 4.0.0
@@ -27244,7 +27247,7 @@ snapshots:
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
react-native-is-edge-to-edge: 1.2.1([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
react-native-safe-area-context: 5.6.2([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
semver: 7.6.3
server-only: 0.0.1
sf-symbols-typescript: 2.2.0
@@ -32773,7 +32776,7 @@ snapshots:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
dependencies:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
@@ -32819,12 +32822,11 @@ snapshots:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
dependencies:
react: 19.2.3
react-freeze: 1.0.4([email protected])
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
- react-native-is-edge-to-edge: 1.2.1([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
warn-once: 0.1.1
@@ -34311,14 +34313,14 @@ snapshots:
ip-address: 9.0.5
smart-buffer: 4.2.0
dependencies:
react: 19.2.3
react-native: 0.81.5(@babel/[email protected])(@types/[email protected])([email protected])
react-native-gesture-handler: 2.28.0([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])
react-native-safe-area-context: 5.6.2([email protected](@babel/[email protected])(@types/[email protected])([email protected]))([email protected])