From 1b98014d6cb0e3eb824d58ccbd35f39864e6ec88 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Sun, 18 Jan 2026 05:32:38 -0800 Subject: fix(mobile): Reader settings preview on mobile matches reader view formatting (#2365) * fix: Reader settings preview on mobile matches reader view formatting * address comments --- .../app/dashboard/settings/reader-settings.tsx | 69 +++++++++--- apps/mobile/components/reader/ReaderPreview.tsx | 117 +++++++++++++++++++++ 2 files changed, 170 insertions(+), 16 deletions(-) create mode 100644 apps/mobile/components/reader/ReaderPreview.tsx (limited to 'apps/mobile') diff --git a/apps/mobile/app/dashboard/settings/reader-settings.tsx b/apps/mobile/app/dashboard/settings/reader-settings.tsx index 6c522557..30ad54b9 100644 --- a/apps/mobile/app/dashboard/settings/reader-settings.tsx +++ b/apps/mobile/app/dashboard/settings/reader-settings.tsx @@ -1,7 +1,11 @@ -import { useEffect, useState } from "react"; +import { useCallback, useEffect, useRef, useState } from "react"; import { Pressable, ScrollView, View } from "react-native"; import { Slider } from "react-native-awesome-slider"; import { runOnJS, useSharedValue } from "react-native-reanimated"; +import { + ReaderPreview, + ReaderPreviewRef, +} from "@/components/reader/ReaderPreview"; import CustomSafeAreaView from "@/components/ui/CustomSafeAreaView"; import { Divider } from "@/components/ui/Divider"; import { Text } from "@/components/ui/Text"; @@ -59,6 +63,40 @@ export default function ReaderSettingsPage() { const [displayLineHeight, setDisplayLineHeight] = useState(effectiveLineHeight); + // Refs to track latest display values (avoids stale closures in callbacks) + const displayFontSizeRef = useRef(displayFontSize); + displayFontSizeRef.current = displayFontSize; + const displayLineHeightRef = useRef(displayLineHeight); + displayLineHeightRef.current = displayLineHeight; + + // Ref for the WebView preview component + const previewRef = useRef(null); + + // Functions to update preview styles via IPC (called from worklets via runOnJS) + const updatePreviewFontSize = useCallback( + (fontSize: number) => { + setDisplayFontSize(fontSize); + previewRef.current?.updateStyles( + effectiveFontFamily, + fontSize, + displayLineHeightRef.current, + ); + }, + [effectiveFontFamily], + ); + + const updatePreviewLineHeight = useCallback( + (lineHeight: number) => { + setDisplayLineHeight(lineHeight); + previewRef.current?.updateStyles( + effectiveFontFamily, + displayFontSizeRef.current, + lineHeight, + ); + }, + [effectiveFontFamily], + ); + // Sync slider progress and display values with effective settings useEffect(() => { fontSizeProgress.value = effectiveFontSize; @@ -72,6 +110,12 @@ export default function ReaderSettingsPage() { const handleFontFamilyChange = (fontFamily: ZReaderFontFamily) => { updateLocal({ fontFamily }); + // Update preview immediately with new font family + previewRef.current?.updateStyles( + fontFamily, + displayFontSize, + displayLineHeight, + ); }; const handleFontSizeChange = (value: number) => { @@ -158,7 +202,7 @@ export default function ReaderSettingsPage() { renderBubble={() => null} onValueChange={(value) => { "worklet"; - runOnJS(setDisplayFontSize)(Math.round(value)); + runOnJS(updatePreviewFontSize)(Math.round(value)); }} onSlidingComplete={(value) => handleFontSizeChange(Math.round(value)) @@ -191,7 +235,7 @@ export default function ReaderSettingsPage() { renderBubble={() => null} onValueChange={(value) => { "worklet"; - runOnJS(setDisplayLineHeight)(Math.round(value * 10) / 10); + runOnJS(updatePreviewLineHeight)(Math.round(value * 10) / 10); }} onSlidingComplete={handleLineHeightChange} /> @@ -207,19 +251,12 @@ export default function ReaderSettingsPage() { Preview - - - The quick brown fox jumps over the lazy dog. Pack my box with five - dozen liquor jugs. How vexingly quick daft zebras jump! - - + diff --git a/apps/mobile/components/reader/ReaderPreview.tsx b/apps/mobile/components/reader/ReaderPreview.tsx new file mode 100644 index 00000000..c091bdbc --- /dev/null +++ b/apps/mobile/components/reader/ReaderPreview.tsx @@ -0,0 +1,117 @@ +import { forwardRef, useEffect, useImperativeHandle, useRef } from "react"; +import { View } from "react-native"; +import WebView from "react-native-webview"; +import { WEBVIEW_FONT_FAMILIES } from "@/lib/readerSettings"; +import { useColorScheme } from "@/lib/useColorScheme"; + +import { ZReaderFontFamily } from "@karakeep/shared/types/users"; + +const PREVIEW_TEXT = + "The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs. How vexingly quick daft zebras jump!"; + +export interface ReaderPreviewRef { + updateStyles: ( + fontFamily: ZReaderFontFamily, + fontSize: number, + lineHeight: number, + ) => void; +} + +interface ReaderPreviewProps { + initialFontFamily: ZReaderFontFamily; + initialFontSize: number; + initialLineHeight: number; +} + +export const ReaderPreview = forwardRef( + ({ initialFontFamily, initialFontSize, initialLineHeight }, ref) => { + const webViewRef = useRef(null); + const { isDarkColorScheme: isDark } = useColorScheme(); + + const fontFamily = WEBVIEW_FONT_FAMILIES[initialFontFamily]; + const textColor = isDark ? "#e5e7eb" : "#374151"; + const bgColor = isDark ? "#000000" : "#ffffff"; + + useImperativeHandle(ref, () => ({ + updateStyles: ( + newFontFamily: ZReaderFontFamily, + newFontSize: number, + newLineHeight: number, + ) => { + const cssFontFamily = WEBVIEW_FONT_FAMILIES[newFontFamily]; + webViewRef.current?.injectJavaScript(` + window.updateStyles("${cssFontFamily}", ${newFontSize}, ${newLineHeight}); + true; + `); + }, + })); + + // Update colors when theme changes + useEffect(() => { + webViewRef.current?.injectJavaScript(` + document.body.style.color = "${textColor}"; + document.body.style.background = "${bgColor}"; + true; + `); + }, [isDark, textColor, bgColor]); + + const html = ` + + + + + + + + + ${PREVIEW_TEXT} + + + `; + + return ( + + + + ); + }, +); + +ReaderPreview.displayName = "ReaderPreview"; -- cgit v1.2.3-70-g09d2