feat(annotation): support read from JSON string

Merge pull request #15 from LupulescuAlexandru/master

Support both annotation JSON string and file path

Author: alpha0010

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

@@ -45,7 +45,7 @@ class PdfView(context: Context, private val pdfMutex: Lock) : View(context) {
   private var mSource = ""
   private val mViewRects = List(SLICES) { Rect() }
 
-  fun setAnnotation(source: String) {
+  fun setAnnotation(source: String, file: Boolean = false) {
     if (source.isEmpty()) {
       if (mAnnotation.isNotEmpty()) {
         mAnnotation = emptyList()
@@ -55,7 +55,11 @@ class PdfView(context: Context, private val pdfMutex: Lock) : View(context) {
     }
 
     try {
-      mAnnotation = Json.decodeFromString(File(source).readText())
+      if (file) {
+        mAnnotation = Json.decodeFromString(File(source).readText())
+      } else {
+        mAnnotation = Json.decodeFromString(source);
+      }
       mDirty = true
     } catch (e: Exception) {
       onError("Failed to load annotation from '$source'. ${e.message}")

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

@@ -38,9 +38,18 @@ class PdfViewManager(private val pdfMutex: Lock) : BaseViewManager<PdfView, PdfV
     view.renderPdf()
   }
 
-  @ReactProp(name = "annotation")
+  /**
+   * Set annotation from a PAS v1 JSON string
+   */
+  @ReactProp(name = "annotationStr")
   fun setAnnotation(view: PdfView, source: String?) = view.setAnnotation(source ?: "")
 
+  /**
+   * Set annotation from file containing a PAS v1 JSON string
+   */
+  @ReactProp(name = "annotation")
+  fun setAnnotationWithPath(view: PdfView, source: String?) = view.setAnnotation(source ?: "", true)
+
   /**
    * Page (0-indexed) of document to display.
    */

ios/PdfView.swift

@@ -4,7 +4,8 @@ enum ResizeMode: String {
 }
 
 class PdfView: UIView {
-    @objc var annotation = "" { didSet { loadAnnotation() } }
+    @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() } }
@@ -23,8 +24,8 @@ class PdfView: UIView {
         super.layoutSubviews()
     }
 
-    private func loadAnnotation() {
-        guard !annotation.isEmpty else {
+    private func loadAnnotation(file: Bool = false) {
+        guard !annotation.isEmpty || !annotationStr.isEmpty else {
             if !annotationData.isEmpty {
                 annotationData.removeAll()
                 renderPdf()
@@ -34,7 +35,13 @@ class PdfView: UIView {
 
         let decoder = JSONDecoder()
         do {
-            let data = try Data(contentsOf: URL(fileURLWithPath: annotation))
+            var data:Data;
+            if (file) {
+                data = try Data(contentsOf: URL(fileURLWithPath: annotation))
+            }
+            else {
+                data = annotationStr.data(using: .utf8)!;
+            }
             annotationData = try decoder.decode([AnnotationPage].self, from: data)
         } catch {
             dispatchOnError(

ios/PdfViewManager.m

@@ -3,6 +3,7 @@
 @interface RCT_EXTERN_REMAP_MODULE(RNPdfView, PdfViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(annotation, 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

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

src/PdfView.tsx

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