react-native-pdf 6.6.2 → 6.7.0

package/ios/{RCTPdf/RCTPdfView.m → RNPDFPdf/RNPDFPdfView.mm}

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTPdfView.h"
+#import "RNPDFPdfView.h"
 
 #import <Foundation/Foundation.h>
 #import <QuartzCore/QuartzCore.h>
@@ -26,6 +26,21 @@
 #import <RCTBlobManager.h">
 #endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <react/renderer/components/rnpdf/ComponentDescriptors.h>
+#import <react/renderer/components/rnpdf/Props.h>
+#import <react/renderer/components/rnpdf/RCTComponentViewHelpers.h>
+
+// Some RN private method hacking below similar to how it is done in RNScreens:
+// https://github.com/software-mansion/react-native-screens/blob/90e548739f35b5ded2524a9d6410033fc233f586/ios/RNSScreenStackHeaderConfig.mm#L30
+@interface RCTBridge (Private)
++ (RCTBridge *)currentBridge;
+@end
+
+#endif
+
 #ifndef __OPTIMIZE__
 // only output log when debug
 #define DLog( s, ... ) NSLog( @"<%p %@:(%d)> %@", self, [[NSString stringWithUTF8String:__FILE__] lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
@@ -39,7 +54,14 @@
 const float MAX_SCALE = 3.0f;
 const float MIN_SCALE = 1.0f;
 
-@implementation RCTPdfView
+@interface RNPDFPdfView() <PDFDocumentDelegate, PDFViewDelegate
+#ifdef RCT_NEW_ARCH_ENABLED
+, RCTRNPDFPdfViewViewProtocol
+#endif
+>
+@end
+
+@implementation RNPDFPdfView
 {
     RCTBridge *_bridge;
     PDFDocument *_pdfDocument;
@@ -48,64 +70,217 @@ const float MIN_SCALE = 1.0f;
     float _fixScaleFactor;
     bool _initialed;
     NSArray<NSString *> *_changedProps;
+    UITapGestureRecognizer *_doubleTapRecognizer;
+    UITapGestureRecognizer *_singleTapRecognizer;
+    UIPinchGestureRecognizer *_pinchRecognizer;
+    UILongPressGestureRecognizer *_longPressRecognizer;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
+#ifdef RCT_NEW_ARCH_ENABLED
+
+using namespace facebook::react;
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
 {
-    self = [super init];
-    if (self) {
+  return concreteComponentDescriptorProvider<RNPDFPdfViewComponentDescriptor>();
+}
 
-        _bridge = bridge;
-        _page = 1;
-        _scale = 1;
-        _minScale = MIN_SCALE;
-        _maxScale = MAX_SCALE;
-        _horizontal = NO;
-        _enablePaging = NO;
-        _enableRTL = NO;
-        _enableAnnotationRendering = YES;
-        _fitPolicy = 2;
-        _spacing = 10;
-        _singlePage = NO;
-
-        // init and config PDFView
-        _pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
-        _pdfView.displayMode = kPDFDisplaySinglePageContinuous;
-        _pdfView.autoScales = YES;
-        _pdfView.displaysPageBreaks = YES;
-        _pdfView.displayBox = kPDFDisplayBoxCropBox;
-        _pdfView.backgroundColor = [UIColor clearColor];
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        static const auto defaultProps = std::make_shared<const RNPDFPdfViewProps>();
+        _props = defaultProps;
+        [self initCommonProps];
+    }
+    return self;
+}
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+    const auto &newProps = *std::static_pointer_cast<const RNPDFPdfViewProps>(props);
+    NSMutableArray<NSString *> *updatedPropNames = [NSMutableArray new];
+    if (_path != RCTNSStringFromStringNilIfEmpty(newProps.path)) {
+        _path = RCTNSStringFromStringNilIfEmpty(newProps.path);
+        [updatedPropNames addObject:@"path"];
+    }
+    if (_page != newProps.page) {
+        _page = newProps.page;
+        [updatedPropNames addObject:@"page"];
+    }
+    if (_scale != newProps.scale) {
+        _scale = newProps.scale;
+        [updatedPropNames addObject:@"scale"];
+    }
+    if (_minScale != newProps.minScale) {
+        _minScale = newProps.minScale;
+        [updatedPropNames addObject:@"minScale"];
+    }
+    if (_maxScale != newProps.maxScale) {
+        _maxScale = newProps.maxScale;
+        [updatedPropNames addObject:@"maxScale"];
+    }
+    if (_horizontal != newProps.horizontal) {
+        _horizontal = newProps.horizontal;
+        [updatedPropNames addObject:@"horizontal"];
+    }
+    if (_enablePaging != newProps.enablePaging) {
+        _enablePaging = newProps.enablePaging;
+        [updatedPropNames addObject:@"enablePaging"];
+    }
+    if (_enableRTL != newProps.enableRTL) {
+        _enableRTL = newProps.enableRTL;
+        [updatedPropNames addObject:@"enableRTL"];
+    }
+    if (_enableAnnotationRendering != newProps.enableAnnotationRendering) {
+        _enableAnnotationRendering = newProps.enableAnnotationRendering;
+        [updatedPropNames addObject:@"enableAnnotationRendering"];
+    }
+    if (_fitPolicy != newProps.fitPolicy) {
+        _fitPolicy = newProps.fitPolicy;
+        [updatedPropNames addObject:@"fitPolicy"];
+    }
+    if (_spacing != newProps.spacing) {
+        _spacing = newProps.spacing;
+        [updatedPropNames addObject:@"spacing"];
+    }
+    if (_password != RCTNSStringFromStringNilIfEmpty(newProps.password)) {
+        _password = RCTNSStringFromStringNilIfEmpty(newProps.password);
+        [updatedPropNames addObject:@"password"];
+    }
+    if (_singlePage != newProps.singlePage) {
+        _singlePage = newProps.singlePage;
+        [updatedPropNames addObject:@"singlePage"];
+    }
+    if (_showsHorizontalScrollIndicator != newProps.showsHorizontalScrollIndicator) {
+        _showsHorizontalScrollIndicator = newProps.showsHorizontalScrollIndicator;
+        [updatedPropNames addObject:@"showsHorizontalScrollIndicator"];
+    }
+    if (_showsVerticalScrollIndicator != newProps.showsVerticalScrollIndicator) {
+        _showsVerticalScrollIndicator = newProps.showsVerticalScrollIndicator;
+        [updatedPropNames addObject:@"showsVerticalScrollIndicator"];
+    }
+
+    [super updateProps:props oldProps:oldProps];
+    [self didSetProps:updatedPropNames];
+}
+
+// already added in case https://github.com/facebook/react-native/pull/35378 has been merged
+- (BOOL)shouldBeRecycled
+{
+    return NO;
+}
 
