@papyrus-sdk/ui-react-native 0.2.35-beta.10 → 0.2.35-beta.11

package/dist/index.d.mts

@@ -124,12 +124,17 @@ interface RightSheetProps {
 }
 declare const RightSheet: React.FC<RightSheetProps>;
 
-declare const AnnotationEditor: React.FC;
+declare const AnnotationEditor: React.FC<{
+    documentId?: string;
+}>;
 
 type BottomBarProps = {
     documentType: DocumentType;
     onOpenInfo: () => void;
     onOpenSettings: () => void;
+    onTurnPage?: (direction: -1 | 1) => void;
+    onNavigateToPage?: (page: number) => void;
+    onOpenPages?: () => void;
     onOpenDestination?: (destination: MobilePrimaryDestination) => void;
 };
 declare const BottomBar: React.FC<BottomBarProps>;
@@ -139,6 +144,7 @@ interface SettingsSheetProps {
     visible: boolean;
     onClose: () => void;
     documentType?: DocumentType;
+    onOpenInfo?: () => void;
 }
 declare const SettingsSheet: React.FC<SettingsSheetProps>;
 
@@ -208,12 +214,14 @@ declare function DocumentActionsSheet({ visible, onClose, }: DocumentActionsShee
 
 type ProgressPillProps = {
     documentType: DocumentType;
+    navigationInDock?: boolean;
     onPress: () => void;
     onOpenPageJump?: () => void;
     onNavigateToPage?: (page: number) => void;
+    onTurnPage?: (direction: -1 | 1) => void;
     onScrubbingChange?: (active: boolean) => void;
 };
-declare function ProgressPill({ documentType, onPress, onOpenPageJump, onNavigateToPage, onScrubbingChange, }: ProgressPillProps): react_jsx_runtime.JSX.Element;
+declare function ProgressPill({ documentType, navigationInDock, onPress, onOpenPageJump, onNavigateToPage, onTurnPage, onScrubbingChange, }: ProgressPillProps): react_jsx_runtime.JSX.Element;
 
 type SearchOverlayProps = {
     engine: DocumentEngine;

package/dist/index.d.ts

@@ -124,12 +124,17 @@ interface RightSheetProps {
 }
 declare const RightSheet: React.FC<RightSheetProps>;
 
-declare const AnnotationEditor: React.FC;
+declare const AnnotationEditor: React.FC<{
+    documentId?: string;
+}>;
 
 type BottomBarProps = {
     documentType: DocumentType;
     onOpenInfo: () => void;
     onOpenSettings: () => void;
+    onTurnPage?: (direction: -1 | 1) => void;
+    onNavigateToPage?: (page: number) => void;
+    onOpenPages?: () => void;
     onOpenDestination?: (destination: MobilePrimaryDestination) => void;
 };
 declare const BottomBar: React.FC<BottomBarProps>;
@@ -139,6 +144,7 @@ interface SettingsSheetProps {
     visible: boolean;
     onClose: () => void;
     documentType?: DocumentType;
+    onOpenInfo?: () => void;
 }
 declare const SettingsSheet: React.FC<SettingsSheetProps>;
 
@@ -208,12 +214,14 @@ declare function DocumentActionsSheet({ visible, onClose, }: DocumentActionsShee
 
 type ProgressPillProps = {
     documentType: DocumentType;
+    navigationInDock?: boolean;
     onPress: () => void;
     onOpenPageJump?: () => void;
     onNavigateToPage?: (page: number) => void;
+    onTurnPage?: (direction: -1 | 1) => void;
     onScrubbingChange?: (active: boolean) => void;
 };
-declare function ProgressPill({ documentType, onPress, onOpenPageJump, onNavigateToPage, onScrubbingChange, }: ProgressPillProps): react_jsx_runtime.JSX.Element;
+declare function ProgressPill({ documentType, navigationInDock, onPress, onOpenPageJump, onNavigateToPage, onTurnPage, onScrubbingChange, }: ProgressPillProps): react_jsx_runtime.JSX.Element;
 
 type SearchOverlayProps = {
     engine: DocumentEngine;

package/dist/index.js

@@ -21833,6 +21833,7 @@ https://github.com/nodeca/pako/blob/main/LICENSE
         if (selectionSession === documentSessionId && selectionRendition === rendition) epubAnnotationRenderers.forEach(renderer => renderer.schedule());
       }));
       rendition.on('relocated', (location) => {
+        if (selectionSession !== documentSessionId || selectionRendition !== rendition) return;
         const start = location && location.start;
         let index = start && Number.isInteger(start.index) ? start.index : -1;
         if (index < 0 && start && start.href) index = getSpineIndexByHref(start.href);
@@ -21951,10 +21952,11 @@ https://github.com/nodeca/pako/blob/main/LICENSE
         sendEvent('VIEWER_SCROLL', { offsetY });
       };
       const handleTouchStart = (event) => {
-        touchStart = getTouchPoint(event);
+        touchStart = event?.touches?.length > 1 ? null : getTouchPoint(event);
         epubScrollDiagnostics && epubScrollDiagnostics.touchStart(event);
       };
       const handleTouchMove = (event) => {
+        if (event?.touches?.length > 1) touchStart = null;
         epubScrollDiagnostics && epubScrollDiagnostics.touchMove(event);
       };
       const handleTouchEnd = (event) => {
@@ -21962,7 +21964,15 @@ https://github.com/nodeca/pako/blob/main/LICENSE
         const start = touchStart;
         touchStart = null;
         const selectedText = event?.target?.ownerDocument?.defaultView?.getSelection?.()?.toString().trim() || '';
-        if (!selectedText && start && end && Math.hypot(end.x - start.x, end.y - start.y) <= 12) {
+        if (!selectedText && start && end && epubViewMode === 'single' && Math.abs(end.x-start.x) >= 48 && Math.abs(end.x-start.x) > Math.abs(end.y-start.y)*1.5) {
+          const active = rendition;
+          const interactionSession = documentSessionId;
+          epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
+            if (active !== rendition || interactionSession !== documentSessionId) return;
+            return end.x < start.x ? active.next() : active.prev();
+          });
+          epubNavigationQueue.catch(error => sendEvent('EPUB_NAVIGATION_ERROR', {message:String(error)}));
+        } else if (!selectedText && start && end && Math.hypot(end.x - start.x, end.y - start.y) <= 12) {
           sendEvent('VIEWER_TAP', {});
         }
         epubScrollDiagnostics && epubScrollDiagnostics.touchEnd(event);
@@ -22007,6 +22017,8 @@ https://github.com/nodeca/pako/blob/main/LICENSE
     return { pageCount, outline };
   };
 
+  let epubNavigationQueue = Promise.resolve();
+  let epubNavigationRequest = 0;
   const displayEpubPage = async (pageIndex) => {
     if (!rendition) return;
     const item = spineItems[pageIndex];
@@ -22016,9 +22028,18 @@ https://github.com/nodeca/pako/blob/main/LICENSE
       target,
       pageIndex,
     });
