danvics/openreader
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix epub last location first page

Browse source
This commit is contained in:
Richard Roberson 2025-02-10 19:57:33 -07:00
parent e8008b68ab
commit 039ac1fe61
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/components/EPUBViewer.tsx
View file

@ -28,20 +28,7 @@ export function EPUBViewer({ className = '' }: EPUBViewerProps) {
const toc = useRef<NavItem[]>([]); const toc = useRef<NavItem[]>([]);
const locationRef = useRef<string | number>(currDocPage); const locationRef = useRef<string | number>(currDocPage);
// Load the last location when component mounts const handleLocationChanged = useCallback((location: string | number, initial = false) => {
// useEffect(() => {
// const loadLastLocation = async () => {
// if (id) {
// const lastLocation = await getLastDocumentLocation(id as string);
// if (lastLocation) {
// locationRef.current = lastLocation;
// }
// }
// };
// loadLastLocation();
// }, [id]);
const handleLocationChanged = useCallback((location: string | number) => {
// Handle special 'next' and 'prev' cases // Handle special 'next' and 'prev' cases
if (location === 'next' && rendition.current) { if (location === 'next' && rendition.current) {
rendition.current.next(); rendition.current.next();
@ -58,7 +45,6 @@ export function EPUBViewer({ className = '' }: EPUBViewerProps) {
console.log('Displayed:', displayed, 'Chapter:', chapter); console.log('Displayed:', displayed, 'Chapter:', chapter);
if (locationRef.current !== 1) { if (locationRef.current !== 1) {
// Save the location to IndexedDB // Save the location to IndexedDB
if (id) { if (id) {
@ -70,7 +56,17 @@ export function EPUBViewer({ className = '' }: EPUBViewerProps) {
locationRef.current = location; locationRef.current = location;
setEPUBPageInChapter(displayed.page, displayed.total, chapter?.label || ''); setEPUBPageInChapter(displayed.page, displayed.total, chapter?.label || '');
extractPageText(bookRef.current, rendition.current);
// Add a small delay for initial load to ensure rendition is ready
if (initial) {
setTimeout(() => {
if (bookRef.current && rendition.current) {
extractPageText(bookRef.current, rendition.current);
}
}, 100);
} else {
extractPageText(bookRef.current, rendition.current);
}
} }
}, [id, setEPUBPageInChapter, extractPageText]); }, [id, setEPUBPageInChapter, extractPageText]);

9
src/contexts/TTSContext.tsx
View file

@ -73,7 +73,7 @@ interface TTSContextType {
setVoiceAndRestart: (voice: string) => void; setVoiceAndRestart: (voice: string) => void;
skipToPage: (page: number) => void; skipToPage: (page: number) => void;
setEPUBPageInChapter: (page: string | number, total: number, chapter: string | number) => void; // Add this line setEPUBPageInChapter: (page: string | number, total: number, chapter: string | number) => void; // Add this line
registerLocationChangeHandler: (handler: (location: string | number) => void) => void; registerLocationChangeHandler: (handler: (location: string | number, initial?: boolean) => void) => void;
} }
// Create the context // Create the context
@ -106,10 +106,10 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
const { availableVoices, fetchVoices } = useVoiceManagement(openApiKey, openApiBaseUrl); const { availableVoices, fetchVoices } = useVoiceManagement(openApiKey, openApiBaseUrl);
// Add ref for location change handler // Add ref for location change handler
const locationChangeHandlerRef = useRef<((location: string | number) => void) | null>(null); const locationChangeHandlerRef = useRef<((location: string | number, initial?: boolean) => void) | null>(null);
// Add method to register location change handler // Add method to register location change handler
const registerLocationChangeHandler = useCallback((handler: (location: string | number) => void) => { const registerLocationChangeHandler = useCallback((handler: (location: string | number, initial?: boolean) => void) => {
locationChangeHandlerRef.current = handler; locationChangeHandlerRef.current = handler;
}, []); }, []);
@ -695,9 +695,10 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
if (id && isEPUB) { if (id && isEPUB) {
getLastDocumentLocation(id as string).then(lastLocation => { getLastDocumentLocation(id as string).then(lastLocation => {
if (lastLocation) { if (lastLocation) {
console.log('Setting last location:', lastLocation);
setCurrDocPage(lastLocation); setCurrDocPage(lastLocation);
if (locationChangeHandlerRef.current) { if (locationChangeHandlerRef.current) {
locationChangeHandlerRef.current(lastLocation); locationChangeHandlerRef.current(lastLocation, true);
} }
} }
}); });