@amafil/react-native-pdf-toolkit 1.1.0 → 1.1.1

package/README.md

@@ -13,6 +13,63 @@ A react native PDF view component (cross-platform support)
 * support password protected pdf
 * jump to a specific page in the pdf
 * auto scroll with configurable speed (ideal for music sheets)
+* annotate pages with ink, text, and highlight tools
+
+### Annotation editing
+
+The component accepts an annotation document through the `annotations` prop together with `annotationMode`, `annotationTool`, `annotationEditable`, and `annotationIdMode`. Ink defaults can be controlled with `annotationInkColor` and `annotationInkThickness`.
+
+```tsx
+const annotations = {
+  editable: true,
+  idMode: 'auto',
+  annotations: [
+    {
+      id: 'note-1',
+      page: 1,
+      type: 'text',
+      bounds: {x: 0.15, y: 0.24, width: 0.28, height: 0.12},
+      text: 'Reminder for page one',
+      style: {color: '#2244aa', fontSize: 15, textAlign: 'left'},
+    },
+    {
+      id: 'stroke-1',
+      page: 2,
+      type: 'ink',
+      points: [
+        {x: 0.12, y: 0.18},
+        {x: 0.26, y: 0.22},
+        {x: 0.34, y: 0.19},
+      ],
+      style: {color: '#111111', thickness: 2},
+    },
+  ],
+};
+
+<Pdf
+  ref={pdfRef}
+  source={source}
+  annotations={annotations}
+  annotationMode
+  annotationTool="ink"
+  annotationInkColor="#1d4ed8"
+  annotationInkThickness={4}
+/>
+```
+
+Supported tools are `select`, `ink`, `text`, and `highlight`.
+
+In `select` mode, tap an annotation to select it, drag to move it, and use the resize handle to resize text and highlight annotations. Deletion is host-controlled: call `pdfRef.current.deleteSelectedAnnotation()` or `pdfRef.current.deleteAllAnnotations()` from your own UI.
+
+Call `await pdfRef.current.saveAnnotations()` to receive the current document back from native as `{ editable, idMode, annotations }`.
+
+Legacy `underline` and `strikeout` annotations are normalized to `highlight` when loading and saving.
+
+Notes:
+
+* Editing currently targets the default vertical viewer flow.
+* Android editing is disabled when `horizontal`, `enablePaging`, `enableRTL`, or `singlePage` are enabled.
+* iOS editing uses PDFKit when `usePDFKit` is true.
 
 ### Supported versions
 We use [`react-native-blob-util`](https://github.com/RonRadtke/react-native-blob-util) to handle file system access in this package,

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

@@ -164,6 +164,16 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
         pdfView.setAnnotationIdMode(annotationIdMode);
     }
 
+    @ReactProp(name = "annotationInkColor")
+    public void setAnnotationInkColor(PdfView pdfView, @Nullable String annotationInkColor) {
+        pdfView.setAnnotationInkColor(annotationInkColor);
+    }
+
+    @ReactProp(name = "annotationInkThickness")
+    public void setAnnotationInkThickness(PdfView pdfView, float annotationInkThickness) {
+        pdfView.setAnnotationInkThickness(annotationInkThickness);
+    }
+
     @ReactProp(name = "enablePaging")
     public void setEnablePaging(PdfView pdfView, boolean enablePaging) {
         pdfView.setEnablePaging(enablePaging);
@@ -211,6 +221,10 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
             stopNativeAutoScroll(root);
         } else if ("saveAnnotations".equals(commandId)) {
             saveAnnotations(root);
+        } else if ("deleteSelectedAnnotation".equals(commandId)) {
+            deleteSelectedAnnotation(root);
+        } else if ("deleteAllAnnotations".equals(commandId)) {
+            deleteAllAnnotations(root);
         }
     }
 
@@ -219,6 +233,16 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
         view.saveAnnotations();
     }
 
+    @Override
+    public void deleteSelectedAnnotation(PdfView view) {
+        view.deleteSelectedAnnotation();
+    }
+
+    @Override
+    public void deleteAllAnnotations(PdfView view) {
+        view.deleteAllAnnotations();
+    }
+
     @Override
     public void onAfterUpdateTransaction(PdfView pdfView) {
         super.onAfterUpdateTransaction(pdfView);

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

@@ -97,6 +97,8 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private String annotationTool = "select";
     private boolean annotationEditable = true;
     private String annotationIdMode = "auto";
+    private String annotationInkColor = "#111111";
+    private float annotationInkThickness = 2f;
     private AnnotationOverlayView annotationOverlayView;
 
     private boolean enablePaging = false;
@@ -494,6 +496,16 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         updateAnnotationOverlayConfig();
     }
 
+    public void setAnnotationInkColor(String annotationInkColor) {
+        this.annotationInkColor = TextUtils.isEmpty(annotationInkColor) ? "#111111" : annotationInkColor;
+        updateAnnotationOverlayConfig();
+    }
+
+    public void setAnnotationInkThickness(float annotationInkThickness) {
+        this.annotationInkThickness = annotationInkThickness > 0f ? annotationInkThickness : 2f;
+        updateAnnotationOverlayConfig();
+    }
+
     public void setPath(String path) {
         this.path = path;
     }
@@ -594,7 +606,9 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 this.annotationTool,
                 this.annotationEditable,
                 this.annotationIdMode,
-                isAnnotationEditingSupported()
+                isAnnotationEditingSupported(),
+                this.annotationInkColor,
+                this.annotationInkThickness
             );
         }
     }
@@ -622,6 +636,8 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         private boolean editable = true;
         private String idMode = "auto";
         private boolean supported = true;
+        private String inkColor = "#111111";
+        private float inkThickness = 2f;
 
         AnnotationOverlayView(Context context) {
             super(context);
@@ -631,12 +647,14 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             touchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         }
 
