Release 4.2.0

Author: pspdfkit-ci

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.2.0 — 11 Feb 2026
+
+- Removes the deprecated Annotation APIs from the `NutrientView` namespace, since they are available on `PDFDocument`. (J#HYB-945)
+- Adds the `enterContentEditingMode` API to `NutrientView` to enter content editing mode programmatically. (J#HYB-943)
+- Adds the `CONTENT_EDITING_BUTTON_ITEM` option to the list of available Toolbar buttons. (J#HYB-943)
+- Updates for Nutrient Android SDK 11.0.0.
+
 ## 4.1.0 — 30 Jan 2026
 
 - Adds the `updateAnnotations` API to `PDFDocument` to update existing annotation properties. (J#HYB-828)

__tests__/pdfdocument.test.ts

@@ -6,7 +6,12 @@ jest.mock('react-native', () => {
   };
 });
 
+jest.mock('../src/ArchitectureDetector', () => ({
+  isNewArchitectureEnabled: jest.fn(),
+}));
+
 import { PDFDocument } from '../src/document/PDFDocument';
+import { isNewArchitectureEnabled } from '../src/ArchitectureDetector';
 import { NativeModules, findNodeHandle } from 'react-native';
 import {
   ButtonFormElement,
@@ -28,16 +33,27 @@ describe('PDFDocument JS helpers', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     (findNodeHandle as jest.Mock).mockReturnValue(999);
+    (isNewArchitectureEnabled as jest.Mock).mockReturnValue(false);
   });
 
-  test('getRef returns numeric reference when findNodeHandle returns null (Fabric fallback)', () => {
+  test('getRef returns numeric reference on Fabric (pdfViewRef is component id)', () => {
+    (isNewArchitectureEnabled as jest.Mock).mockReturnValue(true);
     (findNodeHandle as jest.Mock).mockReturnValue(null);
     const doc = new PDFDocument(1234);
     // @ts-ignore access private
     const ref = (doc as any).getRef();
     expect(ref).toBe(1234);
   });
 
+  test('getRef returns null on Paper when findNodeHandle returns null (no fallback)', () => {
+    (isNewArchitectureEnabled as jest.Mock).mockReturnValue(false);
+    (findNodeHandle as jest.Mock).mockReturnValue(null);
+    const doc = new PDFDocument(1234);
+    // @ts-ignore access private
+    const ref = (doc as any).getRef();
+    expect(ref).toBeNull();
+  });
+
   test('setPageIndex rejects out of bounds', async () => {
     const doc = new PDFDocument(5);
     (NativeModules.PDFDocumentManager.getPageCount as jest.Mock).mockResolvedValueOnce(3);

android/build.gradle

@@ -15,7 +15,7 @@
  *   Contains gradle configuration constants
  */
 ext {
-    NUTRIENT_VERSION = '10.10.1'
+    NUTRIENT_VERSION = '11.0.0'
 }
 
 buildscript {
@@ -146,6 +146,9 @@ dependencies {
 
     implementation "androidx.recyclerview:recyclerview:1.4.0"
 
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.7.3"
+
     // Explicitly declare Compose Foundation to ensure version 1.9.4 (matches PSPDFKit SDK)
     implementation "androidx.compose.foundation:foundation:1.9.4"
 

android/src/main/java/com/pspdfkit/react/PDFDocumentModule.kt

@@ -65,31 +65,19 @@ public class ReactPdfViewManager extends ViewGroupManager<PdfView> {
 
     public static final int COMMAND_ENTER_ANNOTATION_CREATION_MODE = 1;
     public static final int COMMAND_EXIT_CURRENTLY_ACTIVE_MODE = 2;
-    public static final int COMMAND_SAVE_CURRENT_DOCUMENT = 3;
-    public static final int COMMAND_GET_ANNOTATIONS = 4;
-    public static final int COMMAND_ADD_ANNOTATION = 5;
-    public static final int COMMAND_GET_ALL_UNSAVED_ANNOTATIONS = 6;
-    public static final int COMMAND_ADD_ANNOTATIONS = 7;
-    public static final int COMMAND_GET_FORM_FIELD_VALUE = 8;
-    public static final int COMMAND_SET_FORM_FIELD_VALUE = 9;
-    public static final int COMMAND_GET_ALL_ANNOTATIONS = 11;
-    public static final int COMMAND_REMOVE_ANNOTATION = 10;
-    public static final int COMMAND_REMOVE_FRAGMENT = 12;
-    public static final int COMMAND_SET_TOOLBAR_MENU_ITEMS = 13;
-    public static final int COMMAND_REMOVE_ANNOTATIONS = 14;
-    public static final int COMMAND_GET_CONFIGURATION = 18;
-    public static final int COMMAND_SET_TOOLBAR = 19;
-    public static final int COMMAND_SET_MEASUREMENT_VALUE_CONFIGURATIONS = 21;
-    public static final int COMMAND_GET_MEASUREMENT_VALUE_CONFIGURATIONS = 22;
-    public static final int COMMAND_IMPORT_XFDF = 23;
-    public static final int COMMAND_EXPORT_XFDF = 24;
-    public static final int COMMAND_SET_ANNOTATION_FLAGS = 25;
-    public static final int COMMAND_GET_ANNOTATION_FLAGS = 26;
-    public static final int COMMAND_CLEAR_SELECTED_ANNOTATIONS = 27;
-    public static final int COMMAND_SELECT_ANNOTATIONS = 28;
-    public static final int COMMAND_SET_PAGE_INDEX = 29;
-    public static final int COMMAND_SET_EXCLUDED_ANNOTATIONS = 30;
-    public static final int COMMAND_SET_USER_INTERFACE_VISIBLE = 31;
+    public static final int COMMAND_ENTER_CONTENT_EDITING_MODE = 3;
+    public static final int COMMAND_SAVE_CURRENT_DOCUMENT = 4;
+    public static final int COMMAND_GET_FORM_FIELD_VALUE = 5;
+    public static final int COMMAND_SET_FORM_FIELD_VALUE = 6;
+    public static final int COMMAND_REMOVE_FRAGMENT = 7;
+    public static final int COMMAND_SET_TOOLBAR_MENU_ITEMS = 8;
+    public static final int COMMAND_GET_CONFIGURATION = 9;
+    public static final int COMMAND_SET_TOOLBAR = 10;
+    public static final int COMMAND_SET_MEASUREMENT_VALUE_CONFIGURATIONS = 11;
+    public static final int COMMAND_GET_MEASUREMENT_VALUE_CONFIGURATIONS = 12;
+    public static final int COMMAND_SET_PAGE_INDEX = 13;
+    public static final int COMMAND_SET_EXCLUDED_ANNOTATIONS = 14;
+    public static final int COMMAND_SET_USER_INTERFACE_VISIBLE = 15;
 
     private final CompositeDisposable annotationDisposables = new CompositeDisposable();
 
@@ -129,28 +117,16 @@ public Map<String, Integer> getCommandsMap() {
         Map<String, Integer> commandMap = MapBuilder.of();
         commandMap.put("enterAnnotationCreationMode", COMMAND_ENTER_ANNOTATION_CREATION_MODE);
         commandMap.put("exitCurrentlyActiveMode", COMMAND_EXIT_CURRENTLY_ACTIVE_MODE);
+        commandMap.put("enterContentEditingMode", COMMAND_ENTER_CONTENT_EDITING_MODE);
         commandMap.put("saveCurrentDocument", COMMAND_SAVE_CURRENT_DOCUMENT);
-        commandMap.put("getAnnotations", COMMAND_GET_ANNOTATIONS);
-        commandMap.put("addAnnotation", COMMAND_ADD_ANNOTATION);
-        commandMap.put("getAllUnsavedAnnotations", COMMAND_GET_ALL_UNSAVED_ANNOTATIONS);
-        commandMap.put("addAnnotations", COMMAND_ADD_ANNOTATIONS);
         commandMap.put("getFormFieldValue", COMMAND_GET_FORM_FIELD_VALUE);
         commandMap.put("setFormFieldValue", COMMAND_SET_FORM_FIELD_VALUE);
-        commandMap.put("removeAnnotation", COMMAND_REMOVE_ANNOTATION);
-        commandMap.put("removeAnnotations", COMMAND_REMOVE_ANNOTATIONS);
-        commandMap.put("getAllAnnotations", COMMAND_GET_ALL_ANNOTATIONS);
         commandMap.put("removeFragment", COMMAND_REMOVE_FRAGMENT);
         commandMap.put("setToolbarMenuItems", COMMAND_SET_TOOLBAR_MENU_ITEMS);
         commandMap.put("setMeasurementValueConfigurations", COMMAND_SET_MEASUREMENT_VALUE_CONFIGURATIONS);
         commandMap.put("getMeasurementValueConfigurations", COMMAND_GET_MEASUREMENT_VALUE_CONFIGURATIONS);
         commandMap.put("getConfiguration", COMMAND_GET_CONFIGURATION);
         commandMap.put("setToolbar", COMMAND_SET_TOOLBAR);
-        commandMap.put("importXFDF", COMMAND_IMPORT_XFDF);
-        commandMap.put("exportXFDF", COMMAND_EXPORT_XFDF);
-        commandMap.put("setAnnotationFlags", COMMAND_SET_ANNOTATION_FLAGS);
-        commandMap.put("getAnnotationFlags", COMMAND_GET_ANNOTATION_FLAGS);
-        commandMap.put("clearSelectedAnnotations", COMMAND_CLEAR_SELECTED_ANNOTATIONS);
-        commandMap.put("selectAnnotations", COMMAND_SELECT_ANNOTATIONS);
         commandMap.put("setPageIndex", COMMAND_SET_PAGE_INDEX);
         commandMap.put("setExcludedAnnotations", COMMAND_SET_EXCLUDED_ANNOTATIONS);
         commandMap.put("setUserInterfaceVisible", COMMAND_SET_USER_INTERFACE_VISIBLE);
@@ -326,6 +302,15 @@ public void receiveCommand(@NonNull final PdfView root, int commandId, @Nullable
                     }
                 }
                 break;
+            case COMMAND_ENTER_CONTENT_EDITING_MODE:
+                if (args != null) {
+                    final int requestIdContent = args.getInt(0);
+                    root.enterContentEditingMode(
+                            () -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestIdContent, true)),
+                            (Consumer<Throwable>) throwable -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestIdContent, throwable))
+                    );
+                }
+                break;
             case COMMAND_EXIT_CURRENTLY_ACTIVE_MODE:
                 if (args != null) {
                     final int requestId = args.getInt(0);
@@ -346,86 +331,6 @@ public void receiveCommand(@NonNull final PdfView root, int commandId, @Nullable
                     }
                 }
                 break;
-            case COMMAND_GET_ANNOTATIONS:
-                if (args != null) {
-                    final int requestId = args.getInt(0);
-                    Disposable annotationDisposable = root.getAnnotations(args.getInt(1), args.getString(2))
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new Consumer<List<Annotation>>() {
-                                @Override
-                                public void accept(List<Annotation> annotations) {
-                                    root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, annotations));
-                                }
-                            });
-                    annotationDisposables.add(annotationDisposable);
-                }
-                break;
-            case COMMAND_GET_ALL_ANNOTATIONS:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.getAllAnnotations(args.getString(1))
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(annotations -> {
-                            root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, annotations));
-                        }, throwable -> {
-                            root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, throwable));
-                        }));
-                }
-                break;
-            case COMMAND_ADD_ANNOTATION:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.addAnnotation(requestId, args.getMap(1)));
-                }
-                break;
-            case COMMAND_REMOVE_ANNOTATION:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.removeAnnotation(requestId, args.getMap(1)));
-                }
-                break;
-            case COMMAND_REMOVE_ANNOTATIONS:
-                if(args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    final ReadableArray annotations = args.getArray(1);
-                    final int length = annotations.size();
-                    for (int i = 0; i < length; i++) {
-                        ReadableMap annotation = annotations.getMap(i);
-                        annotationDisposables.add(root.removeAnnotation(requestId, annotation));
-                    }
-                }
-                break;
-            case COMMAND_GET_ALL_UNSAVED_ANNOTATIONS:
-                if (args != null) {
-                    final int requestId = args.getInt(0);
-                    Disposable annotationDisposable = root.getAllUnsavedAnnotations()
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(jsonObject -> root.getEventDispatcher()
-                                    .dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, jsonObject)));
-                    annotationDisposables.add(annotationDisposable);
-                }
-                break;
-            case COMMAND_ADD_ANNOTATIONS:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.addAnnotations(requestId, args.getMap(1)));
-                }
-                break;
-            case COMMAND_SET_ANNOTATION_FLAGS:
-                if (args != null && args.size() == 3) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.setAnnotationFlags(requestId, args.getString(1), args.getArray(2)));
-                }
-                break;
-            case COMMAND_GET_ANNOTATION_FLAGS:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    annotationDisposables.add(root.getAnnotationFlags(requestId, args.getString(1)));
-                }
-                break;
             case COMMAND_GET_FORM_FIELD_VALUE:
                 if (args != null && args.size() == 2) {
                     final int requestId = args.getInt(0);
@@ -493,41 +398,6 @@ public void accept(List<Annotation> annotations) {
                     setToolbar(root,args.getMap(0));
                 }
                 break;
-            case COMMAND_IMPORT_XFDF:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    root.importXFDF(requestId, args.getString(1));
-                }
-                break;
-            case COMMAND_EXPORT_XFDF:
-                if (args != null && args.size() == 2) {
-                    final int requestId = args.getInt(0);
-                    root.exportXFDF(requestId, args.getString(1));
-                }
-                break;
-            case COMMAND_CLEAR_SELECTED_ANNOTATIONS:
-                if (args != null) {
-                    final int requestId = args.getInt(0);
-                    try {
-                        root.clearSelectedAnnotations();
-                        JSONObject result = new JSONObject();
-                        result.put("success", true);
-                        root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, result));
-                    } catch (Exception e) {
-                        root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, e));
-                    }
-                }
-                break;
-            case COMMAND_SELECT_ANNOTATIONS:
-                if (args != null && args.size() == 3) {
-                    final int requestId = args.getInt(0);
-                    try {
-                        root.selectAnnotations(requestId, args.getArray(1), args.getBoolean(2));
-                    } catch (Exception e) {
-                        root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, e));
-                    }
-                }
-                break;
             case COMMAND_SET_PAGE_INDEX:
                 if (args != null && args.size() == 1) {
                     try {

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

@@ -30,6 +30,7 @@ public class ToolbarMenuItemsAdapter {
     private static final String TOOLBAR_ITEM_ANNOTATION_LIST = "annotationListButtonItem";
     private static final String TOOLBAR_ITEM_AI_ASSISTANT = "aiAssistantButtonItem";
     private static final String TOOLBAR_ITEM_READER_VIEW = "readerViewButtonItem";
+    private static final String TOOLBAR_ITEM_CONTENT_EDITING = "contentEditingButtonItem";
 
     private final PdfActivityConfiguration.Builder newConfigurations;
 
@@ -69,6 +70,9 @@ public ToolbarMenuItemsAdapter(@NonNull final PdfActivityConfiguration currentCo
                 case TOOLBAR_ITEM_READER_VIEW:
                     configuration.enableReaderView(true);
                     break;
+                case TOOLBAR_ITEM_CONTENT_EDITING:
+                    configuration.contentEditingEnabled(true);
+                    break;
             }
         }
         newConfigurations = configuration;

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

@@ -30,7 +30,12 @@ public static void applyToolbar(@NonNull final PdfView view, @NonNull ReadableMa
             for (int i = 0; i < buttons.size(); i++) {
                 Object item = buttons.get(i);
                 if (item instanceof String) {
-                    stockToolbarItems.pushString((String) item);
+                    String stockItem = (String) item;
+                    // On Android, documentEditorButtonItem should behave like thumbnailsButtonItem.
+                    if ("documentEditorButtonItem".equals(stockItem)) {
+                        stockItem = "thumbnailsButtonItem";
+                    }
+                    stockToolbarItems.pushString(stockItem);
                 } else if (item instanceof HashMap) {
                     ((HashMap<String, Integer>) item).put("index", i);
                     customToolbarItems.add(item);