@amafil/react-native-pdf-toolkit 1.1.3 → 1.1.18

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Apr 30 12:36:50 CEST 2026
+#Sat May 16 13:51:56 CEST 2026

package/android/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/main/assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/debug/jniLibs"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/react-native-pdf-1/FabricExample/node_modules/react-native-pdf/android/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/filippo/Documents/diodellamialode/DioDellaMiaLode/node_modules/@amafil/react-native-pdf-toolkit/android/src/debug/shaders"/></dataSet></merger>

package/android/src/main/java/org/wonday/pdf/PdfManager.java

@@ -29,7 +29,6 @@ import com.facebook.react.viewmanagers.RNPDFPdfViewManagerInterface;
 public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfViewManagerInterface<PdfView> {
     public static final String REACT_CLASS = "RNPDFPdfView";
     private Context context;
-    private PdfView pdfView;
     private final ViewManagerDelegate<PdfView> mDelegate;
 
     @Nullable
@@ -54,13 +53,13 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
 
     @Override
     public PdfView createViewInstance(ThemedReactContext context) {
-        this.pdfView = new PdfView(context,null);
-        return pdfView;
+        return new PdfView(context,null);
     }
 
     @Override
     public void onDropViewInstance(PdfView pdfView) {
-        pdfView = null;
+        pdfView.cleanup();
+        super.onDropViewInstance(pdfView);
     }
 
     @ReactProp(name = "path")
@@ -106,12 +105,12 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
 
     @ReactProp(name = "enableRTL")
     public void setEnableRTL(PdfView view, boolean enableRTL) {
-        pdfView.setEnableRTL(enableRTL);
+        view.setEnableRTL(enableRTL);
     }
 
     @ReactProp(name = "scrollEnabled")
     public void setScrollEnabled(PdfView view, boolean scrollEnabled) {
-        pdfView.setScrollEnabled(scrollEnabled);
+        view.setScrollEnabled(scrollEnabled);
     }
 
     @ReactProp(name = "spacing")
@@ -193,7 +192,7 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
     // use `receiveCommand` method and call this one there
     @Override
     public void setNativePage(PdfView view, int page) {
-        pdfView.setPage(page);
+        view.setPage(page);
     }
 
     @Override

package/android/src/main/java/org/wonday/pdf/PdfView.java

@@ -17,6 +17,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.util.SizeF;
+import android.util.SparseArray;
 import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +28,7 @@ import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
@@ -113,6 +115,9 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private float originalWidth = 0;
     private float lastPageWidth = 0;
     private float lastPageHeight = 0;
+    private final SparseArray<PageRenderInfo> pageRenderInfoByIndex = new SparseArray<>();
+    private final Matrix pageRenderMatrix = new Matrix();
+    private final float[] pageRenderMatrixValues = new float[9];
 
     // used to store the parameters for `super.onSizeChanged`
     private int oldW = 0;
@@ -129,6 +134,20 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private long lastFrameTimeNanos = 0;
     private float accumulatedScrollOffset = 0f; // float accumulator – avoids re-reading the rendering-quantised offset
 
+    private static final class PageRenderInfo {
+        final float left;
+        final float top;
+        final float width;
+        final float height;
+
+        PageRenderInfo(float left, float top, float width, float height) {
+            this.left = left;
+            this.top = top;
+            this.width = width;
+            this.height = height;
+        }
+    }
+
     public PdfView(Context context, AttributeSet set){
         super(context, set);
         ConfigKt.setPdfiumConfig(new Config(new DefaultLogger(), AlreadyClosedBehavior.IGNORE));
@@ -336,6 +355,15 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             originalWidth = pageWidth;
         }
 
+        canvas.getMatrix(pageRenderMatrix);
+        pageRenderMatrix.getValues(pageRenderMatrixValues);
+        pageRenderInfoByIndex.put(displayedPage, new PageRenderInfo(
+            pageRenderMatrixValues[Matrix.MTRANS_X] - getCurrentXOffset(),
+            pageRenderMatrixValues[Matrix.MTRANS_Y] - getCurrentYOffset(),
+            pageWidth,
+            pageHeight
+        ));
+
         if (lastPageWidth>0 && lastPageHeight>0 && (pageWidth!=lastPageWidth || pageHeight!=lastPageHeight)) {
             // maybe change by other instance, restore zoom setting
             Constants.Pinch.MINIMUM_ZOOM = this.minScale;
@@ -368,6 +396,52 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         }
     }
 
