diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift index 5e0fd55..072c45d 100644 --- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift +++ b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift @@ -183,9 +183,13 @@ final class RDEPUBChapterWarmupOrchestrator { group.notify(queue: .main) { [weak self] in guard let self else { return } defer { self.endPartialBookPageMapExtension() } + // Use live position values rather than the stale captured values, + // since the user may have turned several pages since the extension began. + let livePageNumber = max(self.context.readerView?.currentPage ?? 0, 0) + 1 + let liveLocation = self.locationCoordinator.currentVisibleLocation() self.applyAsyncPartialBookPageMapExtension( - currentPageNumber: currentPageNumber, - currentLocation: currentLocation, + currentPageNumber: livePageNumber, + currentLocation: liveLocation, currentMap: currentMap, loadedChapters: loadedChapters ) diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift index d46c49c..433116c 100644 --- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift +++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift @@ -248,8 +248,13 @@ final class RDEPUBPresentationRuntime { rebindVisibleLocation(currentLocation, readerView: readerView, controller: controller) { return true } + // Fallback: prefer the live readerView.currentPage over the stale captured + // currentPageNumber, which may be outdated by the time this commit runs + // (especially in pageCurl mode where the user may have turned several pages + // since the extension was initiated). + let livePageIndex = max(readerView.currentPage, 0) rebindVisiblePage( - to: max(currentPageNumber - 1, 0), + to: livePageIndex, readerView: readerView ) return true @@ -264,7 +269,17 @@ final class RDEPUBPresentationRuntime { private func rebindVisiblePage(to pageIndex: Int, readerView: RDReaderView) { if readerView.currentDisplayType == .pageCurl { - readerView.transitionToPage(pageNum: pageIndex, animated: false) + if readerView.isPageCurlTransitioning { + // Defer the transition until the current page-curl animation completes, + // and re-read the live page at that time to avoid jumping to a stale position. + DispatchQueue.main.async { [weak readerView] in + guard let readerView, !readerView.isPageCurlTransitioning else { return } + let livePageIndex = max(readerView.currentPage, 0) + readerView.transitionToPage(pageNum: livePageIndex, animated: false) + } + } else { + readerView.transitionToPage(pageNum: pageIndex, animated: false) + } } else { readerView.reloadPageCountOnly() if pageIndex != readerView.currentPage {