react-native-pdf 6.2.0 → 6.4.0

package/ios/RCTPdf/RCTPdfView.m

@@ -17,11 +17,13 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/UIView+React.h>
 #import <React/RCTLog.h>
+#import <React/RCTBlobManager.h>
 #else
 #import "RCTBridgeModule.h"
 #import "RCTEventDispatcher.h"
 #import "UIView+React.h"
 #import "RCTLog.h"
+#import <RCTBlobManager.h">
 #endif
 
 #ifndef __OPTIMIZE__
@@ -39,6 +41,7 @@ const float MIN_SCALE = 1.0f;
 
 @implementation RCTPdfView
 {
+    RCTBridge *_bridge;
     PDFDocument *_pdfDocument;
     PDFView *_pdfView;
     PDFOutline *root;
@@ -47,11 +50,12 @@ const float MIN_SCALE = 1.0f;
     NSArray<NSString *> *_changedProps;
 }
 
-- (instancetype)init
+- (instancetype)initWithBridge:(RCTBridge *)bridge
 {
     self = [super init];
     if (self) {
-        
+
+        _bridge = bridge;
         _page = 1;
         _scale = 1;
         _minScale = MIN_SCALE;
@@ -62,7 +66,8 @@ const float MIN_SCALE = 1.0f;
         _enableAnnotationRendering = YES;
         _fitPolicy = 2;
         _spacing = 10;
-        
+        _singlePage = NO;
+
         // init and config PDFView
         _pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
         _pdfView.displayMode = kPDFDisplaySinglePageContinuous;
@@ -74,23 +79,23 @@ const float MIN_SCALE = 1.0f;
         _fixScaleFactor = -1.0f;
         _initialed = NO;
         _changedProps = NULL;
-        
+
         [self addSubview:_pdfView];
-        
-        
+
+
         // register notification
         NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
         [center addObserver:self selector:@selector(onDocumentChanged:) name:PDFViewDocumentChangedNotification object:_pdfView];
         [center addObserver:self selector:@selector(onPageChanged:) name:PDFViewPageChangedNotification object:_pdfView];
         [center addObserver:self selector:@selector(onScaleChanged:) name:PDFViewScaleChangedNotification object:_pdfView];
-        
+
         [[_pdfView document] setDelegate: self];
         [_pdfView setDelegate: self];
-        
-        
+
+
         [self bindTap];
     }
-    
+
     return self;
 }
 
@@ -106,43 +111,52 @@ const float MIN_SCALE = 1.0f;
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
     if (!_initialed) {
-        
+
         _changedProps = changedProps;
-        
+
     } else {
-        
+
         if ([changedProps containsObject:@"path"]) {
-            
-            NSURL *fileURL = [NSURL fileURLWithPath:_path];
-            
+
+
             if (_pdfDocument != Nil) {
                 //Release old doc
                 _pdfDocument = Nil;
             }
             
-            _pdfDocument = [[PDFDocument alloc] initWithURL:fileURL];
-            
+            if ([_path hasPrefix:@"blob:"]) {
+                RCTBlobManager *blobManager = [_bridge moduleForName:@"BlobModule"];
+                NSURL *blobURL = [NSURL URLWithString:_path];
+                NSData *blobData = [blobManager resolveURL:blobURL];
+                if (blobData != nil) {
+                    _pdfDocument = [[PDFDocument alloc] initWithData:blobData];
+                }
+            } else {
+                NSURL *fileURL = [NSURL fileURLWithPath:_path];
+                _pdfDocument = [[PDFDocument alloc] initWithURL:fileURL];
+            }
+
             if (_pdfDocument) {
-                
+
                 //check need password or not
                 if (_pdfDocument.isLocked && ![_pdfDocument unlockWithPassword:_password]) {
-                    
+
                     _onChange(@{ @"message": @"error|Password required or incorrect password."});
-                    
+
                     _pdfDocument = Nil;
                     return;
                 }
-                
+
                 _pdfView.document = _pdfDocument;
             } else {
-                
+
                 _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"error|Load pdf failed. path=%s",_path.UTF8String]]});
