@june24/expo-pdf-reader 0.1.1 → 0.1.3

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import ExpoPdfReaderView from './ExpoPdfReaderView';
-import { ExpoPdfReaderViewProps } from './ExpoPdfReader.types';
-export { ExpoPdfReaderView, ExpoPdfReaderViewProps };
+import ExpoPdfReaderView, { ExpoPdfReaderRef } from './ExpoPdfReaderView';
+import { ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode } from './ExpoPdfReader.types';
+export { ExpoPdfReaderView, ExpoPdfReaderRef, ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode, };
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,EAAE,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAE,qBAAqB,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAG,MAAM,uBAAuB,CAAC;AAE/L,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAE,qBAAqB,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,GAAG,CAAC"}

package/build/index.js

@@ -1,3 +1,3 @@
 import ExpoPdfReaderView from './ExpoPdfReaderView';
-export { ExpoPdfReaderView };
+export { ExpoPdfReaderView, };
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,iBAAiB,EAA0B,CAAC","sourcesContent":["import ExpoPdfReaderView from './ExpoPdfReaderView';\nimport { ExpoPdfReaderViewProps } from './ExpoPdfReader.types';\n\nexport { ExpoPdfReaderView, ExpoPdfReaderViewProps };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAuC,MAAM,qBAAqB,CAAC;AAG1E,OAAO,EAAE,iBAAiB,GAA4K,CAAC","sourcesContent":["import ExpoPdfReaderView, { ExpoPdfReaderRef } from './ExpoPdfReaderView';\nimport { ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode, } from './ExpoPdfReader.types';\n\nexport { ExpoPdfReaderView, ExpoPdfReaderRef, ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode, };\n"]}

package/ios/ExpoPdfReaderView.swift

@@ -1,7 +1,7 @@
 import ExpoModulesCore
 import PDFKit
 
-class ExpoPdfReaderView: ExpoView {
+class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
   let pdfView = PDFView()
   var currentTool: String = "none"
   var currentColor: UIColor = .black
@@ -40,7 +40,9 @@ class ExpoPdfReaderView: ExpoView {
     
     // Setup gestures
     panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
+    panGesture?.delegate = self
     tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
+    tapGesture?.delegate = self
     
     // Initially disabled
     panGesture?.isEnabled = false
@@ -76,12 +78,15 @@ class ExpoPdfReaderView: ExpoView {
   
   private func notifyScroll() {
     let bounds = pdfView.bounds
-    let contentSize = pdfView.document?.bounds(for: .mediaBox).size ?? .zero
     
-    // Get scroll position from PDFView
-    let visibleRect = pdfView.visiblePageRect
-    let scrollX = visibleRect.origin.x
-    let scrollY = visibleRect.origin.y
+    // Get scroll info from the underlying UIScrollView instead of PDFView helpers
+    guard let scrollView = pdfView.subviews.first(where: { $0 is UIScrollView }) as? UIScrollView else {
+      return
+    }
+    
+    let contentSize = scrollView.contentSize
+    let scrollX = scrollView.contentOffset.x
+    let scrollY = scrollView.contentOffset.y
     
     onScroll([
       "x": scrollX,
@@ -192,11 +197,18 @@ class ExpoPdfReaderView: ExpoView {
     let isDrawing = tool == "pen" || tool == "highlighter"
     let isEraser = tool == "eraser"
     panGesture?.isEnabled = isDrawing || isEraser
-    pdfView.isUserInteractionEnabled = !isDrawing && !isEraser // Disable PDF interaction when drawing/erasing to prevent scrolling
     
-    // Re-enable scrolling if not drawing or erasing
-    if !isDrawing && !isEraser {
-        pdfView.isUserInteractionEnabled = true
+    // Disable PDF's built-in gestures when drawing/erasing
+    if isDrawing || isEraser {
+        // Disable scroll and other PDF interactions
+        if let scrollView = pdfView.subviews.first(where: { $0 is UIScrollView }) as? UIScrollView {
+            scrollView.isScrollEnabled = false
+        }
+    } else {
+        // Re-enable scrolling
+        if let scrollView = pdfView.subviews.first(where: { $0 is UIScrollView }) as? UIScrollView {
+            scrollView.isScrollEnabled = true
+        }
     }
     
     if tool == "text" || tool == "note" {
@@ -387,17 +399,14 @@ class ExpoPdfReaderView: ExpoView {
                   // Simplified extraction logic
                   
                   var colorHex = "#000000"
-                  if let color = annotation.color {
-                      colorHex = color.toHex() ?? "#000000"
-                  }
+                  let strokeColor = annotation.color
+                  colorHex = strokeColor.toHex() ?? "#000000"
                   
                   var type = "pen"
-                  if let color = annotation.color {
-                      var a: CGFloat = 0
-                      color.getWhite(nil, alpha: &a)
-                      if a < 0.5 {
-                          type = "highlighter"
-                      }
+                  var a: CGFloat = 0
+                  strokeColor.getWhite(nil, alpha: &a)
+                  if a < 0.5 {
+                      type = "highlighter"
                   }
                   
                   annotationsData.append([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@june24/expo-pdf-reader",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A PDF reader for Expo apps with annotation and zoom controls",
   "homepage": "git@gitlab.com:june_241/expo-pdf-reader.git",
   "main": "build/index.js",
@@ -22,7 +22,7 @@
   "author": "User",
   "license": "MIT",
   "dependencies": {
-    "expo-modules-core": "^4.0.0"
+    "expo-modules-core": "^3.0.29"
   },
   "devDependencies": {
     "expo-module-scripts": "^5.0.8",

package/src/ExpoPdfReader.types.ts

@@ -89,7 +89,7 @@ export type NativeExpoPdfReaderViewProps = ViewProps & {
   annotationColor?: string; // Hex color
   annotationFontSize?: number;
   annotationText?: string; // Default text to place
-   // Native-only props derived from AnnotationOptions
+  // Native-only props derived from AnnotationOptions
   annotationStrokeWidth?: number;
   initialAnnotations?: Annotation[];
   onAnnotationChange?: (event: AnnotationChangeEvent) => void;

package/src/index.ts

@@ -1,4 +1,4 @@
-import ExpoPdfReaderView from './ExpoPdfReaderView';
-import { ExpoPdfReaderViewProps } from './ExpoPdfReader.types';
+import ExpoPdfReaderView, { ExpoPdfReaderRef } from './ExpoPdfReaderView';
+import { ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode, } from './ExpoPdfReader.types';
 
-export { ExpoPdfReaderView, ExpoPdfReaderViewProps };
+export { ExpoPdfReaderView, ExpoPdfReaderRef, ExpoPdfReaderViewProps, Annotation, AnnotationOptions, AnnotationTool, AnnotationChangeEvent, PageChangeEvent, ScrollEvent, SearchResult, DisplayMode, };