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

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

@@ -4,8 +4,7 @@
  */
  'use strict';
 
- import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
- import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+ import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
  
  type ChangeEvent = $ReadOnly<{|
    message: ?string,
@@ -35,6 +34,8 @@
   annotationTool: ?string,
   annotationEditable: ?boolean,
   annotationIdMode: ?string,
+  annotationInkColor: ?string,
+  annotationInkThickness: ?Float,
    onChange: ?BubblingEventHandler<ChangeEvent>,
    singlePage: ?boolean,
  |}>;
@@ -55,10 +56,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;