-                
+
                 _pdfDocument = Nil;
                 return;
             }
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"spacing"])) {
             if (_horizontal) {
                 _pdfView.pageBreakMargins = UIEdgeInsetsMake(0,_spacing,0,0);
@@ -168,11 +182,11 @@ const float MIN_SCALE = 1.0f;
                 }
             }
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enableRTL"])) {
             _pdfView.displaysRTL = _enableRTL;
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enableAnnotationRendering"])) {
             if (!_enableAnnotationRendering) {
                 for (unsigned long i=0; i<_pdfView.document.pageCount; i++) {
@@ -183,17 +197,17 @@ const float MIN_SCALE = 1.0f;
                 }
             }
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"fitPolicy"] || [changedProps containsObject:@"minScale"] || [changedProps containsObject:@"maxScale"])) {
-            
+
             PDFPage *pdfPage = [_pdfDocument pageAtIndex:_pdfDocument.pageCount-1];
             CGRect pdfPageRect = [pdfPage boundsForBox:kPDFDisplayBoxCropBox];
-            
+
             // some pdf with rotation, then adjust it
             if (pdfPage.rotation == 90 || pdfPage.rotation == 270) {
                 pdfPageRect = CGRectMake(0, 0, pdfPageRect.size.height, pdfPageRect.size.width);
             }
-            
+
             if (_fitPolicy == 0) {
                 _fixScaleFactor = self.frame.size.width/pdfPageRect.size.width;
                 _pdfView.scaleFactor = _scale * _fixScaleFactor;
@@ -219,15 +233,15 @@ const float MIN_SCALE = 1.0f;
                     _pdfView.maxScaleFactor = _fixScaleFactor*_maxScale;
                 }
             }
-            
+
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"scale"])) {
             _pdfView.scaleFactor = _scale * _fixScaleFactor;
             if (_pdfView.scaleFactor>_pdfView.maxScaleFactor) _pdfView.scaleFactor = _pdfView.maxScaleFactor;
             if (_pdfView.scaleFactor<_pdfView.minScaleFactor) _pdfView.scaleFactor = _pdfView.minScaleFactor;
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"horizontal"])) {
             if (_horizontal) {
                 _pdfView.displayDirection = kPDFDisplayDirectionHorizontal;
@@ -237,7 +251,7 @@ const float MIN_SCALE = 1.0f;
                 _pdfView.pageBreakMargins = UIEdgeInsetsMake(0,0,_spacing,0);
             }
         }
-        
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enablePaging"])) {
             if (_enablePaging) {
                 [_pdfView usePageViewController:YES withViewOptions:@{UIPageViewControllerOptionSpineLocationKey:@(UIPageViewControllerSpineLocationMin),UIPageViewControllerOptionInterPageSpacingKey:@(_spacing)}];
@@ -245,26 +259,36 @@ const float MIN_SCALE = 1.0f;
                 [_pdfView usePageViewController:NO withViewOptions:Nil];
             }
         }
-        
+
+        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"singlePage"])) {
+            if (_singlePage) {
+                _pdfView.displayMode = kPDFDisplaySinglePage;
+                _pdfView.userInteractionEnabled = NO;
+            } else {
+                _pdfView.displayMode = kPDFDisplaySinglePageContinuous;
+                _pdfView.userInteractionEnabled = YES;
+            }
+        }
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enablePaging"] || [changedProps containsObject:@"horizontal"] || [changedProps containsObject:@"page"])) {
-            
+
             PDFPage *pdfPage = [_pdfDocument pageAtIndex:_page-1];
             if (pdfPage) {
                 CGRect pdfPageRect = [pdfPage boundsForBox:kPDFDisplayBoxCropBox];
-                
+
                 // some pdf with rotation, then adjust it
                 if (pdfPage.rotation == 90 || pdfPage.rotation == 270) {
                     pdfPageRect = CGRectMake(0, 0, pdfPageRect.size.height, pdfPageRect.size.width);
                 }
-                
+
                 CGPoint pointLeftTop = CGPointMake(0, pdfPageRect.size.height);
                 PDFDestination *pdfDest = [[PDFDestination alloc] initWithPage:pdfPage atPoint:pointLeftTop];
                 [_pdfView goToDestination:pdfDest];
                 _pdfView.scaleFactor = _fixScaleFactor*_scale;
             }
         }