+    private void clearPageRenderInfo() {
+        pageRenderInfoByIndex.clear();
+        originalWidth = 0;
+        lastPageWidth = 0;
+        lastPageHeight = 0;
+    }
+
+    private PageRenderInfo getPageRenderInfo(int pageIndex) {
+        PageRenderInfo pageRenderInfo = pageRenderInfoByIndex.get(pageIndex);
+        if (pageRenderInfo != null) {
+            return new PageRenderInfo(
+                pageRenderInfo.left + getCurrentXOffset(),
+                pageRenderInfo.top + getCurrentYOffset(),
+                pageRenderInfo.width,
+                pageRenderInfo.height
+            );
+        }
+
+        SizeF pageSize = getPageSize(pageIndex);
+        if (pageSize == null) {
+            return null;
+        }
+
+        float zoom = getZoom();
+        float scaledPageWidth = pageSize.getWidth() * zoom;
+        float scaledPageHeight = pageSize.getHeight() * zoom;
+        float horizontalMargin = Math.max(0f, (getWidth() - scaledPageWidth) / 2f);
+        float pageTop = getFallbackPageTop(pageIndex, zoom) + getCurrentYOffset();
+        return new PageRenderInfo(horizontalMargin, pageTop, scaledPageWidth, scaledPageHeight);
+    }
+
+    private float getFallbackPageTop(int pageIndex, float zoom) {
+        float pageTop = 0f;
+        for (int i = 0; i < pageIndex; i++) {
+            SizeF previousPageSize = getPageSize(i);
+            if (previousPageSize == null) {
+                continue;
+            }
+
+            pageTop += previousPageSize.getHeight() * zoom;
+            pageTop += spacing * zoom;
+        }
+
+        return pageTop;
+    }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -387,6 +461,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
     public void drawPdf() {
         showLog(format("drawPdf path:%s %s", this.path, this.page));
+        clearPageRenderInfo();
 
         if (this.path != null){
 
@@ -506,6 +581,13 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         updateAnnotationOverlayConfig();
     }
 
+    public void cleanup() {
+        stopAutoScroll();
+        if (!this.isRecycled()) {
+            this.recycle();
+        }
+    }
+
     public void setPath(String path) {
         this.path = path;
     }
@@ -801,24 +883,6 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     endInk();
                     return true;
                 }