-        _fixScaleFactor = -1.0f;
-        _initialed = NO;
-        _changedProps = NULL;
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+
+    [_pdfView removeFromSuperview];
+    _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];
+
+    // remove old recognizers before adding new ones
+    [self removeGestureRecognizer:_doubleTapRecognizer];
+    [self removeGestureRecognizer:_singleTapRecognizer];
+    [self removeGestureRecognizer:_pinchRecognizer];
+    [self removeGestureRecognizer:_longPressRecognizer];
+
+    [self initCommonProps];
+}
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics
+{
+    // Fabric equivalent of `reactSetFrame` method
+    [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+    _pdfView.frame = CGRectMake(0, 0, layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
 
-        [self addSubview:_pdfView];
+    NSMutableArray *mProps = [_changedProps mutableCopy];
+    if (_initialed) {
+        [mProps removeObject:@"path"];
+    }
+    _initialed = YES;
 
+    [self didSetProps:mProps];
+}
 
-        // 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];
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+  RCTRNPDFPdfViewHandleCommand(self, commandName, args);
+}
 
-        [[_pdfView document] setDelegate: self];
-        [_pdfView setDelegate: self];
+- (void)setNativePage:(NSInteger)page
+{
+    _page = page;
+    [self didSetProps:[NSArray arrayWithObject:@"page"]];
+}
 
+#endif
 
-        [self bindTap];
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+{
+    self = [super init];
+    if (self) {
+        _bridge = bridge;
+        [self initCommonProps];
     }
 
     return self;
 }
 
+- (void)initCommonProps
+{
+    _page = 1;
+    _scale = 1;
+    _minScale = MIN_SCALE;
+    _maxScale = MAX_SCALE;
+    _horizontal = NO;
+    _enablePaging = NO;
+    _enableRTL = NO;
+    _enableAnnotationRendering = YES;
+    _fitPolicy = 2;
+    _spacing = 10;
+    _singlePage = NO;
+    _showsHorizontalScrollIndicator = YES;
+    _showsVerticalScrollIndicator = YES;
+
+    // init and config PDFView
+    _pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+    _pdfView.displayMode = kPDFDisplaySinglePageContinuous;
+    _pdfView.autoScales = YES;
+    _pdfView.displaysPageBreaks = YES;
+    _pdfView.displayBox = kPDFDisplayBoxCropBox;
+    _pdfView.backgroundColor = [UIColor clearColor];
+
+    _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];
+}
+
 - (void)PDFViewWillClickOnLink:(PDFView *)sender withURL:(NSURL *)url
 {
     NSString *_url = url.absoluteString;
-    _onChange(@{ @"message":
+    [self notifyOnChangeWithMessage:
                      [[NSString alloc] initWithString:
                       [NSString stringWithFormat:
-                       @"linkPressed|%s", _url.UTF8String]] });
+                       @"linkPressed|%s", _url.UTF8String]]];
 }
 
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
@@ -125,7 +300,13 @@ const float MIN_SCALE = 1.0f;
             }
             
             if ([_path hasPrefix:@"blob:"]) {
-                RCTBlobManager *blobManager = [_bridge moduleForName:@"BlobModule"];
+                RCTBlobManager *blobManager = [
+#ifdef RCT_NEW_ARCH_ENABLED
+        [RCTBridge currentBridge]
+#else
+        _bridge
+#endif // RCT_NEW_ARCH_ENABLED
+                    moduleForName:@"BlobModule"];
                 NSURL *blobURL = [NSURL URLWithString:_path];
                 NSData *blobData = [blobManager resolveURL:blobURL];
                 if (blobData != nil) {
@@ -144,7 +325,7 @@ const float MIN_SCALE = 1.0f;
                 //check need password or not
                 if (_pdfDocument.isLocked && ![_pdfDocument unlockWithPassword:_password]) {
 
-                    _onChange(@{ @"message": @"error|Password required or incorrect password."});
+                    [self notifyOnChangeWithMessage:@"error|Password required or incorrect password."];
 
                     _pdfDocument = Nil;
                     return;
@@ -153,7 +334,7 @@ const float MIN_SCALE = 1.0f;
                 _pdfView.document = _pdfDocument;
             } else {
 
-                _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"error|Load pdf failed. path=%s",_path.UTF8String]]});
+                [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"error|Load pdf failed. path=%s",_path.UTF8String]]];
 
                 _pdfDocument = Nil;
                 return;
