Create the PDFViewPage when asked to by react native. (#229)

nickwinder · web-flow · commit d541e0879883 · 2019-05-27T14:33:55.000-07:00
There was a lifetime issue when navigating back and forth between views. Now we create a view when react native wants to. The unloading is still handled in UWP.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.23.13",
+  "version": "1.23.14",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",
diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Catalog",
-  "version": "1.23.13",
+  "version": "1.23.14",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start"
diff --git a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs
@@ -39,6 +39,8 @@ public PDFViewPage()
                 // This is a work aronud to ensure that if the user navigates away from
                 // the Page and then back, a document will still be shown.
                 _fileToOpen = null;
+
+                args.Complete();
             };
 
             PDFView.OnDocumentOpened += (pdfView, document) =>
diff --git a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitModule.cs b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitModule.cs
@@ -22,12 +22,12 @@ namespace ReactNativePSPDFKit
     /// </summary>
     class PSPDFKitModule : ReactContextNativeModuleBase
     {
-        private readonly PDFViewPage _pdfViewPage;
+        private readonly PSPDFKitViewManger _viewManager;
         private string VERSION_KEY = "versionString";
 
-        public PSPDFKitModule(ReactContext reactContext, PDFViewPage pdfViewPage) : base(reactContext)
+        public PSPDFKitModule(ReactContext reactContext, PSPDFKitViewManger viewManager) : base(reactContext)
         {
-            _pdfViewPage = pdfViewPage;
+            _viewManager = viewManager;
         }
 
         /// <summary>
@@ -98,8 +98,14 @@ private static async Task<StorageFile> PickPDF()
         private async Task LoadFileAsync(StorageFile file)
         {
             if (file == null) return;
-
-            await _pdfViewPage.OpenFileAsync(file);
+            if(_viewManager.PdfViewPage != null)
+            {
+                await _viewManager.PdfViewPage.OpenFileAsync(file);
+            }
+            else
+            {
+                throw new Exception("PdfViewPage: is not ready or unavailable.");
+            }
         }
 
         /// <summary>
diff --git a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitPackage.cs b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitPackage.cs
@@ -12,6 +12,7 @@
 using ReactNative.UIManager;
 using System;
 using System.Collections.Generic;
+using Windows.UI.Xaml;
 
 namespace ReactNativePSPDFKit
 {
@@ -23,13 +24,14 @@ namespace ReactNativePSPDFKit
     /// </summary>
     public class PSPDFKitPackage : IReactPackage
     {
-        private readonly PSPDFKitViewManger _pspdfkitViewManger = new PSPDFKitViewManger();
+        private readonly PSPDFKitViewManger _pspdfkitViewManger;
 
         /// <summary>
         /// Creates a PSPDFKit package with the default settings.
         /// </summary>
         public PSPDFKitPackage()
         {
+            _pspdfkitViewManger = new PSPDFKitViewManger(null);
         }
 
         /// <summary>
@@ -38,7 +40,7 @@ public PSPDFKitPackage()
         /// </summary>
         public PSPDFKitPackage(Uri cssResource)
         {
-            _pspdfkitViewManger.PdfViewPage.Pdfview.Css = cssResource;
+            _pspdfkitViewManger = new PSPDFKitViewManger(cssResource);
         }
 
         /// <summary>
@@ -49,10 +51,20 @@ public PSPDFKitPackage(Uri cssResource)
         /// <returns>The list of native modules.</returns>
         public IReadOnlyList<INativeModule> CreateNativeModules(ReactContext reactContext)
         {
+            object pspdfkitLicense;
+            try
+            {
+                pspdfkitLicense = Application.Current.Resources["PSPDFKitLicense"];
+            }
+            catch (Exception)
+            {
+                throw new Exception("Please ensure you define PSPDFKitLicense. See https://github.com/PSPDFKit/react-native#running-catalog-project-2");
+            }
+
             return new List<INativeModule>
             {
-                new PSPDFKitModule(reactContext, _pspdfkitViewManger.PdfViewPage),
-                new LibraryModule(reactContext, _pspdfkitViewManger.PdfViewPage.Pdfview.License)
+                new PSPDFKitModule(reactContext, _pspdfkitViewManger),
+                new LibraryModule(reactContext, pspdfkitLicense as string)
             };
         }
 
diff --git a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitViewManager.cs b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PSPDFKitViewManager.cs
@@ -29,10 +29,21 @@ public class PSPDFKitViewManger : SimpleViewManager<PDFViewPage>
         private const int COMMAND_SET_TOOLBAR_ITEMS = 7;
         private const int COMMAND_REMOVE_ANNOTATION = 8;
 
-        internal readonly PDFViewPage PdfViewPage = new PDFViewPage();
+        private readonly Uri _cssResource = null;
+        internal PDFViewPage PdfViewPage;
+
+        public PSPDFKitViewManger(Uri cssResource)
+        {
+            _cssResource = cssResource;
+        }
 
         protected override PDFViewPage CreateViewInstance(ThemedReactContext reactContext)
         {
+            PdfViewPage = new PDFViewPage();
+            if(_cssResource != null)
+            {
+                PdfViewPage.Pdfview.Css = _cssResource;
+            }
             return PdfViewPage;
         }
 
@@ -93,28 +104,28 @@ public override async void ReceiveCommand(PDFViewPage view, int commandId, JArra
             switch (commandId)
             {
                 case COMMAND_ENTER_ANNOTATION_CREATION_MODE:
-                    await PdfViewPage.SetInteractionMode(args[0].Value<int>(), InteractionMode.Note);
+                    await view.SetInteractionMode(args[0].Value<int>(), InteractionMode.Note);
                     break;
                 case COMMAND_EXIT_CURRENTLY_ACTIVE_MODE:
-                    await PdfViewPage.SetInteractionMode(args[0].Value<int>(), InteractionMode.None);
+                    await view.SetInteractionMode(args[0].Value<int>(), InteractionMode.None);
                     break;
                 case COMMAND_SAVE_CURRENT_DOCUMENT:
-                    await PdfViewPage.ExportCurrentDocument(args[0].Value<int>());
+                    await view.ExportCurrentDocument(args[0].Value<int>());
                     break;
                 case COMMAND_GET_ANNOTATIONS:
-                    await PdfViewPage.GetAnnotations(args[0].Value<int>(), args[1].Value<int>());
+                    await view.GetAnnotations(args[0].Value<int>(), args[1].Value<int>());
                     break;
                 case COMMAND_ADD_ANNOTATION:
-                    await PdfViewPage.CreateAnnotation(args[0].Value<int>(), args[1].ToString());
+                    await view.CreateAnnotation(args[0].Value<int>(), args[1].ToString());
                     break;
                 case COMMAND_REMOVE_ANNOTATION:
-                    await PdfViewPage.RemoveAnnotation(args[0].Value<int>(), args[1].ToString());
+                    await view.RemoveAnnotation(args[0].Value<int>(), args[1].ToString());
                     break;
                 case COMMAND_GET_TOOLBAR_ITEMS:
-                    PdfViewPage.GetToolbarItems(args[0].Value<int>());
+                    view.GetToolbarItems(args[0].Value<int>());
                     break;
                 case COMMAND_SET_TOOLBAR_ITEMS:
-                    await PdfViewPage.SetToolbarItems(args[0].Value<int>(), args[1].ToString());
+                    await view.SetToolbarItems(args[0].Value<int>(), args[1].ToString());
                     break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-pspdfkit",`
`3`		`- "version": "1.23.13",`
	`3`	`+ "version": "1.23.14",`
`4`	`4`	`"description": "A React Native module for the PSPDFKit library.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react native",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Catalog",`
`3`		`- "version": "1.23.13",`
	`3`	`+ "version": "1.23.14",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "node node_modules/react-native/local-cli/cli.js start"`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ namespace ReactNativePSPDFKit`
`22`	`22`	`/// </summary>`
`23`	`23`	`class PSPDFKitModule : ReactContextNativeModuleBase`
`24`	`24`	`{`
`25`		`- private readonly PDFViewPage _pdfViewPage;`
	`25`	`+ private readonly PSPDFKitViewManger _viewManager;`
`26`	`26`	`private string VERSION_KEY = "versionString";`
`27`	`27`
`28`		`- public PSPDFKitModule(ReactContext reactContext, PDFViewPage pdfViewPage) : base(reactContext)`
	`28`	`+ public PSPDFKitModule(ReactContext reactContext, PSPDFKitViewManger viewManager) : base(reactContext)`
`29`	`29`	`{`
`30`		`- _pdfViewPage = pdfViewPage;`
	`30`	`+ _viewManager = viewManager;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/// <summary>`
`@@ -98,8 +98,14 @@ private static async Task<StorageFile> PickPDF()`
`98`	`98`	`private async Task LoadFileAsync(StorageFile file)`
`99`	`99`	`{`
`100`	`100`	`if (file == null) return;`
`101`		`-`
`102`		`- await _pdfViewPage.OpenFileAsync(file);`
	`101`	`+ if(_viewManager.PdfViewPage != null)`
	`102`	`+ {`
	`103`	`+ await _viewManager.PdfViewPage.OpenFileAsync(file);`
	`104`	`+ }`
	`105`	`+ else`
	`106`	`+ {`
	`107`	`+ throw new Exception("PdfViewPage: is not ready or unavailable.");`
	`108`	`+ }`
`103`	`109`	`}`
`104`	`110`
`105`	`111`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using ReactNative.UIManager;`
`13`	`13`	`using System;`
`14`	`14`	`using System.Collections.Generic;`
	`15`	`+using Windows.UI.Xaml;`
`15`	`16`
`16`	`17`	`namespace ReactNativePSPDFKit`
`17`	`18`	`{`
`@@ -23,13 +24,14 @@ namespace ReactNativePSPDFKit`
`23`	`24`	`/// </summary>`
`24`	`25`	`public class PSPDFKitPackage : IReactPackage`
`25`	`26`	`{`
`26`		`- private readonly PSPDFKitViewManger _pspdfkitViewManger = new PSPDFKitViewManger();`
	`27`	`+ private readonly PSPDFKitViewManger _pspdfkitViewManger;`
`27`	`28`
`28`	`29`	`/// <summary>`
`29`	`30`	`/// Creates a PSPDFKit package with the default settings.`
`30`	`31`	`/// </summary>`
`31`	`32`	`public PSPDFKitPackage()`
`32`	`33`	`{`
	`34`	`+ _pspdfkitViewManger = new PSPDFKitViewManger(null);`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`/// <summary>`
`@@ -38,7 +40,7 @@ public PSPDFKitPackage()`
`38`	`40`	`/// </summary>`
`39`	`41`	`public PSPDFKitPackage(Uri cssResource)`
`40`	`42`	`{`
`41`		`- _pspdfkitViewManger.PdfViewPage.Pdfview.Css = cssResource;`
	`43`	`+ _pspdfkitViewManger = new PSPDFKitViewManger(cssResource);`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`/// <summary>`
`@@ -49,10 +51,20 @@ public PSPDFKitPackage(Uri cssResource)`
`49`	`51`	`/// <returns>The list of native modules.</returns>`
`50`	`52`	`public IReadOnlyList<INativeModule> CreateNativeModules(ReactContext reactContext)`
`51`	`53`	`{`
	`54`	`+ object pspdfkitLicense;`
	`55`	`+ try`
	`56`	`+ {`
	`57`	`+ pspdfkitLicense = Application.Current.Resources["PSPDFKitLicense"];`
	`58`	`+ }`
	`59`	`+ catch (Exception)`
	`60`	`+ {`
	`61`	`+ throw new Exception("Please ensure you define PSPDFKitLicense. See https://github.com/PSPDFKit/react-native#running-catalog-project-2");`
	`62`	`+ }`
	`63`	`+`
`52`	`64`	`return new List<INativeModule>`
`53`	`65`	`{`
`54`		`- new PSPDFKitModule(reactContext, _pspdfkitViewManger.PdfViewPage),`
`55`		`- new LibraryModule(reactContext, _pspdfkitViewManger.PdfViewPage.Pdfview.License)`
	`66`	`+ new PSPDFKitModule(reactContext, _pspdfkitViewManger),`
	`67`	`+ new LibraryModule(reactContext, pspdfkitLicense as string)`
`56`	`68`	`};`
`57`	`69`	`}`
`58`	`70`