Release 2.16.1

Author: PSPDFKit

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.16.1 - 27 Mar 2025
+
+- Adds support for React Native 0.78. (J#HYB-737)
+- Fixes an issue where a crash could occur during `onAnnotationChanged` event callbacks on Android. (J#HYB-738)
+
 ## 2.16.0 - 26 Feb 2025
 
 - Adds the ability to merge entire PDF documents using the `generatePDFFromDocuments` Processor API. (J#HYB-579)

android/.settings/org.eclipse.buildship.core.prefs

@@ -26,6 +26,7 @@
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.pspdfkit.annotations.AnnotationType;
@@ -100,7 +101,7 @@ protected PdfView createViewInstance(ThemedReactContext reactContext) {
             FragmentActivity fragmentActivity = (FragmentActivity) reactContext.getCurrentActivity();
             PdfView pdfView = new PdfView(reactContext);
             pdfView.inject(fragmentActivity.getSupportFragmentManager(),
-                    reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher());
+                    UIManagerHelper.getEventDispatcher(reactContext, pdfView.getId()));
             return pdfView;
         } else {
             throw new IllegalStateException("ReactPSPDFKitView can only be used in FragmentActivity subclasses.");

android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java

@@ -91,7 +91,14 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
 
             WritableMap eventData = Arguments.makeNativeMap(map);
             rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
-        } catch (JSONException e) {
+        } catch (Exception e) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("change", eventType);
+            List<Map<String, Object>> annotations = new ArrayList<>();
+            map.put("annotations", annotations);
+            WritableMap eventData = Arguments.makeNativeMap(map);
+            rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+ 
             e.printStackTrace();
         }
     }

android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationChangedEvent.java

@@ -67,7 +67,7 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
                 WritableMap eventData = Arguments.makeNativeMap(map);
                 rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationTappedEvent.java

@@ -22,7 +22,8 @@ class MenuItemListener: MenuItem.OnMenuItemClickListener {
     override fun onMenuItemClick(menuItem: MenuItem): Boolean {
         val resourceName: String? = context?.resources?.getResourceEntryName(menuItem.itemId)
         if (resourceName != null) {
-            eventDispatcher!!.dispatchEvent(parent?.let { CustomToolbarButtonTappedEvent(it.id, resourceName) })
+            parent?.let { CustomToolbarButtonTappedEvent(it.id, resourceName) }
+                ?.let { eventDispatcher!!.dispatchEvent(it) }
         }
         return false
     }

android/src/main/java/com/pspdfkit/views/MenuItemListener.kt

@@ -28,7 +28,8 @@ class ToolbarMenuItemListener: ContextualToolbar.OnMenuItemClickListener {
         if (this.resourceIds.contains(menuItem.id)) {
             val resourceName: String? = context?.resources?.getResourceEntryName(menuItem.id)
             if (resourceName != null) {
-                eventDispatcher!!.dispatchEvent(parent?.let { CustomAnnotationContextualMenuItemTappedEvent(it.id, resourceName) })
+                parent?.let { CustomAnnotationContextualMenuItemTappedEvent(it.id, resourceName) }
+                    ?.let { eventDispatcher!!.dispatchEvent(it) }
             }
             return true
         }

android/src/main/java/com/pspdfkit/views/ToolbarMenuItemListener.kt

@@ -34,6 +34,10 @@ import {
  *    />
  */
 class PSPDFKitView extends React.Component {
+  /**
+   * @ignore
+   */
+  refs;
   /**
    * @ignore
    */

index.js

@@ -35,14 +35,18 @@ @implementation RCTPSPDFKitManager
 RCT_EXPORT_MODULE(PSPDFKit)
 
 RCT_REMAP_METHOD(setLicenseKey, setLicenseKey:(nullable NSString *)licenseKey resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  [PSPDFKitGlobal setLicenseKey:licenseKey options:@{PSPDFSettingKeyHybridEnvironment: @"ReactNative"}];
+  if (![licenseKey isEqual:[NSNull null]]) {
+    [PSPDFKitGlobal setLicenseKey:licenseKey options:@{PSPDFSettingKeyHybridEnvironment: @"ReactNative"}];
+  }
   resolve(@(YES));
 }
 
 RCT_REMAP_METHOD(setLicenseKeys, setLicenseKeys:(nullable NSString *)androidLicenseKey iOSLicenseKey:(nullable NSString *)iOSLicenseKey resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
   // Here, we ignore the `androidLicenseKey` parameter and only care about `iOSLicenseKey`.
   // `androidLicenseKey` will be used to activate the license on Android.
-  [PSPDFKitGlobal setLicenseKey:iOSLicenseKey options:@{PSPDFSettingKeyHybridEnvironment: @"ReactNative"}];
+  if (![iOSLicenseKey isEqual:[NSNull null]]) {
+    [PSPDFKitGlobal setLicenseKey:iOSLicenseKey options:@{PSPDFSettingKeyHybridEnvironment: @"ReactNative"}];
+  }
   resolve(@(YES));
 }
 

ios/RCTPSPDFKit/RCTPSPDFKitManager.m

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "description": "Nutrient React Native SDK",
   "keywords": [
     "react native",
@@ -31,7 +31,7 @@
     "dev-build": "npm run build-and-generate-types && npm run docs && npm run copy-types-and-lib"
   },
   "peerDependencies": {
-    "@types/react": "^18.2.28",
+    "@types/react": ">=17.0.0",
     "prop-types": "^15.8.1",
     "react": ">=17.0.0",
     "react-native": ">=0.66.0"