-    await rendition.display(target);
-    currentPage = pageIndex + 1;
-    sendState();
+    const activeRendition = rendition;
+    const session = documentSessionId;
+    const request = ++epubNavigationRequest;
+    const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
+      if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
+      await activeRendition.display(target);
+      if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
+      currentPage = pageIndex + 1;
+      sendState();
+    });
+    epubNavigationQueue = navigation;
+    await navigation;
   };
 
   const getTextContent = async (pageIndex) => {
@@ -22120,6 +22141,7 @@ https://github.com/nodeca/pako/blob/main/LICENSE
   };
 
   let nativeMenuSelection = null;
+  let epubViewMode = "continuous";
 
   const handleCommand = async (message) => {
     const { id, kind, payload } = message;
@@ -22132,6 +22154,9 @@ https://github.com/nodeca/pako/blob/main/LICENSE
         epubAnnotations = [];
         annotationDocumentId = undefined;
         zoom = 1.0;
+        epubViewMode = "continuous";
+        epubNavigationRequest += 1;
+        epubNavigationQueue = Promise.resolve();
 
         if (currentType === 'text') {
           const result = await loadText(
@@ -22186,17 +22211,23 @@ https://github.com/nodeca/pako/blob/main/LICENSE
           epubAnnotationRenderers.forEach(renderer => renderer.schedule());
         } else {
           const annotation = epubAnnotations.find(a => a.id === payload.annotationId);
-          if (!annotation) throw new Error('Annotation not available');
+          if (!annotation || (annotation.anchor.documentId && annotation.anchor.documentId !== annotationDocumentId)) throw new Error('Annotation not available for this document');
           // Navigation uses the CFI, never a synthetic percentage/page rectangle.
           const navigationSession = documentSessionId;
           const activeRendition = rendition;
           // Open the confirmed chapter first, resolve its quote, then navigate its actual range.
-          await activeRendition.display(annotation.anchor.href);
-          if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
-          const contents = activeRendition.getContents().find(c => spineItems[c.sectionIndex]?.href === annotation.anchor.href);
-          const range = contents && window.PapyrusEpubAnnotations.resolveRange(contents,annotation.anchor);
-          if(!range)throw new Error('EPUB anchor unresolved');
-          await activeRendition.display(contents.cfiFromRange(range));
+          epubNavigationRequest += 1;
+          const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
+            if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
+            await activeRendition.display(annotation.anchor.href);
+            if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
+            const contents = activeRendition.getContents().find(c => spineItems[c.sectionIndex]?.href === annotation.anchor.href);
+            const range = contents && window.PapyrusEpubAnnotations.resolveRange(contents,annotation.anchor);
+            if(!range)throw new Error('EPUB anchor unresolved');
+            await activeRendition.display(contents.cfiFromRange(range));
+          });
+          epubNavigationQueue = navigation;
+          await navigation;
         }
         sendResponse(id,true,null); return;
       }
