Release 2.11.0

Author: PSPDFKit

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Newest Release
 
+### 2.11.0 - 07 Jun 2024
+
+- Adds the ability to clear the document cache. (J#HYB-347)
+- Adds support for opening PDF documents from a remote URL. (J#HYB-354)
+- Updates `setAnnotationFlags` and `getAnnotationFlags` APIs to support using annotation `name` as an identifier. (J#HYB-372)
+- Fixes an issue where calling `exitCurrentlyActiveMode` while not in annotation editing mode generates an exception on iOS. (J#HYB-373)
+- Fixes an issue where the annotation `uuid` isn't included in `onAnnotationTapped` callbacks. (J#HYB-374)
+- Fixes an issue where Instant configuration wasn't applied when using the `presentInstant` API on iOS. (J#HYB-375)
+
+## Previous Releases
+
 ### 2.10.0 - 06 May 2024
 
 - Adds the ability to define annotation behavior using flags. (J#HYB-283)
@@ -9,8 +20,6 @@
 - Fixes an issue where selecting a measurement annotation without the Measurement Tools license causes a crash. (J#HYB-318)
 - Fixes an issue where the `removeAnnotation` API sometimes failed to remove an annotation on iOS. (J#HYB-43)
 
-## Previous Releases
-
 ### 2.9.1 - 12 Apr 2024
 
 - Adds the ability to import and export annotations from XFDF files. (J#HYB-293)

License-Evaluation.pdf

@@ -0,0 +1,57 @@
+package com.pspdfkit.react
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+import com.pspdfkit.document.PdfDocument
+
+@ReactModule(name = PDFDocumentModule.NAME)
+class PDFDocumentModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private var documents = mutableMapOf<Int, PdfDocument>()
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    private fun getDocument(reference: Int): PdfDocument? {
+        return this.documents[reference]
+    }
+
+    fun setDocument(document: PdfDocument, reference: Int) {
+        this.documents[reference] = document
+    }
+
+    @ReactMethod fun getDocumentId(reference: Int, promise: Promise) {
+        try {
+            // Using uid here until Android exposes the documentId property.
+            promise.resolve(this.getDocument(reference)?.uid)
+        } catch (e: Throwable) {
+            promise.reject("getDocumentId error", e)
+        }
+    }
+
+    @ReactMethod fun invalidateCacheForPage(reference: Int, pageIndex: Int, promise: Promise) {
+        try {
+            this.getDocument(reference)?.invalidateCacheForPage(pageIndex)
+            promise.resolve(true)
+        } catch (e: Throwable) {
+            promise.reject("invalidateCacheForPage error", e)
+        }
+    }
+
+    @ReactMethod fun invalidateCache(reference: Int, promise: Promise) {
+        try {
+            this.getDocument(reference)?.invalidateCache()
+            promise.resolve(true)
+        } catch (e: Throwable) {
+            promise.reject("invalidateCache error", e)
+        }
+    }
+
+    companion object {
+        const val NAME = "PDFDocumentManager"
+    }
+}

android/src/main/java/com/pspdfkit/react/PDFDocumentModule.kt

@@ -107,11 +107,10 @@ public String getName() {
 
     @ReactMethod
     public void present(@NonNull String document, @NonNull ReadableMap configuration, @Nullable Promise promise) {
-        File documentFile = new File(document);
-        if(PSPDFKitUtils.isValidPdf(documentFile)) {
+        if(PSPDFKitUtils.isValidPdf(document)) {
             lastPresentPromise = promise;
             presentPdf(document, configuration, promise);
-        } else if(PSPDFKitUtils.isValidImage(documentFile)) {
+        } else if(PSPDFKitUtils.isValidImage(document)) {
             lastPresentPromise = promise;
             presentImage(document, configuration, promise);
         }else {

android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java

@@ -33,13 +33,14 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         modules.add(new PSPDFKitModule(reactContext));
         modules.add(new TestingModule(reactContext));
         modules.add(new RNProcessor(reactContext));
+        modules.add(new PDFDocumentModule(reactContext));
         return modules;
     }
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         List<ViewManager> viewManagers = new ArrayList<>();
-        viewManagers.add(new ReactPdfViewManager());
+        viewManagers.add(new ReactPdfViewManager(reactContext));
         return viewManagers;
     }
 }

android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java

@@ -18,6 +18,7 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
@@ -78,6 +79,12 @@ public class ReactPdfViewManager extends ViewGroupManager<PdfView> {
 
     private final CompositeDisposable annotationDisposables = new CompositeDisposable();
 
+    private final ReactApplicationContext reactApplicationContext;
+
+    public ReactPdfViewManager(ReactApplicationContext reactApplicationContext) {
+        this.reactApplicationContext = reactApplicationContext;
+    }
+
     @NonNull
     @Override
     public String getName() {
@@ -152,13 +159,14 @@ public void setConfiguration(PdfView view, @NonNull ReadableMap configuration) {
             view.setConfiguration(configurationBuild);
         }
         view.setDocumentPassword(configuration.getString("documentPassword"));
+        view.setRemoteDocumentConfiguration(configuration.getMap("remoteDocumentConfiguration"));
         // Although MeasurementValueConfigurations is specified as part of Configuration, it is configured separately on the Android SDK
         if (configuration.getArray("measurementValueConfigurations") != null) {
             view.setMeasurementValueConfigurations(configuration.getArray("measurementValueConfigurations"));
-        }        
+        }
     }
 
-     @ReactProp(name = "annotationPresets")
+    @ReactProp(name = "annotationPresets")
     public void setAnnotationPresets(PdfView view, @NonNull ReadableMap annotationPresets) {
         Map<AnnotationType, AnnotationConfiguration> annotationsConfiguration = AnnotationConfigurationAdaptor.convertAnnotationConfigurations(
                 view.getContext(), annotationPresets
@@ -168,7 +176,7 @@ public void setAnnotationPresets(PdfView view, @NonNull ReadableMap annotationPr
 
     @ReactProp(name = "document")
     public void setDocument(PdfView view, @NonNull String document) {
-        view.setDocument(document);
+        view.setDocument(document, this.reactApplicationContext);
     }
 
     @ReactProp(name = "pageIndex")

android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java

@@ -13,7 +13,7 @@ class CustomAnnotationContextualMenuItemTappedEvent: Event<CustomAnnotationConte
         this.buttonId = buttonId
     }
 
-    override fun getEventName(): String? {
+    override fun getEventName(): String {
         return EVENT_NAME
     }
 

android/src/main/java/com/pspdfkit/react/events/CustomAnnotationContextualMenuItemTappedEvent.kt

@@ -13,7 +13,7 @@ class CustomToolbarButtonTappedEvent: Event<CustomToolbarButtonTappedEvent> {
         this.buttonId = buttonId
     }
 
-    override fun getEventName(): String? {
+    override fun getEventName(): String {
         return EVENT_NAME
     }
 

android/src/main/java/com/pspdfkit/react/events/CustomToolbarButtonTappedEvent.kt

@@ -55,6 +55,7 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
             if (rawInstantJson != null && !rawInstantJson.equals("null")) {
                 JSONObject instantJson = new JSONObject(rawInstantJson);
                 Map<String, Object> map = JsonUtilities.jsonObjectToMap(instantJson);
+                map.put("uuid", annotation.getUuid());
                 WritableMap eventData = Arguments.makeNativeMap(map);
                 rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
             }

android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationTappedEvent.java

@@ -51,7 +51,9 @@ public PdfViewDataReturnedEvent(@IdRes int viewId, int requestId, @NonNull List<
                     continue;
                 }
                 JSONObject instantJson = new JSONObject(annotation.toInstantJson());
-                annotationsSerialized.add(JsonUtilities.jsonObjectToMap(instantJson));
+                Map<String, Object> annotationMap = JsonUtilities.jsonObjectToMap(instantJson);
+                annotationMap.put("uuid", annotation.getUuid());
+                annotationsSerialized.add(annotationMap);
             }
 
             Map<String, Object> annotations = new HashMap<>();