@@ -273,6 +454,42 @@ const float MIN_SCALE = 1.0f;
             }
         }
 
+        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"showsHorizontalScrollIndicator"])) {
+            if (_showsHorizontalScrollIndicator) {
+                for (UIView *subview in _pdfView.subviews) {
+                    if ([subview isKindOfClass:[UIScrollView class]]) {
+                        UIScrollView *scrollView = (UIScrollView *)subview;
+                        scrollView.showsHorizontalScrollIndicator = YES;
+                    }
+                }
+            } else {
+                for (UIView *subview in _pdfView.subviews) {
+                    if ([subview isKindOfClass:[UIScrollView class]]) {
+                        UIScrollView *scrollView = (UIScrollView *)subview;
+                        scrollView.showsHorizontalScrollIndicator = NO;
+                    }
+                }
+            }
+        }
+
+        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"showsVerticalScrollIndicator"])) {
+            if (_showsVerticalScrollIndicator) {
+                for (UIView *subview in _pdfView.subviews) {
+                    if ([subview isKindOfClass:[UIScrollView class]]) {
+                        UIScrollView *scrollView = (UIScrollView *)subview;
+                        scrollView.showsVerticalScrollIndicator = YES;
+                    }
+                }
+            } else {
+                for (UIView *subview in _pdfView.subviews) {
+                    if ([subview isKindOfClass:[UIScrollView class]]) {
+                        UIScrollView *scrollView = (UIScrollView *)subview;
+                        scrollView.showsVerticalScrollIndicator = NO;
+                    }
+                }
+            }
+        }
+
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enablePaging"] || [changedProps containsObject:@"horizontal"] || [changedProps containsObject:@"page"])) {
 
             PDFPage *pdfPage = [_pdfDocument pageAtIndex:_page-1];
