Merge pull request #156 from PSPDFKit/use-uuids-for-removal

Use the uuid property to remove an annotation

Author: radazzouz

README.md

@@ -25,7 +25,7 @@ The [PSPDFKit SDK](https://pspdfkit.com/) is a framework that allows you to view
 #### Requirements
 
 - Xcode 10.1
-- PSPDFKit 8.1 for iOS or later
+- PSPDFKit 8.1.3 for iOS or later
 - react-native >= 0.55.4
 
 #### Getting Started

ios/RCTPSPDFKit/Converters/RCTConvert+PSPDFAnnotation.m

@@ -14,15 +14,17 @@ @implementation RCTConvert (PSPDFAnnotation)
 + (NSArray <NSDictionary *> *)instantJSONFromAnnotations:(NSArray <PSPDFAnnotation *> *) annotations {
   NSMutableArray <NSDictionary *> *annotationsJSON = [NSMutableArray new];
   for (PSPDFAnnotation *annotation in annotations) {
+    NSDictionary <NSString *, NSString *> *uuidDict = @{@"uuid" : annotation.uuid};
     NSData *annotationData = [annotation generateInstantJSONWithError:NULL];
     if (annotationData) {
-      NSDictionary *annotationDictionary = [NSJSONSerialization JSONObjectWithData:annotationData options:kNilOptions error:NULL];
+      NSMutableDictionary *annotationDictionary = [[NSJSONSerialization JSONObjectWithData:annotationData options:kNilOptions error:NULL] mutableCopy];
+      [annotationDictionary addEntriesFromDictionary:uuidDict];
       if (annotationDictionary) {
         [annotationsJSON addObject:annotationDictionary];
       }
-    } else if (annotation.name) {
-      // We only generate Instant JSON data for attached annotations. When an annotation is deleted, we only send the annotation name.
-      [annotationsJSON addObject:@{@"name" : annotation.name}];
+    } else {
+      // We only generate Instant JSON data for attached annotations. When an annotation is deleted, we only set the annotation uuid.
+      [annotationsJSON addObject:uuidDict];
     }
   }
 

ios/RCTPSPDFKit/RCTPSPDFKitView.h

@@ -38,7 +38,7 @@
 /// Anotations
 - (NSDictionary<NSString *, NSArray<NSDictionary *> *> *)getAnnotations:(PSPDFPageIndex)pageIndex type:(PSPDFAnnotationType)type;
 - (BOOL)addAnnotation:(id)jsonAnnotation;
-- (BOOL)removeAnnotation:(id)jsonAnnotation;
+- (BOOL)removeAnnotationWithUUID:(NSString *)annotationUUID;
 - (NSDictionary<NSString *, NSArray<NSDictionary *> *> *)getAllUnsavedAnnotations;
 - (BOOL)addAnnotations:(NSString *)jsonAnnotations;
 

ios/RCTPSPDFKit/RCTPSPDFKitView.m

@@ -205,31 +205,19 @@ - (BOOL)addAnnotation:(id)jsonAnnotation {
   return success;
 }
 
-- (BOOL)removeAnnotation:(id)jsonAnnotation {
-  NSData *data;
-  if ([jsonAnnotation isKindOfClass:NSString.class]) {
-    data = [jsonAnnotation dataUsingEncoding:NSUTF8StringEncoding];
-  } else if ([jsonAnnotation isKindOfClass:NSDictionary.class])  {
-    data = [NSJSONSerialization dataWithJSONObject:jsonAnnotation options:0 error:nil];
-  } else {
-    NSLog(@"Invalid JSON Annotation.");
-    return NO;
-  }
-
+- (BOOL)removeAnnotationWithUUID:(NSString *)annotationUUID {
   PSPDFDocument *document = self.pdfController.document;
-  PSPDFDocumentProvider *documentProvider = document.documentProviders.firstObject;
 
   BOOL success = NO;
-  if (data) {
-    PSPDFAnnotation *annotationToRemove = [PSPDFAnnotation annotationFromInstantJSON:data documentProvider:documentProvider error:NULL];
-    for (PSPDFAnnotation *annotation in [document annotationsForPageAtIndex:annotationToRemove.pageIndex type:annotationToRemove.type]) {
+
+  NSArray<PSPDFAnnotation *> *allAnnotations = [[document allAnnotationsOfType:PSPDFAnnotationTypeAll].allValues valueForKeyPath:@"@unionOfArrays.self"];
+    for (PSPDFAnnotation *annotation in allAnnotations) {
       // Remove the annotation if the name matches.
-      if ([annotation.name isEqualToString:annotationToRemove.name]) {
+      if ([annotation.uuid isEqualToString:annotationUUID]) {
         success = [document removeAnnotations:@[annotation] options:nil];
         break;
       }
     }
-  }
 
   if (!success) {
     NSLog(@"Failed to remove annotation.");

ios/RCTPSPDFKit/RCTPSPDFKitViewManager.m

@@ -147,7 +147,7 @@ @implementation RCTPSPDFKitViewManager
 RCT_EXPORT_METHOD(removeAnnotation:(id)jsonAnnotation reactTag:(nonnull NSNumber *)reactTag resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     RCTPSPDFKitView *component = (RCTPSPDFKitView *)[self.bridge.uiManager viewForReactTag:reactTag];
-    BOOL success = [component removeAnnotation:jsonAnnotation];
+    BOOL success = [component removeAnnotationWithUUID:jsonAnnotation[@"uuid"]];
     if (success) {
       resolve(@(success));
     } else {

ios/cocoapods.md

@@ -3,8 +3,8 @@
 ### CocoaPods integration
 
 #### Requirements
-- Xcode 10
-- PSPDFKit 8.0 for iOS or later
+- Xcode 10.1
+- PSPDFKit 8.1.3 for iOS or later
 - react-native >= 0.55.4
 - CocoaPods >= 1.5.3
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",