change name of the annotation props to support backward compatibility

Author: LupulescuAlexandru

android/src/main/java/com/alpha0010/pdf/PdfViewManager.kt

@@ -41,13 +41,13 @@ class PdfViewManager(private val pdfMutex: Lock) : BaseViewManager<PdfView, PdfV
   /**
    * Set annotation from a PAS v1 JSON string
    */
-  @ReactProp(name = "annotation")
+  @ReactProp(name = "annotationStr")
   fun setAnnotation(view: PdfView, source: String?) = view.setAnnotation(source ?: "")
 
   /**
    * Set annotation from file containing a PAS v1 JSON string
    */
-  @ReactProp(name = "annotationPath")
+  @ReactProp(name = "annotation")
   fun setAnnotationWithPath(view: PdfView, source: String?) = view.setAnnotation(source ?: "", true)
 
   /**

ios/PdfView.swift

@@ -4,8 +4,8 @@ enum ResizeMode: String {
 }
 
 class PdfView: UIView {
-    @objc var annotation = "" { didSet { loadAnnotation() } }
-    @objc var annotationPath = "" { didSet { loadAnnotation(file: true) } }
+    @objc var annotationStr = "" { didSet { loadAnnotation() } }
+    @objc var annotation = "" { didSet { loadAnnotation(file: true) } }
     @objc var page: NSNumber = 0 { didSet { renderPdf() } }
     @objc var resizeMode = ResizeMode.CONTAIN.rawValue { didSet { validateResizeMode() } }
     @objc var source = "" { didSet { renderPdf() } }
@@ -25,7 +25,7 @@ class PdfView: UIView {
     }
 
     private func loadAnnotation(file: Bool = false) {
-        guard !annotation.isEmpty || !annotationPath.isEmpty else {
+        guard !annotation.isEmpty || !annotationStr.isEmpty else {
             if !annotationData.isEmpty {
                 annotationData.removeAll()
                 renderPdf()
@@ -37,10 +37,10 @@ class PdfView: UIView {
         do {
             var data:Data;
             if (file) {
-                data = try Data(contentsOf: URL(fileURLWithPath: annotationPath))
+                data = try Data(contentsOf: URL(fileURLWithPath: annotation))
             }
             else {
-                data = annotation.data(using: .utf8)!;
+                data = annotationStr.data(using: .utf8)!;
             }
             annotationData = try decoder.decode([AnnotationPage].self, from: data)
         } catch {
@@ -244,4 +244,4 @@ class PdfView: UIView {
         }
         dispatcher(["width": pageWidth, "height": pageHeight])
     }
-}
+}

ios/PdfViewManager.m

@@ -3,7 +3,7 @@
 @interface RCT_EXTERN_REMAP_MODULE(RNPdfView, PdfViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(annotation, NSString)
-RCT_EXPORT_VIEW_PROPERTY(annotationPath, NSString)
+RCT_EXPORT_VIEW_PROPERTY(annotationStr, NSString)
 RCT_EXPORT_VIEW_PROPERTY(page, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(resizeMode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(source, NSString)

src/Pdf.tsx

@@ -108,12 +108,12 @@ type PdfProps = BaseListProps & {
   /**
    * PAS v1 annotation JSON string.
    */
-  annotation?: string;
+  annotationStr?: string;
 
   /**
    * Path to annotation data.
    */
-  annotationPath?: string;
+  annotation?: string;
 
   /**
    * Callback to handle errors.
@@ -319,15 +319,15 @@ export const Pdf = forwardRef((props: PdfProps, ref: React.Ref<PdfRef>) => {
         <View>
           <PdfView
             annotation={props.annotation}
-            annotationPath={props.annotationPath}
+            annotationStr={props.annotationStr}
             page={index}
             source={source}
             style={styles.page}
           />
         </View>
       </View>
     ),
-    [maxPageHeight, props.annotation, props.annotationPath, source]
+    [maxPageHeight, props.annotation, props.annotationStr, source]
   );
 
   return (

src/PdfView.tsx

@@ -15,7 +15,7 @@ export type ResizeMode = 'contain' | 'fitWidth';
 
 type PdfViewNativeProps = {
   annotation?: string;
-  annotationPath?: string;
+  annotationStr?: string;
   onLayout?: (event: LayoutChangeEvent) => void;
   onPdfError: (event: NativeSyntheticEvent<ErrorEvent>) => void;
   onPdfLoadComplete: (event: NativeSyntheticEvent<LoadCompleteEvent>) => void;
@@ -29,12 +29,12 @@ export type PdfViewProps = {
   /**
    * PAS v1 annotation JSON string.
    */
-  annotation?: string;
+  annotationStr?: string;
 
   /**
    * Path to annotation data.
    */
-  annotationPath?: string;
+  annotation?: string;
   /**
    * Callback to handle errors.
    */
@@ -110,8 +110,8 @@ export function PdfView(props: PdfViewProps) {
 
   return (
     <PdfViewNative
-      annotation={props.annotation}
-      annotationPath={asPath(props.annotationPath)}
+      annotation={asPath(props.annotation)}
+      annotationStr={props.annotationStr}
       onLayout={onLayout}
       onPdfError={onPdfError}
       onPdfLoadComplete={onPdfLoadComplete}