Merge pull request #244 from PSPDFKit/reinhard/path-fix

Reinhard Hafenscher · web-flow · commit 7ca348c38efb · 2019-07-11T11:00:25.000+02:00
Fix for PdfView not being rendered
diff --git a/android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java b/android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java
@@ -16,6 +16,7 @@
 import com.pspdfkit.react.events.PdfViewAnnotationChangedEvent;
 import com.pspdfkit.react.events.PdfViewAnnotationTappedEvent;
 import com.pspdfkit.react.events.PdfViewDataReturnedEvent;
+import com.pspdfkit.react.events.PdfViewDocumentLoadFailedEvent;
 import com.pspdfkit.react.events.PdfViewDocumentSaveFailedEvent;
 import com.pspdfkit.react.events.PdfViewDocumentSavedEvent;
 import com.pspdfkit.react.events.PdfViewStateChangedEvent;
@@ -75,7 +76,7 @@ protected PdfView createViewInstance(ThemedReactContext reactContext) {
 
     @Override
     public void onDropViewInstance(PdfView view) {
-        view.removeFragment();
+        view.removeFragment(true);
     }
 
     @Nullable
@@ -148,11 +149,13 @@ public void setMenuItemGrouping(PdfView view, @NonNull ReadableArray menuItemGro
     @Override
     public Map getExportedCustomDirectEventTypeConstants() {
         return MapBuilder.of(PdfViewStateChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onStateChanged"),
-                PdfViewDocumentSavedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDocumentSaved"),
-                PdfViewAnnotationTappedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onAnnotationTapped"),
-                PdfViewAnnotationChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onAnnotationsChanged"),
-                PdfViewDataReturnedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDataReturned"),
-                PdfViewDocumentSaveFailedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDocumentSaveFailed"));
+            PdfViewDocumentSavedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDocumentSaved"),
+            PdfViewAnnotationTappedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onAnnotationTapped"),
+            PdfViewAnnotationChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onAnnotationsChanged"),
+            PdfViewDataReturnedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDataReturned"),
+            PdfViewDocumentSaveFailedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDocumentSaveFailed"),
+            PdfViewDocumentLoadFailedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onDocumentLoadFailed")
+        );
     }
 
     @Override
diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentLoadFailedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentLoadFailedEvent.java
@@ -0,0 +1,36 @@
+package com.pspdfkit.react.events;
+
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+
+/**
+ * Event sent by the {@link com.pspdfkit.views.PdfView} when the document load failed.
+ */
+public class PdfViewDocumentLoadFailedEvent extends Event<PdfViewDocumentLoadFailedEvent> {
+
+    public static final String EVENT_NAME = "pdfViewDocumentLoadFailed";
+
+    private final String error;
+
+    public PdfViewDocumentLoadFailedEvent(@IdRes int viewId, @NonNull String error) {
+        super(viewId);
+        this.error = error;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public void dispatch(RCTEventEmitter rctEventEmitter) {
+        WritableMap eventData = Arguments.createMap();
+        eventData.putString("error", error);
+        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+    }
+}
diff --git a/android/src/main/java/com/pspdfkit/views/PdfView.java b/android/src/main/java/com/pspdfkit/views/PdfView.java
@@ -31,6 +31,7 @@
 import com.pspdfkit.listeners.SimpleDocumentListener;
 import com.pspdfkit.react.R;
 import com.pspdfkit.react.events.PdfViewDataReturnedEvent;
+import com.pspdfkit.react.events.PdfViewDocumentLoadFailedEvent;
 import com.pspdfkit.react.events.PdfViewDocumentSaveFailedEvent;
 import com.pspdfkit.react.events.PdfViewDocumentSavedEvent;
 import com.pspdfkit.react.events.PdfViewStateChangedEvent;
@@ -49,6 +50,7 @@
 import org.json.JSONObject;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -151,6 +153,9 @@ public void doFrame(long frameTimeNanos) {
                 }
             }
         });
+
+        // Set a default configuration.
+        configuration = new PdfActivityConfiguration.Builder(getContext()).build();
     }
 
     public void inject(FragmentManager fragmentManager, EventDispatcher eventDispatcher) {
@@ -170,9 +175,20 @@ public void setConfiguration(PdfActivityConfiguration configuration) {
         setupFragment();
     }
 
-    public void setDocument(String document) {
+    public void setDocument(@Nullable String document) {
+        if (document == null) {
+            removeFragment(false);
+            return;
+        }
+
         if (Uri.parse(document).getScheme() == null) {
-            document = FILE_SCHEME + document;
+            // If there is no scheme it might be a raw path.
+            try {
+                File file = new File(document);
+                document = Uri.fromFile(file).toString();
+            } catch (Exception e) {
+                document = FILE_SCHEME + document;
+            }
         }
         if (documentOpeningDisposable != null) {
             documentOpeningDisposable.dispose();
@@ -188,6 +204,14 @@ public void accept(PdfDocument pdfDocument) throws Exception {
                         PdfView.this.document = pdfDocument;
                         setupFragment();
                     }
+
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        PdfView.this.document = null;
+                        setupFragment();
+                        eventDispatcher.dispatchEvent(new PdfViewDocumentLoadFailedEvent(getId(), throwable.getMessage()));
+                    }
                 });
     }
 
