@june24/expo-pdf-reader 0.1.9 → 0.1.11

package/ios/ExpoPdfReaderView.swift

@@ -430,12 +430,15 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
                       type = "highlighter"
                   }
                   
+                  let extractedWidth = annotation.border?.lineWidth ?? 10.0
+                  print("📏 Extracting annotation width: \(extractedWidth)")
+                  
                   annotationsData.append([
                       "type": type,
                       "color": colorHex,
                       "page": i,
                       "points": allStrokes, 
-                      "width": annotation.border?.lineWidth ?? 10.0
+                      "width": extractedWidth
                   ])
               } else if annotation.type == "FreeText" {
                   var colorHex = "#000000"
@@ -464,7 +467,11 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
       // Clear all existing annotations first
       for i in 0..<document.pageCount {
           guard let page = document.page(at: i) else { continue }
-          page.annotations.removeAll()
+          // Remove annotations one by one (annotations is read-only)
+          let annotationsToRemove = page.annotations
+          for annotation in annotationsToRemove {
+              page.removeAnnotation(annotation)
+          }
       }
       
       // Clear undo/redo stacks when setting annotations
@@ -512,6 +519,18 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
                   let annotation = PDFAnnotation(bounds: bounds, forType: .ink, withProperties: nil)
                   annotation.add(path)
                   
+                  // Set stroke width from data
+                  let border = PDFBorder()
+                  if let width = data["width"] as? Double {
+                      border.lineWidth = CGFloat(width)
+                      print("📏 Applying annotation width: \(width) for type: \(type)")
+                  } else {
+                      // Default width based on type
+                      border.lineWidth = type == "highlighter" ? 30.0 : 10.0
+                      print("📏 Using default width: \(border.lineWidth) for type: \(type)")
+                  }
+                  annotation.border = border
+                  
                   if type == "highlighter" {
                       annotation.color = color.withAlphaComponent(0.3)
                   } else {
@@ -531,7 +550,8 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
   }
 
   @objc func handlePan(_ gesture: UIPanGestureRecognizer) {
-    guard let page = pdfView.currentPage else { return }
+    guard let page = pdfView.currentPage,
+          let document = pdfView.document else { return }
     let location = gesture.location(in: pdfView)
     let convertedPoint = pdfView.convert(location, to: page)
     let viewLocation = location // Keep view coordinates for drawing layer
@@ -673,18 +693,23 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
           print("✅ Adding pen annotation to page")
           print("   Bounds: \(pathBounds)")
           print("   Paths count: \(annotation.paths?.count ?? 0)")
+          print("   Stroke width: \(currentStrokeWidth)")
+          print("   Border lineWidth: \(annotation.border?.lineWidth ?? 0)")
           
           // Make sure annotation is visible
           annotation.shouldDisplay = true
           annotation.shouldPrint = true
-          
           page.addAnnotation(annotation)
           
           print("   Total annotations on page: \(page.annotations.count)")
+          print("   Page index: \(document.index(for: page))")
           
-          // Force comprehensive PDF view update
+          // Force comprehensive PDF view update immediately
           pdfView.layoutDocumentView()
           pdfView.setNeedsDisplay(pdfView.bounds)
+          
+          // Also force the specific page to redraw
+          pdfView.go(to: page)
       }
       else if currentTool == "highlighter" {
            let annotation = PDFAnnotation(bounds: pathBounds, forType: .ink, withProperties: nil)
@@ -696,6 +721,8 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
            
            print("✅ Adding highlighter annotation to page")
            print("   Bounds: \(pathBounds)")
+           print("   Stroke width: \(currentStrokeWidth)")
+           print("   Border lineWidth: \(annotation.border?.lineWidth ?? 0)")
            
            // Make sure annotation is visible
            annotation.shouldDisplay = true
@@ -704,10 +731,14 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
            page.addAnnotation(annotation)
            
            print("   Total annotations on page: \(page.annotations.count)")
+           print("   Page index: \(document.index(for: page))")
            
-           // Force comprehensive PDF view update
+           // Force comprehensive PDF view update immediately
            pdfView.layoutDocumentView()
            pdfView.setNeedsDisplay(pdfView.bounds)
+           
+           // Also force the specific page to redraw
+           pdfView.go(to: page)
       }
       
       // Clear redo stack when new annotation is added
@@ -716,6 +747,18 @@ class ExpoPdfReaderView: ExpoView, UIGestureRecognizerDelegate {
       currentPath = nil
       currentAnnotation = nil
       
+      // Force PDF view to refresh again after annotation is added
+      DispatchQueue.main.async {
+          self.pdfView.layoutDocumentView()
+          self.pdfView.setNeedsDisplay(self.pdfView.bounds)
+          
+          // Also refresh the current page specifically
+          if let currentPage = self.pdfView.currentPage {
+              // Force page to redraw
+              self.pdfView.go(to: currentPage)
+          }
+      }
+      
       // Emit event
       let allAnnotations = getAnnotations()
       print("📤 Emitting annotation change event: \(allAnnotations.count) annotations")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@june24/expo-pdf-reader",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "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",