@papyrus-sdk/ui-react-native 0.2.35-beta.0 → 0.2.35-beta.2

package/dist/index.mjs

@@ -22175,7 +22175,7 @@ import {
 import {
   Animated,
   FlatList,
-  Platform as Platform3,
+  Platform as Platform4,
   ScrollView,
   StyleSheet as StyleSheet5,
   View as View5,
@@ -25490,7 +25490,7 @@ var styles2 = StyleSheet2.create({
 var WebViewViewer_default = WebViewViewer;
 
 // components/NativePdfDocumentViewer.tsx
-import { Platform as Platform2 } from "react-native";
+import { Platform as Platform3 } from "react-native";
 
 // components/nativePdfViewerMode.ts
 var resolveViewerModeTelemetry = ({
@@ -25521,13 +25521,16 @@ var shouldUseNativePdfViewer = ({
   nativePdfDocumentViewAvailable = false,
   pageTheme = "normal",
   viewMode = "continuous",
-  rotation = 0
+  rotation = 0,
+  activeTool = "select",
+  nativeInkOverlayAvailable = true
 }) => {
   if (viewerMode !== "native" || pageCount <= 0 || isWebView || !nativeEngineId) {
     return false;
   }
   const implementation = resolveNativePdfViewerImplementation(platform);
   if (implementation === "android") return true;
+  if (activeTool === "ink" && !nativeInkOverlayAvailable) return false;
   return implementation === "ios" && nativePdfDocumentViewAvailable && pageTheme === "normal" && viewMode !== "double" && rotation === 0;
 };
 
@@ -25876,8 +25879,7 @@ var styles3 = StyleSheet3.create({
 
 // components/DedicatedIosPdfViewer.tsx
 import { useCallback as useCallback3, useEffect as useEffect4, useRef as useRef4, useState as useState4 } from "react";
-import { Pressable as Pressable3, StyleSheet as StyleSheet4, Text, View as View4 } from "react-native";
-import Clipboard3 from "@react-native-clipboard/clipboard";
+import { Platform as Platform2, Pressable as Pressable3, StyleSheet as StyleSheet4, Text, View as View4 } from "react-native";
 import { useViewerStore as useViewerStore4 } from "@papyrus-sdk/core";
 import { PapyrusPdfDocumentView as PapyrusPdfDocumentView2 } from "@papyrus-sdk/engine-native";
 
@@ -25945,7 +25947,14 @@ var STRINGS = {
     more: "More",
     close: "Close",
     copy: "Copy",
-    define: "Define"
+    define: "Define",
+    annotate: "Annotate",
+    annotationHighlight: "Highlight",
+    annotationUnderline: "Underline",
+    annotationStrikeout: "Strikeout",
+    annotationSquiggly: "Squiggly",
+    annotationNote: "Note",
+    deleteAnnotation: "Delete"
   },
   "pt-BR": {
     pages: "Paginas",
@@ -26009,11 +26018,37 @@ var STRINGS = {
     more: "Mais",
     close: "Fechar",
     copy: "Copiar",
-    define: "Definir"
+    define: "Definir",
+    annotate: "Anotar",
+    annotationHighlight: "Destacar",
+    annotationUnderline: "Sublinhar",
+    annotationStrikeout: "Riscar",
+    annotationSquiggly: "Ondulado",
+    annotationNote: "Nota",
+    deleteAnnotation: "Apagar"
   }
 };
 var getStrings = (locale) => STRINGS[locale ?? "en"] ?? STRINGS.en;
 
+// components/annotationDeletion.ts
+var MARKUP_ANNOTATION_TYPES = /* @__PURE__ */ new Set([
+  "highlight",
+  "underline",
+  "strikeout",
+  "squiggly"
+]);
+function resolveMarkupAnnotationDeleteFallback(annotations, selectedAnnotationId, hasNativeEditMenu) {
+  if (!selectedAnnotationId || hasNativeEditMenu) return null;
+  const selected = annotations.find(
+    (annotation) => annotation.id === selectedAnnotationId
+  );
+  return selected && MARKUP_ANNOTATION_TYPES.has(selected.type) ? selected : null;
+}
+function deleteAnnotationAndClearSelection(annotationId, removeAnnotation, setSelectedAnnotation) {
+  removeAnnotation(annotationId);
+  setSelectedAnnotation(null);
+}
+
 // components/nativePdfViewerEvents.ts
 var resolveNativePdfTextSelection = (selection) => {
   if (typeof selection?.text !== "string" || !selection.text.trim() || !Number.isInteger(selection.pageIndex) || (selection.pageIndex ?? -1) < 0) {
@@ -26070,6 +26105,7 @@ var MOBILE_CHROME_SHOW_DELTA2 = 22;
 var MOBILE_CHROME_SHOW_DELAY_MS2 = 180;
 var MOBILE_CHROME_TOP_RESET2 = 16;
 var MIN_VISIBLE_PAGE_RATIO = 0.03;
+var supportsNativeEditMenu = Number.parseInt(String(Platform2.Version), 10) >= 16;
 function DedicatedIosPdfViewer({
   engine,
   maxPageWidth,
@@ -26082,15 +26118,41 @@ function DedicatedIosPdfViewer({
   const pageTheme = useViewerStore4((state) => state.pageTheme);
   const zoom = useViewerStore4((state) => state.zoom);
   const currentPage = useViewerStore4((state) => state.currentPage);
+  const searchResults = useViewerStore4((state) => state.searchResults);
+  const activeSearchIndex = useViewerStore4((state) => state.activeSearchIndex);
   const viewMode = useViewerStore4((state) => state.viewMode);
   const selectionActive = useViewerStore4((state) => state.selectionActive);
   const activeTool = useViewerStore4((state) => state.activeTool);
+  const activeDrawToolPreset = useViewerStore4(
+    (state) => state.activeDrawToolPreset
+  );
+  const inkStrokeWidth = useViewerStore4((state) => state.inkStrokeWidth);
+  const annotations = useViewerStore4((state) => state.annotations);
+  const annotationColor = useViewerStore4((state) => state.annotationColor);
+  const annotationSelectionColor = useViewerStore4((state) => state.accentColor);
+  const annotationOpacity = useViewerStore4((state) => state.annotationOpacity);
+  const selectedAnnotationId = useViewerStore4(
+    (state) => state.selectedAnnotationId
+  );
+  const addAnnotation = useViewerStore4((state) => state.addAnnotation);
+  const removeAnnotation = useViewerStore4((state) => state.removeAnnotation);
+  const setSelectedAnnotation = useViewerStore4(
+    (state) => state.setSelectedAnnotation
+  );
   const mobileChromeVisible = useViewerStore4(
     (state) => state.mobileChromeVisible
   );
   const setDocumentState = useViewerStore4((state) => state.setDocumentState);
+  const commitInkStrokesForPage = useViewerStore4(
+    (state) => state.commitInkStrokesForPage
+  );
   const engineId = getDedicatedAndroidPdfEngineId(engine);
   const nativeViewMode = viewMode === "single" ? "single" : "continuous";
+  const fallbackDeleteAnnotation = resolveMarkupAnnotationDeleteFallback(
+    annotations,
+    selectedAnnotationId,
+    supportsNativeEditMenu
+  );
   const resolvedMaxPageWidth = typeof maxPageWidth === "number" && Number.isFinite(maxPageWidth) && maxPageWidth > 0 ? maxPageWidth : void 0;
   const chromeVisibleRef = useRef4(mobileChromeVisible);
   const lastScrollOffsetYRef = useRef4(0);
@@ -26101,6 +26163,15 @@ function DedicatedIosPdfViewer({
   const lastVisiblePagesKeyRef = useRef4("");
   const [selection, setSelection] = useState4(null);
   const selectionRef = useRef4(null);
+  useEffect4(() => {
+    const pickerActive = supportsNativeEditMenu && activeTool === "ink";
+    setDocumentState({ nativeInkToolPickerActive: pickerActive });
+    return () => {
+      if (pickerActive) {
+        setDocumentState({ nativeInkToolPickerActive: false });
+      }
+    };
+  }, [activeTool, setDocumentState]);
   useEffect4(() => {
     chromeVisibleRef.current = mobileChromeVisible;
   }, [mobileChromeVisible]);
@@ -26131,16 +26202,12 @@ function DedicatedIosPdfViewer({
       if (nextSelection) {
         const { text, pageIndex } = nextSelection;
         onTextSelected?.({ text, pageIndex });
+      } else {
+        setSelectedAnnotation(null);
       }
     },
-    [onTextSelected, updateSelection]
+    [onTextSelected, setSelectedAnnotation, updateSelection]
   );
-  const copySelection = useCallback3(async () => {
-    const selection2 = selectionRef.current;
-    if (!selection2) return;
-    const copied = await copySelectionText(selection2.text, Clipboard3);
-    if (copied) updateSelection(null);
-  }, [updateSelection]);
   const defineSelection = useCallback3(() => {
     const currentSelection = selectionRef.current;
     if (!currentSelection) return;
@@ -26150,6 +26217,18 @@ function DedicatedIosPdfViewer({
     });
     updateSelection(null);
   }, [onDefineSelection, updateSelection]);
+  const handleNativeDefineSelection = useCallback3(
+    (event) => {
+      const text = event.nativeEvent?.text;
+      const pageIndex = event.nativeEvent?.pageIndex;
+      if (typeof text !== "string" || text.length === 0 || typeof pageIndex !== "number" || !Number.isInteger(pageIndex) || pageIndex < 0) {
+        return;
+      }
+      onDefineSelection?.({ text, pageIndex });
+      updateSelection(null);
+    },
+    [onDefineSelection, updateSelection]
+  );
   const trackMobileChromeByOffset = useCallback3(
     (offsetY) => {
       if (pageCount <= 0) return;
@@ -26212,6 +26291,7 @@ function DedicatedIosPdfViewer({
     [trackMobileChromeByOffset]
   );
   const handleTap = useCallback3(() => {
+    setSelectedAnnotation(null);
     const nextVisible = resolvePageTapChromeVisibility({
       chromeVisible: chromeVisibleRef.current,
       selectionActive: selectionActive || selectionRef.current !== null,
@@ -26219,7 +26299,17 @@ function DedicatedIosPdfViewer({
       toolActive: activeTool !== "select"
     });
     if (nextVisible !== null) setMobileChromeVisible(nextVisible);
-  }, [activeTool, selectionActive, setMobileChromeVisible]);
+  }, [activeTool, selectionActive, setMobileChromeVisible, setSelectedAnnotation]);
+  const handleDeleteAnnotation = useCallback3(
+    (annotationId) => {
+      deleteAnnotationAndClearSelection(
+        annotationId,
+        removeAnnotation,
+        setSelectedAnnotation
+      );
+    },
+    [removeAnnotation, setSelectedAnnotation]
+  );
   const cappedViewerStyle = resolvedMaxPageWidth ? {
     width: "100%",
     maxWidth: resolvedMaxPageWidth,
@@ -26234,6 +26324,16 @@ function DedicatedIosPdfViewer({
         pageTheme,
         zoom,
         currentPage,
+        searchResults,
+        activeSearchIndex,
+        annotations,
+        activeTool,
+        activeDrawToolPreset,
+        inkStrokeWidth,
+        annotationColor,
+        annotationSelectionColor,
+        annotationOpacity,
+        selectedAnnotationId,
         viewMode: nativeViewMode,
         selectionActive: selection !== null,
         onPageChange: (event) => {
@@ -26256,40 +26356,64 @@ function DedicatedIosPdfViewer({
         onVisiblePagesChange: handleVisiblePagesChange,
         onScroll: handleScroll,
         onTap: handleTap,
-        onTextSelected: handleTextSelectionChange
+        onTextSelected: handleTextSelectionChange,
+        defineLabel: t.define,
+        annotateLabel: t.annotate,
+        annotationHighlightLabel: t.annotationHighlight,
+        annotationUnderlineLabel: t.annotationUnderline,
+        annotationStrikeoutLabel: t.annotationStrikeout,
+        annotationSquigglyLabel: t.annotationSquiggly,
+        annotationNoteLabel: t.annotationNote,
+        annotationDeleteLabel: t.deleteAnnotation,
+        onDefineSelection: onDefineSelection ? handleNativeDefineSelection : void 0,
+        onAnnotationCreated: (event) => addAnnotation(event.nativeEvent),
+        onAnnotationTap: (event) => setSelectedAnnotation(event.nativeEvent.id),
+        onAnnotationDelete: (event) => handleDeleteAnnotation(event.nativeEvent.id),
+        onAnnotationDeselected: () => setSelectedAnnotation(null),
+        onInkDrawingCommitted: (event) => {
+          const pageIndex = event.nativeEvent?.pageIndex;
+          const strokes = event.nativeEvent?.strokes;
+          if (typeof pageIndex !== "number" || !Number.isInteger(pageIndex) || pageIndex < 0 || !Array.isArray(strokes)) {
+            return;
+          }
+          commitInkStrokesForPage(pageIndex, strokes);
+        }
       }
     ),
-    selection && /* @__PURE__ */ jsx6(View4, { style: styles4.selectionToolbar, pointerEvents: "box-none", children: /* @__PURE__ */ jsxs5(View4, { style: styles4.toolbarContent, children: [
-      /* @__PURE__ */ jsxs5(
-        Pressable3,
-        {
-          onPress: () => void copySelection(),
-          style: styles4.toolbarButton,
-          accessibilityRole: "button",
-          accessibilityLabel: t.copy,
-          children: [
-            /* @__PURE__ */ jsx6(IconCopy, { size: 18, color: "#fff", strokeWidth: 2 }),
-            /* @__PURE__ */ jsx6(Text, { style: styles4.toolbarButtonText, children: t.copy })
-          ]
-        }
-      ),
-      onDefineSelection && /* @__PURE__ */ jsx6(
-        Pressable3,
-        {
-          onPress: defineSelection,
-          style: styles4.toolbarButton,
-          accessibilityRole: "button",
-          accessibilityLabel: t.define,
-          children: /* @__PURE__ */ jsx6(Text, { style: styles4.toolbarButtonText, children: t.define })
-        }
-      )
-    ] }) })
+    selection && !supportsNativeEditMenu && onDefineSelection && /* @__PURE__ */ jsx6(View4, { style: styles4.selectionFallback, pointerEvents: "box-none", children: /* @__PURE__ */ jsx6(
+      Pressable3,
+      {
+        onPress: defineSelection,
+        style: styles4.fallbackButton,
+        accessibilityRole: "button",
+        accessibilityLabel: t.define,
+        children: /* @__PURE__ */ jsx6(Text, { style: styles4.fallbackButtonText, children: t.define })
+      }
+    ) }),
+    fallbackDeleteAnnotation && /* @__PURE__ */ jsx6(
+      View4,
+      {
+        style: styles4.annotationDeleteFallback,
+        pointerEvents: "box-none",
+        children: /* @__PURE__ */ jsx6(
+          Pressable3,
+          {
+            onPress: () => handleDeleteAnnotation(fallbackDeleteAnnotation.id),
+            style: styles4.annotationDeleteButton,
+            accessibilityRole: "button",
+            accessibilityLabel: t.deleteAnnotation,
+            hitSlop: 8,
+            children: /* @__PURE__ */ jsx6(Text, { style: styles4.annotationDeleteButtonText, children: t.deleteAnnotation })
+          }
+        )
+      }
+    )
   ] });
 }
 var styles4 = StyleSheet4.create({
   container: { flex: 1, alignItems: "stretch" },
   viewer: { flex: 1, width: "100%" },
-  selectionToolbar: {
+  selectionFallback: {
     position: "absolute",
     left: 0,
     right: 0,
@@ -26298,31 +26422,43 @@ var styles4 = StyleSheet4.create({
     justifyContent: "center",
     zIndex: 50
   },
-  toolbarContent: {
-    flexDirection: "row",
+  fallbackButton: {
     backgroundColor: "rgba(30, 30, 30, 0.92)",
     borderRadius: 16,
     paddingHorizontal: 8,
     paddingVertical: 8,
-    gap: 4,
     shadowColor: "#000",
     shadowOffset: { width: 0, height: 4 },
     shadowOpacity: 0.3,
     shadowRadius: 12,
     elevation: 10
   },
-  toolbarButton: {
-    minWidth: 76,
-    height: 40,
-    borderRadius: 10,
-    backgroundColor: "rgba(255,255,255,0.1)",
-    flexDirection: "row",
-    alignItems: "center",
+  fallbackButtonText: {
+    color: "#fff",
+    fontSize: 12,
+    fontWeight: "700"
+  },
+  annotationDeleteFallback: {
+    position: "absolute",
+    left: 0,
+    right: 16,
+    bottom: 120,
+    alignItems: "flex-end",
     justifyContent: "center",
-    gap: 6,
-    paddingHorizontal: 10
+    zIndex: 51
   },
-  toolbarButtonText: {
+  annotationDeleteButton: {
+    backgroundColor: "#b91c1c",
+    borderRadius: 16,
+    paddingHorizontal: 12,
+    paddingVertical: 8,
+    shadowColor: "#000",
+    shadowOffset: { width: 0, height: 4 },
+    shadowOpacity: 0.3,
+    shadowRadius: 12,
+    elevation: 10
+  },
+  annotationDeleteButtonText: {
     color: "#fff",
     fontSize: 12,
     fontWeight: "700"
@@ -26338,7 +26474,7 @@ function NativePdfDocumentViewer({
   onDefineSelection
 }) {
   const implementation = resolveNativePdfViewerImplementation(
-    Platform2.OS
+    Platform3.OS
   );
   if (implementation === "android") {
     return /* @__PURE__ */ jsx7(
@@ -26516,7 +26652,7 @@ var shouldEnableViewerScrollForPageScrub = ({
   isScrubbing
 }) => viewerScrollEnabled && !isScrubbing;
 var resolvePageScrubberTouchPolicy = () => ({
-  responderTarget: "track",
+  responderTarget: "pill",
   claimOnStart: true,
   captureOnStart: true,
   captureOnMove: true,
@@ -26526,11 +26662,18 @@ var resolvePageScrubberOverlayStyle = () => ({
   zIndex: 30,
   elevation: 30
 });
-var resolvePageScrubberPointerEvents = () => "box-only";
+var resolvePageScrubberPointerEvents = () => "box-none";
 var resolvePageScrubberReleaseAction = ({
   hasMoved,
-  pendingPage
-}) => hasMoved && pendingPage !== null ? { kind: "navigate", page: pendingPage } : { kind: "open" };
+  pendingPage,
+  longPressTriggered = false
+}) => {
+  if (longPressTriggered) return { kind: "none" };
+  if (hasMoved && pendingPage !== null) {
+    return { kind: "navigate", page: pendingPage };
+  }
+  return { kind: "open" };
+};
 var createPageScrubberNavigationController = (onRelease) => {
   let active = false;
   let pendingPage = null;
@@ -26727,7 +26870,7 @@ var Viewer = ({
   const renderTargetType = engine.getRenderTargetType?.() ?? "canvas";
   const isWebView = renderTargetType === "webview";
   const resolvedViewerMode = resolveEffectivePdfViewerMode({
-    platform: Platform3.OS,
+    platform: Platform4.OS,
     viewerMode,
     useDedicatedAndroidPdfViewer,
     storeViewerMode
@@ -26738,9 +26881,10 @@ var Viewer = ({
     [mobilePerf]
   );
   const nativeEngineId = getDedicatedAndroidPdfEngineId(engine);
-  const nativePdfDocumentViewAvailable = Platform3.OS === "ios" && isPapyrusPdfDocumentViewAvailable();
+  const nativePdfDocumentViewAvailable = Platform4.OS === "ios" && isPapyrusPdfDocumentViewAvailable();
+  const nativeInkOverlayAvailable = Platform4.OS !== "ios" || Number.parseInt(String(Platform4.Version), 10) >= 16;
   const isNativePdfViewer = shouldUseNativePdfViewer({
-    platform: Platform3.OS,
+    platform: Platform4.OS,
     viewerMode: resolvedViewerMode,
     pageCount,
     isWebView,
@@ -26748,7 +26892,9 @@ var Viewer = ({
     nativePdfDocumentViewAvailable,
     pageTheme,
     viewMode,
-    rotation
+    rotation,
+    activeTool,
+    nativeInkOverlayAvailable
   });
   useEffect5(() => {
     mobilePerf.emit(
@@ -26762,12 +26908,15 @@ var Viewer = ({
   }, [isNativePdfViewer, isWebView, mobilePerf, resolvedViewerMode]);
   const warnedNativePdfFallbackRef = useRef5("");
   useEffect5(() => {
-    if (!__DEV__ || Platform3.OS !== "ios" || resolvedViewerMode !== "native" || isWebView || pageCount <= 0) {
+    if (!__DEV__ || Platform4.OS !== "ios" || resolvedViewerMode !== "native" || isWebView || pageCount <= 0) {
       return;
     }
     const reason = (() => {
       if (!nativePdfDocumentViewAvailable) return "manager-unavailable";
       if (!nativeEngineId) return "engine-unavailable";
+      if (activeTool === "ink" && !nativeInkOverlayAvailable) {
+        return "unsupported-ink-overlay";
+      }
       if (pageTheme !== "normal") return "unsupported-page-theme";
       if (viewMode === "double") return "unsupported-view-mode";
       if (rotation !== 0) return "unsupported-rotation";
@@ -26778,6 +26927,7 @@ var Viewer = ({
     const detailByReason = {
       "manager-unavailable": "the PapyrusPdfDocumentView manager is not registered",
       "engine-unavailable": "the native PDF engine id is unavailable",
+      "unsupported-ink-overlay": "PencilKit page overlays require iOS 16 or newer",
       "unsupported-page-theme": `pageTheme '${pageTheme}' is not supported by the native viewport`,
       "unsupported-view-mode": "double-page mode is not supported by the native viewport",
       "unsupported-rotation": "document rotation is not supported by the native viewport"
@@ -26787,8 +26937,10 @@ var Viewer = ({
     );
   }, [
     isWebView,
+    activeTool,
     nativeEngineId,
     nativePdfDocumentViewAvailable,
+    nativeInkOverlayAvailable,
     pageCount,
     pageTheme,
     rotation,
@@ -26884,7 +27036,7 @@ var Viewer = ({
     [maxToRenderPerBatch]
   );
   const resolvedRemoveClippedSubviews = resolveRemoveClippedSubviews({
-    platform: Platform3.OS,
+    platform: Platform4.OS,
     viewerMode: resolvedViewerMode,
     requestedValue: removeClippedSubviews
   });
@@ -28019,7 +28171,7 @@ var Viewer = ({
     [ensurePageDimensions, isDouble, rows, scaledListLayoutMetrics]
   );
   useEffect5(() => {
-    if (Platform3.OS === "ios" && isNativePdfViewer) {
+    if (Platform4.OS === "ios" && isNativePdfViewer) {
       clearPendingScrollTarget();
       if (scrollToPageSignal === null) return;
       if (pageCount === 0) return;
@@ -29445,6 +29597,9 @@ import { useViewerStore as useViewerStore7 } from "@papyrus-sdk/core";
 // components/ToolDock.layout.ts
 var TOOL_DOCK_SCROLL_THRESHOLD = 420;
 var shouldUseScrollablePrimaryToolsRow = (windowWidth) => windowWidth < TOOL_DOCK_SCROLL_THRESHOLD;
+var shouldShowToolDockInkControls = ({
+  nativeInkToolPickerActive
+}) => !nativeInkToolPickerActive;
 var DRAWING_TOOL_IDS = /* @__PURE__ */ new Set(["ink", "highlight", "underline"]);
 var resolveToolDockBaseIconColor = ({
   label,
@@ -29648,6 +29803,7 @@ var ToolDock = () => {
     toolDockOpen,
     setDocumentState,
     activeDrawToolPreset,
+    nativeInkToolPickerActive,
     annotationUndoStack,
     annotationRedoStack,
     undoAnnotations,
@@ -29675,9 +29831,17 @@ var ToolDock = () => {
     [activeTool, activeDrawToolPreset, interactionMode]
   );
   const inkSettingsExpanded = activeTool === "ink" && activeDrawToolPreset === "ink";
+  const showInkDockControls = shouldShowToolDockInkControls({
+    nativeInkToolPickerActive
+  });
   const canUndo = annotationUndoStack.length > 0;
   const canRedo = annotationRedoStack.length > 0;
   const primaryToolsRowIsScrollable = shouldUseScrollablePrimaryToolsRow(windowWidth);
+  useEffect8(() => {
+    if (!nativeInkToolPickerActive) return;
+    setPaletteExpanded(false);
+    setExtrasExpanded(false);
+  }, [nativeInkToolPickerActive]);
   const applyTool = (toolId) => {
     if (toolId === "ink") {
       setDocumentState({
@@ -29782,7 +29946,7 @@ var ToolDock = () => {
       pointerEvents: "box-none",
       style: [styles9.root, { paddingBottom: chromeOffsets.toolDock }],
       children: toolDockOpen ? /* @__PURE__ */ jsxs10(View9, { style: styles9.stack, children: [
-        paletteExpanded ? /* @__PURE__ */ jsx13(
+        paletteExpanded && showInkDockControls ? /* @__PURE__ */ jsx13(
           View9,
           {
             style: [
@@ -29823,7 +29987,7 @@ var ToolDock = () => {
             }) })
           }
         ) : null,
-        inkSettingsExpanded ? /* @__PURE__ */ jsxs10(
+        inkSettingsExpanded && showInkDockControls ? /* @__PURE__ */ jsxs10(
           View9,
           {
             style: [
@@ -30394,7 +30558,7 @@ import {
 } from "react";
 import {
   Image as Image2,
-  Platform as Platform4,
+  Platform as Platform5,
   Pressable as Pressable8,
   StyleSheet as StyleSheet10,
   Text as Text6,
@@ -30475,7 +30639,7 @@ var PageThumbnail = ({
     if (!layoutReady || !useNativePreview || !shouldRenderPreview) return;
     const viewTag = findNodeHandle2(viewRef.current);
     if (!viewTag) return;
-    const isNative = Platform4.OS === "android" || Platform4.OS === "ios";
+    const isNative = Platform5.OS === "android" || Platform5.OS === "ios";
     const renderScale = isNative ? 2 / Math.max(zoom, 0.5) : 2;
     void engine.renderPage(pageIndex, viewTag, renderScale);
   }, [
@@ -31415,6 +31579,7 @@ var AnnotationEditor = () => {
     annotations,
     selectedAnnotationId,
     updateAnnotation,
+    removeAnnotation,
     setSelectedAnnotation,
     uiTheme,
     locale,
@@ -31436,6 +31601,13 @@ var AnnotationEditor = () => {
     updateAnnotation(annotation.id, { content: draft });
     setSelectedAnnotation(null);
   };
+  const handleDelete = () => {
+    deleteAnnotationAndClearSelection(
+      annotation.id,
+      removeAnnotation,
+      setSelectedAnnotation
+    );
+  };
   return /* @__PURE__ */ jsx15(
     Modal2,
     {
@@ -31457,6 +31629,22 @@ var AnnotationEditor = () => {
           }
         ),
         /* @__PURE__ */ jsxs12(View11, { style: styles11.actions, children: [
+          /* @__PURE__ */ jsx15(
+            Pressable9,
+            {
+              onPress: handleDelete,
+              style: [
+                styles11.actionButton,
+                styles11.actionDelete,
+                isDark && styles11.actionDeleteDark
+              ],
+              accessibilityRole: "button",
+              accessibilityLabel: t.deleteAnnotation,
+              testID: "annotation-delete-button",
+              children: /* @__PURE__ */ jsx15(Text7, { style: [styles11.actionText, styles11.actionTextLight], children: t.deleteAnnotation })
+            }
+          ),
+          /* @__PURE__ */ jsx15(View11, { style: styles11.actionSpacer }),
           /* @__PURE__ */ jsx15(
             Pressable9,
             {
@@ -31526,8 +31714,9 @@ var styles11 = StyleSheet11.create({
   actions: {
     marginTop: 16,
     flexDirection: "row",
-    justifyContent: "flex-end"
+    alignItems: "center"
   },
+  actionSpacer: { flex: 1 },
   actionButton: {
     paddingHorizontal: 12,
     paddingVertical: 8,
@@ -31537,6 +31726,12 @@ var styles11 = StyleSheet11.create({
   actionCancel: {
     backgroundColor: "#e5e7eb"
   },
+  actionDelete: {
+    backgroundColor: "#b91c1c"
+  },
+  actionDeleteDark: {
+    backgroundColor: "#991b1b"
+  },
   actionSave: {
     backgroundColor: "#2563eb"
   },
@@ -33182,7 +33377,8 @@ function ProgressPill({
         const releasedPage = scrubNavigationControllerRef.current.release();
         const releaseAction = resolvePageScrubberReleaseAction({
           hasMoved: hasMovedRef.current,
-          pendingPage: releasedPage
+          pendingPage: releasedPage,
+          longPressTriggered: longPressTriggeredRef.current
         });
         if (releaseAction.kind === "navigate") {
           pendingReleasedScrubPageRef.current = releaseAction.page;
@@ -33220,9 +33416,6 @@ function ProgressPill({
     });
   }
   const responderPanHandlers = scrubberResponderRef.current?.panHandlers ?? {};
-  const responderTarget = touchPolicy.responderTarget;
-  const scrubberPanHandlers = responderTarget === "track" ? responderPanHandlers : {};
-  const pillPanHandlers = responderTarget === "pill" ? responderPanHandlers : {};
   return /* @__PURE__ */ jsx22(
     View18,
     {
@@ -33241,7 +33434,6 @@ function ProgressPill({
           ref: scrubberRef,
           pointerEvents: resolvePageScrubberPointerEvents(),
           style: [styles18.scrubber, { height: trackHeight }],
-          ...scrubberPanHandlers,
           onLayout: () => {
             scrubberRef.current?.measureInWindow((_x, y) => {
               trackYRef.current = y;
@@ -33251,6 +33443,7 @@ function ProgressPill({
             /* @__PURE__ */ jsx22(
               Animated3.View,
               {
+                pointerEvents: "none",
                 style: [
                   styles18.track,
                   isDark && styles18.trackDark,
@@ -33263,29 +33456,36 @@ function ProgressPill({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx22(Animated3.View, { style: [styles18.thumb, { top: thumbTopRef.current }], children: /* @__PURE__ */ jsxs18(
-              View18,
+            /* @__PURE__ */ jsx22(
+              Animated3.View,
               {
-                style: [
-                  styles18.pill,
-                  isDark && styles18.pillDark,
-                  { borderColor: `${accentColor}33` }
-                ],
-                ...pillPanHandlers,
-                testID: "papyrus-progress-pill",
-                children: [
-                  /* @__PURE__ */ jsx22(View18, { style: styles18.labelHit, children: /* @__PURE__ */ jsx22(Text13, { style: [styles18.label, isDark && styles18.labelDark], children: label }) }),
-                  /* @__PURE__ */ jsx22(View18, { style: styles18.iconHit, children: /* @__PURE__ */ jsx22(
-                    IconPageNav,
-                    {
-                      size: 20,
-                      color: isDark ? "#f8fafc" : "#111827",
-                      strokeWidth: 1.8
-                    }
-                  ) })
-                ]
+                pointerEvents: "box-none",
+                style: [styles18.thumb, { top: thumbTopRef.current }],
+                children: /* @__PURE__ */ jsxs18(
+                  View18,
+                  {
+                    style: [
+                      styles18.pill,
+                      isDark && styles18.pillDark,
+                      { borderColor: `${accentColor}33` }
+                    ],
+                    ...responderPanHandlers,
+                    testID: "papyrus-progress-pill",
+                    children: [
+                      /* @__PURE__ */ jsx22(View18, { style: styles18.labelHit, children: /* @__PURE__ */ jsx22(Text13, { style: [styles18.label, isDark && styles18.labelDark], children: label }) }),
+                      /* @__PURE__ */ jsx22(View18, { style: styles18.iconHit, children: /* @__PURE__ */ jsx22(
+                        IconPageNav,
+                        {
+                          size: 20,
+                          color: isDark ? "#f8fafc" : "#111827",
+                          strokeWidth: 1.8
+                        }
+                      ) })
+                    ]
+                  }
+                )
               }
-            ) })
+            )
           ]
         }
       )