toolbar position fixed using status bar height

Author: sekar_neutrinos

README.md

@@ -4,8 +4,8 @@ This plugin allows you to view pdf file base64 using ios native library PDFKit a
 
 ## Supported Platforms ##
 
-* iOS 11+
-* Cordova/Phonegap >=7.1.0
+* iOS 13+
+* Cordova/Phonegap >=10.0.0
 
 ## Installation ##
 ```bash

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-pdf-viewer-ios",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "cordova pdf viewer plugin",
   "cordova": {
     "id": "cordova-plugin-pdf-viewer-ios",
@@ -39,8 +39,8 @@
   "engines": {
     "cordovaDependencies": {
       "1.0.0": {
-        "cordova": ">=7.1.0",
-        "cordova-ios": ">=4.5.1"
+        "cordova": ">=10.0.0",
+        "cordova-ios": ">=6.0.0"
       }
     }
   },

plugin.xml

@@ -2,10 +2,10 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" 
         xmlns:android="http://schemas.android.com/apk/res/android" 
         id="cordova-plugin-pdf-viewer-ios" 
-        version="1.0.8">
+        version="1.0.9">
     <engines>
-        <engine name="cordova" version=">=7.1.0" />
-        <engine name="cordova-ios" version=">=4.5.1" />
+        <engine name="cordova" version=">=10.0.0" />
+        <engine name="cordova-ios" version=">=6.0.0" />
     </engines>
    <name>PDFViewer</name>
    <js-module name="PDFViewer" src="www/PDFViewer.js">

src/ios/PDFViewer.m

@@ -26,11 +26,18 @@ - (void)viewPDF:(CDVInvokedUrlCommand*)command
 
         self.pdfDocument = [[PDFDocument alloc] initWithData:[self getBase64Data]];
 
-        self.pdfWebview = [[WKWebView alloc] initWithFrame: self.webView.bounds];
+        /* Get status bar height if visible */
+        UIStatusBarManager *manager = [UIApplication sharedApplication].windows.firstObject.windowScene.statusBarManager;
+        CGFloat height = 0;
+        if(!manager.statusBarHidden) {
+            height = manager.statusBarFrame.size.height;
+        }
+        
+        self.pdfWebview = [[WKWebView alloc] initWithFrame: CGRectMake(0, height, self.webView.bounds.size.width,self.webView.bounds.size.height - height)];
 
-        [self setToolbar];
+        UIToolbar *toolbar = [self setToolbar];
 
-        self.pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 50, self.pdfWebview.bounds.size.width, self.pdfWebview.bounds.size.height - 50)];
+        self.pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, toolbar.bounds.size.height, self.pdfWebview.bounds.size.width, self.pdfWebview.bounds.size.height - toolbar.bounds.size.height)];
         self.pdfView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
         self.pdfView.displayMode = [mode integerValue];
         self.pdfView.displayDirection = [direction  isEqual: @"vertical"] ? kPDFDisplayDirectionVertical : kPDFDisplayDirectionHorizontal;
@@ -156,7 +163,7 @@ -(UIColor *)colorWithHexString:(NSString *)str_HEX  alpha:(CGFloat)alpha_range{
     return  [UIColor colorWithRed:red/255.0 green:green/255.0 blue:blue/255.0 alpha:alpha_range];
 }
 
--(void)setToolbar {
+-(UIToolbar *)setToolbar {
 
     NSString* toolbarColour = [self.command.arguments objectAtIndex:5];
     NSString* doneBtnColour = [self.command.arguments objectAtIndex:6];
@@ -244,7 +251,8 @@ -(void)setToolbar {
    [toolbar setItems: items];
    [self.pdfWebview addSubview:toolbar];
    [self.pdfWebview bringSubviewToFront: toolbar];
-
+    
+    return toolbar;
 }
 
 -(NSString*)getPath {
@@ -351,7 +359,7 @@ -(void)shareFn:(UIButton* _Nullable)sender base64:(NSData *)data shareText:(NSSt
                 activityViewControntroller.popoverPresentationController.sourceView = sender;
                 activityViewControntroller.popoverPresentationController.sourceRect = sender.bounds;
             } else {
-                activityViewControntroller.popoverPresentationController.sourceView = self.webView;
+                activityViewControntroller.popoverPresentationController.sourceView = self.pdfWebview;
                 activityViewControntroller.popoverPresentationController.sourceRect = CGRectMake(self.pdfWebview.bounds.size.width/2, self.pdfWebview.bounds.size.height/4, 0, 0);
             }
 
@@ -472,6 +480,7 @@ -(void)drawSignBox:(NSString*)titleText annotationKey:(NSString*)fieldName {
         PKInkingTool* tool = [[PKInkingTool alloc] initWithInkType:PKInkTypePen color:UIColor.blackColor width:10];
 
         [self.canvas setTool:tool];
+        [self.canvas setAllowsFingerDrawing:YES];
 
         [self.signView addSubview:self.canvas];
         [self.signView bringSubviewToFront: self.canvas];