Release 2.4.1

PSPDFKit · Nov 22, 2022 · 7e91b82 · 7e91b82
1 parent b20a3c8
commit 7e91b82
Show file tree

Hide file tree

Showing 34 changed files with 871 additions and 1,163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,18 @@
 ## Newest Release
 
+### 2.4.1 - 22 Nov 2022
+- Updates for PSPDFKit 12.0.1 for iOS.
+- Fixes Catalog example toolbar menu items not rendering. (#37368)
+- Fixes the Annotation Processing Catalog example. (#37534)
+
+## Previous Releases
+
 ### 2.4.0 - 25 Oct 2022
 
 - Adds PDF generation from HTML, images and template. (#36736)
 - Updates for PSPDFKit 8.4.1 for Android 
 - Updates for PSPDFKit 12.0 for iOS
 
-## Previous Releases
-
 ### 2.3.1 - 22 Jul 2022
 
 - Updates for PSPDFKit 8.2.1 for Android. (#34430)
@@ -23,7 +28,7 @@
 
 ### 2.2.2 - 15 Mar 2022
 
-- Adds image support to `PSKDFKit.present()` on Android. (#33312)
+- Adds image support to `PSPDFKit.present()` on Android. (#33312)
 - Adds a new **Save As** example to the Catalog example project. (#33376)
 - Updates for PSPDFKit 11.3.0 for iOS. (#33485)
 - Fixes React Native Annotation Processor API for Android. (#33189, #33302)

diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "2.4.0",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "React Native PDF Library by PSPDFKit",
   "keywords": [
     "react native",

diff --git a/samples/Catalog/Catalog.js b/samples/Catalog/Catalog.js
@@ -9,7 +9,7 @@
 // Imports
 import React, { Component } from 'react';
 import { NavigationContainer } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { createStackNavigator } from '@react-navigation/stack';
 
 import { PSPDFKitViewComponent } from './examples/PSPDFKitViewComponent';
 import { OpenImageDocument } from './examples/OpenImageDocument';
@@ -44,7 +44,7 @@ class Catalog extends Component {
   };
 
   render() {
-    const Stack = createNativeStackNavigator();
+    const Stack = createStackNavigator();
 
     return (
       <NavigationContainer>

diff --git a/samples/Catalog/android/build.gradle b/samples/Catalog/android/build.gradle
@@ -6,20 +6,32 @@ buildscript {
         compileSdkVersion = 31
         targetSdkVersion = 30
         ndkVersion = "20.1.5948944"
+        kotlin_version = '1.6.10' // <- add this line
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath("com.android.tools.build:gradle:7.1.1")
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // <- add this line
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
+        exclusiveContent {
+           filter {
+               includeGroup "com.facebook.react"
+           }
+           forRepository {
+               maven {
+                   url "$rootDir/../node_modules/react-native/android"
+               }
+           }
+        }
         mavenLocal()
         mavenCentral()
         maven {

diff --git a/samples/Catalog/examples/AnnotationProcessing.js b/samples/Catalog/examples/AnnotationProcessing.js
@@ -17,17 +17,7 @@ export class AnnotationProcessing extends BaseExampleAutoHidingHeaderComponent {
     super(props);
     const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
     hideToolbar(navigation);
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {
@@ -59,7 +49,7 @@ export class AnnotationProcessing extends BaseExampleAutoHidingHeaderComponent {
                     })
                     // First, save all annotations in the current document.
                     .then(() => {
-                      this.refs.pdfView
+                      this.pdfRef.current
                         .saveCurrentDocument()
                         .then(saved => {
                           // Then, embed all the annotations
@@ -104,7 +94,7 @@ export class AnnotationProcessing extends BaseExampleAutoHidingHeaderComponent {
                     })
                     .then(() => {
                       // First, save all annotations in the current document.
-                      this.refs.pdfView
+                      this.pdfRef.current
                         .saveCurrentDocument()
                         .then(saved => {
                           // Then, flatten all the annotations
@@ -151,7 +141,7 @@ export class AnnotationProcessing extends BaseExampleAutoHidingHeaderComponent {
                     })
                     .then(() => {
                       // First, save all annotations in the current document.
-                      this.refs.pdfView
+                      this.pdfRef.current
                         .saveCurrentDocument()
                         .then(saved => {
                           // Then, remove all the annotations
@@ -196,7 +186,7 @@ export class AnnotationProcessing extends BaseExampleAutoHidingHeaderComponent {
                     })
                     .then(() => {
                       // First, save all annotations in the current document.
-                      this.refs.pdfView
+                      this.pdfRef.current
                         .saveCurrentDocument()
                         .then(success => {
                           // Then, print all the annotations

diff --git a/samples/Catalog/examples/CustomFontPicker.js b/samples/Catalog/examples/CustomFontPicker.js
@@ -14,15 +14,6 @@ export class CustomFontPicker extends BaseExampleAutoHidingHeaderComponent {
     this.pdfRef = React.createRef();
 
     hideToolbar(navigation);
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/EventListeners.js b/samples/Catalog/examples/EventListeners.js
@@ -14,16 +14,8 @@ export class EventListeners extends BaseExampleAutoHidingHeaderComponent {
     this.pdfRef = React.createRef();
 
     hideToolbar(navigation);
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
   }
 
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
-  }
   render() {
     return (
       <View style={styles.flex}>

diff --git a/samples/Catalog/examples/GeneratePDF.js b/samples/Catalog/examples/GeneratePDF.js
@@ -3,24 +3,13 @@ import { BaseExampleAutoHidingHeaderComponent } from '../helpers/BaseExampleAuto
 import { processColor, View } from 'react-native';
 import PSPDFKitView from 'react-native-pspdfkit';
 import { pspdfkitColor } from '../configuration/Constants';
-import { hideToolbar } from '../helpers/NavigationHelper';
 
 export class GeneratePDF extends BaseExampleAutoHidingHeaderComponent {
   pdfRef = null;
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/HiddenToolbar.js b/samples/Catalog/examples/HiddenToolbar.js
@@ -35,17 +35,8 @@ export class HiddenToolbar extends Component {
     };
   }
 
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
-  }
-
   componentDidMount() {
     const { navigation } = this.props;
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-
     navigation.setOptions({
       handleAnnotationButtonPress: () => {
         if (

diff --git a/samples/Catalog/examples/ManualSave.js b/samples/Catalog/examples/ManualSave.js
@@ -12,17 +12,7 @@ export class ManualSave extends BaseExampleAutoHidingHeaderComponent {
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/OpenImageDocument.js b/samples/Catalog/examples/OpenImageDocument.js
@@ -14,16 +14,8 @@ export class OpenImageDocument extends BaseExampleAutoHidingHeaderComponent {
     this.pdfRef = React.createRef();
 
     hideToolbar(navigation);
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
   }
 
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
-  }
   render() {
     return (
       <View style={styles.flex}>

diff --git a/samples/Catalog/examples/PSPDFKitViewComponent.js b/samples/Catalog/examples/PSPDFKitViewComponent.js
@@ -14,15 +14,6 @@ export class PSPDFKitViewComponent extends BaseExampleAutoHidingHeaderComponent
     this.pdfRef = React.createRef();
 
     hideToolbar(navigation);
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/ProgrammaticAnnotations.js b/samples/Catalog/examples/ProgrammaticAnnotations.js
@@ -18,18 +18,7 @@ export class ProgrammaticAnnotations extends BaseExampleAutoHidingHeaderComponen
     };
   }
 
-  pdfRef = null;
-  componentDidMount() {
-    const { navigation } = this.props;
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
-  }
+  // pdfRef = null;
 
   render() {
     return (

diff --git a/samples/Catalog/examples/ProgrammaticFormFilling.js b/samples/Catalog/examples/ProgrammaticFormFilling.js
@@ -8,18 +8,9 @@ export class ProgrammaticFormFilling extends BaseExampleAutoHidingHeaderComponen
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
   }
 
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
-  }
   render() {
     return (
       <View style={styles.flex}>

diff --git a/samples/Catalog/examples/SaveAs.js b/samples/Catalog/examples/SaveAs.js
@@ -14,17 +14,7 @@ export class SaveAs extends BaseExampleAutoHidingHeaderComponent {
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/SplitPDF.js b/samples/Catalog/examples/SplitPDF.js
@@ -16,16 +16,6 @@ export class SplitPDF extends BaseExampleAutoHidingHeaderComponent {
     super(props);
     this.state = { dimensions: undefined };
     this.pdfRef2 = React.createRef();
-    const { navigation } = this.props;
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef1?.current?.destroyView();
-      this.pdfRef2?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {

diff --git a/samples/Catalog/examples/StateChange.js b/samples/Catalog/examples/StateChange.js
@@ -9,23 +9,13 @@ export class StateChange extends BaseExampleAutoHidingHeaderComponent {
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
     this.state = {
       currentPageIndex: 0,
       pageCount: 0,
       annotationCreationActive: false,
       annotationEditingActive: false,
     };
-
-    navigation.addListener('beforeRemove', e => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {
@@ -55,6 +45,10 @@ export class StateChange extends BaseExampleAutoHidingHeaderComponent {
           pageIndex={this.state.currentPageIndex}
           style={styles.pdfColor}
           onStateChanged={event => {
+            if (event.currentPageIndex !== this.state.currentPageIndex) {
+              return;
+            }
+
             this.setState({
               annotationCreationActive: event.annotationCreationActive,
               annotationEditingActive: event.annotationEditingActive,

diff --git a/samples/Catalog/examples/ToolbarCustomization.js b/samples/Catalog/examples/ToolbarCustomization.js
@@ -9,17 +9,7 @@ export class ToolbarCustomization extends BaseExampleAutoHidingHeaderComponent {
 
   constructor(props) {
     super(props);
-    const { navigation } = this.props;
     this.pdfRef = React.createRef();
-
-    navigation.addListener('beforeRemove', () => {
-      this.pdfRef?.current?.destroyView();
-    });
-  }
-
-  componentWillUnmount() {
-    const { navigation } = this.props;
-    navigation.removeListener('beforeRemove');
   }
 
   render() {