-        void setConfiguration(boolean annotationMode, String annotationTool, boolean annotationEditable, String annotationIdMode, boolean annotationEditingSupported) {
+        void setConfiguration(boolean annotationMode, String annotationTool, boolean annotationEditable, String annotationIdMode, boolean annotationEditingSupported, String annotationInkColor, float annotationInkThickness) {
             annotationModeEnabled = annotationMode;
-            tool = annotationTool == null ? "select" : annotationTool;
+            tool = normalizeAnnotationType(annotationTool == null ? "select" : annotationTool);
             editable = annotationEditable;
             idMode = annotationIdMode == null ? "auto" : annotationIdMode;
             supported = annotationEditingSupported;
+            inkColor = TextUtils.isEmpty(annotationInkColor) ? "#111111" : annotationInkColor;
+            inkThickness = annotationInkThickness > 0f ? annotationInkThickness : 2f;
 
             if (!annotationModeEnabled || !editable || !supported) {
                 commitTextEditingIfNeeded();
@@ -649,6 +667,21 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             invalidate();
         }
 
+        void deleteSelectedAnnotation() {
+            JSONObject selectedAnnotation = getSelectedAnnotation();
+            if (selectedAnnotation != null) {
+                deleteAnnotation(selectedAnnotation);
+            }
+        }
+
+        void deleteAllAnnotations() {
+            commitTextEditingIfNeeded();
+            draftAnnotations.clear();
+            selectedAnnotationId = null;
+            clearSelectionInteraction();
+            invalidate();
+        }
+
         void replaceAnnotations(String json) {
             draftAnnotations.clear();
             clearSelectionInteraction();
@@ -677,6 +710,10 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     }
 
                     JSONObject annotation = new JSONObject(source.toString());
+                    String type = normalizeAnnotationType(annotation.optString("type", null));
+                    if (!TextUtils.isEmpty(type)) {
+                        annotation.put("type", type);
+                    }
                     if (!annotation.has("id")) {
                         annotation.put("id", nextLocalAnnotationId());
                     }
@@ -764,7 +801,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     endInk();
                     return true;
                 }
-            } else if ("highlight".equals(currentTool) || "underline".equals(currentTool) || "strikeout".equals(currentTool)) {
+            } else if ("highlight".equals(currentTool)) {
                 if (action == MotionEvent.ACTION_DOWN) {
                     AnnotationHit hit = hitTest(event.getX(), event.getY());
                     if (hit == null) {
@@ -813,7 +850,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     continue;
                 }
 
-                String type = annotation.optString("type", "");
+                String type = normalizeAnnotationType(annotation.optString("type", ""));
                 RectF rect = viewRectForAnnotation(annotation, pageIndex);
                 if (rect == null && !"ink".equals(type)) {
                     continue;
@@ -864,17 +901,9 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                     textPaint.setTextAlign(Paint.Align.LEFT);
                     String text = annotation.optString("text", "");
                     canvas.drawText(text, rect.left + 8f, rect.top + Math.max(20f, textPaint.getTextSize() + 6f), textPaint);
-                } else if ("highlight".equals(type) || "underline".equals(type) || "strikeout".equals(type)) {
+                } else if ("highlight".equals(type)) {
                     fillPaint.setColor(annotationColor(annotation, annotationFillColor(type)));
                     canvas.drawRect(rect, fillPaint);
-
-                    if ("underline".equals(type) || "strikeout".equals(type)) {
-                        strokePaint.setStyle(Paint.Style.STROKE);
-                        strokePaint.setStrokeWidth(Math.max(1f, rect.height() * 0.15f));
-                        strokePaint.setColor(annotationColor(annotation, annotationFillColor(type)));
-                        float y = "underline".equals(type) ? rect.bottom - 2f : rect.centerY();
-                        canvas.drawLine(rect.left, y, rect.right, y, strokePaint);
-                    }
                 }
             }
 
@@ -895,7 +924,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 selectAnnotation(hit.annotation);
                 activeSelectionAnnotation = hit.annotation;
                 activeSelectionHandle = hit.hitPart;
-                activeSelectionMode = "delete".equals(hit.hitPart) ? "delete" : ("resize".equals(hit.hitPart) ? "resize" : "move");
+                activeSelectionMode = "resize".equals(hit.hitPart) ? "resize" : "move";
                 activeSelectionPageIndex = hit.pageIndex;
                 activeSelectionStartBounds = normalizedBoundsForAnnotation(hit.annotation);
                 activeSelectionStartPoints = copyPointsForAnnotation(hit.annotation);
@@ -903,12 +932,6 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 activeSelectionDownY = event.getY();
                 activeSelectionHasMoved = false;
 
-                if ("delete".equals(activeSelectionMode)) {
-                    deleteAnnotation(hit.annotation);
-                    clearSelectionInteraction();
-                    return true;
-                }
-
                 return true;
             }
 
@@ -972,13 +995,11 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
             canvas.drawRoundRect(rect, 4f, 4f, outlinePaint);
 
-            RectF deleteHandle = deleteHandleRect(rect);
-            fillPaint.setColor(Color.argb(235, 210, 48, 48));
-            canvas.drawOval(deleteHandle, fillPaint);
-
-            RectF resizeHandle = resizeHandleRect(rect);
-            fillPaint.setColor(Color.argb(235, 34, 68, 170));
-            canvas.drawRoundRect(resizeHandle, 2f, 2f, fillPaint);
+            if (annotationSupportsResize(annotation)) {
+                RectF resizeHandle = resizeHandleRect(rect);
+                fillPaint.setColor(Color.argb(235, 34, 68, 170));
+                canvas.drawRoundRect(resizeHandle, 2f, 2f, fillPaint);
+            }
         }
 
         private void clearSelectionInteraction() {
@@ -1212,11 +1233,6 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             }
         }
 
-        private RectF deleteHandleRect(RectF rect) {
-            float size = Math.max(18f, Math.min(rect.width(), rect.height()) * 0.18f);
-            return new RectF(rect.right - size, rect.top - size, rect.right, rect.top);
-        }
-
         private RectF resizeHandleRect(RectF rect) {
             float size = Math.max(18f, Math.min(rect.width(), rect.height()) * 0.18f);
             return new RectF(rect.right - size, rect.bottom - size, rect.right, rect.bottom);
@@ -1246,12 +1262,8 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 }
 
                 String hitPart = "body";
