[iOS] Match Android implementation of importAnnotations (#682)

* Add replace parameter to importAnnotations function on iOS * Update documentation * Updating package version --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ApryseSDK · Mar 5, 2024 · 73af623 · 73af623
1 parent 16504cf
commit 73af623
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/API.md b/API.md
@@ -2580,7 +2580,7 @@ Parameters:
 Name | Type | Description
 --- | --- | ---
 xfdf | string | annotation string in XFDF format for import
-replace | boolean | whether to replace existing form and annotation data with those imported from the XFDF string (Android only) 
+replace | boolean | whether to replace existing form and annotation data with those imported from the XFDF string
 
 Returns a Promise.
 Promise Parameters:

diff --git a/ios/RNTPTDocumentView.h b/ios/RNTPTDocumentView.h
@@ -572,7 +572,7 @@ static NSString * const PTSignaturesManager_signatureDirectory = @"PTSignaturesM
 
 - (nullable NSString *)exportAnnotationsWithOptions:(NSDictionary *)options;
 
-- (nullable NSArray<NSDictionary *> *)importAnnotations:(NSString *)xfdfString;
+- (nullable NSArray<NSDictionary *> *)importAnnotations:(NSString *)xfdfString replace:(BOOL)replace;
 
 - (void)flattenAnnotations:(BOOL)formsOnly;
 

diff --git a/ios/RNTPTDocumentView.m b/ios/RNTPTDocumentView.m
@@ -1353,7 +1353,7 @@ - (NSString *)exportAnnotationsWithOptions:(NSDictionary *)options
     return nil;
 }
 
-- (nullable NSArray<NSDictionary *> *)importAnnotations:(NSString *)xfdfString
+- (nullable NSArray<NSDictionary *> *)importAnnotations:(NSString *)xfdfString replace:(BOOL)replace
 {
     PTDocumentBaseViewController *documentViewController = self.currentDocumentViewController;
     PTPDFViewCtrl *pdfViewCtrl = documentViewController.pdfViewCtrl;
@@ -1369,12 +1369,24 @@ - (NSString *)exportAnnotationsWithOptions:(NSDictionary *)options
         return nil;
     }
 
-    PTAnnotationManager * const annotationManager = documentViewController.toolManager.annotationManager;
+    if (self.collaborationManager != nil) {
+        [self.collaborationManager importAnnotationsWithXFDFString:xfdfString];
+        return [self getAnnotationFromXFDF:xfdfString];
+    }
 
-    const BOOL updateSuccess = [annotationManager updateAnnotationsWithXFDFString:xfdfString
-                                                                            error:&error];
-    if (!updateSuccess || error) {
-        @throw [NSException exceptionWithName:NSGenericException reason:error.localizedFailureReason userInfo:error.userInfo];
+    [pdfViewCtrl DocLock:YES withBlock:^(PTPDFDoc * _Nullable doc) {
+        PTFDFDoc *fdfDoc = [PTFDFDoc CreateFromXFDF:xfdfString];
+        if (replace) {
+            [doc FDFUpdate:fdfDoc];
+        } else {
+            [doc FDFMerge:fdfDoc];
+        }
+        [pdfViewCtrl Update:YES];
+    } error:&error];
+
+    if (error) {
+        NSLog(@"Error: There was an error while trying to import annotations. %@", error.localizedDescription);
+        return nil;
     }
 
     return [self getAnnotationFromXFDF:xfdfString];

diff --git a/ios/RNTPTDocumentViewManager.m b/ios/RNTPTDocumentViewManager.m
@@ -1130,7 +1130,7 @@ - (void)importAnnotationCommandForDocumentViewTag:(NSNumber *)tag xfdfCommand:(N
 {
     RNTPTDocumentView *documentView = self.documentViews[tag];
     if (documentView) {
-        return [documentView importAnnotations:xfdfString];
+        return [documentView importAnnotations:xfdfString replace:replace];
     } else {
         @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Unable to find DocumentView for tag" userInfo:nil];
     }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-pdftron",
   "title": "React Native Pdftron",
-  "version": "3.0.3-36",
+  "version": "3.0.3-37",
   "description": "React Native Pdftron",
   "main": "./lib/index.js",
   "typings": "index.ts",