@@ -312,6 +529,19 @@ const float MIN_SCALE = 1.0f;
     [self didSetProps:mProps];
 }
 
+
+- (void)notifyOnChangeWithMessage:(NSString *)message
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+    if (_eventEmitter != nullptr) {
+             std::dynamic_pointer_cast<const RNPDFPdfViewEventEmitter>(_eventEmitter)
+                 ->onChange(RNPDFPdfViewEventEmitter::OnChange{.message = RCTStringFromNSString(message)});
+           }
+#else
+    _onChange(@{ @"message": message});
+#endif
+}
+
 - (void)dealloc{
 
     _pdfDocument = Nil;
@@ -322,6 +552,10 @@ const float MIN_SCALE = 1.0f;
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewPageChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewScaleChangedNotification" object:nil];
 
+    _doubleTapRecognizer = nil;
+    _singleTapRecognizer = nil;
+    _pinchRecognizer = nil;
+    _longPressRecognizer = nil;
 }
 
 #pragma mark notification process
@@ -335,7 +569,8 @@ const float MIN_SCALE = 1.0f;
         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]]});
+        [self notifyOnChangeWithMessage:
+         [[NSString alloc] initWithString:[NSString stringWithFormat:@"loadComplete|%lu|%f|%f|%@", numberOfPages, pageSize.width, pageSize.height,jsonString]]];
     }
 
 }
@@ -434,7 +669,7 @@ const float MIN_SCALE = 1.0f;
         unsigned long page = [_pdfDocument indexForPage:currentPage];
         unsigned long numberOfPages = _pdfDocument.pageCount;
 
-        _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"pageChanged|%lu|%lu", page+1, numberOfPages]]});
+        [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"pageChanged|%lu|%lu", page+1, numberOfPages]]];
     }
 
 }
@@ -445,7 +680,7 @@ const float MIN_SCALE = 1.0f;
     if (_initialed && _fixScaleFactor>0) {
         if (_scale != _pdfView.scaleFactor/_fixScaleFactor) {
             _scale = _pdfView.scaleFactor/_fixScaleFactor;
-            _onChange(@{ @"message": [[NSString alloc] initWithString:[NSString stringWithFormat:@"scaleChanged|%f", _scale]]});
+            [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"scaleChanged|%f", _scale]]];
         }
     }
 }
@@ -475,17 +710,36 @@ const float MIN_SCALE = 1.0f;
 
     CGFloat newScale = scale * self->_fixScaleFactor;
     CGPoint tapPoint = [recognizer locationInView:self->_pdfView];
-    tapPoint = [self->_pdfView convertPoint:tapPoint toPage:self->_pdfView.currentPage];
-    CGRect zoomRect = CGRectZero;
-    zoomRect.size.width = self->_pdfView.frame.size.width * newScale;
-    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;
+
+    PDFPage *tappedPdfPage = [_pdfView pageForPoint:tapPoint nearest:NO];
+    PDFPage *pageRef;
+    if (tappedPdfPage) {
+        pageRef = tappedPdfPage;
+    }   else {
+        pageRef = self->_pdfView.currentPage;
+    }
+    tapPoint = [self->_pdfView convertPoint:tapPoint toPage:pageRef];
+
+    CGRect tempZoomRect = CGRectZero;
+    tempZoomRect.size.width = self->_pdfView.frame.size.width;
+    tempZoomRect.size.height = 1;
+    tempZoomRect.origin = tapPoint;
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [UIView animateWithDuration:0.3 animations:^{
             [self->_pdfView setScaleFactor:newScale];
-            [self->_pdfView goToRect:zoomRect onPage:self->_pdfView.currentPage];
+
+            [self->_pdfView goToRect:tempZoomRect onPage:pageRef];
+            CGPoint defZoomOrigin = [self->_pdfView convertPoint:tempZoomRect.origin fromPage:pageRef];
+            defZoomOrigin.x = defZoomOrigin.x - self->_pdfView.frame.size.width / 2;
+            defZoomOrigin.y = defZoomOrigin.y - self->_pdfView.frame.size.height / 2;
+            defZoomOrigin = [self->_pdfView convertPoint:defZoomOrigin toPage:pageRef];
+            CGRect defZoomRect =  CGRectOffset(
+                tempZoomRect,
+                defZoomOrigin.x - tempZoomRect.origin.x,
+                defZoomOrigin.y - tempZoomRect.origin.y
+            );
+            [self->_pdfView goToRect:defZoomRect onPage:pageRef];
 
             [self setNeedsDisplay];
             [self onScaleChanged:Nil];
@@ -507,7 +761,8 @@ const float MIN_SCALE = 1.0f;
     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 notifyOnChangeWithMessage:
+         [[NSString alloc] initWithString:[NSString stringWithFormat:@"pageSingleTap|%lu|%f|%f", page+1, point.x, point.y]]];
     }
 
     //[self setNeedsDisplay];