-                if (includeHandles && selectedAnnotationId != null && selectedAnnotationId.equals(annotation.optString("id", null))) {
-                    if (deleteHandleRect(rect).contains(x, y)) {
-                        hitPart = "delete";
-                    } else if (resizeHandleRect(rect).contains(x, y)) {
-                        hitPart = "resize";
-                    }
+                if (includeHandles && selectedAnnotationId != null && selectedAnnotationId.equals(annotation.optString("id", null)) && annotationSupportsResize(annotation) && resizeHandleRect(rect).contains(x, y)) {
+                    hitPart = "resize";
                 }
 
                 return new AnnotationSelectionHit(annotation, pageIndex, rect, hitPart);
@@ -1282,8 +1294,8 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 annotation.put("type", "ink");
                 annotation.put("points", new JSONArray());
                 JSONObject style = new JSONObject();
-                style.put("color", "#111111");
-                style.put("thickness", 2.0f);
+                style.put("color", inkColor);
+                style.put("thickness", inkThickness);
                 annotation.put("style", style);
                 draftAnnotations.add(annotation);
                 activeInkAnnotation = annotation;
@@ -1325,7 +1337,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 JSONObject annotation = new JSONObject();
                 annotation.put("id", nextLocalAnnotationId());
                 annotation.put("page", hit.pageIndex + 1);
-                annotation.put("type", type);
+                annotation.put("type", normalizeAnnotationType(type));
                 annotation.put("bounds", new JSONObject().put("x", markupStartNormalized.x).put("y", markupStartNormalized.y).put("width", 0).put("height", 0));
                 annotation.put("style", new JSONObject());
                 draftAnnotations.add(annotation);
@@ -1590,6 +1602,19 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             return style == null ? new JSONObject() : style;
         }
 
+        private String normalizeAnnotationType(String type) {
+            if ("underline".equals(type) || "strikeout".equals(type)) {
+                return "highlight";
+            }
+
+            return type;
+        }
+
+        private boolean annotationSupportsResize(JSONObject annotation) {
+            String type = normalizeAnnotationType(annotation.optString("type", ""));
+            return "text".equals(type) || "highlight".equals(type);
+        }
+
         private int annotationColor(JSONObject annotation, int fallback) {
             String color = styleFor(annotation).optString("color", null);
             if (TextUtils.isEmpty(color)) {
@@ -1604,15 +1629,9 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         }
 
         private int annotationFillColor(String type) {
-            if ("highlight".equals(type)) {
+            if ("highlight".equals(type) || "underline".equals(type) || "strikeout".equals(type)) {
                 return Color.argb(90, 255, 230, 60);
             }
-            if ("underline".equals(type)) {
-                return Color.argb(120, 50, 120, 255);
-            }
-            if ("strikeout".equals(type)) {
-                return Color.argb(120, 255, 50, 50);
-            }
 
             return Color.BLACK;
         }
@@ -1700,6 +1719,18 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         notifyOnChangeWithMessage("annotationSaveError|Annotation overlay unavailable");
     }
 
+    public void deleteSelectedAnnotation() {
+        if (annotationOverlayView != null) {
+            annotationOverlayView.deleteSelectedAnnotation();
+        }
+    }
+
+    public void deleteAllAnnotations() {
+        if (annotationOverlayView != null) {
+            annotationOverlayView.deleteAllAnnotations();
+        }
+    }
+
     private void showLog(final String str) {
         Log.d("PdfView", str);
     }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNPDFPdfViewManagerDelegate.java

@@ -77,6 +77,12 @@ public class RNPDFPdfViewManagerDelegate<T extends View, U extends BaseViewManag
       case "annotationIdMode":
         mViewManager.setAnnotationIdMode(view, value == null ? null : (String) value);
         break;
+      case "annotationInkColor":
+        mViewManager.setAnnotationInkColor(view, value == null ? null : (String) value);
+        break;
+      case "annotationInkThickness":
+        mViewManager.setAnnotationInkThickness(view, value == null ? 0f : ((Double) value).floatValue());
+        break;
       case "enableAntialiasing":
         mViewManager.setEnableAntialiasing(view, value == null ? false : (boolean) value);
         break;
@@ -105,6 +111,12 @@ public class RNPDFPdfViewManagerDelegate<T extends View, U extends BaseViewManag
       case "saveAnnotations":
         mViewManager.saveAnnotations(view);
         break;
+      case "deleteSelectedAnnotation":
+        mViewManager.deleteSelectedAnnotation(view);
+        break;
+      case "deleteAllAnnotations":
+        mViewManager.deleteAllAnnotations(view);
+        break;
     }
   }
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNPDFPdfViewManagerInterface.java

@@ -31,6 +31,8 @@ public interface RNPDFPdfViewManagerInterface<T extends View> {
   void setAnnotationTool(T view, @Nullable String value);
   void setAnnotationEditable(T view, boolean value);
   void setAnnotationIdMode(T view, @Nullable String value);
+  void setAnnotationInkColor(T view, @Nullable String value);
+  void setAnnotationInkThickness(T view, float value);
   void setEnableAntialiasing(T view, boolean value);
   void setFitPolicy(T view, int value);
   void setSpacing(T view, int value);
@@ -38,4 +40,6 @@ public interface RNPDFPdfViewManagerInterface<T extends View> {
   void setSinglePage(T view, boolean value);
   void setNativePage(T view, int page);
   void saveAnnotations(T view);
+  void deleteSelectedAnnotation(T view);
+  void deleteAllAnnotations(T view);
 }

package/annotationDocumentUtils.js

@@ -0,0 +1,74 @@
+'use strict';
+
+const LEGACY_MARKUP_TYPES = new Set(['underline', 'strikeout']);
+
+export function normalizeAnnotation(annotation) {
+    if (!annotation || typeof annotation !== 'object' || Array.isArray(annotation)) {
+        return annotation;
+    }
+
+    if (!LEGACY_MARKUP_TYPES.has(annotation.type)) {
+        return annotation;
+    }
+
+    return {
+        ...annotation,
+        type: 'highlight',
+    };
+}
+
+export function normalizeAnnotationPayload(payload) {
+    if (!payload || typeof payload !== 'object') {
+        return payload;
+    }
+
+    if (Array.isArray(payload)) {
+        return payload.map(normalizeAnnotation);
+    }
+
+    if (!Array.isArray(payload.annotations)) {
+        return payload;
+    }
+
+    return {
+        ...payload,
+        annotations: payload.annotations.map(normalizeAnnotation),
+    };
+}
+
+export function joinAnnotationMessagePayload(messageParts, startIndex = 1) {
+    if (!Array.isArray(messageParts) || messageParts.length <= startIndex) {
+        return '';
+    }
+
+    return messageParts.slice(startIndex).join('|');
+}
+
+export function parseAnnotationMessagePayload(messageParts, startIndex = 1) {
+    const payload = joinAnnotationMessagePayload(messageParts, startIndex);
+
+    if (!payload) {
+        return null;
+    }
+
+    try {
+        return normalizeAnnotationPayload(JSON.parse(payload));
+    } catch (error) {
+        return payload;
+    }
+}
+
+export function stringifyAnnotationDocument(document, onError) {
+    if (!document) {
+        return null;
+    }
+
+    try {
+        return JSON.stringify(normalizeAnnotationPayload(document));
+    } catch (error) {
+        if (onError) {
+            onError(error);
+        }
+        return null;
+    }
+}

package/fabric/RNPDFPdfNativeComponent.js

@@ -35,6 +35,8 @@
   annotationTool: ?string,
   annotationEditable: ?boolean,
   annotationIdMode: ?string,
+  annotationInkColor: ?string,
+  annotationInkThickness: ?Float,
    onChange: ?BubblingEventHandler<ChangeEvent>,
    singlePage: ?boolean,
  |}>;