-        
-        
+
+        _pdfView.backgroundColor = [UIColor clearColor];
         [_pdfView layoutDocumentView];
         [self setNeedsDisplay];
     }
@@ -275,129 +299,133 @@ const float MIN_SCALE = 1.0f;
 {
     [super reactSetFrame:frame];
     _pdfView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height);
-    
+
+    NSMutableArray *mProps = [_changedProps mutableCopy];
+    if (_initialed) {
+        [mProps removeObject:@"path"];
+    }
     _initialed = YES;
-    
-    [self didSetProps:_changedProps];
+
+    [self didSetProps:mProps];
 }
 
 - (void)dealloc{
-    
+
     _pdfDocument = Nil;
     _pdfView = Nil;
-    
+
     //Remove notifications
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewDocumentChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewPageChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewScaleChangedNotification" object:nil];
-    
+
 }
 
 #pragma mark notification process
 - (void)onDocumentChanged:(NSNotification *)noti
 {
-    
+
     if (_pdfDocument) {
-        
+
         unsigned long numberOfPages = _pdfDocument.pageCount;
         PDFPage *page = [_pdfDocument pageAtIndex:_pdfDocument.pageCount-1];
         CGSize pageSize = [_pdfView rowSizeForPage:page];
         NSString *jsonString = [self getTableContents];
-        
+
         _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"loadComplete|%lu|%f|%f|%@", numberOfPages, pageSize.width, pageSize.height,jsonString]]});
     }
-    
+
 }
 
 -(NSString *) getTableContents
 {
-    
+
     NSMutableArray<PDFOutline *> *arrTableOfContents = [[NSMutableArray alloc] init];
-    
+
     if (_pdfDocument.outlineRoot) {
-        
+
         PDFOutline *currentRoot = _pdfDocument.outlineRoot;
         NSMutableArray<PDFOutline *> *stack = [[NSMutableArray alloc] init];
-        
+
         [stack addObject:currentRoot];
-        
+
         while (stack.count > 0) {
-            
+
             PDFOutline *currentOutline = stack.lastObject;
             [stack removeLastObject];
-            
+
             if (currentOutline.label.length > 0){
                 [arrTableOfContents addObject:currentOutline];
             }
-            
+
             for ( NSInteger i= currentOutline.numberOfChildren; i > 0; i-- )
             {
                 [stack addObject:[currentOutline childAtIndex:i-1]];
             }
         }
     }
-    
+
     NSMutableArray *arrParentsContents = [[NSMutableArray alloc] init];
-    
+
     for ( NSInteger i= 0; i < arrTableOfContents.count; i++ )
     {
         PDFOutline *currentOutline = [arrTableOfContents objectAtIndex:i];
-        
+
         NSInteger indentationLevel = -1;
-        
+
         PDFOutline *parentOutline = currentOutline.parent;
-        
+
         while (parentOutline != nil) {
             indentationLevel += 1;
             parentOutline = parentOutline.parent;
         }
-        
+
         if (indentationLevel == 0) {
-            
+
             NSMutableDictionary *DXParentsContent = [[NSMutableDictionary alloc] init];
-            
+
             [DXParentsContent setObject:[[NSMutableArray alloc] init] forKey:@"children"];
             [DXParentsContent setObject:@"" forKey:@"mNativePtr"];
             [DXParentsContent setObject:[NSString stringWithFormat:@"%lu", [_pdfDocument indexForPage:currentOutline.destination.page]] forKey:@"pageIdx"];
             [DXParentsContent setObject:currentOutline.label forKey:@"title"];
-            
+
             //currentOutlin
             //mNativePtr
             [arrParentsContents addObject:DXParentsContent];
         }
         else {
             NSMutableDictionary *DXParentsContent = [arrParentsContents lastObject];
-            
+
             NSMutableArray *arrChildren = [DXParentsContent valueForKey:@"children"];
-            
+
             while (indentationLevel > 1) {
                 NSMutableDictionary *DXchild = [arrChildren lastObject];
                 arrChildren = [DXchild valueForKey:@"children"];
                 indentationLevel--;
             }
-            
+
             NSMutableDictionary *DXChildContent = [[NSMutableDictionary alloc] init];
             [DXChildContent setObject:[[NSMutableArray alloc] init] forKey:@"children"];
             [DXChildContent setObject:@"" forKey:@"mNativePtr"];
             [DXChildContent setObject:[NSString stringWithFormat:@"%lu", [_pdfDocument indexForPage:currentOutline.destination.page]] forKey:@"pageIdx"];
             [DXChildContent setObject:currentOutline.label forKey:@"title"];
             [arrChildren addObject:DXChildContent];
-            
+
         }
     }
-    
+
     NSError *error;
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:arrParentsContents options:NSJSONWritingPrettyPrinted error:&error];
-    
+
     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