@@ -22223,6 +22254,33 @@ https://github.com/nodeca/pako/blob/main/LICENSE
         return;
       }
 
+      if (kind === 'epub-turn-page') {
+        if (epubViewMode !== 'single') {sendResponse(id,true,null); return;}
+        if (currentType !== 'epub' || payload.documentSessionId !== documentSessionId) throw new Error('Stale EPUB navigation');
+        const active = rendition;
+        epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
+          if (active !== rendition || payload.documentSessionId !== documentSessionId) return;
+          return payload.direction < 0 ? active.prev() : active.next();
+        });
+        await epubNavigationQueue;
+        sendResponse(id,true,null); return;
+      }
+
+      if (kind === 'set-epub-view-mode') {
+        if (currentType !== 'epub' || payload.documentSessionId !== documentSessionId) throw new Error('Stale EPUB layout session');
+        epubViewMode = payload.viewMode === 'single' ? 'single' : 'continuous';
+        const active = rendition;
+        epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
+          if (active !== rendition || payload.documentSessionId !== documentSessionId) return;
+          const flow = epubViewMode === 'single' ? 'paginated' : 'scrolled-continuous';
+          if (active.settings.flow === flow) return;
+          active.flow(flow);
+          return active.q.enqueue(() => Promise.resolve());
+        });
+        await epubNavigationQueue;
+        sendResponse(id,true,null); return;
+      }
+
       if (kind === 'set-zoom') {
         zoom = Math.max(0.5, Math.min(4.0, payload.zoom || 1.0));
         applyZoom();
@@ -25980,7 +26038,7 @@ var WebViewViewer = ({
   onTap
 }) => {
   const webViewRef = (0, import_react3.useRef)(null);
-  const { pageTheme, annotations, isLoaded, locale, annotationColor, annotationOpacity, addAnnotation, beginAnnotationDraft, setSelectedAnnotation } = (0, import_core4.useViewerStore)();
+  const { pageTheme, viewMode, annotations, isLoaded, locale, annotationColor, annotationOpacity, addAnnotation, beginAnnotationDraft, setSelectedAnnotation } = (0, import_core4.useViewerStore)();
   const [selection, setSelection] = (0, import_react3.useState)(null);
   const t = getStrings(locale);
   const bridgeEngine = engine;
@@ -26061,6 +26119,10 @@ var WebViewViewer = ({
     (note !== void 0 ? beginAnnotationDraft : addAnnotation)((0, import_core4.createContextualAnnotation)({ id: `annotation-${Date.now()}-${Math.random().toString(36).slice(2)}`, anchor: selected.anchor, pageIndex: selected.pageIndex, style, color: annotationColor, opacity: annotationOpacity, note }));
     setSelection(null);
   };
+  (0, import_react3.useEffect)(() => {
+    if (!isLoaded) return;
+    webViewRef.current?.postMessage(JSON.stringify({ id: "epub-layout", kind: "set-epub-view-mode", payload: { viewMode, documentSessionId: bridgeEngine.getWebViewDocumentSessionId?.() } }));
+  }, [isLoaded, viewMode, bridgeEngine]);
   const sendSelectionCommand = (key) => {
     webViewRef.current?.postMessage(JSON.stringify({
       type: "epub-selection-action",
@@ -30247,6 +30309,7 @@ var Topbar = ({
           {
             style: [
               styles11.container,
+              import_react_native13.Platform.OS === "ios" && styles11.containerIos,
               isDark && styles11.containerDark,
               isLandscape && styles11.containerLandscape
             ],
@@ -30403,7 +30466,8 @@ var styles11 = import_react_native13.StyleSheet.create({
     maxWidth: MOBILE_CHROME_METRICS.maxFloatingWidth,
     marginTop: 10,
     paddingHorizontal: 14,
-    paddingVertical: 10,
+    height: MOBILE_CHROME_METRICS.topbarHeight,
+    paddingVertical: 0,
     backgroundColor: "rgba(255,255,255,0.88)",
     borderWidth: 1,
     borderColor: "rgba(255,255,255,0.72)",
@@ -30420,6 +30484,10 @@ var styles11 = import_react_native13.StyleSheet.create({
     backgroundColor: "rgba(15,17,21,0.88)",
     borderColor: "rgba(71,85,105,0.48)"
   },
+  containerIos: {
+    height: MOBILE_CHROME_METRICS.topbarHeight,
+    paddingVertical: 0
+  },
   containerLandscape: {
     maxWidth: void 0,
     marginTop: 0
@@ -32556,10 +32624,10 @@ var import_react_native16 = require("react-native");
 var import_core15 = require("@papyrus-sdk/core");
 var import_jsx_runtime18 = require("react/jsx-runtime");
 var COLORS = ["#fbbf24", "#fb7185", "#60a5fa", "#34d399", "#c084fc"];
-var AnnotationEditor = () => {
+var AnnotationEditor = ({ documentId }) => {
   const { annotations, annotationDraft, clearAnnotationDraft, addAnnotation, selectedAnnotationId, updateAnnotation, removeAnnotation, setSelectedAnnotation, uiTheme, locale, accentColor } = (0, import_core15.useViewerStore)();
   const annotation = annotationDraft?.id === selectedAnnotationId ? annotationDraft : annotations.find((a) => a.id === selectedAnnotationId);
-  const supported = annotation && annotation.type !== "ink";
+  const supported = annotation && annotation.type !== "ink" && (!documentId || !annotation.anchor?.documentId || annotation.anchor.documentId === documentId);
   const [editing, setEditing] = (0, import_react16.useState)(false);
   const [draft, setDraft] = (0, import_react16.useState)("");
   const [color, setColor] = (0, import_react16.useState)(COLORS[0]);
@@ -32624,7 +32692,7 @@ var AnnotationEditor = () => {
     /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_react_native16.Animated.View, { accessibilityViewIsModal: true, style: [styles14.card, { backgroundColor: dark ? "#17191f" : "#fff", marginBottom: Math.max(16, insets.bottom), opacity: progress, transform: [{ translateY: progress.interpolate({ inputRange: [0, 1], outputRange: [12, 0] }) }] }], children: [
       /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_react_native16.View, { style: styles14.header, children: [
         /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_native16.Text, { style: [styles14.title, textStyle], children: editing ? t.editNote : t.annotationNote }),
-        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_native16.Pressable, { onPress: close, accessibilityRole: "button", accessibilityLabel: t.close, style: styles14.button, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_native16.Text, { style: textStyle, children: "\xD7" }) })
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_native16.Pressable, { onPress: close, accessibilityRole: "button", accessibilityLabel: t.close, style: [styles14.button, { borderRadius: 22, backgroundColor: dark ? "#242936" : "#f1f5f9" }], children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(IconClose, { size: 20, color: textStyle.color }) })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_react_native16.ScrollView, { style: styles14.content, keyboardShouldPersistTaps: "handled", children: [
         quote ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_native16.Text, { style: [styles14.quote, textStyle], selectable: true, children: quote }) : null,
@@ -32717,10 +32785,17 @@ var BottomBar = ({
   documentType,
   onOpenInfo,
   onOpenSettings,
-  onOpenDestination
+  onOpenDestination,
+  onTurnPage,
+  onNavigateToPage,
+  onOpenPages
 }) => {
   const {
     activeMobileDestination,
+    viewMode,
+    comicLayoutMode,
+    currentPage,
+    pageCount,
     mobileDockVisible,
     setDocumentState,
     uiTheme,
@@ -32757,6 +32832,15 @@ var BottomBar = ({
     activeMobileDestination,
     toolDockOpen
   });
+  const paginated = documentType !== "text" && (documentType === "comic" ? comicLayoutMode === "single" : viewMode === "single");
+  if (paginated) {
+    layout.leftSlots.push(...layout.rightSlots.filter((slot) => slot.key === "search"));
+    layout.rightSlots = [];
+  }
+  const turnPage = (direction) => {
+    if (onTurnPage) onTurnPage(direction);
+    else onNavigateToPage?.(currentPage + direction);
+  };
   const slotMeta = {
     annotate: {
       label: t.tools,
@@ -32882,7 +32966,15 @@ var BottomBar = ({
               isDark && styles15.islandDark
             ],
             testID: "papyrus-floating-bottom-dock",
-            children: layout.rightSlots.map((slot) => {
+            children: paginated ? /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(import_jsx_runtime19.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_native17.Pressable, { accessibilityRole: "button", accessibilityLabel: locale === "pt-BR" ? "P\xE1gina anterior" : "Previous page", disabled: !dockVisible || !onTurnPage && currentPage <= 1, onPress: () => turnPage(-1), style: styles15.iconOnlyItem, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(IconChevronLeft, { size: MOBILE_CHROME_METRICS.iconSize, color: iconColor(false) }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_native17.Pressable, { accessibilityRole: "button", accessibilityLabel: locale === "pt-BR" ? "Ir para p\xE1gina" : "Go to page", onPress: onOpenPages, style: [styles15.iconOnlyItem, { minWidth: 56 }], children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(import_react_native17.Text, { style: { color: iconColor(false), fontWeight: "700", fontSize: 13, lineHeight: 18, includeFontPadding: false }, children: [
+                currentPage,
+                "/",
+                pageCount
+              ] }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_native17.Pressable, { accessibilityRole: "button", accessibilityLabel: locale === "pt-BR" ? "Pr\xF3xima p\xE1gina" : "Next page", disabled: !dockVisible || !onTurnPage && currentPage >= pageCount, onPress: () => turnPage(1), style: styles15.iconOnlyItem, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(IconChevronRight, { size: MOBILE_CHROME_METRICS.iconSize, color: iconColor(false) }) })
+            ] }) : layout.rightSlots.map((slot) => {
               const meta = slotMeta[slot.key];
               const Icon = meta.icon;
               return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
@@ -32945,8 +33037,9 @@ var styles15 = import_react_native17.StyleSheet.create({
   island: {
     flexDirection: "row",
     alignItems: "center",
-    paddingVertical: 8,
-    paddingHorizontal: 10,
+    height: MOBILE_CHROME_METRICS.bottomBarVisualHeight,
+    paddingVertical: 0,
+    paddingHorizontal: 6,
     backgroundColor: "rgba(255,255,255,0.9)",
     borderWidth: 1,
     borderColor: "rgba(255,255,255,0.72)",
@@ -32972,6 +33065,8 @@ var styles15 = import_react_native17.StyleSheet.create({
     borderColor: "rgba(71,85,105,0.48)"
   },
   iconOnlyItem: {
+    minWidth: 44,
+    height: 44,
     alignItems: "center",
     justifyContent: "center",
     paddingHorizontal: MOBILE_CHROME_METRICS.bottomBarItemPaddingHorizontal,
@@ -33048,7 +33143,8 @@ var SettingsSheet = ({
   engine,
   visible,
   onClose,
-  documentType = "pdf"
+  documentType = "pdf",
+  onOpenInfo
 }) => {
   const {
     viewMode,
@@ -33113,6 +33209,7 @@ var SettingsSheet = ({
           contentContainerStyle: styles16.sheetContent,
           showsVerticalScrollIndicator: false,
           children: [
+            onOpenInfo ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_react_native18.Pressable, { accessibilityRole: "button", onPress: onOpenInfo, style: { minHeight: 44, justifyContent: "center", marginBottom: 16 }, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_react_native18.Text, { style: [styles16.sectionTitle, isDark && styles16.sectionTitleDark], children: t.info }) }) : null,
             (documentType === "text" || documentType === "epub") && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_react_native18.View, { style: styles16.section, children: [
               /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_react_native18.Text, { style: [styles16.sectionTitle, isDark && styles16.sectionTitleDark], children: locale === "pt-BR" ? "Tamanho da fonte" : "Font size" }),
               /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_react_native18.View, { style: { flexDirection: "row", alignItems: "center", gap: 12 }, children: [
@@ -34218,9 +34315,11 @@ var import_jsx_runtime25 = require("react/jsx-runtime");
 var clampPercent = (value) => Math.max(0, Math.min(100, Math.round(value)));
 function ProgressPill({
   documentType,
+  navigationInDock = false,
   onPress,
   onOpenPageJump,
   onNavigateToPage,
+  onTurnPage,
   onScrubbingChange
 }) {
   const {
@@ -34358,14 +34457,15 @@ function ProgressPill({
   }
   const progressViewMode = documentType === "comic" ? comicLayoutMode === "single" ? "single" : "continuous" : viewMode;
   const pillMode = resolveProgressPillMode(progressViewMode, currentPage, pageCount);
+  if (pillMode.kind === "navigation" && navigationInDock) return null;
   if (pillMode.kind === "navigation") {
-    const previousDisabled = pillMode.previousPage === null || !onNavigateToPage;
-    const nextDisabled = pillMode.nextPage === null || !onNavigateToPage;
+    const previousDisabled = !onTurnPage && (pillMode.previousPage === null || !onNavigateToPage);
+    const nextDisabled = !onTurnPage && (pillMode.nextPage === null || !onNavigateToPage);
     return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
       import_react_native23.View,
       {
         pointerEvents: "box-none",
-        style: [styles21.frame, styles21.singleFrame, { top: offsets.progress, right: offsets.right }],
+        style: [{ position: "absolute", zIndex: 18, bottom: offsets.bottom + MOBILE_CHROME_METRICS.bottomBarVisualHeight + 12, left: offsets.left, right: offsets.right, alignItems: "center" }],
         children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_react_native23.View, { style: [styles21.singlePill, isDark && styles21.pillDark], children: [
           /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             import_react_native23.Pressable,
@@ -34374,7 +34474,7 @@ function ProgressPill({
               accessibilityLabel: t.previousPage,
               accessibilityState: { disabled: previousDisabled },
               disabled: previousDisabled,
-              onPress: () => pillMode.previousPage !== null && onNavigateToPageRef.current?.(pillMode.previousPage),
+              onPress: () => onTurnPage ? onTurnPage(-1) : pillMode.previousPage !== null && onNavigateToPageRef.current?.(pillMode.previousPage),
               style: styles21.pageArrowHit,
               testID: "papyrus-progress-page-previous",
               children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_react_native23.Text, { style: [styles21.pageArrow, isDark && styles21.labelDark, previousDisabled && styles21.pageArrowDisabled], children: "\u2039" })
@@ -34402,7 +34502,7 @@ function ProgressPill({
               accessibilityLabel: t.nextPage,
               accessibilityState: { disabled: nextDisabled },
               disabled: nextDisabled,
-              onPress: () => pillMode.nextPage !== null && onNavigateToPageRef.current?.(pillMode.nextPage),
+              onPress: () => onTurnPage ? onTurnPage(1) : pillMode.nextPage !== null && onNavigateToPageRef.current?.(pillMode.nextPage),
               style: styles21.pageArrowHit,
               testID: "papyrus-progress-page-next",
               children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_react_native23.Text, { style: [styles21.pageArrow, isDark && styles21.labelDark, nextDisabled && styles21.pageArrowDisabled], children: "\u203A" })
@@ -35281,13 +35381,7 @@ function ReadingShell({
       {
         engine,
         title,
-        onOpenOverflow: () => {
-          closeMobileDestination();
-          setInfoOpen(false);
-          setActionsOpen(false);
-          setSettingsOpen(false);
-          setOverflowOpen(true);
-        },
+        onOpenSettings: () => openDestination("display"),
         onOpenPageJump: () => setPageJumpOpen(true),
         showPageNavigationControls: false
       }
@@ -35303,7 +35397,13 @@ function ReadingShell({
     /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       ProgressPill,
       {
+        navigationInDock: true,
         documentType,
+        onTurnPage: documentType === "epub" ? (direction) => {
+          const paginatedEngine = engine;
+          void paginatedEngine.turnEpubPage?.(direction).catch(() => {
+          });
+        } : void 0,
         onNavigateToPage: navigateToPage,
         onPress: () => openDestination(
           documentType === "pdf" ? "pages" : documentType === "epub" ? "contents" : "progress"
@@ -35315,6 +35415,12 @@ function ReadingShell({
     /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       BottomBar_default,
       {
+        onNavigateToPage: navigateToPage,
+        onOpenPages: () => setPageJumpOpen(true),
+        onTurnPage: documentType === "epub" ? (direction) => {
+          const paginatedEngine = engine;
+          void paginatedEngine.turnEpubPage?.(direction).catch((error) => console.warn("[Papyrus] page navigation failed", error));
+        } : void 0,
         documentType,
         onOpenDestination: openDestination,
         onOpenInfo: () => openDestination("info"),
@@ -35394,6 +35500,7 @@ function ReadingShell({
     /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       SettingsSheet_default,
       {
+        onOpenInfo: () => openDestination("info"),
         engine,
         documentType,
         visible: settingsOpen,