@@ -301,16 +325,19 @@ public void onPageChanged(@NonNull PdfThumbnailBarController pdfThumbnailBarCont
         });
     }
 
-    public void removeFragment() {
+    public void removeFragment(boolean makeInactive) {
         PdfFragment pdfFragment = (PdfFragment) fragmentManager.findFragmentByTag(fragmentTag);
         if (pdfFragment != null) {
             fragmentManager.beginTransaction()
                     .remove(pdfFragment)
                     .commitAllowingStateLoss();
         }
-        isActive = false;
+        if (makeInactive) {
+            isActive = false;
+        }
 
         fragment = null;
+        document = null;
         fragmentGetter.onComplete();
         fragmentGetter = BehaviorSubject.create();
         pendingFragmentActions.dispose();
@@ -319,6 +346,7 @@ public void removeFragment() {
             textSelectionPopupToolbar.dismiss();
             textSelectionPopupToolbar = null;
         }
+        pdfThumbnailBar.setVisibility(View.GONE);
     }
 
     void manuallyLayoutChildren() {
diff --git a/index.js b/index.js
@@ -35,6 +35,7 @@ class PSPDFKitView extends React.Component {
           onStateChanged={this._onStateChanged}
           onDocumentSaved={this._onDocumentSaved}
           onDocumentSaveFailed={this._onDocumentSaveFailed}
+          onDocumentLoadFailed={this._onDocumentLoadFailed}
           onAnnotationTapped={this._onAnnotationTapped}
           onAnnotationsChanged={this._onAnnotationsChanged}
           onDataReturned={this._onDataReturned}
@@ -63,6 +64,12 @@ class PSPDFKitView extends React.Component {
     }
   };
 
+  _onDocumentLoadFailed = event => {
+    if (this.props.onDocumentLoadFailed) {
+      this.props.onDocumentLoadFailed(event.nativeEvent);
+    }
+  };
+
   _onAnnotationTapped = event => {
     if (this.props.onAnnotationTapped) {
       this.props.onAnnotationTapped(event.nativeEvent);
diff --git a/ios/RCTPSPDFKit/RCTPSPDFKitView.h b/ios/RCTPSPDFKit/RCTPSPDFKitView.h
@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTBubblingEventBlock onCloseButtonPressed;
 @property (nonatomic, copy) RCTBubblingEventBlock onDocumentSaved;
 @property (nonatomic, copy) RCTBubblingEventBlock onDocumentSaveFailed;
+@property (nonatomic, copy) RCTBubblingEventBlock onDocumentLoadFailed;
 @property (nonatomic, copy) RCTBubblingEventBlock onAnnotationTapped;
 @property (nonatomic, copy) RCTBubblingEventBlock onAnnotationsChanged;
 @property (nonatomic, copy) RCTBubblingEventBlock onStateChanged;
diff --git a/ios/RCTPSPDFKit/RCTPSPDFKitView.m b/ios/RCTPSPDFKit/RCTPSPDFKitView.m
@@ -13,7 +13,7 @@
 #import "RCTConvert+PSPDFViewMode.h"
 #import "RCTConvert+UIBarButtonItem.h"
 
-#define VALIDATE_DOCUMENT(document, ...) { if (!document.isValid) { NSLog(@"Document is invalid."); return __VA_ARGS__; }}
+#define VALIDATE_DOCUMENT(document, ...) { if (!document.isValid) { NSLog(@"Document is invalid."); if (self.onDocumentLoadFailed) { self.onDocumentLoadFailed(@{@"error": @"Document is invalid."}); } return __VA_ARGS__; }}
 
 @interface RCTPSPDFKitView ()<PSPDFDocumentDelegate, PSPDFViewControllerDelegate, PSPDFFlexibleToolbarContainerDelegate>
 
@@ -160,6 +160,10 @@ - (void)pdfViewController:(PSPDFViewController *)pdfController willBeginDisplayi
   [self onStateChangedForPDFViewController:pdfController pageView:pageView pageAtIndex:pageIndex];
 }
 
+- (void)pdfViewController:(PSPDFViewController *)pdfController didChangeDocument:(nullable PSPDFDocument *)document {
+    VALIDATE_DOCUMENT(document)
+}
+
 #pragma mark - PSPDFFlexibleToolbarContainerDelegate
 
 - (void)flexibleToolbarContainerDidShow:(PSPDFFlexibleToolbarContainer *)container {
diff --git a/ios/RCTPSPDFKit/RCTPSPDFKitViewManager.m b/ios/RCTPSPDFKit/RCTPSPDFKitViewManager.m
@@ -93,6 +93,8 @@ @implementation RCTPSPDFKitViewManager
 
 RCT_EXPORT_VIEW_PROPERTY(onDocumentSaveFailed, RCTBubblingEventBlock)
 
+RCT_EXPORT_VIEW_PROPERTY(onDocumentLoadFailed, RCTBubblingEventBlock)
+
 RCT_EXPORT_VIEW_PROPERTY(onAnnotationTapped, RCTBubblingEventBlock)
 
 RCT_EXPORT_VIEW_PROPERTY(onAnnotationsChanged, RCTBubblingEventBlock)