+
     return jsonString;
-    
+
 }
 
 - (void)onPageChanged:(NSNotification *)noti
 {
-    
+
     if (_pdfDocument) {
         PDFPage *currentPage = _pdfView.currentPage;
         unsigned long page = [_pdfDocument indexForPage:currentPage];
@@ -405,12 +433,12 @@ const float MIN_SCALE = 1.0f;
 
         _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"pageChanged|%lu|%lu", page+1, numberOfPages]]});
     }
-    
+
 }
 
 - (void)onScaleChanged:(NSNotification *)noti
 {
-    
+
     if (_initialed && _fixScaleFactor>0) {
         if (_scale != _pdfView.scaleFactor/_fixScaleFactor) {
             _scale = _pdfView.scaleFactor/_fixScaleFactor;
@@ -441,7 +469,7 @@ const float MIN_SCALE = 1.0f;
     } else {
         scale = min;
     }
-    
+
     CGFloat newScale = scale * self->_fixScaleFactor;
     CGPoint tapPoint = [recognizer locationInView:self->_pdfView];
     tapPoint = [self->_pdfView convertPoint:tapPoint toPage:self->_pdfView.currentPage];
@@ -450,12 +478,12 @@ const float MIN_SCALE = 1.0f;
     zoomRect.size.height = self->_pdfView.frame.size.height * newScale;
     zoomRect.origin.x = tapPoint.x - zoomRect.size.width / 2;
     zoomRect.origin.y = tapPoint.y - zoomRect.size.height / 2;
-    
+
     dispatch_async(dispatch_get_main_queue(), ^{
         [UIView animateWithDuration:0.3 animations:^{
             [self->_pdfView setScaleFactor:newScale];
             [self->_pdfView goToRect:zoomRect onPage:self->_pdfView.currentPage];
-            
+
             [self setNeedsDisplay];
             [self onScaleChanged:Nil];
         }];
@@ -470,20 +498,19 @@ const float MIN_SCALE = 1.0f;
  */
 - (void)handleSingleTap:(UITapGestureRecognizer *)sender
 {
-	
     //_pdfView.scaleFactor = _pdfView.minScaleFactor;
-    
+
     CGPoint point = [sender locationInView:self];
     PDFPage *pdfPage = [_pdfView pageForPoint:point nearest:NO];
     if (pdfPage) {
         unsigned long page = [_pdfDocument indexForPage:pdfPage];
         _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"pageSingleTap|%lu|%f|%f", page+1, point.x, point.y]]});
     }
-    
+
     //[self setNeedsDisplay];
     //[self onScaleChanged:Nil];
-    
-    
+
+
 }
 
 /**
@@ -502,7 +529,7 @@ const float MIN_SCALE = 1.0f;
  *
  */
 - (void)handleLongPress:(UILongPressGestureRecognizer *)sender{
-    
+
 }
 
 /**
@@ -518,44 +545,44 @@ const float MIN_SCALE = 1.0f;
     doubleTapRecognizer.numberOfTapsRequired = 2;
     doubleTapRecognizer.numberOfTouchesRequired = 1;
     doubleTapRecognizer.delegate = self;
-    
+
     [self addGestureRecognizer:doubleTapRecognizer];
-    
+
     UITapGestureRecognizer *singleTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                                           action:@selector(handleSingleTap:)];
     //trigger by one finger and one touch
     singleTapRecognizer.numberOfTapsRequired = 1;
     singleTapRecognizer.numberOfTouchesRequired = 1;
     singleTapRecognizer.delegate = self;
-    
+
     [self addGestureRecognizer:singleTapRecognizer];
     [singleTapRecognizer requireGestureRecognizerToFail:doubleTapRecognizer];
-    
+
     UIPinchGestureRecognizer *pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self
                                                                                           action:@selector(handlePinch:)];
     [self addGestureRecognizer:pinchRecognizer];
     pinchRecognizer.delegate = self;
-    
+
     UILongPressGestureRecognizer *longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
                                                                                             action:@selector(handleLongPress:)];
     // Making sure the allowable movement isn not too narrow
     longPressRecognizer.allowableMovement=100;
     // Important: The duration must be long enough to allow taps but not longer than the period in which view opens the magnifying glass
     longPressRecognizer.minimumPressDuration=0.3;
-    
+
     [self addGestureRecognizer:longPressRecognizer];
-    
+
 }
 
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 
 {
-    return YES;
+    return !_singlePage;
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
-    return YES;
+    return !_singlePage;
 }
 
 

package/ios/RCTPdf/RCTPdfViewManager.m

@@ -20,7 +20,7 @@ RCT_EXPORT_MODULE()
 {
     if([[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] == NSOrderedDescending
        || [[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] == NSOrderedSame) {
-        return [[RCTPdfView alloc] init];
+        return [[RCTPdfView alloc] initWithBridge:self.bridge];
     } else {
         return NULL;
     }
@@ -40,6 +40,7 @@ RCT_EXPORT_VIEW_PROPERTY(fitPolicy, int);
 RCT_EXPORT_VIEW_PROPERTY(spacing, int);
 RCT_EXPORT_VIEW_PROPERTY(password, NSString);
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(singlePage, BOOL);
 
 RCT_EXPORT_METHOD(supportPDFKit:(RCTResponseSenderBlock)callback)
 {

package/ios/RCTPdf.xcodeproj/xcuserdata/wonday.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>RCTPdf.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>52</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf",
-    "version": "6.2.0",
+    "version": "6.4.0",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",
@@ -28,9 +28,24 @@
         "url": "https://github.com/wonday/react-native-pdf/issues"
     },
     "dependencies": {
-        "crypto-js": "^3.2.0",
-        "prop-types": "^15.7.2",
-        "@react-native-community/progress-bar-android": "^1.0.3",
-        "@react-native-community/progress-view": "^1.0.3"
-    }
+        "crypto-js": "^3.2.0"
+    },
+    "devDependencies": {
+        "prop-types": "^15.7.2"
+    },
+    "files": [
+        "android/",
+        "ios/",
+        "windows/",
+        "DoubleTapView.js",
+        "index.d.ts",
+        "index.js",
+        "index.js.flow",
+        "PdfManager.js",
+        "PdfPageView.js",
+        "PdfView.js",
+        "PdfViewFlatList.js",
+        "PinchZoomView.js",
+        "react-native-pdf.podspec"
+    ]
 }

package/react-native-pdf.podspec

@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.requires_arc   = true
   s.platform       = :ios, '8.0'
   s.source_files   = 'ios/**/*.{h,m}'
-  s.dependency     'React'
+  s.dependency     'React-Core'
 end

package/windows/RCTPdf/PropertySheet.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <!--
+    To customize common C++/WinRT project properties: 
+    * right-click the project node
+    * expand the Common Properties item
+    * select the C++/WinRT property page
+
+    For more advanced scenarios, and complete documentation, please see:
+    https://github.com/Microsoft/xlang/tree/master/src/package/cppwinrt/nuget 
+    -->
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+</Project>

package/windows/RCTPdf/RCTPdf.def

@@ -0,0 +1,3 @@
+EXPORTS
+DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
+DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE