@embedpdf/plugin-redaction 2.3.0 → 2.4.1

package/dist/index.js

@@ -1,6 +1,7 @@
 import { clamp, BasePlugin, createBehaviorEmitter, refreshPages } from "@embedpdf/core";
-import { PdfPermissionFlag, uuidV4, PdfTaskHelper, PdfErrorCode, Task } from "@embedpdf/models";
+import { PdfAnnotationSubtype, PdfPermissionFlag, PdfTaskHelper, PdfErrorCode, Task, uuidV4 } from "@embedpdf/models";
 var RedactionMode = /* @__PURE__ */ ((RedactionMode2) => {
+  RedactionMode2["Redact"] = "redact";
   RedactionMode2["MarqueeRedact"] = "marqueeRedact";
   RedactionMode2["RedactSelection"] = "redactSelection";
   return RedactionMode2;
@@ -13,6 +14,7 @@ const END_REDACTION = "END_REDACTION";
 const SET_ACTIVE_TYPE = "SET_ACTIVE_TYPE";
 const ADD_PENDING = "ADD_PENDING";
 const REMOVE_PENDING = "REMOVE_PENDING";
+const UPDATE_PENDING = "UPDATE_PENDING";
 const CLEAR_PENDING = "CLEAR_PENDING";
 const SELECT_PENDING = "SELECT_PENDING";
 const DESELECT_PENDING = "DESELECT_PENDING";
@@ -34,6 +36,10 @@ const clearPending = (documentId) => ({
   type: CLEAR_PENDING,
   payload: documentId
 });
+const updatePending = (documentId, page, id, patch) => ({
+  type: UPDATE_PENDING,
+  payload: { documentId, page, id, patch }
+});
 const startRedaction = (documentId, mode) => ({
   type: START_REDACTION,
   payload: { documentId, mode }
@@ -141,7 +147,9 @@ const redactionReducer = (state = initialState, action) => {
       if (!docState) return state;
       const next = { ...docState.pending };
       for (const item of items) {
-        next[item.page] = (next[item.page] ?? []).concat(item);
+        const existing = next[item.page] ?? [];
+        if (existing.some((it) => it.id === item.id)) continue;
+        next[item.page] = existing.concat(item);
       }
       return {
         ...state,
@@ -176,6 +184,23 @@ const redactionReducer = (state = initialState, action) => {
         }
       };
     }
+    case UPDATE_PENDING: {
+      const { documentId, page, id, patch } = action.payload;
+      const docState = state.documents[documentId];
+      if (!docState) return state;
+      const list = docState.pending[page] ?? [];
+      const updated = list.map((item) => item.id === id ? { ...item, ...patch } : item);
+      return {
+        ...state,
+        documents: {
+          ...state.documents,
+          [documentId]: {
+            ...docState,
+            pending: { ...docState.pending, [page]: updated }
+          }
+        }
+      };
+    }
     case CLEAR_PENDING: {
       const documentId = action.payload;
       const docState = state.documents[documentId];
@@ -249,9 +274,6 @@ const redactionReducer = (state = initialState, action) => {
           ...state.documents,
           [documentId]: {
             ...docState,
-            pending: {},
-            pendingCount: 0,
-            selected: null,
             isRedacting: false,
             activeType: null
           }
@@ -277,9 +299,42 @@ const redactionReducer = (state = initialState, action) => {
       return state;
   }
 };
+const redactTool = {
+  id: "redact",
+  name: "Redact",
+  matchScore: (a) => a.type === PdfAnnotationSubtype.REDACT ? 10 : 0,
+  interaction: {
+    mode: RedactionMode.Redact,
+    exclusive: false,
+    cursor: "crosshair",
+    textSelection: true,
+    // Dynamic based on whether it's a text or area redaction
+    isDraggable: (anno) => {
+      var _a;
+      if (anno.type !== PdfAnnotationSubtype.REDACT) return true;
+      return !((_a = anno.segmentRects) == null ? void 0 : _a.length);
+    },
+    isResizable: (anno) => {
+      var _a;
+      if (anno.type !== PdfAnnotationSubtype.REDACT) return true;
+      return !((_a = anno.segmentRects) == null ? void 0 : _a.length);
+    },
+    lockAspectRatio: false,
+    isGroupDraggable: false,
+    isGroupResizable: false
+  },
+  defaults: {
+    type: PdfAnnotationSubtype.REDACT,
+    color: "#E44234",
+    overlayColor: "#000000",
+    strokeColor: "#E44234",
+    opacity: 1
+  }
+};
+const redactTools = [redactTool];
 const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
   constructor(id, registry, config) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     super(id, registry);
     this.redactionSelection$ = /* @__PURE__ */ new Map();
     this.pending$ = createBehaviorEmitter();
@@ -290,25 +345,71 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     this.config = config;
     this.selectionCapability = (_a = this.registry.getPlugin("selection")) == null ? void 0 : _a.provides();
     this.interactionManagerCapability = (_b = this.registry.getPlugin("interaction-manager")) == null ? void 0 : _b.provides();
-    if (this.interactionManagerCapability) {
-      this.interactionManagerCapability.registerMode({
-        id: RedactionMode.MarqueeRedact,
-        scope: "page",
-        exclusive: true,
-        cursor: "crosshair"
-      });
-      this.interactionManagerCapability.registerMode({
-        id: RedactionMode.RedactSelection,
-        scope: "page",
-        exclusive: false
-      });
+    this.annotationCapability = (_c = this.registry.getPlugin("annotation")) == null ? void 0 : _c.provides();
+    this.historyCapability = (_d = this.registry.getPlugin("history")) == null ? void 0 : _d.provides();
+    if (this.config.useAnnotationMode) {
+      if (this.annotationCapability) {
+        this.useAnnotationMode = true;
+      } else {
+        this.logger.warn(
+          "RedactionPlugin",
+          "ConfigError",
+          "useAnnotationMode is enabled but annotation plugin is not available. Falling back to legacy mode."
+        );
+        this.useAnnotationMode = false;
+      }
+    } else {
+      this.useAnnotationMode = false;
     }
-    (_c = this.interactionManagerCapability) == null ? void 0 : _c.onModeChange((modeState) => {
+    if (this.useAnnotationMode) {
+      for (const tool of redactTools) {
+        this.annotationCapability.addTool(tool);
+      }
+    }
+    this.setupRedactionModes();
+    if (!this.useAnnotationMode && this.annotationCapability) {
+      this.logger.info(
+        "RedactionPlugin",
+        "LegacyMode",
+        "Using legacy redaction mode. Set useAnnotationMode: true in config to use annotation-based redactions."
+      );
+    }
+    this.setupModeChangeListener();
+  }
+  /**
+   * Setup redaction modes - registers all interaction modes for redaction.
+   * Works for both annotation mode and legacy mode.
+   */
+  setupRedactionModes() {
+    if (!this.interactionManagerCapability) return;
+    this.interactionManagerCapability.registerMode({
+      id: RedactionMode.Redact,
+      scope: "page",
+      exclusive: false,
+      cursor: "crosshair"
+    });
+    this.interactionManagerCapability.registerMode({
+      id: RedactionMode.MarqueeRedact,
+      scope: "page",
+      exclusive: false,
+      cursor: "crosshair"
+    });
+    this.interactionManagerCapability.registerMode({
+      id: RedactionMode.RedactSelection,
+      scope: "page",
+      exclusive: false
+    });
+  }
+  /**
+   * Setup mode change listener - handles all redaction modes
+   */
+  setupModeChangeListener() {
+    var _a;
+    (_a = this.interactionManagerCapability) == null ? void 0 : _a.onModeChange((modeState) => {
       const documentId = modeState.documentId;
-      if (modeState.activeMode === RedactionMode.RedactSelection) {
-        this.dispatch(startRedaction(documentId, RedactionMode.RedactSelection));
-      } else if (modeState.activeMode === RedactionMode.MarqueeRedact) {
-        this.dispatch(startRedaction(documentId, RedactionMode.MarqueeRedact));
+      const isRedactionMode = modeState.activeMode === RedactionMode.Redact || modeState.activeMode === RedactionMode.MarqueeRedact || modeState.activeMode === RedactionMode.RedactSelection;
+      if (isRedactionMode) {
+        this.dispatch(startRedaction(documentId, modeState.activeMode));
       } else {
         const docState = this.getDocumentState(documentId);
         if (docState == null ? void 0 : docState.isRedacting) {
@@ -340,28 +441,68 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       const unsubEndSelection = selectionScope.onEndSelection(() => {
         const docState = this.getDocumentState(documentId);
         if (!(docState == null ? void 0 : docState.isRedacting)) return;
-        if (!this.checkPermission(documentId, PdfPermissionFlag.ModifyContents)) {
-          return;
-        }
+        if (!this.checkPermission(documentId, PdfPermissionFlag.ModifyContents)) return;
         const formattedSelection = selectionScope.getFormattedSelection();
-        const items = formattedSelection.map((s) => ({
-          id: uuidV4(),
-          kind: "text",
-          page: s.pageIndex,
-          rect: s.rect,
-          rects: s.segmentRects
-        }));
-        this.dispatch(addPending(documentId, items));
+        if (!formattedSelection.length) return;
+        const textTask = selectionScope.getSelectedText();
         const emitter = this.redactionSelection$.get(documentId);
         emitter == null ? void 0 : emitter.emit([]);
         selectionScope.clear();
-        this.emitPendingChange(documentId);
-        if (items.length) {
-          this.selectPending(items[items.length - 1].page, items[items.length - 1].id, documentId);
-        }
+        textTask.wait(
+          (textArr) => {
+            const text = textArr.join(" ");
+            this.createRedactionsFromSelection(documentId, formattedSelection, text);
+          },
+          () => {
+            this.createRedactionsFromSelection(documentId, formattedSelection);
+          }
+        );
       });
       unsubscribers.push(unsubSelection, unsubEndSelection);
     }
+    if (this.useAnnotationMode && this.annotationCapability) {
+      const annoScope = this.annotationCapability.forDocument(documentId);
+      const unsubEvents = annoScope.onAnnotationEvent((event) => {
+        var _a;
+        if (event.type === "loaded") {
+          this.syncFromAnnotationLoad(documentId);
+          return;
+        }
+        if (((_a = event.annotation) == null ? void 0 : _a.type) !== PdfAnnotationSubtype.REDACT) return;
+        const redactAnno = event.annotation;
+        if (event.type === "create") {
+          this.syncFromAnnotationCreate(documentId, redactAnno);
+          this.events$.emit({
+            type: "add",
+            documentId,
+            items: [this.annotationToRedactionItem(redactAnno)]
+          });
+        } else if (event.type === "update") {
+          this.logger.debug("RedactionPlugin", "AnnotationUpdated", {
+            documentId,
+            redactAnno,
+            patch: event.patch
+          });
+          this.syncFromAnnotationUpdate(
+            documentId,
+            redactAnno,
+            event.patch
+          );
+        } else if (event.type === "delete") {
+          this.syncFromAnnotationDelete(documentId, redactAnno);
+          this.events$.emit({
+            type: "remove",
+            documentId,
+            page: redactAnno.pageIndex,
+            id: redactAnno.id
+          });
+        }
+      });
+      const unsubState = annoScope.onStateChange(() => {
+        this.syncSelectionFromAnnotation(documentId);
+      });
+      unsubscribers.push(unsubEvents, unsubState);
+    }
     this.documentUnsubscribers.set(documentId, unsubscribers);
     this.logger.debug(
       "RedactionPlugin",
@@ -370,8 +511,9 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     );
   }
   onDocumentLoaded(documentId) {
-    var _a;
-    (_a = this.selectionCapability) == null ? void 0 : _a.enableForMode(
+    var _a, _b;
+    (_a = this.selectionCapability) == null ? void 0 : _a.enableForMode(RedactionMode.Redact, { showRects: false }, documentId);
+    (_b = this.selectionCapability) == null ? void 0 : _b.enableForMode(
       RedactionMode.RedactSelection,
       { showRects: false },
       documentId
@@ -403,9 +545,16 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     return {
       // Active document operations
       queueCurrentSelectionAsPending: () => this.queueCurrentSelectionAsPending(),
+      // Unified redact mode
+      enableRedact: () => this.enableRedact(),
+      toggleRedact: () => this.toggleRedact(),
+      isRedactActive: () => this.isRedactActive(),
+      endRedact: () => this.endRedact(),
+      // Legacy marquee mode
       enableMarqueeRedact: () => this.enableMarqueeRedact(),
       toggleMarqueeRedact: () => this.toggleMarqueeRedact(),
       isMarqueeRedactActive: () => this.isMarqueeRedactActive(),
+      // Legacy selection mode
       enableRedactSelection: () => this.enableRedactSelection(),
       toggleRedactSelection: () => this.toggleRedactSelection(),
       isRedactSelectionActive: () => this.isRedactSelectionActive(),
@@ -414,8 +563,6 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       clearPending: () => this.clearPendingItems(),
       commitAllPending: () => this.commitAllPending(),
       commitPending: (page, id) => this.commitPendingOne(page, id),
-      endRedaction: () => this.endRedactionMode(),
-      startRedaction: () => this.startRedactionMode(),
       selectPending: (page, id) => this.selectPending(page, id),
       getSelectedPending: () => this.getSelectedPending(),
       deselectPending: () => this.deselectPending(),
@@ -435,9 +582,16 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
   createRedactionScope(documentId) {
     return {
       queueCurrentSelectionAsPending: () => this.queueCurrentSelectionAsPending(documentId),
+      // Unified redact mode
+      enableRedact: () => this.enableRedact(documentId),
+      toggleRedact: () => this.toggleRedact(documentId),
+      isRedactActive: () => this.isRedactActive(documentId),
+      endRedact: () => this.endRedact(documentId),
+      // Legacy marquee mode
       enableMarqueeRedact: () => this.enableMarqueeRedact(documentId),
       toggleMarqueeRedact: () => this.toggleMarqueeRedact(documentId),
       isMarqueeRedactActive: () => this.isMarqueeRedactActive(documentId),
+      // Legacy selection mode
       enableRedactSelection: () => this.enableRedactSelection(documentId),
       toggleRedactSelection: () => this.toggleRedactSelection(documentId),
       isRedactSelectionActive: () => this.isRedactSelectionActive(documentId),
@@ -446,8 +600,6 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       clearPending: () => this.clearPendingItems(documentId),
       commitAllPending: () => this.commitAllPending(documentId),
       commitPending: (page, id) => this.commitPendingOne(page, id, documentId),
-      endRedaction: () => this.endRedactionMode(documentId),
-      startRedaction: () => this.startRedactionMode(documentId),
       selectPending: (page, id) => this.selectPending(page, id, documentId),
       getSelectedPending: () => this.getSelectedPending(documentId),
       deselectPending: () => this.deselectPending(documentId),
@@ -469,6 +621,26 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
   // ─────────────────────────────────────────────────────────
   // State Helpers
   // ─────────────────────────────────────────────────────────
+  /**
+   * Get pending redactions derived from annotation plugin (annotation mode only)
+   */
+  getPendingFromAnnotations(documentId) {
+    if (!this.annotationCapability) return {};
+    try {
+      const annoState = this.annotationCapability.forDocument(documentId).getState();
+      const result = {};
+      for (const ta of Object.values(annoState.byUid)) {
+        if (ta.object.type === PdfAnnotationSubtype.REDACT) {
+          const item = this.annotationToRedactionItem(ta.object);
+          const page = ta.object.pageIndex;
+          (result[page] ?? (result[page] = [])).push(item);
+        }
+      }
+      return result;
+    } catch {
+      return {};
+    }
+  }
   getDocumentState(documentId) {
     const id = documentId ?? this.getActiveDocumentId();
     return this.state.documents[id] ?? null;
@@ -481,6 +653,75 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     return state;
   }
   // ─────────────────────────────────────────────────────────
+  // Annotation Mode State Sync
+  // ─────────────────────────────────────────────────────────
+  /**
+   * Sync internal state when REDACT annotation is created.
+   * Called from annotation event listener in annotation mode.
+   */
+  syncFromAnnotationCreate(documentId, annotation) {
+    const item = this.annotationToRedactionItem(annotation);
+    this.dispatch(addPending(documentId, [item]));
+  }
+  /**
+   * Sync internal state when REDACT annotation is updated (moved/resized/color changed).
+   * Called from annotation event listener in annotation mode.
+   */
+  syncFromAnnotationUpdate(documentId, annotation, patch) {
+    if (!("rect" in patch) && !("segmentRects" in patch) && !("strokeColor" in patch) && !("color" in patch))
+      return;
+    const updatePatch = {};
+    if (patch.rect) updatePatch.rect = patch.rect;
+    if (patch.segmentRects) updatePatch.rects = patch.segmentRects;
+    if (patch.strokeColor) updatePatch.markColor = patch.strokeColor;
+    if (patch.color) updatePatch.redactionColor = patch.color;
+    this.logger.debug("RedactionPlugin", "AnnotationUpdated", {
+      documentId,
+      annotation,
+      patch: updatePatch
+    });
+    this.dispatch(updatePending(documentId, annotation.pageIndex, annotation.id, updatePatch));
+  }
+  /**
+   * Sync internal state when REDACT annotation is deleted.
+   * Called from annotation event listener in annotation mode.
+   */
+  syncFromAnnotationDelete(documentId, annotation) {
+    this.dispatch(removePending(documentId, annotation.pageIndex, annotation.id));
+  }
+  /**
+   * Sync internal state from existing REDACT annotations after initial load.
+   * Called when annotation plugin emits 'loaded' event.
+   */
+  syncFromAnnotationLoad(documentId) {
+    const pending = this.getPendingFromAnnotations(documentId);
+    this.dispatch(clearPending(documentId));
+    for (const [, items] of Object.entries(pending)) {
+      if (items.length > 0) {
+        this.dispatch(addPending(documentId, items));
+      }
+    }
+  }
+  /**
+   * Sync selection state from annotation plugin's selected REDACT annotation.
+   * Called when annotation plugin state changes.
+   */
+  syncSelectionFromAnnotation(documentId) {
+    var _a;
+    const annoState = (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(documentId).getState();
+    if (!annoState) return;
+    const selectedRedact = annoState.selectedUids.map((uid) => annoState.byUid[uid]).find((ta) => (ta == null ? void 0 : ta.object.type) === PdfAnnotationSubtype.REDACT);
+    if (selectedRedact) {
+      const obj = selectedRedact.object;
+      this.dispatch(selectPending(documentId, obj.pageIndex, obj.id));
+    } else {
+      const docState = this.getDocumentState(documentId);
+      if (docState == null ? void 0 : docState.selected) {
+        this.dispatch(deselectPending(documentId));
+      }
+    }
+  }
+  // ─────────────────────────────────────────────────────────
   // Core Operations
   // ─────────────────────────────────────────────────────────
   addPendingItems(items, documentId) {
@@ -493,28 +734,57 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       );
       return;
     }
-    this.dispatch(addPending(id, items));
-    this.emitPendingChange(id);
+    if (this.useAnnotationMode) {
+      const annoScope = this.annotationCapability.forDocument(id);
+      for (const item of items) {
+        const annotation = this.redactionItemToAnnotation(item);
+        annoScope.createAnnotation(item.page, annotation);
+      }
+      if (items.length > 0) {
+        const lastItem = items[items.length - 1];
+        annoScope.selectAnnotation(lastItem.page, lastItem.id);
+      }
+    } else {
+      this.dispatch(addPending(id, items));
+    }
     this.events$.emit({ type: "add", documentId: id, items });
   }
   removePendingItem(page, itemId, documentId) {
+    var _a;
     const id = documentId ?? this.getActiveDocumentId();
-    this.dispatch(removePending(id, page, itemId));
-    this.emitPendingChange(id);
+    if (this.useAnnotationMode) {
+      (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(id).deleteAnnotation(page, itemId);
+    } else {
+      this.dispatch(removePending(id, page, itemId));
+    }
     this.events$.emit({ type: "remove", documentId: id, page, id: itemId });
   }
   clearPendingItems(documentId) {
+    var _a;
     const id = documentId ?? this.getActiveDocumentId();
-    this.dispatch(clearPending(id));
-    this.emitPendingChange(id);
+    if (this.useAnnotationMode) {
+      const pending = this.getPendingFromAnnotations(id);
+      const annoScope = (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(id);
+      for (const [pageStr, items] of Object.entries(pending)) {
+        const page = Number(pageStr);
+        for (const item of items) {
+          annoScope == null ? void 0 : annoScope.deleteAnnotation(page, item.id);
+        }
+      }
+    } else {
+      this.dispatch(clearPending(id));
+    }
     this.events$.emit({ type: "clear", documentId: id });
   }
   selectPending(page, itemId, documentId) {
-    var _a;
+    var _a, _b;
     const id = documentId ?? this.getActiveDocumentId();
-    this.dispatch(selectPending(id, page, itemId));
-    (_a = this.selectionCapability) == null ? void 0 : _a.forDocument(id).clear();
-    this.emitSelectedChange(id);
+    if (this.useAnnotationMode) {
+      (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(id).selectAnnotation(page, itemId);
+    } else {
+      this.dispatch(selectPending(id, page, itemId));
+    }
+    (_b = this.selectionCapability) == null ? void 0 : _b.forDocument(id).clear();
   }
   getSelectedPending(documentId) {
     var _a;
@@ -522,10 +792,17 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     return ((_a = this.getDocumentState(id)) == null ? void 0 : _a.selected) ?? null;
   }
   deselectPending(documentId) {
+    var _a;
     const id = documentId ?? this.getActiveDocumentId();
-    this.dispatch(deselectPending(id));
-    this.emitSelectedChange(id);
+    if (this.useAnnotationMode) {
+      (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(id).deselectAnnotation();
+    } else {
+      this.dispatch(deselectPending(id));
+    }
   }
+  // ─────────────────────────────────────────────────────────
+  // Legacy Selection Mode (text-based redactions)
+  // ─────────────────────────────────────────────────────────
   enableRedactSelection(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
@@ -543,17 +820,25 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
     const scope = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id);
-    if ((scope == null ? void 0 : scope.getActiveMode()) === RedactionMode.RedactSelection) {
-      scope.activateDefaultMode();
+    const activeMode = scope == null ? void 0 : scope.getActiveMode();
+    if (activeMode === RedactionMode.RedactSelection) {
+      scope == null ? void 0 : scope.activateDefaultMode();
     } else {
+      if (!this.checkPermission(id, PdfPermissionFlag.ModifyContents)) {
+        return;
+      }
       scope == null ? void 0 : scope.activate(RedactionMode.RedactSelection);
     }
   }
   isRedactSelectionActive(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
-    return ((_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).getActiveMode()) === RedactionMode.RedactSelection;
+    const activeMode = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).getActiveMode();
+    return activeMode === RedactionMode.Redact || activeMode === RedactionMode.RedactSelection;
   }
+  // ─────────────────────────────────────────────────────────
+  // Legacy Marquee Mode (area-based redactions)
+  // ─────────────────────────────────────────────────────────
   enableMarqueeRedact(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
@@ -571,31 +856,59 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
     const scope = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id);
-    if ((scope == null ? void 0 : scope.getActiveMode()) === RedactionMode.MarqueeRedact) {
-      scope.activateDefaultMode();
+    const activeMode = scope == null ? void 0 : scope.getActiveMode();
+    if (activeMode === RedactionMode.MarqueeRedact) {
+      scope == null ? void 0 : scope.activateDefaultMode();
     } else {
+      if (!this.checkPermission(id, PdfPermissionFlag.ModifyContents)) {
+        return;
+      }
       scope == null ? void 0 : scope.activate(RedactionMode.MarqueeRedact);
     }
   }
   isMarqueeRedactActive(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
-    return ((_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).getActiveMode()) === RedactionMode.MarqueeRedact;
+    const activeMode = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).getActiveMode();
+    return activeMode === RedactionMode.Redact || activeMode === RedactionMode.MarqueeRedact;
   }
-  startRedactionMode(documentId) {
+  // ─────────────────────────────────────────────────────────
+  // Unified Redact Mode (recommended)
+  // ─────────────────────────────────────────────────────────
+  enableRedact(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
     if (!this.checkPermission(id, PdfPermissionFlag.ModifyContents)) {
       this.logger.debug(
         "RedactionPlugin",
-        "StartRedactionMode",
-        `Cannot start redaction mode: document ${id} lacks ModifyContents permission`
+        "EnableRedact",
+        `Cannot enable redact mode: document ${id} lacks ModifyContents permission`
       );
       return;
     }
-    (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).activate(RedactionMode.RedactSelection);
+    (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).activate(RedactionMode.Redact);
+  }
+  toggleRedact(documentId) {
+    var _a;
+    const id = documentId ?? this.getActiveDocumentId();
+    const scope = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id);
+    const activeMode = scope == null ? void 0 : scope.getActiveMode();
+    if (activeMode === RedactionMode.Redact) {
+      scope == null ? void 0 : scope.activateDefaultMode();
+    } else {
+      if (!this.checkPermission(id, PdfPermissionFlag.ModifyContents)) {
+        return;
+      }
+      scope == null ? void 0 : scope.activate(RedactionMode.Redact);
+    }
   }
-  endRedactionMode(documentId) {
+  isRedactActive(documentId) {
+    var _a;
+    const id = documentId ?? this.getActiveDocumentId();
+    const activeMode = (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).getActiveMode();
+    return activeMode === RedactionMode.Redact;
+  }
+  endRedact(documentId) {
     var _a;
     const id = documentId ?? this.getActiveDocumentId();
     (_a = this.interactionManagerCapability) == null ? void 0 : _a.forDocument(id).activateDefaultMode();
@@ -608,6 +921,18 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     return (emitter == null ? void 0 : emitter.on(callback)) ?? (() => {
     });
   }
+  /**
+   * Get the stroke color for redaction previews.
+   * In annotation mode: returns tool's defaults.strokeColor
+   * In legacy mode: returns hardcoded red
+   */
+  getPreviewStrokeColor() {
+    if (this.useAnnotationMode && this.annotationCapability) {
+      const tool = this.annotationCapability.getTool("redact");
+      return (tool == null ? void 0 : tool.defaults.strokeColor) ?? "#FF0000";
+    }
+    return "#FF0000";
+  }
   registerMarqueeOnPage(opts) {
     if (!this.interactionManagerCapability) {
       this.logger.warn(
@@ -636,17 +961,23 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       onPreview: opts.callback.onPreview,
       onCommit: (r) => {
         var _a, _b;
-        const item = {
-          id: uuidV4(),
-          kind: "area",
-          page: opts.pageIndex,
-          rect: r
-        };
-        this.dispatch(addPending(opts.documentId, [item]));
-        this.emitPendingChange(opts.documentId);
         (_b = (_a = opts.callback).onCommit) == null ? void 0 : _b.call(_a, r);
-        this.enableRedactSelection(opts.documentId);
-        this.selectPending(opts.pageIndex, item.id, opts.documentId);
+        if (this.useAnnotationMode) {
+          this.createRedactAnnotationFromArea(opts.documentId, opts.pageIndex, r);
+        } else {
+          const redactionColor = this.config.drawBlackBoxes ? "#000000" : "transparent";
+          const item = {
+            id: uuidV4(),
+            kind: "area",
+            page: opts.pageIndex,
+            rect: r,
+            source: "legacy",
+            markColor: "#FF0000",
+            redactionColor
+          };
+          this.dispatch(addPending(opts.documentId, [item]));
+          this.selectPending(opts.pageIndex, item.id, opts.documentId);
+        }
       }
     });
     const off = this.interactionManagerCapability.registerAlways({
@@ -664,6 +995,12 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       }
     });
     const off2 = this.interactionManagerCapability.registerHandlers({
+      documentId: opts.documentId,
+      modeId: RedactionMode.Redact,
+      handlers,
+      pageIndex: opts.pageIndex
+    });
+    const off3 = this.interactionManagerCapability.registerHandlers({
       documentId: opts.documentId,
       modeId: RedactionMode.MarqueeRedact,
       handlers,
@@ -672,38 +1009,44 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     return () => {
       off();
       off2();
+      off3();
     };
   }
   queueCurrentSelectionAsPending(documentId) {
     const id = documentId ?? this.getActiveDocumentId();
-    if (!this.selectionCapability)
+    if (!this.selectionCapability) {
       return PdfTaskHelper.reject({
         code: PdfErrorCode.NotFound,
         message: "[RedactionPlugin] selection plugin required"
       });
+    }
     const coreDoc = this.coreState.core.documents[id];
-    if (!(coreDoc == null ? void 0 : coreDoc.document))
+    if (!(coreDoc == null ? void 0 : coreDoc.document)) {
       return PdfTaskHelper.reject({ code: PdfErrorCode.NotFound, message: "Document not found" });
+    }
     const selectionScope = this.selectionCapability.forDocument(id);
     const formatted = selectionScope.getFormattedSelection();
     if (!formatted.length) return PdfTaskHelper.resolve(true);
-    const uniqueId = uuidV4();
-    const items = formatted.map((s) => ({
-      id: uniqueId,
-      kind: "text",
-      page: s.pageIndex,
-      rect: s.rect,
-      rects: s.segmentRects
-    }));
-    this.enableRedactSelection(id);
-    this.dispatch(addPending(id, items));
-    this.emitPendingChange(id);
-    const last = items[items.length - 1];
-    this.selectPending(last.page, last.id, id);
+    const textTask = selectionScope.getSelectedText();
     const emitter = this.redactionSelection$.get(id);
     emitter == null ? void 0 : emitter.emit([]);
     selectionScope.clear();
-    return PdfTaskHelper.resolve(true);
+    if (!this.useAnnotationMode) {
+      this.enableRedactSelection(id);
+    }
+    const task = new Task();
+    textTask.wait(
+      (textArr) => {
+        const text = textArr.join(" ");
+        this.createRedactionsFromSelection(id, formatted, text);
+        task.resolve(true);
+      },
+      () => {
+        this.createRedactionsFromSelection(id, formatted);
+        task.resolve(true);
+      }
+    );
+    return task;
   }
   commitPendingOne(page, id, documentId) {
     const docId = documentId ?? this.getActiveDocumentId();
@@ -721,6 +1064,17 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     const coreDoc = this.coreState.core.documents[docId];
     if (!(coreDoc == null ? void 0 : coreDoc.document))
       return PdfTaskHelper.reject({ code: PdfErrorCode.NotFound, message: "Document not found" });
+    const pdfPage = coreDoc.document.pages[page];
+    if (!pdfPage)
+      return PdfTaskHelper.reject({ code: PdfErrorCode.NotFound, message: "Page not found" });
+    if (this.useAnnotationMode) {
+      this.logger.debug(
+        "RedactionPlugin",
+        "CommitPendingOne",
+        `Applying redaction in annotation mode: page ${page}, id ${id}`
+      );
+      return this.applyRedactionAnnotationMode(docId, coreDoc.document, pdfPage, id);
+    }
     const docState = this.getDocumentState(docId);
     if (!docState) {
       return PdfTaskHelper.reject({
@@ -729,18 +1083,27 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       });
     }
     const item = (docState.pending[page] ?? []).find((it) => it.id === id);
-    if (!item) return PdfTaskHelper.resolve(true);
+    if (!item) {
+      this.logger.debug(
+        "RedactionPlugin",
+        "CommitPendingOne",
+        `No pending item found for page ${page}, id ${id}`
+      );
+      return PdfTaskHelper.resolve(true);
+    }
+    return this.commitPendingOneLegacy(docId, coreDoc.document, pdfPage, page, item);
+  }
+  /**
+   * Legacy commit single redaction using redactTextInRects
+   */
+  commitPendingOneLegacy(docId, doc, pdfPage, page, item) {
     const rects = item.kind === "text" ? item.rects : [item.rect];
-    const pdfPage = coreDoc.document.pages[page];
-    if (!pdfPage)
-      return PdfTaskHelper.reject({ code: PdfErrorCode.NotFound, message: "Page not found" });
     const task = new Task();
-    this.engine.redactTextInRects(coreDoc.document, pdfPage, rects, {
+    this.engine.redactTextInRects(doc, pdfPage, rects, {
       drawBlackBoxes: this.config.drawBlackBoxes
     }).wait(
       () => {
-        this.dispatch(removePending(docId, page, id));
-        this.emitPendingChange(docId);
+        this.dispatch(removePending(docId, page, item.id));
         this.dispatchCoreAction(refreshPages(docId, [page]));
         this.events$.emit({ type: "commit", documentId: docId, success: true });
         task.resolve(true);
@@ -757,6 +1120,73 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     );
     return task;
   }
+  /**
+   * Annotation mode: Apply single redaction using engine.applyRedaction
+   */
+  applyRedactionAnnotationMode(docId, doc, pdfPage, annotationId) {
+    var _a;
+    const task = new Task();
+    const anno = (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(docId).getAnnotationById(annotationId);
+    this.logger.debug(
+      "RedactionPlugin",
+      "ApplyRedactionAnnotationMode",
+      `Looking for annotation ${annotationId}, found: ${!!anno}, type: ${anno == null ? void 0 : anno.object.type}`
+    );
+    if (!anno || anno.object.type !== PdfAnnotationSubtype.REDACT) {
+      this.logger.warn(
+        "RedactionPlugin",
+        "ApplyRedactionAnnotationMode",
+        `Redaction annotation not found or wrong type: ${annotationId}`
+      );
+      return PdfTaskHelper.reject({
+        code: PdfErrorCode.NotFound,
+        message: "Redaction annotation not found"
+      });
+    }
+    this.logger.debug(
+      "RedactionPlugin",
+      "ApplyRedactionAnnotationMode",
+      `Calling engine.applyRedaction for annotation ${annotationId} on page ${pdfPage.index}`
+    );
+    this.engine.applyRedaction(doc, pdfPage, anno.object).wait(
+      () => {
+        var _a2, _b;
+        this.logger.debug(
+          "RedactionPlugin",
+          "ApplyRedactionAnnotationMode",
+          `Successfully applied redaction ${annotationId} on page ${pdfPage.index}`
+        );
+        (_a2 = this.annotationCapability) == null ? void 0 : _a2.forDocument(docId).purgeAnnotation(pdfPage.index, annotationId);
+        this.dispatch(removePending(docId, pdfPage.index, annotationId));
+        (_b = this.historyCapability) == null ? void 0 : _b.forDocument(docId).purgeByMetadata(
+          (meta) => {
+            var _a3;
+            return ((_a3 = meta == null ? void 0 : meta.annotationIds) == null ? void 0 : _a3.includes(annotationId)) ?? false;
+          },
+          "annotations"
+        );
+        this.dispatchCoreAction(refreshPages(docId, [pdfPage.index]));
+        this.events$.emit({ type: "commit", documentId: docId, success: true });
+        task.resolve(true);
+      },
+      (error) => {
+        var _a2;
+        this.logger.error(
+          "RedactionPlugin",
+          "ApplyRedactionAnnotationMode",
+          `Failed to apply redaction ${annotationId}: ${((_a2 = error.reason) == null ? void 0 : _a2.message) ?? "Unknown error"}`
+        );
+        this.events$.emit({
+          type: "commit",
+          documentId: docId,
+          success: false,
+          error: error.reason
+        });
+        task.reject({ code: PdfErrorCode.Unknown, message: "Failed to apply redaction" });
+      }
+    );
+    return task;
+  }
   commitAllPending(documentId) {
     const docId = documentId ?? this.getActiveDocumentId();
     if (!this.checkPermission(docId, PdfPermissionFlag.ModifyContents)) {
@@ -780,6 +1210,16 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
         message: "Document state not found"
       });
     }
+    if (this.useAnnotationMode) {
+      return this.applyAllRedactionsAnnotationMode(docId, coreDoc.document);
+    } else {
+      return this.commitAllPendingLegacy(docId, coreDoc.document, docState);
+    }
+  }
+  /**
+   * Legacy commit all redactions using redactTextInRects
+   */
+  commitAllPendingLegacy(docId, doc, docState) {
     const perPage = /* @__PURE__ */ new Map();
     for (const [page, items] of Object.entries(docState.pending)) {
       const p = Number(page);
@@ -793,11 +1233,11 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     const pagesToRefresh = Array.from(perPage.entries()).filter(([_, rects]) => rects.length > 0).map(([pageIndex]) => pageIndex);
     const tasks = [];
     for (const [pageIndex, rects] of perPage) {
-      const page = coreDoc.document.pages[pageIndex];
+      const page = doc.pages[pageIndex];
       if (!page) continue;
       if (!rects.length) continue;
       tasks.push(
-        this.engine.redactTextInRects(coreDoc.document, page, rects, {
+        this.engine.redactTextInRects(doc, page, rects, {
           drawBlackBoxes: this.config.drawBlackBoxes
         })
       );
@@ -807,7 +1247,6 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
       () => {
         this.dispatch(clearPending(docId));
         this.dispatchCoreAction(refreshPages(docId, pagesToRefresh));
-        this.emitPendingChange(docId);
         this.events$.emit({ type: "commit", documentId: docId, success: true });
         task.resolve(true);
       },
@@ -823,6 +1262,208 @@ const _RedactionPlugin = class _RedactionPlugin extends BasePlugin {
     );
     return task;
   }
+  /**
+   * Annotation mode: Apply all redactions using engine.applyAllRedactions per page
+   */
+  applyAllRedactionsAnnotationMode(docId, doc) {
+    const annoState = this.annotationCapability.forDocument(docId).getState();
+    const redactAnnotationsByPage = /* @__PURE__ */ new Map();
+    for (const ta of Object.values(annoState.byUid)) {
+      if (ta.object.type === PdfAnnotationSubtype.REDACT) {
+        const pageIds = redactAnnotationsByPage.get(ta.object.pageIndex) ?? [];
+        pageIds.push(ta.object.id);
+        redactAnnotationsByPage.set(ta.object.pageIndex, pageIds);
+      }
+    }
+    const pagesToProcess = Array.from(redactAnnotationsByPage.keys());
+    if (pagesToProcess.length === 0) {
+      return PdfTaskHelper.resolve(true);
+    }
+    const tasks = [];
+    for (const pageIndex of pagesToProcess) {
+      const page = doc.pages[pageIndex];
+      if (!page) continue;
+      tasks.push(this.engine.applyAllRedactions(doc, page));
+    }
+    const task = new Task();
+    Task.all(tasks).wait(
+      () => {
+        var _a, _b;
+        const annoScope = (_a = this.annotationCapability) == null ? void 0 : _a.forDocument(docId);
+        const allPurgedIds = [];
+        for (const [pageIndex, ids] of redactAnnotationsByPage) {
+          for (const id of ids) {
+            annoScope == null ? void 0 : annoScope.purgeAnnotation(pageIndex, id);
+            this.dispatch(removePending(docId, pageIndex, id));
+            allPurgedIds.push(id);
+          }
+        }
+        if (allPurgedIds.length > 0) {
+          (_b = this.historyCapability) == null ? void 0 : _b.forDocument(docId).purgeByMetadata(
+            (meta) => {
+              var _a2;
+              return ((_a2 = meta == null ? void 0 : meta.annotationIds) == null ? void 0 : _a2.some((id) => allPurgedIds.includes(id))) ?? false;
+            },
+            "annotations"
+          );
+        }
+        this.dispatchCoreAction(refreshPages(docId, pagesToProcess));
+        this.events$.emit({ type: "commit", documentId: docId, success: true });
+        task.resolve(true);
+      },
+      (error) => {
+        this.events$.emit({
+          type: "commit",
+          documentId: docId,
+          success: false,
+          error: error.reason
+        });
+        task.reject({ code: PdfErrorCode.Unknown, message: "Failed to apply redactions" });
+      }
+    );
+    return task;
+  }
+  // ─────────────────────────────────────────────────────────
+  // Annotation Mode Helpers
+  // ─────────────────────────────────────────────────────────
+  /**
+   * Create REDACT annotations from text selection (annotation mode only)
+   * @returns Array of annotation IDs that were created
+   */
+  createRedactAnnotationsFromSelection(documentId, formattedSelection, text) {
+    if (!this.annotationCapability) return [];
+    const annoScope = this.annotationCapability.forDocument(documentId);
+    const tool = this.annotationCapability.getTool("redact");
+    const defaults = tool == null ? void 0 : tool.defaults;
+    const annotationIds = [];
+    for (const selection of formattedSelection) {
+      const annotationId = uuidV4();
+      annotationIds.push(annotationId);
+      const annotation = {
+        ...defaults,
+        id: annotationId,
+        type: PdfAnnotationSubtype.REDACT,
+        pageIndex: selection.pageIndex,
+        rect: selection.rect,
+        segmentRects: selection.segmentRects,
+        ...text ? { custom: { text } } : {},
+        created: /* @__PURE__ */ new Date()
+      };
+      annoScope.createAnnotation(selection.pageIndex, annotation);
+      if (selection === formattedSelection[formattedSelection.length - 1]) {
+        annoScope.selectAnnotation(selection.pageIndex, annotationId);
+      }
+    }
+    if (text) {
+      for (let i = 0; i < annotationIds.length; i++) {
+        const pageIndex = formattedSelection[i].pageIndex;
+        this.dispatch(updatePending(documentId, pageIndex, annotationIds[i], { text }));
+      }
+    }
+    return annotationIds;
+  }
+  /**
+   * Create legacy RedactionItems from text selection (legacy mode only)
+   */
+  createLegacyRedactionsFromSelection(documentId, formattedSelection, text) {
+    const redactionColor = this.config.drawBlackBoxes ? "#000000" : "transparent";
+    const items = formattedSelection.map((s) => ({
+      id: uuidV4(),
+      kind: "text",
+      page: s.pageIndex,
+      rect: s.rect,
+      rects: s.segmentRects,
+      source: "legacy",
+      markColor: "#FF0000",
+      redactionColor,
+      text
+    }));
+    this.dispatch(addPending(documentId, items));
+    if (items.length) {
+      this.selectPending(items[items.length - 1].page, items[items.length - 1].id, documentId);
+    }
+  }
+  /**
+   * Unified method to create redactions from text selection.
+   * Delegates to annotation mode or legacy mode helper based on configuration.
+   */
+  createRedactionsFromSelection(documentId, formattedSelection, text) {
+    if (this.useAnnotationMode) {
+      this.createRedactAnnotationsFromSelection(documentId, formattedSelection, text);
+    } else {
+      this.createLegacyRedactionsFromSelection(documentId, formattedSelection, text);
+    }
+  }
+  /**
+   * Create a REDACT annotation from an area/marquee selection (annotation mode only)
+   */
+  createRedactAnnotationFromArea(documentId, pageIndex, rect) {
+    if (!this.annotationCapability) return;
+    const annoScope = this.annotationCapability.forDocument(documentId);
+    const tool = this.annotationCapability.getTool("redact");
+    const defaults = tool == null ? void 0 : tool.defaults;
+    const annotationId = uuidV4();
+    const annotation = {
+      ...defaults,
+      id: annotationId,
+      type: PdfAnnotationSubtype.REDACT,
+      pageIndex,
+      rect,
+      segmentRects: [],
+      // No segment rects for area redaction
+      created: /* @__PURE__ */ new Date()
+    };
+    annoScope.createAnnotation(pageIndex, annotation);
+    annoScope.selectAnnotation(pageIndex, annotationId);
+  }
+  /**
+   * Convert a RedactionItem to a PdfRedactAnnoObject
+   */
+  redactionItemToAnnotation(item) {
+    var _a;
+    const tool = (_a = this.annotationCapability) == null ? void 0 : _a.getTool("redact");
+    const defaults = (tool == null ? void 0 : tool.defaults) ?? {};
+    return {
+      ...defaults,
+      id: item.id,
+      type: PdfAnnotationSubtype.REDACT,
+      pageIndex: item.page,
+      rect: item.rect,
+      segmentRects: item.kind === "text" ? item.rects : [],
+      created: /* @__PURE__ */ new Date()
+    };
+  }
+  /**
+   * Convert a PdfRedactAnnoObject to a RedactionItem
+   */
+  annotationToRedactionItem(anno) {
+    var _a;
+    const markColor = anno.strokeColor ?? "#FF0000";
+    const redactionColor = anno.color ?? "transparent";
+    if (anno.segmentRects && anno.segmentRects.length > 0) {
+      return {
+        id: anno.id,
+        kind: "text",
+        page: anno.pageIndex,
+        rect: anno.rect,
+        rects: anno.segmentRects,
+        source: "annotation",
+        markColor,
+        redactionColor,
+        ...((_a = anno.custom) == null ? void 0 : _a.text) ? { text: anno.custom.text } : {}
+      };
+    } else {
+      return {
+        id: anno.id,
+        kind: "area",
+        page: anno.pageIndex,
+        rect: anno.rect,
+        source: "annotation",
+        markColor,
+        redactionColor
+      };
+    }
+  }
   // ─────────────────────────────────────────────────────────
   // Event Emission Helpers
   // ─────────────────────────────────────────────────────────
@@ -883,7 +1524,7 @@ const manifest = {
   version: "1.0.0",
   provides: ["redaction"],
   requires: [],
-  optional: ["interaction-manager", "selection"],
+  optional: ["interaction-manager", "selection", "annotation"],
   defaultConfig: {
     drawBlackBoxes: true
   }
@@ -914,6 +1555,8 @@ export {
   hasPendingRedactions,
   initialDocumentState,
   initialState,
-  manifest
+  manifest,
+  redactTool,
+  redactTools
 };
 //# sourceMappingURL=index.js.map