@@ -55,10 +57,16 @@
   +saveAnnotations: (
     viewRef: React.ElementRef<ComponentType>,
   ) => void;
+  +deleteSelectedAnnotation: (
+    viewRef: React.ElementRef<ComponentType>,
+  ) => void;
+  +deleteAllAnnotations: (
+    viewRef: React.ElementRef<ComponentType>,
+  ) => void;
 }
 
 export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['setNativePage', 'startNativeAutoScroll', 'stopNativeAutoScroll', 'saveAnnotations'],
+  supportedCommands: ['setNativePage', 'startNativeAutoScroll', 'stopNativeAutoScroll', 'saveAnnotations', 'deleteSelectedAnnotation', 'deleteAllAnnotations'],
 });
 
  export default codegenNativeComponent<NativeProps>('RNPDFPdfView');

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' | 'underline' | 'strikeout';
+export type AnnotationTool = 'select' | 'ink' | 'text' | 'highlight';
 export type AnnotationTextAlign = 'left' | 'center' | 'right';
 
 export type AnnotationPoint = {
@@ -76,7 +76,7 @@ export type TextAnnotation = AnnotationBase & {
 };
 
 export type MarkupAnnotation = AnnotationBase & {
-    type: 'highlight' | 'underline' | 'strikeout',
+    type: 'highlight',
     bounds: AnnotationBounds,
     style?: AnnotationStyle,
 };
@@ -120,11 +120,34 @@ export interface PdfProps {
     enableRTL?: boolean,
     enableAnnotationRendering?: boolean,
     enableDoubleTapZoom?: boolean;
+    /**
+     * Initial annotation document to render in the overlay.
+     */
     annotations?: AnnotationDocument,
+    /**
+     * Enable annotation editing mode.
+     */
     annotationMode?: boolean,
+    /**
+     * Active tool used while annotation editing is enabled.
+     */
     annotationTool?: AnnotationTool,
+    /**
+     * Allow in-place annotation edits.
+     */
     annotationEditable?: boolean,
+    /**
+     * Controls how annotation IDs are generated and preserved.
+     */
     annotationIdMode?: AnnotationIdMode,
+    /**
+     * Default color applied to newly created ink annotations.
+     */
+    annotationInkColor?: string,
+    /**
+     * Default thickness applied to newly created ink annotations.
+     */
+    annotationInkThickness?: number,
     /**
      * Only works on iOS. Defaults to `true`.
      */
@@ -151,7 +174,18 @@ export interface PdfProps {
 
 export interface PdfRef {
     setPage(pageNumber: number): void
+    /**
+     * Resolves with the current annotation document serialized by native code.
+     */
     saveAnnotations(): Promise<AnnotationDocument>
+    /**
+     * Deletes the currently selected custom annotation.
+     */
+    deleteSelectedAnnotation(): void
+    /**
+     * Deletes all custom annotations in the current overlay draft.
+     */
+    deleteAllAnnotations(): void
     /**
      * Start smooth automatic vertical scrolling using the display refresh rate.
      * @param dpPerSecond - Scroll speed in density-independent pixels (dp) per second (default: 15). Produces consistent physical speed across screen densities.

package/index.js

@@ -23,6 +23,11 @@ import PdfViewNativeComponent, {
 import ReactNativeBlobUtil from 'react-native-blob-util'
 import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 const SHA1 = require('crypto-js/sha1');
+import {
+        joinAnnotationMessagePayload,
+        parseAnnotationMessagePayload,
+        stringifyAnnotationDocument,
+} from './annotationDocumentUtils';
 import PdfView from './PdfView';
 
 export default class Pdf extends Component {
@@ -59,9 +64,11 @@ export default class Pdf extends Component {
         singlePage: PropTypes.bool,
         annotations: PropTypes.object,
         annotationMode: PropTypes.bool,
-        annotationTool: PropTypes.oneOf(['select', 'ink', 'text', 'highlight', 'underline', 'strikeout']),
+        annotationTool: PropTypes.oneOf(['select', 'ink', 'text', 'highlight']),
         annotationEditable: PropTypes.bool,
         annotationIdMode: PropTypes.oneOf(['auto', 'manual']),
+        annotationInkColor: PropTypes.string,
+        annotationInkThickness: PropTypes.number,
         onLoadComplete: PropTypes.func,
         onPageChanged: PropTypes.func,
         onError: PropTypes.func,
@@ -106,6 +113,8 @@ export default class Pdf extends Component {
         annotationTool: 'select',
         annotationEditable: true,
         annotationIdMode: 'auto',
+        annotationInkColor: '#111111',
+        annotationInkThickness: 2,
         onLoadProgress: (percent) => {
         },
         onLoadComplete: (numberOfPages, path) => {
@@ -423,6 +432,34 @@ export default class Pdf extends Component {
         });
     }
 
+    deleteSelectedAnnotation() {
+        this._dispatchAnnotationCommand('deleteSelectedAnnotation', PdfViewCommands.deleteSelectedAnnotation);
+    }
+
+    deleteAllAnnotations() {
+        this._dispatchAnnotationCommand('deleteAllAnnotations', PdfViewCommands.deleteAllAnnotations);
+    }
+
+    _dispatchAnnotationCommand(commandName, fabricCommand) {
+        if (!this._root) {
+            return;
+        }
+
+        if (!!global?.nativeFabricUIManager) {
+            if (fabricCommand) {
+                fabricCommand(this._root);
+            }
+            return;
+        }
+
+        const ReactNative = require('react-native');
+        ReactNative.UIManager.dispatchViewManagerCommand(
+            ReactNative.findNodeHandle(this._root),
+            commandName,
+            [],
+        );
+    }
+
     startAutoScroll( dpPerSecond = 15, resumeDelay = 3000 ) {
         this._isAutoScrollActive = true;
         if (!!global?.nativeFabricUIManager) {
@@ -517,24 +554,17 @@ export default class Pdf extends Component {
                 this._isAutoScrollActive = false;
                 this.props.onAutoScrollEnd && this.props.onAutoScrollEnd();
             } else if (message[0] === 'annotationSaveComplete') {
-                message[1] = message.slice(1).join('|');
-
-                let annotationDocument;
-                try {
-                    annotationDocument = message[1] ? JSON.parse(message[1]) : null;
-                } catch (e) {
-                    annotationDocument = message[1];
-                }
+                const annotationDocument = parseAnnotationMessagePayload(message);
 
                 if (this._annotationSavePromise) {
                     this._annotationSavePromise.resolve(annotationDocument);
                     this._annotationSavePromise = null;
                 }
             } else if (message[0] === 'annotationSaveError') {
-                message[1] = message.slice(1).join('|');
+                const annotationError = joinAnnotationMessagePayload(message);
 
                 if (this._annotationSavePromise) {
-                    this._annotationSavePromise.reject(new Error(message[1] || 'Annotation save failed'));
+                    this._annotationSavePromise.reject(new Error(annotationError || 'Annotation save failed'));
                     this._annotationSavePromise = null;
                 }
             }
@@ -549,16 +579,7 @@ export default class Pdf extends Component {
     };
 
     _getNativeAnnotations = () => {
-        if (!this.props.annotations) {
-            return null;
-        }
-
-        try {
-            return JSON.stringify(this.props.annotations);
-        } catch (error) {
-            this._onError(error);
-            return null;
-        }
+        return stringifyAnnotationDocument(this.props.annotations, this._onError);
     };
 
     render() {

package/index.js.flow

@@ -26,7 +26,7 @@ export type Source = {
 
 export type AnnotationRotation = 0 | 90 | 180 | 270;
 export type AnnotationIdMode = 'auto' | 'manual';
-export type AnnotationTool = 'select' | 'ink' | 'text' | 'highlight' | 'underline' | 'strikeout';
+export type AnnotationTool = 'select' | 'ink' | 'text' | 'highlight';
 export type AnnotationTextAlign = 'left' | 'center' | 'right';
 
 export type AnnotationPoint = {
@@ -73,7 +73,7 @@ export type TextAnnotation = AnnotationBase & {
 };
 
 export type MarkupAnnotation = AnnotationBase & {
-  type: 'highlight' | 'underline' | 'strikeout',
+  type: 'highlight',
   bounds: AnnotationBounds,
   style?: AnnotationStyle,
 };
@@ -100,6 +100,8 @@ export type Props = {
   annotationTool?: AnnotationTool,
   annotationEditable?: boolean,
   annotationIdMode?: AnnotationIdMode,
+  annotationInkColor?: string,
+  annotationInkThickness?: number,
   enableAnnotationRendering?: boolean,
   enableAntialiasing?: boolean,
   enablePaging?: boolean,
@@ -132,4 +134,6 @@ export type Props = {
 declare export default class Pdf extends Component<Props> {
   setPage: (pageNumber: number) => void;
   saveAnnotations: () => Promise<AnnotationDocument>;
+  deleteSelectedAnnotation: () => void;
+  deleteAllAnnotations: () => void;
 }

package/ios/RNPDFPdf/RNPDFPdfView.h

@@ -54,6 +54,8 @@ UIView
 @property(nonatomic, strong) NSString *annotationTool;
 @property(nonatomic) BOOL annotationEditable;
 @property(nonatomic, strong) NSString *annotationIdMode;
+@property(nonatomic, strong) NSString *annotationInkColor;
+@property(nonatomic) float annotationInkThickness;
 @property(nonatomic) int fitPolicy;
 @property(nonatomic) int spacing;
 @property(nonatomic, strong) NSString *password;
@@ -62,6 +64,8 @@ UIView
 @property(nonatomic, copy) RCTBubblingEventBlock onChange;
 
 - (void)saveAnnotations;
+- (void)deleteSelectedAnnotation;
+- (void)deleteAllAnnotations;
 
 @property(nonatomic, strong) NSString *selectedText;
 @property(nonatomic) BOOL enableTextSelection;

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -63,9 +63,12 @@ const float MIN_SCALE = 1.0f;
 @property(nonatomic, assign) BOOL annotationEditable;
 @property(nonatomic, copy) NSString *annotationTool;
 @property(nonatomic, copy) NSString *annotationIdMode;
+@property(nonatomic, copy) NSString *annotationInkColor;
+@property(nonatomic, assign) CGFloat annotationInkThickness;
 
 - (void)replaceAnnotationsJSONString:(NSString *)json editable:(BOOL)editable idMode:(NSString *)idMode;
 - (void)setAnnotationMode:(BOOL)annotationMode tool:(NSString *)tool editable:(BOOL)editable idMode:(NSString *)idMode;
+- (void)setInkDefaultsColor:(NSString *)color thickness:(CGFloat)thickness;
 - (void)beginInkAtViewPoint:(CGPoint)viewPoint page:(PDFPage *)page;
 - (void)appendInkPointAtViewPoint:(CGPoint)viewPoint page:(PDFPage *)page;
 - (void)endInk;
@@ -77,6 +80,8 @@ const float MIN_SCALE = 1.0f;
 - (void)selectAnnotation:(NSDictionary *)annotation;
 - (void)clearSelection;
 - (void)deleteAnnotation:(NSDictionary *)annotation;
+- (void)deleteSelectedAnnotation;
+- (void)deleteAllAnnotations;
 - (void)beginSelectionInteractionAtPoint:(CGPoint)point hit:(NSDictionary *)hit;
 - (void)updateSelectionInteractionAtPoint:(CGPoint)point;
 - (void)endSelectionInteraction;
@@ -209,6 +214,14 @@ using namespace facebook::react;
         _annotationIdMode = RCTNSStringFromStringNilIfEmpty(newProps.annotationIdMode);
         [updatedPropNames addObject:@"annotationIdMode"];
     }
+    if (_annotationInkColor != RCTNSStringFromStringNilIfEmpty(newProps.annotationInkColor)) {
+        _annotationInkColor = RCTNSStringFromStringNilIfEmpty(newProps.annotationInkColor);
+        [updatedPropNames addObject:@"annotationInkColor"];
+    }
+    if (_annotationInkThickness != newProps.annotationInkThickness) {
+        _annotationInkThickness = newProps.annotationInkThickness;
+        [updatedPropNames addObject:@"annotationInkThickness"];
+    }
     if (_fitPolicy != newProps.fitPolicy) {
         _fitPolicy = newProps.fitPolicy;
         [updatedPropNames addObject:@"fitPolicy"];
@@ -245,6 +258,7 @@ using namespace facebook::react;
     if (_annotationOverlay) {
         [_annotationOverlay replaceAnnotationsJSONString:_annotations editable:_annotationEditable idMode:_annotationIdMode];
         [_annotationOverlay setAnnotationMode:_annotationMode tool:_annotationTool editable:_annotationEditable idMode:_annotationIdMode];
+        [_annotationOverlay setInkDefaultsColor:_annotationInkColor thickness:_annotationInkThickness];
         _annotationOverlay.pdfView = _pdfView;
         _annotationOverlay.pdfDocument = _pdfDocument;
     }
@@ -353,6 +367,8 @@ using namespace facebook::react;
     _showsHorizontalScrollIndicator = YES;
     _showsVerticalScrollIndicator = YES;
     _scrollEnabled = YES;
+    _annotationInkColor = @"#111111";
+    _annotationInkThickness = 2.0f;
     _enableTextSelection = YES;
     _selectedText = nil;
     _currentPDFSelection = nil;
@@ -383,6 +399,7 @@ using namespace facebook::react;
     _annotationOverlay.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _annotationOverlay.backgroundColor = UIColor.clearColor;
     _annotationOverlay.userInteractionEnabled = YES;
+    [_annotationOverlay setInkDefaultsColor:_annotationInkColor thickness:_annotationInkThickness];
     [self addSubview:_annotationOverlay];
     [self bringSubviewToFront:_annotationOverlay];
 
@@ -672,6 +689,14 @@ using namespace facebook::react;
             }
         }
 
+        if (_annotationOverlay) {
+            [_annotationOverlay replaceAnnotationsJSONString:_annotations editable:_annotationEditable idMode:_annotationIdMode];
+            [_annotationOverlay setAnnotationMode:_annotationMode tool:_annotationTool editable:_annotationEditable idMode:_annotationIdMode];
+            [_annotationOverlay setInkDefaultsColor:_annotationInkColor thickness:_annotationInkThickness];
+            _annotationOverlay.pdfView = _pdfView;
+            _annotationOverlay.pdfDocument = _pdfDocument;
+        }
+
         _pdfView.backgroundColor = [UIColor clearColor];
         [_pdfView layoutDocumentView];
         [self setNeedsDisplay];
@@ -960,12 +985,7 @@ using namespace facebook::react;
                 NSDictionary *hit = [_annotationOverlay annotationSelectionHitAtPoint:point includeHandles:YES];
                 if (hit) {
                     NSDictionary *annotation = hit[@"annotation"];
-                    NSString *hitPart = hit[@"hitPart"];
-                    if ([hitPart isEqualToString:@"delete"]) {
-                        [_annotationOverlay deleteAnnotation:annotation];
-                    } else {
-                        [_annotationOverlay selectAnnotation:annotation];
-                    }
+                    [_annotationOverlay selectAnnotation:annotation];
 
                     return;
                 }
@@ -1032,14 +1052,7 @@ using namespace facebook::react;
                 return;
             }
 
-            NSDictionary *annotation = hit[@"annotation"];
-            NSString *hitPart = hit[@"hitPart"];
-            if ([hitPart isEqualToString:@"delete"]) {
-                [_annotationOverlay deleteAnnotation:annotation];
-                return;
-            }
-
-            [_annotationOverlay selectAnnotation:annotation];
+            [_annotationOverlay selectAnnotation:hit[@"annotation"]];
             [_annotationOverlay beginSelectionInteractionAtPoint:point hit:hit];
         } else if (sender.state == UIGestureRecognizerStateChanged) {
             [_annotationOverlay updateSelectionInteractionAtPoint:point];
@@ -1052,19 +1065,19 @@ using namespace facebook::react;
     if (sender.state == UIGestureRecognizerStateBegan) {
         if ([_annotationTool isEqualToString:@"ink"]) {
             [_annotationOverlay beginInkAtViewPoint:point page:pdfPage];
-        } else if ([@[@"highlight", @"underline", @"strikeout"] containsObject:_annotationTool]) {
+        } else if ([_annotationTool isEqualToString:@"highlight"]) {
             [_annotationOverlay beginMarkupAtViewPoint:point page:pdfPage type:_annotationTool];
         }
     } else if (sender.state == UIGestureRecognizerStateChanged) {
         if ([_annotationTool isEqualToString:@"ink"]) {
             [_annotationOverlay appendInkPointAtViewPoint:point page:pdfPage];
-        } else if ([@[@"highlight", @"underline", @"strikeout"] containsObject:_annotationTool]) {
+        } else if ([_annotationTool isEqualToString:@"highlight"]) {
             [_annotationOverlay updateMarkupAtViewPoint:point page:pdfPage];
         }
     } else if (sender.state == UIGestureRecognizerStateEnded || sender.state == UIGestureRecognizerStateCancelled || sender.state == UIGestureRecognizerStateFailed) {
         if ([_annotationTool isEqualToString:@"ink"]) {
             [_annotationOverlay endInk];
-        } else if ([@[@"highlight", @"underline", @"strikeout"] containsObject:_annotationTool]) {
+        } else if ([_annotationTool isEqualToString:@"highlight"]) {
             [_annotationOverlay endMarkup];
         }
     }
@@ -1082,6 +1095,22 @@ using namespace facebook::react;
     [self notifyOnChangeWithMessage:@"annotationSaveError|Annotation overlay unavailable"];
 }
 
+- (void)deleteSelectedAnnotation
+{
+    if (_annotationOverlay) {
+        [_annotationOverlay commitTextEditingIfNeeded];
+        [_annotationOverlay deleteSelectedAnnotation];
+    }
+}
+
+- (void)deleteAllAnnotations
+{
+    if (_annotationOverlay) {
+        [_annotationOverlay commitTextEditingIfNeeded];
+        [_annotationOverlay deleteAllAnnotations];
+    }
+}
+
 /**
  *  Bind tap
  *
@@ -1158,7 +1187,7 @@ using namespace facebook::react;
             return [_annotationOverlay annotationSelectionHitAtPoint:point includeHandles:YES] != nil;
         }
 
-        return [@[@"ink", @"highlight", @"underline", @"strikeout"] containsObject:_annotationTool];
+        return [@[@"ink", @"highlight"] containsObject:_annotationTool];
     }
 
     return !_singlePage;
@@ -1407,6 +1436,8 @@ static NSString *RNPDFGenerateAnnotationId(void)
         _annotationEditable = YES;
         _annotationTool = @"select";
         _annotationIdMode = @"auto";
+        _annotationInkColor = @"#111111";
+        _annotationInkThickness = 2.0f;
         self.backgroundColor = UIColor.clearColor;
         self.opaque = NO;
     }
@@ -1441,7 +1472,7 @@ static NSString *RNPDFGenerateAnnotationId(void)
 {
     _annotationMode = annotationMode;
     _annotationEditable = editable;
-    _annotationTool = tool ?: @"select";
+    _annotationTool = [self normalizedAnnotationType:(tool ?: @"select")];
     _annotationIdMode = idMode ?: @"auto";
 
     if (!annotationMode) {
@@ -1449,6 +1480,27 @@ static NSString *RNPDFGenerateAnnotationId(void)
     }
 }
 
+- (void)setInkDefaultsColor:(NSString *)color thickness:(CGFloat)thickness
+{
+    _annotationInkColor = color.length > 0 ? color : @"#111111";
+    _annotationInkThickness = thickness > 0 ? thickness : 2.0f;
+}
+
+- (NSString *)normalizedAnnotationType:(NSString *)type
+{
+    if ([type isEqualToString:@"underline"] || [type isEqualToString:@"strikeout"]) {
+        return @"highlight";
+    }
+
+    return type;
+}
+
+- (BOOL)annotationSupportsResize:(NSDictionary *)annotation
+{
+    NSString *type = [self normalizedAnnotationType:annotation[@"type"]];
+    return [type isEqualToString:@"text"] || [type isEqualToString:@"highlight"];
+}
+
 - (NSArray *)parseAnnotationsFromJSONString:(NSString *)json
 {
     if (![json isKindOfClass:[NSString class]] || json.length == 0) {
@@ -1487,6 +1539,10 @@ static NSString *RNPDFGenerateAnnotationId(void)
         }
 
         NSMutableDictionary *annotation = [item mutableCopy];
+        NSString *type = [self normalizedAnnotationType:annotation[@"type"]];
+        if (type.length > 0) {
+            annotation[@"type"] = type;
+        }
         if (!annotation[@"id"]) {
             annotation[@"id"] = RNPDFGenerateAnnotationId();
         }
@@ -1727,12 +1783,6 @@ static NSString *RNPDFGenerateAnnotationId(void)
     return nil;
 }
 
-- (CGRect)deleteHandleRectForRect:(CGRect)rect
-{
-    CGFloat size = MAX(16.0f, MIN(rect.size.width, rect.size.height) * 0.18f);
-    return CGRectMake(CGRectGetMaxX(rect) - size, CGRectGetMinY(rect) - size, size, size);
-}
-
 - (CGRect)resizeHandleRectForRect:(CGRect)rect
 {
     CGFloat size = MAX(16.0f, MIN(rect.size.width, rect.size.height) * 0.18f);
@@ -1768,12 +1818,8 @@ static NSString *RNPDFGenerateAnnotationId(void)
         }
 
         NSString *hitPart = @"body";
-        if (includeHandles && [_selectedAnnotationId isEqualToString:annotation[@"id"]]) {
-            if (CGRectContainsPoint([self deleteHandleRectForRect:rect], point)) {
-                hitPart = @"delete";
-            } else if (CGRectContainsPoint([self resizeHandleRectForRect:rect], point)) {
-                hitPart = @"resize";
-            }
+        if (includeHandles && [_selectedAnnotationId isEqualToString:annotation[@"id"]] && [self annotationSupportsResize:annotation] && CGRectContainsPoint([self resizeHandleRectForRect:rect], point)) {
+            hitPart = @"resize";
         }
 
         return @{@"annotation": annotation,
@@ -1832,6 +1878,23 @@ static NSString *RNPDFGenerateAnnotationId(void)
     [self refreshDisplay];
 }
 
+- (void)deleteSelectedAnnotation
+{
+    NSDictionary *annotation = [self selectedAnnotation];
+    if (annotation) {
+        [self deleteAnnotation:annotation];
+    }
+}
+
+- (void)deleteAllAnnotations
+{
+    [self commitTextEditingIfNeeded];
+    [_draftAnnotations removeAllObjects];
+    _selectedAnnotationId = nil;
+    [self endSelectionInteraction];
+    [self refreshDisplay];
+}
+
 - (void)beginSelectionInteractionAtPoint:(CGPoint)point hit:(NSDictionary *)hit
 {
     NSDictionary *annotation = hit[@"annotation"];
@@ -1961,15 +2024,12 @@ static NSString *RNPDFGenerateAnnotationId(void)
     [outlineColor setStroke];
     [outlinePath stroke];
 
-    CGRect deleteHandle = [self deleteHandleRectForRect:rect];
-    [[UIColor colorWithRed:0.83 green:0.19 blue:0.19 alpha:0.95] setFill];
-    UIBezierPath *deletePath = [UIBezierPath bezierPathWithOvalInRect:deleteHandle];
-    [deletePath fill];
-
-    CGRect resizeHandle = [self resizeHandleRectForRect:rect];
-    [[UIColor colorWithRed:0.13 green:0.27 blue:0.67 alpha:0.95] setFill];
-    UIBezierPath *resizePath = [UIBezierPath bezierPathWithRoundedRect:resizeHandle cornerRadius:2.0f];
-    [resizePath fill];
+    if ([self annotationSupportsResize:annotation]) {
+        CGRect resizeHandle = [self resizeHandleRectForRect:rect];
+        [[UIColor colorWithRed:0.13 green:0.27 blue:0.67 alpha:0.95] setFill];
+        UIBezierPath *resizePath = [UIBezierPath bezierPathWithRoundedRect:resizeHandle cornerRadius:2.0f];
+        [resizePath fill];
+    }
 }
 
 - (NSDictionary *)normalizedBoundsForViewRect:(CGRect)viewRect page:(PDFPage *)page
@@ -1999,21 +2059,16 @@ static NSString *RNPDFGenerateAnnotationId(void)
 
 - (UIColor *)colorForAnnotationType:(NSString *)type style:(NSDictionary *)style
 {
+    NSString *normalizedType = [self normalizedAnnotationType:type];
     NSString *colorString = [style isKindOfClass:[NSDictionary class]] ? style[@"color"] : nil;
     if (colorString) {
         return RNPDFColorFromHexString(colorString, UIColor.blackColor);
     }
 
-    if ([type isEqualToString:@"highlight"]) {
+    if ([normalizedType isEqualToString:@"highlight"]) {
         return [UIColor colorWithRed:1.0 green:0.93 blue:0.2 alpha:0.35];
     }
-    if ([type isEqualToString:@"underline"]) {
-        return [UIColor colorWithRed:0.2 green:0.45 blue:1.0 alpha:0.5];
-    }
-    if ([type isEqualToString:@"strikeout"]) {
-        return [UIColor colorWithRed:1.0 green:0.2 blue:0.2 alpha:0.45];
-    }
-    if ([type isEqualToString:@"text"]) {
+    if ([normalizedType isEqualToString:@"text"]) {
         return [UIColor colorWithRed:0.13 green:0.27 blue:0.67 alpha:1.0];
     }
 
@@ -2074,7 +2129,7 @@ static NSString *RNPDFGenerateAnnotationId(void)
         }
 
         PDFPage *page = [_pdfDocument pageAtIndex:pageIndex];
-        NSString *type = annotation[@"type"];
+        NSString *type = [self normalizedAnnotationType:annotation[@"type"]];
         if ([type isEqualToString:@"ink"]) {
             NSArray *points = annotation[@"points"];
             if (points.count < 2) {
@@ -2127,7 +2182,7 @@ static NSString *RNPDFGenerateAnnotationId(void)
                 NSParagraphStyleAttributeName: paragraphStyle,
             };
             [text drawInRect:CGRectInset(viewRect, 6.0f, 4.0f) withAttributes:attributes];
-        } else if ([type isEqualToString:@"highlight"] || [type isEqualToString:@"underline"] || [type isEqualToString:@"strikeout"]) {
+        } else if ([type isEqualToString:@"highlight"]) {
             NSDictionary *bounds = annotation[@"bounds"];
             CGRect viewRect = [self viewRectForNormalizedBounds:bounds page:page];
             if (CGRectIsEmpty(viewRect)) {
@@ -2137,15 +2192,6 @@ static NSString *RNPDFGenerateAnnotationId(void)
             UIColor *fillColor = [self colorForAnnotationType:type style:annotation[@"style"]];
             CGContextSetFillColorWithColor(context, fillColor.CGColor);
             CGContextFillRect(context, viewRect);
-
-            if ([type isEqualToString:@"underline"] || [type isEqualToString:@"strikeout"]) {
-                CGContextSetStrokeColorWithColor(context, fillColor.CGColor);
-                CGContextSetLineWidth(context, MAX(1.0f, viewRect.size.height * 0.15f));
-                CGFloat y = [type isEqualToString:@"underline"] ? CGRectGetMaxY(viewRect) - 2.0f : CGRectGetMidY(viewRect);
-                CGContextMoveToPoint(context, CGRectGetMinX(viewRect), y);
-                CGContextAddLineToPoint(context, CGRectGetMaxX(viewRect), y);
-                CGContextStrokePath(context);
-            }
         }
     }
 
@@ -2163,7 +2209,7 @@ static NSString *RNPDFGenerateAnnotationId(void)
         @"page": @([_pdfDocument indexForPage:page] + 1),
         @"type": @"ink",
         @"points": [NSMutableArray array],
-        @"style": @{@"color": @"#111111", @"thickness": @(2.0f)}
+        @"style": @{@"color": _annotationInkColor ?: @"#111111", @"thickness": @(_annotationInkThickness > 0 ? _annotationInkThickness : 2.0f)}
     } mutableCopy];
 
     [_draftAnnotations addObject:annotation];
@@ -2206,7 +2252,7 @@ static NSString *RNPDFGenerateAnnotationId(void)
     NSMutableDictionary *annotation = [@{
         @"id": [self nextLocalAnnotationId],
         @"page": @([_pdfDocument indexForPage:page] + 1),
-        @"type": type ?: @"highlight",
+        @"type": @"highlight",
         @"bounds": @{@"x": @(normalizedPoint.x), @"y": @(normalizedPoint.y), @"width": @0, @"height": @0},
         @"style": @{}
     } mutableCopy];

package/ios/RNPDFPdf/RNPDFPdfViewManager.mm

@@ -51,6 +51,8 @@ RCT_EXPORT_VIEW_PROPERTY(annotationMode, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(annotationTool, NSString);
 RCT_EXPORT_VIEW_PROPERTY(annotationEditable, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(annotationIdMode, NSString);
+RCT_EXPORT_VIEW_PROPERTY(annotationInkColor, NSString);
+RCT_EXPORT_VIEW_PROPERTY(annotationInkThickness, float);
 RCT_EXPORT_VIEW_PROPERTY(fitPolicy, int);
 RCT_EXPORT_VIEW_PROPERTY(spacing, int);
 RCT_EXPORT_VIEW_PROPERTY(password, NSString);
@@ -91,6 +93,26 @@ RCT_EXPORT_METHOD(saveAnnotations:(nonnull NSNumber *)reactTag)
     }];
 }
 
+RCT_EXPORT_METHOD(deleteSelectedAnnotation:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        RNPDFPdfView *view = (RNPDFPdfView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[RNPDFPdfView class]]) {
+            [view deleteSelectedAnnotation];
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(deleteAllAnnotations:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        RNPDFPdfView *view = (RNPDFPdfView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[RNPDFPdfView class]]) {
+            [view deleteAllAnnotations];
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(supportPDFKit:(RCTResponseSenderBlock)callback)
 {
     if([[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] == NSOrderedDescending

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@amafil/react-native-pdf-toolkit",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",
@@ -49,6 +49,7 @@
         "index.d.ts",
         "index.js",
         "index.js.flow",
+        "annotationDocumentUtils.js",
         "PdfManager.js",
         "PdfPageView.js",
         "PdfView.js",