@@ -550,6 +805,7 @@ const float MIN_SCALE = 1.0f;
     doubleTapRecognizer.delegate = self;
 
     [self addGestureRecognizer:doubleTapRecognizer];
+    _doubleTapRecognizer = doubleTapRecognizer;
 
     UITapGestureRecognizer *singleTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
                                                                                           action:@selector(handleSingleTap:)];
@@ -559,11 +815,15 @@ const float MIN_SCALE = 1.0f;
     singleTapRecognizer.delegate = self;
 
     [self addGestureRecognizer:singleTapRecognizer];
+    _singleTapRecognizer = singleTapRecognizer;
+
     [singleTapRecognizer requireGestureRecognizerToFail:doubleTapRecognizer];
 
     UIPinchGestureRecognizer *pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self
                                                                                           action:@selector(handlePinch:)];
     [self addGestureRecognizer:pinchRecognizer];
+    _pinchRecognizer = pinchRecognizer;
+
     pinchRecognizer.delegate = self;
 
     UILongPressGestureRecognizer *longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
@@ -574,6 +834,7 @@ const float MIN_SCALE = 1.0f;
     longPressRecognizer.minimumPressDuration=0.3;
 
     [self addGestureRecognizer:longPressRecognizer];
+    _longPressRecognizer = longPressRecognizer;
 
 }
 
@@ -588,6 +849,12 @@ const float MIN_SCALE = 1.0f;
     return !_singlePage;
 }
 
+@end
 
+#ifdef RCT_NEW_ARCH_ENABLED
+Class<RCTComponentViewProtocol> RNPDFPdfViewCls(void)
+{
+    return RNPDFPdfView.class;
+}
 
-@end
+#endif

package/ios/{RCTPdf/RCTPdfViewManager.h → RNPDFPdf/RNPDFPdfViewManager.h}

@@ -13,6 +13,6 @@
 #endif
 
 
-@interface RCTPdfViewManager : RCTViewManager
+@interface RNPDFPdfViewManager : RCTViewManager
 
 @end

package/ios/{RCTPdf/RCTPdfViewManager.m → RNPDFPdf/RNPDFPdfViewManager.mm}

@@ -8,11 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "RCTPdfViewManager.h"
-#import "RCTPdfView.h"
+#import "RNPDFPdfViewManager.h"
+#import "RNPDFPdfView.h"
 
 
-@implementation RCTPdfViewManager
+@implementation RNPDFPdfViewManager
 
 RCT_EXPORT_MODULE()
 
@@ -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] initWithBridge:self.bridge];
+        return [[RNPDFPdfView alloc] initWithBridge:self.bridge];
     } else {
         return NULL;
     }
@@ -33,6 +33,8 @@ RCT_EXPORT_VIEW_PROPERTY(scale, float);
 RCT_EXPORT_VIEW_PROPERTY(minScale, float);
 RCT_EXPORT_VIEW_PROPERTY(maxScale, float);
 RCT_EXPORT_VIEW_PROPERTY(horizontal, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(showsHorizontalScrollIndicator, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(showsVerticalScrollIndicator, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(enablePaging, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(enableRTL, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(enableAnnotationRendering, BOOL);
@@ -61,4 +63,4 @@ RCT_EXPORT_METHOD(supportPDFKit:(RCTResponseSenderBlock)callback)
 - (void)dealloc{
 }
 
-@end
+@end