-            } else if ("highlight".equals(currentTool)) {
-                if (action == MotionEvent.ACTION_DOWN) {
-                    AnnotationHit hit = hitTest(event.getX(), event.getY());
-                    if (hit == null) {
-                        return false;
-                    }
-                    beginMarkup(hit, event.getX(), event.getY(), currentTool);
-                    return true;
-                } else if (action == MotionEvent.ACTION_MOVE) {
-                    AnnotationHit hit = hitTest(event.getX(), event.getY());
-                    if (hit != null) {
-                        updateMarkup(hit, event.getX(), event.getY());
-                    }
-                    return true;
-                } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
-                    endMarkup();
-                    return true;
-                }
             } else if ("text".equals(currentTool)) {
                 if (action == MotionEvent.ACTION_UP) {
                     AnnotationHit hit = hitTest(event.getX(), event.getY());
@@ -858,7 +922,22 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
                 if ("ink".equals(type)) {
                     JSONArray points = annotation.optJSONArray("points");
-                    if (points == null || points.length() < 2) {
+                    if (points == null || points.length() == 0) {
+                        continue;
+                    }
+
+                    if (points.length() == 1) {
+                        JSONObject point = points.optJSONObject(0);
+                        if (point != null) {
+                            float pageX = (float) point.optDouble("x", 0f);
+                            float pageY = (float) point.optDouble("y", 0f);
+                            PointF viewPoint = viewPointForNormalizedPoint(pageIndex, pageX, pageY);
+                            float radius = Math.max(1f, (float) styleFor(annotation).optDouble("thickness", 2.0)) / 2f;
+                            Paint dotPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+                            dotPaint.setStyle(Paint.Style.FILL);
+                            dotPaint.setColor(annotationColor(annotation, Color.BLACK));
+                            canvas.drawCircle(viewPoint.x, viewPoint.y, radius, dotPaint);
+                        }
                         continue;
                     }
 
@@ -970,6 +1049,10 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         }
 
         private void drawSelectionDecorations(Canvas canvas) {
+            if (!annotationModeEnabled || !editable || !supported) {
+                return;
+            }
+
             JSONObject annotation = getSelectedAnnotation();
             if (annotation == null) {
                 return;
@@ -1132,14 +1215,13 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 return;
             }
 
-            SizeF pageSize = PdfView.this.getPageSize(activeSelectionPageIndex);
-            if (pageSize == null) {
+            PageRenderInfo pageRenderInfo = PdfView.this.getPageRenderInfo(activeSelectionPageIndex);
+            if (pageRenderInfo == null) {
                 return;
             }
 
-            float zoom = PdfView.this.getZoom();
-            float scaledPageWidth = Math.max(1f, pageSize.getWidth() * zoom);
-            float scaledPageHeight = Math.max(1f, pageSize.getHeight() * zoom);
+            float scaledPageWidth = Math.max(1f, pageRenderInfo.width);
+            float scaledPageHeight = Math.max(1f, pageRenderInfo.height);
             float normalizedDeltaX = deltaX / scaledPageWidth;
             float normalizedDeltaY = deltaY / scaledPageHeight;
 
@@ -1159,14 +1241,13 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 return;
             }
 
-            SizeF pageSize = PdfView.this.getPageSize(activeSelectionPageIndex);
-            if (pageSize == null) {
+            PageRenderInfo pageRenderInfo = PdfView.this.getPageRenderInfo(activeSelectionPageIndex);
+            if (pageRenderInfo == null) {
                 return;
             }
 
-            float zoom = PdfView.this.getZoom();
-            float scaledPageWidth = Math.max(1f, pageSize.getWidth() * zoom);
-            float scaledPageHeight = Math.max(1f, pageSize.getHeight() * zoom);
+            float scaledPageWidth = Math.max(1f, pageRenderInfo.width);
+            float scaledPageHeight = Math.max(1f, pageRenderInfo.height);
             float normalizedDeltaX = deltaX / scaledPageWidth;
             float normalizedDeltaY = deltaY / scaledPageHeight;
 
@@ -1329,6 +1410,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         private void endInk() {
             activeInkAnnotation = null;
             invalidate();
+            PdfView.this.notifyOnChangeWithMessage("strokeEnd");
         }
 
         private void beginMarkup(AnnotationHit hit, float x, float y, String type) {
@@ -1485,23 +1567,17 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 return null;
             }
 
-            float zoom = PdfView.this.getZoom();
-            float documentY = y - PdfView.this.getCurrentYOffset();
             for (int i = 0; i < PdfView.this.getPageCount(); i++) {
-                SizeF pageSize = PdfView.this.getPageSize(i);
-                if (pageSize == null) {
+                PageRenderInfo pageRenderInfo = PdfView.this.getPageRenderInfo(i);
+                if (pageRenderInfo == null) {
                     continue;
                 }
 
-                float scaledPageWidth = pageSize.getWidth() * zoom;
-                float scaledPageHeight = pageSize.getHeight() * zoom;
-                float horizontalMargin = Math.max(0f, (PdfView.this.getWidth() - scaledPageWidth) / 2f);
-                float pageTop = getPageTop(i, zoom);
-                if (documentY >= pageTop && documentY <= pageTop + scaledPageHeight) {
-                    float pageX = x - horizontalMargin;
-                    if (pageX >= 0f && pageX <= scaledPageWidth) {
-                        return new AnnotationHit(i, pageSize);
-                    }
+                if (x >= pageRenderInfo.left &&
+                    x <= pageRenderInfo.left + pageRenderInfo.width &&
+                    y >= pageRenderInfo.top &&
+                    y <= pageRenderInfo.top + pageRenderInfo.height) {
+                    return new AnnotationHit(i, pageRenderInfo);
                 }
             }
 
@@ -1509,26 +1585,25 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         }
 
         private PointF normalizedPointFor(AnnotationHit hit, float x, float y) {
-            float zoom = PdfView.this.getZoom();
-            SizeF pageSize = hit.pageSize;
-            float scaledPageWidth = pageSize.getWidth() * zoom;
-            float scaledPageHeight = pageSize.getHeight() * zoom;
-            float horizontalMargin = Math.max(0f, (PdfView.this.getWidth() - scaledPageWidth) / 2f);
-            float pageTop = getPageTop(hit.pageIndex, zoom);
-            float pageX = x - horizontalMargin;
-            float documentY = y - PdfView.this.getCurrentYOffset();
-            float pageY = documentY - pageTop;
-            return new PointF(pageX / Math.max(1f, scaledPageWidth), pageY / Math.max(1f, scaledPageHeight));
+            PageRenderInfo pageRenderInfo = hit.pageRenderInfo;
+            float pageX = x - pageRenderInfo.left;
+            float pageY = y - pageRenderInfo.top;
+            return new PointF(
+                pageX / Math.max(1f, pageRenderInfo.width),
+                pageY / Math.max(1f, pageRenderInfo.height)
+            );
         }
 
         private PointF viewPointForNormalizedPoint(int pageIndex, float normalizedX, float normalizedY) {
-            SizeF pageSize = PdfView.this.getPageSize(pageIndex);
-            float zoom = PdfView.this.getZoom();
-            float scaledPageWidth = pageSize.getWidth() * zoom;
-            float scaledPageHeight = pageSize.getHeight() * zoom;
-            float horizontalMargin = Math.max(0f, (PdfView.this.getWidth() - scaledPageWidth) / 2f);
-            float pageTop = getPageTop(pageIndex, zoom) + PdfView.this.getCurrentYOffset();
-            return new PointF(horizontalMargin + (normalizedX * scaledPageWidth), pageTop + (normalizedY * scaledPageHeight));
+            PageRenderInfo pageRenderInfo = PdfView.this.getPageRenderInfo(pageIndex);
+            if (pageRenderInfo == null) {
+                return new PointF();
+            }
+
+            return new PointF(
+                pageRenderInfo.left + (normalizedX * pageRenderInfo.width),
+                pageRenderInfo.top + (normalizedY * pageRenderInfo.height)
+            );
         }
 
         private RectF viewRectForAnnotation(JSONObject annotation, int pageIndex) {
@@ -1538,17 +1613,11 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 return null;
             }
 
-            SizeF pageSize = PdfView.this.getPageSize(pageIndex);
-            if (pageSize == null) {
+            PageRenderInfo pageRenderInfo = PdfView.this.getPageRenderInfo(pageIndex);
+            if (pageRenderInfo == null) {
                 return null;
             }
 
-            float zoom = PdfView.this.getZoom();
-            float scaledPageWidth = pageSize.getWidth() * zoom;
-            float scaledPageHeight = pageSize.getHeight() * zoom;
-            float horizontalMargin = Math.max(0f, (PdfView.this.getWidth() - scaledPageWidth) / 2f);
-            float pageTop = getPageTop(pageIndex, zoom) + PdfView.this.getCurrentYOffset();
-
             if ("ink".equals(type)) {
                 JSONArray points = annotation.optJSONArray("points");
                 if (points == null || points.length() == 0) {
@@ -1577,10 +1646,10 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     return null;
                 }
 
-                float left = horizontalMargin + (minX * scaledPageWidth);
-                float top = pageTop + (minY * scaledPageHeight);
-                float right = horizontalMargin + (maxX * scaledPageWidth);
-                float bottom = pageTop + (maxY * scaledPageHeight);
+                float left = pageRenderInfo.left + (minX * pageRenderInfo.width);
+                float top = pageRenderInfo.top + (minY * pageRenderInfo.height);
+                float right = pageRenderInfo.left + (maxX * pageRenderInfo.width);
+                float bottom = pageRenderInfo.top + (maxY * pageRenderInfo.height);
                 return new RectF(Math.min(left, right), Math.min(top, bottom), Math.max(left, right), Math.max(top, bottom));
             }
 
@@ -1589,10 +1658,10 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             float width = (float) bounds.optDouble("width", 0f);
             float height = (float) bounds.optDouble("height", 0f);
 
-            float left = horizontalMargin + (x * scaledPageWidth);
-            float top = pageTop + (y * scaledPageHeight);
-            float right = horizontalMargin + ((x + width) * scaledPageWidth);
-            float bottom = pageTop + ((y + height) * scaledPageHeight);
+            float left = pageRenderInfo.left + (x * pageRenderInfo.width);
+            float top = pageRenderInfo.top + (y * pageRenderInfo.height);
+            float right = pageRenderInfo.left + ((x + width) * pageRenderInfo.width);
+            float bottom = pageRenderInfo.top + ((y + height) * pageRenderInfo.height);
 
             return new RectF(Math.min(left, right), Math.min(top, bottom), Math.max(left, right), Math.max(top, bottom));
         }
@@ -1622,6 +1691,14 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             }
 
             try {
+                // Support CSS-standard #RRGGBBAA (alpha last) in addition to #RRGGBB
+                if (color.startsWith("#") && color.length() == 9) {
+                    int r = Integer.parseInt(color.substring(1, 3), 16);
+                    int g = Integer.parseInt(color.substring(3, 5), 16);
+                    int b = Integer.parseInt(color.substring(5, 7), 16);
+                    int a = Integer.parseInt(color.substring(7, 9), 16);
+                    return Color.argb(a, r, g, b);
+                }
                 return Color.parseColor(color);
             } catch (IllegalArgumentException ex) {
                 return fallback;
@@ -1640,26 +1717,13 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             return "local-" + java.util.UUID.randomUUID().toString();
         }
 
-        private float getPageTop(int pageIndex, float zoom) {
-            float pageTop = 0f;
-            for (int i = 0; i < pageIndex; i++) {
-                SizeF previousPageSize = PdfView.this.getPageSize(i);
-                if (previousPageSize == null) {
-                    continue;
-                }
-                pageTop += previousPageSize.getHeight() * zoom;
-                pageTop += PdfView.this.spacing * zoom;
-            }
-            return pageTop;
-        }
-
         private final class AnnotationHit {
             final int pageIndex;
-            final SizeF pageSize;
+            final PageRenderInfo pageRenderInfo;
 
-            AnnotationHit(int pageIndex, SizeF pageSize) {
+            AnnotationHit(int pageIndex, PageRenderInfo pageRenderInfo) {
                 this.pageIndex = pageIndex;
-                this.pageSize = pageSize;
+                this.pageRenderInfo = pageRenderInfo;
             }
         }
     }

package/index.d.ts

@@ -29,7 +29,7 @@ export type Source = {
 
 export type AnnotationRotation = 0 | 90 | 180 | 270;
 export type AnnotationIdMode = 'auto' | 'manual';
-export type AnnotationTool = 'select' | 'ink' | 'text' | 'highlight';
+export type AnnotationTool = 'select' | 'ink' | 'text';
 export type AnnotationTextAlign = 'left' | 'center' | 'right';
 
 export type AnnotationPoint = {
@@ -169,6 +169,7 @@ export interface PdfProps {
     onScaleChanged?: (scale: number) => void,
     onPressLink?: (url: string) => void,
     onAutoScrollEnd?: () => void,
+    onAnnotationStrokeEnd?: () => void,
     onTextSelectionChange?: (event: TextSelectionChangeEvent) => void,
 }