diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e40314717..007f74a26 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11,28 +11,28 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.7.7", "@dnd-kit/core": "^6.3.1", - "@embedpdf/core": "^2.3.0", - "@embedpdf/engines": "^2.3.0", - "@embedpdf/models": "^2.3.0", - "@embedpdf/plugin-annotation": "^2.3.0", - "@embedpdf/plugin-bookmark": "^2.3.0", - "@embedpdf/plugin-document-manager": "^2.3.0", - "@embedpdf/plugin-export": "^2.3.0", - "@embedpdf/plugin-history": "^2.3.0", - "@embedpdf/plugin-interaction-manager": "^2.3.0", - "@embedpdf/plugin-pan": "^2.3.0", - "@embedpdf/plugin-print": "^2.3.0", - "@embedpdf/plugin-redaction": "^2.3.0", - "@embedpdf/plugin-render": "^2.3.0", - "@embedpdf/plugin-rotate": "^2.3.0", - "@embedpdf/plugin-scroll": "^2.3.0", - "@embedpdf/plugin-search": "^2.3.0", - "@embedpdf/plugin-selection": "^2.3.0", - "@embedpdf/plugin-spread": "^2.3.0", - "@embedpdf/plugin-thumbnail": "^2.3.0", - "@embedpdf/plugin-tiling": "^2.3.0", - "@embedpdf/plugin-viewport": "^2.3.0", - "@embedpdf/plugin-zoom": "^2.3.0", + "@embedpdf/core": "^2.5.0", + "@embedpdf/engines": "^2.5.0", + "@embedpdf/models": "^2.5.0", + "@embedpdf/plugin-annotation": "^2.5.0", + "@embedpdf/plugin-bookmark": "^2.5.0", + "@embedpdf/plugin-document-manager": "^2.5.0", + "@embedpdf/plugin-export": "^2.5.0", + "@embedpdf/plugin-history": "^2.5.0", + "@embedpdf/plugin-interaction-manager": "^2.5.0", + "@embedpdf/plugin-pan": "^2.5.0", + "@embedpdf/plugin-print": "^2.5.0", + "@embedpdf/plugin-redaction": "^2.5.0", + "@embedpdf/plugin-render": "^2.5.0", + "@embedpdf/plugin-rotate": "^2.5.0", + "@embedpdf/plugin-scroll": "^2.5.0", + "@embedpdf/plugin-search": "^2.5.0", + "@embedpdf/plugin-selection": "^2.5.0", + "@embedpdf/plugin-spread": "^2.5.0", + "@embedpdf/plugin-thumbnail": "^2.5.0", + "@embedpdf/plugin-tiling": "^2.5.0", + "@embedpdf/plugin-viewport": "^2.5.0", + "@embedpdf/plugin-zoom": "^2.5.0", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.1", "@iconify/react": "^6.0.2", @@ -553,13 +553,13 @@ } }, "node_modules/@embedpdf/core": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/core/-/core-2.3.0.tgz", - "integrity": "sha512-aPD7lNSCOLc5Nos9xGA3qAT5jFZdrTT7IVcpxtM1BOKa1FI0XmotJ8vgzcRxH/FLwUASC4xwR9QxzTKp2aLsZQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/core/-/core-2.5.0.tgz", + "integrity": "sha512-nI7GnA5xCNtJHAdKBLPKJVvi4+yAKjy1sysaDf+qp+z3D81Hy8oAcl///QTaZ9ob0SL2jyqi3x//hKl0Rwmgrw==", "license": "MIT", "dependencies": { - "@embedpdf/engines": "2.3.0", - "@embedpdf/models": "2.3.0" + "@embedpdf/engines": "2.5.0", + "@embedpdf/models": "2.5.0" }, "peerDependencies": { "preact": "^10.26.4", @@ -570,9 +570,9 @@ } }, "node_modules/@embedpdf/engines": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/engines/-/engines-2.3.0.tgz", - "integrity": "sha512-QxNY58E2HgNgnbsTt5TnDUNvKoyabkf5IniGsiN5+rx6f4SFDpCnz3h1VJxNReWDyn9e16QlkUfgXX0qQWd3iQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/engines/-/engines-2.5.0.tgz", + "integrity": "sha512-SEknNmQrYvkAZgJllRKXuvXSrHSndDQsr7b3mrIVa9bzV6TeZua0a/YUlvI3/jf74Sdajru3XKPe22iHEOH4Zg==", "license": "MIT", "dependencies": { "@embedpdf/fonts-arabic": "1.0.0", @@ -582,8 +582,8 @@ "@embedpdf/fonts-latin": "1.0.0", "@embedpdf/fonts-sc": "1.0.0", "@embedpdf/fonts-tc": "1.0.0", - "@embedpdf/models": "2.3.0", - "@embedpdf/pdfium": "2.3.0" + "@embedpdf/models": "2.5.0", + "@embedpdf/pdfium": "2.5.0" }, "peerDependencies": { "preact": "^10.26.4", @@ -636,31 +636,31 @@ "license": "OFL-1.1" }, "node_modules/@embedpdf/models": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/models/-/models-2.3.0.tgz", - "integrity": "sha512-YAH3YdXl/UOhVcvMPd6mtU+tJ3veh24Q5swRDfuWUsJ3L2CcAG2P+4pjj4EAwvWUQcmN/HlVOjVQL0PkbkytKw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/models/-/models-2.5.0.tgz", + "integrity": "sha512-wu7XgargYBQEh46hVnfsmkTF6TvuoP9nAkTASR60s5ourjlT12qL9RiFLpwGkOBfs8E58h8V5hkgKsra5t03Lw==", "license": "MIT" }, "node_modules/@embedpdf/pdfium": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/pdfium/-/pdfium-2.3.0.tgz", - "integrity": "sha512-AIWHDDG24we1r8sWVO9Uae6V2ISXji2gIkZS3+CjtYowaBCpMTSu4QEQRnjQam2EWrEMVIJOXwBfx11TZKrxWA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/pdfium/-/pdfium-2.5.0.tgz", + "integrity": "sha512-2VEO4cNZsV8ig9upS+C+x3Tb58aqNxiAdaUMlD2ZZT8FgszhsV9xMyEuM2maFRdjeT7EO37FtzYBdXc/K67ivA==", "license": "MIT" }, "node_modules/@embedpdf/plugin-annotation": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-annotation/-/plugin-annotation-2.3.0.tgz", - "integrity": "sha512-TIN/OiDTg5tCNsebp1SWnS6aa7nnDvRrrZe3jx7Sg5IMEiZc6P3z+0aOjJtvoz0cp3Xi7Bb0PQsTLwo+bdfpVg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-annotation/-/plugin-annotation-2.5.0.tgz", + "integrity": "sha512-S5zCeWU3hM9jrnaGuW5RAXt+AzXXvQbFtAdCtxHW1hFADiZ97FKr8KS9MGCkkj6C9madtZP6iUJikvnhoLCABQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0", - "@embedpdf/utils": "2.3.0" + "@embedpdf/models": "2.5.0", + "@embedpdf/utils": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-history": "2.3.0", - "@embedpdf/plugin-interaction-manager": "2.3.0", - "@embedpdf/plugin-selection": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-history": "2.5.0", + "@embedpdf/plugin-interaction-manager": "2.5.0", + "@embedpdf/plugin-selection": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -669,15 +669,15 @@ } }, "node_modules/@embedpdf/plugin-bookmark": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-bookmark/-/plugin-bookmark-2.3.0.tgz", - "integrity": "sha512-7XO2NntgRb/Jk1XN/EOf7+yVaOPVVFvBuF0xlCqnz2BGAnMNrTn8QE73FtluJBgNhuK9LwDT2C4W+BTD2gd59Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-bookmark/-/plugin-bookmark-2.5.0.tgz", + "integrity": "sha512-2N5kGoamUrQqWZC5SMWIhdyBHqZN/CdcGf8GVH71FFw3AU6rmZ1AD/AkLzgqoYGIuZFE8ACckdrhtbpsZMmSDQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -686,15 +686,15 @@ } }, "node_modules/@embedpdf/plugin-document-manager": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-document-manager/-/plugin-document-manager-2.3.0.tgz", - "integrity": "sha512-hdKaWU1sjlLgXo2iWF4N734lklCfSO5Tj1xqk+0omxOpnVL1Ed5fzFO2N584pMkfFn1xo9Y2JPHSUtCdzF7/EQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-document-manager/-/plugin-document-manager-2.5.0.tgz", + "integrity": "sha512-I8Z/0B7R/YhtVaJFruwFO+QBLIDmQfHx9WVlrDXWZs68YiGwEbjSyizEIEqtulUJxcXfPs2Tf7oIBbdSuPG2NQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -703,15 +703,15 @@ } }, "node_modules/@embedpdf/plugin-export": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-export/-/plugin-export-2.3.0.tgz", - "integrity": "sha512-Xa048lKnc1jehWbaWv5qER1RVIHhHqt+JhgzAlqFSURXmzowbUzVEDBZ7fYImXRkpqp+ZeyBhWfZ60DBNE55Cw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-export/-/plugin-export-2.5.0.tgz", + "integrity": "sha512-KC9jXqwcxe76QqfxLx0tnrSdFoApTFOpT+dwrvox186uxYKSmSt1JHFWe4THB/A63hCNr8uMwyswYdFO8fWNHw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -720,15 +720,15 @@ } }, "node_modules/@embedpdf/plugin-history": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-history/-/plugin-history-2.3.0.tgz", - "integrity": "sha512-+fr/kjK2Z9BiC53IMlUZvWjkD6iilcI3XCUKQPXRgS5MDAuwpVlgdAtc+3VAMlG3IddElxVFdvvxRO9R89k5Mg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-history/-/plugin-history-2.5.0.tgz", + "integrity": "sha512-Av9NBSE9Or1Y6cXcNWpx0bBZN3yI4vywa6kSNjhaqOrgpQDWMaTO57eApJpyHzBodqEztY+klE9YJ7MH88zm6w==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -737,15 +737,15 @@ } }, "node_modules/@embedpdf/plugin-interaction-manager": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-interaction-manager/-/plugin-interaction-manager-2.3.0.tgz", - "integrity": "sha512-1/tDLPoQm6skNe/WOd6QD7SA0XRKphbJHi/s9XY4fhGgBvlD5XHFrYxtmrsaheYjqIBFtAWWZ3m5lAXRaO/igA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-interaction-manager/-/plugin-interaction-manager-2.5.0.tgz", + "integrity": "sha512-QrmowLVvC5FNZdvVr2kczSDdnHHOuhf+So0VG5Ythts/OL1bIR/0OOpuyJsScTyo5boYnRkXv8yPf8htL57YKQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -754,17 +754,17 @@ } }, "node_modules/@embedpdf/plugin-pan": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-pan/-/plugin-pan-2.3.0.tgz", - "integrity": "sha512-5yGxLpn28PHKCYx3tjzeVir7D5vHZ0Fk9HJRJr4K+Uqbg8pYFavb9tseXzPE4FcqpejqZo2DZyfo54ErQFXEyQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-pan/-/plugin-pan-2.5.0.tgz", + "integrity": "sha512-DfdA+hBm9kGYYy7OuJym6azk2h2U/Geirud+tmVzFSL7+OZ3tZ3K9fqj07w66zx0msyUVlYrXzkYSU9NEmwpLA==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-interaction-manager": "2.3.0", - "@embedpdf/plugin-viewport": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-interaction-manager": "2.5.0", + "@embedpdf/plugin-viewport": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -773,15 +773,15 @@ } }, "node_modules/@embedpdf/plugin-print": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-print/-/plugin-print-2.3.0.tgz", - "integrity": "sha512-LNxvXm3rZkRXXC41IArBDiwPLzSflmBmxxi+L+91xvw8n/FWUeXfWwQn7oQEAGq9Ha/3pEVHTls48QSFZN0mhg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-print/-/plugin-print-2.5.0.tgz", + "integrity": "sha512-qejq7/0K9hh3hzop+u+Qmn7ijTqGcDhxaiXoPkyl91CZVOyAD8qMBzWnhC7vRNOB7hcYgBP81uegE3se+EIlcA==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=18.0.0", "react-dom": ">=18.0.0", @@ -790,18 +790,20 @@ } }, "node_modules/@embedpdf/plugin-redaction": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-redaction/-/plugin-redaction-2.3.0.tgz", - "integrity": "sha512-un6AQL5Pqcm9v1tCV9Mb3NeowsGUtlCT/198k4nd+SWOMWNsbuFqI+rWOGV3auqXRGSzKj0gnt29t8aaeLpLeA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-redaction/-/plugin-redaction-2.5.0.tgz", + "integrity": "sha512-G0cm1hLWi09gU8WV+IShq2XHkmLtEbk+EvD3dIiyJV2kbOjgwGSC2Ezt8br3DzH6R/0bF6RAbDIpFyS2Q0oMfg==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0", - "@embedpdf/utils": "2.3.0" + "@embedpdf/models": "2.5.0", + "@embedpdf/utils": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-interaction-manager": "2.3.0", - "@embedpdf/plugin-selection": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-annotation": "2.5.0", + "@embedpdf/plugin-history": "2.5.0", + "@embedpdf/plugin-interaction-manager": "2.5.0", + "@embedpdf/plugin-selection": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -810,15 +812,15 @@ } }, "node_modules/@embedpdf/plugin-render": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-render/-/plugin-render-2.3.0.tgz", - "integrity": "sha512-UyQncK5NTokuEVISUcxPOXpZP4SItn4MjfeEaPsTXJkSRjHL4g3mU3iWy0nXJMCOT10OB+5m7qQ0/KkF4f+b5w==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-render/-/plugin-render-2.5.0.tgz", + "integrity": "sha512-nrTmg8cVMohcKYiQ/7erErsaWlyaq20OtXbVjmnPNnqz4amJLAjlPyudTJRlWWPyIiri9SF4A0ue5ICDY2sypg==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -827,15 +829,15 @@ } }, "node_modules/@embedpdf/plugin-rotate": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-rotate/-/plugin-rotate-2.3.0.tgz", - "integrity": "sha512-vibDXHA0L2LlMrmkSuanmdtUpc2JPBuQybiGwf9F4wlleKN3f7uSWxZsHdVAxWdzsaG+/26QTGl75otZLnVuig==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-rotate/-/plugin-rotate-2.5.0.tgz", + "integrity": "sha512-crFsXduaxNZJmVRfgklBpO4x4i9cRxPmfFBvdIoyJ1ea6AGOCL0rQKQcfqHTFdgtPzlVUiIg6Hi2v+033jdLUg==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -844,16 +846,16 @@ } }, "node_modules/@embedpdf/plugin-scroll": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-scroll/-/plugin-scroll-2.3.0.tgz", - "integrity": "sha512-8pdaSY9QuqdX22Ykw2jKn07Rx6FIsDdj/O0+mlbccY/ISofj9WEFNeQgnOY64OUTDyurJYqpYvq6QqvgbGLs+A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-scroll/-/plugin-scroll-2.5.0.tgz", + "integrity": "sha512-AdLuSgvAaukLl1uQ0FbswcAIPFaR3Jk2ZbEJpWLd9E6iQ+66Cta0Sz8d5J6ndx7VBlRYAZwoqiXF85utJxpQ5g==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-viewport": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-viewport": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -862,15 +864,15 @@ } }, "node_modules/@embedpdf/plugin-search": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-search/-/plugin-search-2.3.0.tgz", - "integrity": "sha512-VNXmNf7fIIRWGVwf2kIUeUeLkUTJlq9AGjUO2TyuYJTWTsmfT4LEqPDDpwC6NDVFhzWE6xwbb3bxvY/9bqBMzw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-search/-/plugin-search-2.5.0.tgz", + "integrity": "sha512-ycHJh05vBZ1PTSdEMgdx6K1py0oklwbwY2eXO4nD54EN9EVZgWlYC4Q+u8nyGOiNL6VmJYcqJ0HmjSWBdmGWBw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -879,17 +881,17 @@ } }, "node_modules/@embedpdf/plugin-selection": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-selection/-/plugin-selection-2.3.0.tgz", - "integrity": "sha512-+emaY4vff3ynAf5C3PfCOlleQIqiImbBpb6zkG5SVUa9Vn5x0SfYGT4Jumtbzq8XBknC1QIRKVlplC9BcnjcmQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-selection/-/plugin-selection-2.5.0.tgz", + "integrity": "sha512-M3WDjahig/6KE83SZGvTaJWhqEOIzH002k2fpJVuks926UBnfgYCH8uqV7SOUQTneQDmIa0PlyFiuEXDw1Ocrw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0", - "@embedpdf/utils": "2.3.0" + "@embedpdf/models": "2.5.0", + "@embedpdf/utils": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-interaction-manager": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-interaction-manager": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -898,15 +900,15 @@ } }, "node_modules/@embedpdf/plugin-spread": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-spread/-/plugin-spread-2.3.0.tgz", - "integrity": "sha512-sFqYKwzKGPaCXn6hAyv6GHdVTlL2vg3poxRNd2W5kLQo07YtHlSjXr/XAhaGT/a4GtR9rtbSJ4hWNJjzIcwE0g==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-spread/-/plugin-spread-2.5.0.tgz", + "integrity": "sha512-kG8HZMZmbpUVDxCOEyQzIiMPW+VjjebOl93V+quAH+GAI5Tkg6exPyyQ2+/DOJPCtYX4Kh2z2aeoyK2b7NRgIQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -915,16 +917,16 @@ } }, "node_modules/@embedpdf/plugin-thumbnail": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-thumbnail/-/plugin-thumbnail-2.3.0.tgz", - "integrity": "sha512-CAOnipeBtdKSHGBuIm5420GykUw7k2rB7Z9GwouTbbycS7Cw+kiaGpOfHfenoKPTlWMkHYAwFcZiWKV3XG/nRQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-thumbnail/-/plugin-thumbnail-2.5.0.tgz", + "integrity": "sha512-iWofJSXKbWrgvS2fe8v3U1+e2wjBRXD2i1DUcJKnTrqyfjZ8YzUomc5EzdG2RT7uUjtqrcu7463TZ9JHXUkASQ==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-render": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-render": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -933,18 +935,18 @@ } }, "node_modules/@embedpdf/plugin-tiling": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-tiling/-/plugin-tiling-2.3.0.tgz", - "integrity": "sha512-6VJ042WksIyZVWyvXq1nf0Ct+U4Pl6+QUDy1ThJefwk/HKDfWU2zEr/+1STJKVWgfUx5QRdipf6Jghd+HnOg3Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-tiling/-/plugin-tiling-2.5.0.tgz", + "integrity": "sha512-oih0GyGOJvfaXPLSEY+qfC05UUU1ZkADEbr6uCwRMmdHIXu/0ZTJnAToegfWXtfE+Sw0J5wscVkipXXIX5azlw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-render": "2.3.0", - "@embedpdf/plugin-scroll": "2.3.0", - "@embedpdf/plugin-viewport": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-render": "2.5.0", + "@embedpdf/plugin-scroll": "2.5.0", + "@embedpdf/plugin-viewport": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -953,15 +955,15 @@ } }, "node_modules/@embedpdf/plugin-viewport": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-viewport/-/plugin-viewport-2.3.0.tgz", - "integrity": "sha512-3NQp3hVfRF7DMUPNAVOfZsqQQrugEfY0voRUrQI90eyi16GFntN3CP9Mc5cOp2jnUICMYlirQ/om+KCseMHS2Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-viewport/-/plugin-viewport-2.5.0.tgz", + "integrity": "sha512-z0AXHA9Z3rZdCLje7P2NsQbxKLJ4b/l8lgzXOVn5Ow/pIPE0D2P3fn9WzImHTNI1RNrZMdkW9OH3lfkEXFTqHw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", + "@embedpdf/core": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -970,17 +972,17 @@ } }, "node_modules/@embedpdf/plugin-zoom": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/plugin-zoom/-/plugin-zoom-2.3.0.tgz", - "integrity": "sha512-wnBqK02ku0zCViqQfSD1Vohy+aBUogXrqUTwo1/1QFEphmgnCHnHbEUduh9M0ghcT4s26pBgbJqCrShpGYAdvQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/plugin-zoom/-/plugin-zoom-2.5.0.tgz", + "integrity": "sha512-HWJlqXOXdv/kttV+XWCCStUZAeLl66AuaO8BsnPlAPwEADLLCH4tR4XqJQoWr7/r5watKP7UeQ00FsWu0oGclw==", "license": "MIT", "dependencies": { - "@embedpdf/models": "2.3.0" + "@embedpdf/models": "2.5.0" }, "peerDependencies": { - "@embedpdf/core": "2.3.0", - "@embedpdf/plugin-scroll": "2.3.0", - "@embedpdf/plugin-viewport": "2.3.0", + "@embedpdf/core": "2.5.0", + "@embedpdf/plugin-scroll": "2.5.0", + "@embedpdf/plugin-viewport": "2.5.0", "preact": "^10.26.4", "react": ">=16.8.0", "react-dom": ">=16.8.0", @@ -989,9 +991,9 @@ } }, "node_modules/@embedpdf/utils": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@embedpdf/utils/-/utils-2.3.0.tgz", - "integrity": "sha512-9DV+tu+GsnijchNSG/NzslnxTGIUH6j2MxBR8QOoZLsWETEVaMLkHtbvzXPyMOx/5RlvBn8wR0jNKTNptOCnXQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@embedpdf/utils/-/utils-2.5.0.tgz", + "integrity": "sha512-JjYj6BRzu9oesA1JOqKPFMEWKinjvJIjziWu1j6lDXxLsE59bkShjUKbaEG+lkXRspuZRWNP++rzE2p2Ht4veg==", "license": "MIT", "peerDependencies": { "preact": "^10.26.4", diff --git a/frontend/package.json b/frontend/package.json index d90c0cfd0..d866a6383 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,28 +7,28 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.7.7", "@dnd-kit/core": "^6.3.1", - "@embedpdf/core": "^2.3.0", - "@embedpdf/engines": "^2.3.0", - "@embedpdf/models": "^2.3.0", - "@embedpdf/plugin-annotation": "^2.3.0", - "@embedpdf/plugin-bookmark": "^2.3.0", - "@embedpdf/plugin-export": "^2.3.0", - "@embedpdf/plugin-history": "^2.3.0", - "@embedpdf/plugin-document-manager": "^2.3.0", - "@embedpdf/plugin-interaction-manager": "^2.3.0", - "@embedpdf/plugin-pan": "^2.3.0", - "@embedpdf/plugin-print": "^2.3.0", - "@embedpdf/plugin-redaction": "^2.3.0", - "@embedpdf/plugin-render": "^2.3.0", - "@embedpdf/plugin-rotate": "^2.3.0", - "@embedpdf/plugin-scroll": "^2.3.0", - "@embedpdf/plugin-search": "^2.3.0", - "@embedpdf/plugin-selection": "^2.3.0", - "@embedpdf/plugin-spread": "^2.3.0", - "@embedpdf/plugin-thumbnail": "^2.3.0", - "@embedpdf/plugin-tiling": "^2.3.0", - "@embedpdf/plugin-viewport": "^2.3.0", - "@embedpdf/plugin-zoom": "^2.3.0", + "@embedpdf/core": "^2.5.0", + "@embedpdf/engines": "^2.5.0", + "@embedpdf/models": "^2.5.0", + "@embedpdf/plugin-annotation": "^2.5.0", + "@embedpdf/plugin-bookmark": "^2.5.0", + "@embedpdf/plugin-export": "^2.5.0", + "@embedpdf/plugin-history": "^2.5.0", + "@embedpdf/plugin-document-manager": "^2.5.0", + "@embedpdf/plugin-interaction-manager": "^2.5.0", + "@embedpdf/plugin-pan": "^2.5.0", + "@embedpdf/plugin-print": "^2.5.0", + "@embedpdf/plugin-redaction": "^2.5.0", + "@embedpdf/plugin-render": "^2.5.0", + "@embedpdf/plugin-rotate": "^2.5.0", + "@embedpdf/plugin-scroll": "^2.5.0", + "@embedpdf/plugin-search": "^2.5.0", + "@embedpdf/plugin-selection": "^2.5.0", + "@embedpdf/plugin-spread": "^2.5.0", + "@embedpdf/plugin-thumbnail": "^2.5.0", + "@embedpdf/plugin-tiling": "^2.5.0", + "@embedpdf/plugin-viewport": "^2.5.0", + "@embedpdf/plugin-zoom": "^2.5.0", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.1", "@iconify/react": "^6.0.2", diff --git a/frontend/public/locales/en-GB/translation.toml b/frontend/public/locales/en-GB/translation.toml index 2fa1710b9..b26843dd8 100644 --- a/frontend/public/locales/en-GB/translation.toml +++ b/frontend/public/locales/en-GB/translation.toml @@ -3411,6 +3411,7 @@ instructions = "Select text or draw areas on the PDF to mark content for redacti markText = "Mark Text" markArea = "Mark Area" pendingLabel = "Pending:" +applyRedactions = "Apply Redactions" applyWarning = "⚠️ Permanent application, cannot be undone and the data underneath will be deleted" apply = "Apply" noMarks = "No redaction marks. Use the tools above to mark content for redaction." diff --git a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx index f4bbb386f..2030fad85 100644 --- a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx +++ b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx @@ -13,6 +13,7 @@ import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext'; import { useRightRailTooltipSide } from '@app/hooks/useRightRailTooltipSide'; import { useRedactionMode, useRedaction } from '@app/contexts/RedactionContext'; import { defaultParameters, RedactParameters } from '@app/hooks/tools/redact/useRedactParameters'; +import { RedactionMode } from '@embedpdf/plugin-redaction'; interface ViewerAnnotationControlsProps { currentView: string; @@ -41,11 +42,11 @@ export default function ViewerAnnotationControls({ currentView, disabled = false const { actions: navActions } = useNavigationActions(); const isSignMode = selectedTool === 'sign'; const isRedactMode = selectedTool === 'redact'; - + // Get redaction pending state and navigation guard const { isRedacting: _isRedacting } = useRedactionMode(); const { requestNavigation, setHasUnsavedChanges } = useNavigationGuard(); - const { setRedactionMode, activateTextSelection, setRedactionConfig, setRedactionsApplied, redactionApiRef, setActiveType } = useRedaction(); + const { setRedactionMode, activateRedact, setRedactionConfig, setRedactionsApplied, redactionApiRef, setActiveType } = useRedaction(); // Check if we're in any annotation tool that should disable the toggle @@ -70,7 +71,7 @@ export default function ViewerAnnotationControls({ currentView, disabled = false const { stirlingFiles, stubs } = await createStirlingFilesAndStubs([file], parentStub, 'redact'); await fileActions.consumeFiles([state.files.ids[0]], stirlingFiles, stubs); - + // Clear unsaved changes flags after successful save setHasUnsavedChanges(false); setRedactionsApplied(false); @@ -113,11 +114,11 @@ export default function ViewerAnnotationControls({ currentView, disabled = false setLeftPanelView('toolContent'); setRedactionMode(true); - // Activate text selection mode after a short delay + // Activate unified redact mode after a short delay setTimeout(() => { const currentType = redactionApiRef.current?.getActiveType?.(); - if (currentType !== 'redactSelection') { - activateTextSelection(); + if (currentType !== RedactionMode.Redact) { + activateRedact(); } }, 200); }; diff --git a/frontend/src/core/components/tools/redact/ManualRedactionControls.tsx b/frontend/src/core/components/tools/redact/ManualRedactionControls.tsx index 96c841447..e522db943 100644 --- a/frontend/src/core/components/tools/redact/ManualRedactionControls.tsx +++ b/frontend/src/core/components/tools/redact/ManualRedactionControls.tsx @@ -14,51 +14,45 @@ interface ManualRedactionControlsProps { /** * ManualRedactionControls provides UI for manual PDF redaction in the tool panel. * Displays controls for marking text/areas for redaction and applying them. - * Uses our RedactionContext which bridges to the EmbedPDF API. */ export default function ManualRedactionControls({ disabled = false }: ManualRedactionControlsProps) { const { t } = useTranslation(); // Use our RedactionContext which bridges to EmbedPDF const { activateTextSelection, activateMarquee, redactionsApplied, setActiveType } = useRedaction(); - const { pendingCount, activeType, isRedacting, isBridgeReady } = useRedactionMode(); - + const { pendingCount, activeType, isBridgeReady } = useRedactionMode(); + // Get viewer context to manage annotation mode and save changes const { isAnnotationMode, setAnnotationMode, applyChanges, activeFileIndex } = useViewer(); - + // Get signature context to deactivate annotation tools when switching to redaction const { signatureApiRef } = useSignature(); - + // Check which tool is active based on activeType const isSelectionActive = activeType === 'redactSelection'; const isMarqueeActive = activeType === 'marqueeRedact'; - - // Track if we've auto-activated + + // Track if we've auto-activated for the current bridge session const hasAutoActivated = useRef(false); - + // Track the previous file index to detect file switches const prevFileIndexRef = useRef(activeFileIndex); - - // Track previous pending count to detect when all redactions are applied - const prevPendingCountRef = useRef(pendingCount); - - // Track if we're currently auto-saving to prevent re-entry - const isAutoSavingRef = useRef(false); // Auto-activate selection mode when the API bridge becomes ready - // This ensures at least one tool is selected when entering manual redaction mode + // This ensures Mark Text is pre-selected when entering manual redaction mode useEffect(() => { - if (isBridgeReady && !disabled && !isRedacting && !hasAutoActivated.current) { + if (isBridgeReady && !disabled && !hasAutoActivated.current) { hasAutoActivated.current = true; // Small delay to ensure EmbedPDF is fully ready const timer = setTimeout(() => { // Deactivate annotation mode to show redaction layer setAnnotationMode(false); + // Pre-select the Mark Text tool activateTextSelection(); - }, 100); + }, 150); return () => clearTimeout(timer); } - }, [isBridgeReady, disabled, isRedacting, activateTextSelection, setAnnotationMode]); + }, [isBridgeReady, disabled, activateTextSelection, setAnnotationMode]); // Reset auto-activation flag when disabled changes or bridge becomes not ready useEffect(() => { @@ -72,50 +66,19 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda useEffect(() => { if (prevFileIndexRef.current !== activeFileIndex) { prevFileIndexRef.current = activeFileIndex; - + // Reset active type to null when switching files // This makes both buttons appear unselected, requiring the user to re-click // which ensures proper activation on the new PDF if (isSelectionActive || isMarqueeActive) { setActiveType(null); } + + // Reset auto-activation flag so new file can auto-activate + hasAutoActivated.current = false; } }, [activeFileIndex, isSelectionActive, isMarqueeActive, setActiveType]); - // Auto-save when all pending redactions have been applied - // This triggers when the user clicks "Apply (permanent)" on the last pending redaction - useEffect(() => { - const hadPendingBefore = prevPendingCountRef.current > 0; - const hasNoPendingNow = pendingCount === 0; - const wasJustCleared = hadPendingBefore && hasNoPendingNow; - - // Update the ref for next comparison - prevPendingCountRef.current = pendingCount; - - // Auto-save when: - // - pendingCount just went from > 0 to 0 (user applied the last pending redaction) - // - redactionsApplied is true (at least one redaction was committed) - // - not already auto-saving - // - applyChanges is available - if (wasJustCleared && redactionsApplied && !isAutoSavingRef.current && applyChanges) { - isAutoSavingRef.current = true; - - // Small delay to ensure UI updates before save - const timer = setTimeout(async () => { - try { - await applyChanges(); - } finally { - isAutoSavingRef.current = false; - } - }, 100); - - return () => { - clearTimeout(timer); - isAutoSavingRef.current = false; - }; - } - }, [pendingCount, redactionsApplied, applyChanges]); - const handleSelectionClick = () => { // Deactivate annotation mode and tools to switch to redaction layer if (isAnnotationMode) { @@ -129,7 +92,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda } } } - + if (isSelectionActive && !isAnnotationMode) { // If already active and not coming from annotation mode, switch to marquee activateMarquee(); @@ -151,7 +114,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda } } } - + if (isMarqueeActive && !isAnnotationMode) { // If already active and not coming from annotation mode, switch to selection activateTextSelection(); @@ -170,7 +133,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda // Check if there are unsaved changes to save (pending redactions OR applied redactions) // Save Changes button will apply pending redactions and then save everything const hasUnsavedChanges = pendingCount > 0 || redactionsApplied; - + // Check if API is available - use isBridgeReady state instead of ref (refs don't trigger re-renders) const isApiReady = isBridgeReady; @@ -181,7 +144,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda {t('redact.manual.title', 'Redaction Tools')} - + {t('redact.manual.instructions', 'Select text or draw areas on the PDF to mark content for redaction.')} @@ -196,7 +159,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda disabled={disabled || !isApiReady} size="sm" styles={{ - root: { + root: { minWidth: 0, }, label: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }, @@ -214,7 +177,7 @@ export default function ManualRedactionControls({ disabled = false }: ManualReda disabled={disabled || !isApiReady} size="sm" styles={{ - root: { + root: { minWidth: 0, }, label: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }, diff --git a/frontend/src/core/components/viewer/AnnotationAPIBridge.tsx b/frontend/src/core/components/viewer/AnnotationAPIBridge.tsx index 2bc779fde..0f4e6b2e4 100644 --- a/frontend/src/core/components/viewer/AnnotationAPIBridge.tsx +++ b/frontend/src/core/components/viewer/AnnotationAPIBridge.tsx @@ -88,6 +88,7 @@ type AnnotationApiSurface = { deselectAnnotation?: () => void; updateAnnotation?: (pageIndex: number, annotationId: string, patch: AnnotationPatch) => void; onAnnotationEvent?: (listener: (event: AnnotationEvent) => void) => void | (() => void); + purgeAnnotation?: (pageIndex: number, annotationId: string) => void; }; type ToolDefaultsBuilder = (options?: AnnotationToolOptions) => AnnotationDefaults; @@ -372,6 +373,11 @@ export const AnnotationAPIBridge = forwardRef(function Annotation const api = annotationApi as AnnotationApiSurface | undefined; return api?.getActiveTool?.() ?? null; }, + + purgeAnnotation: (pageIndex: number, annotationId: string) => { + const api = annotationApi as AnnotationApiSurface | undefined; + api?.purgeAnnotation?.(pageIndex, annotationId); + }, }), [annotationApi, configureAnnotationTool, buildAnnotationDefaults] ); diff --git a/frontend/src/core/components/viewer/HistoryAPIBridge.tsx b/frontend/src/core/components/viewer/HistoryAPIBridge.tsx index 94dca3f6a..e590f9bb2 100644 --- a/frontend/src/core/components/viewer/HistoryAPIBridge.tsx +++ b/frontend/src/core/components/viewer/HistoryAPIBridge.tsx @@ -146,6 +146,13 @@ export const HistoryAPIBridge = forwardRef(function HistoryAPIBridge return historyApi ? historyApi.canRedo() : false; }, + purgeByMetadata: (predicate: (metadata: T | undefined) => boolean, topic?: string) => { + if (historyApi?.purgeByMetadata) { + return historyApi.purgeByMetadata(predicate, topic); + } + return 0; + }, + subscribe: (listener: () => void) => { if (!historyApi?.onHistoryChange) { return () => {}; diff --git a/frontend/src/core/components/viewer/PanAPIBridge.tsx b/frontend/src/core/components/viewer/PanAPIBridge.tsx index a09b01394..111ef70e2 100644 --- a/frontend/src/core/components/viewer/PanAPIBridge.tsx +++ b/frontend/src/core/components/viewer/PanAPIBridge.tsx @@ -48,7 +48,7 @@ function PanAPIBridgeInner({ documentId }: { documentId: string }) { currentPan.togglePan(); }, makePanDefault: () => { - // v2.3.0: makePanDefault may not exist, enable pan as fallback + // v2.5.0: makePanDefault may not exist, enable pan as fallback if ('makePanDefault' in currentPan && typeof (currentPan as any).makePanDefault === 'function') { (currentPan as any).makePanDefault(); } else { diff --git a/frontend/src/core/components/viewer/RedactionAPIBridge.tsx b/frontend/src/core/components/viewer/RedactionAPIBridge.tsx index 4220da84e..6ac8596f2 100644 --- a/frontend/src/core/components/viewer/RedactionAPIBridge.tsx +++ b/frontend/src/core/components/viewer/RedactionAPIBridge.tsx @@ -3,6 +3,11 @@ import { useRedaction as useEmbedPdfRedaction } from '@embedpdf/plugin-redaction import { useRedaction } from '@app/contexts/RedactionContext'; import { useActiveDocumentId } from '@app/components/viewer/useActiveDocumentId'; +/** + * RedactionAPIBridge - Uses embedPDF v2.5.0 + * Bridges between the EmbedPDF redaction plugin and the Stirling-PDF RedactionContext. + * Uses the unified redaction mode (toggleRedact/enableRedact/endRedact). + */ export function RedactionAPIBridge() { const activeDocumentId = useActiveDocumentId(); @@ -43,13 +48,22 @@ function RedactionAPIBridgeInner({ documentId }: { documentId: string }) { }, [state?.pendingCount, state?.activeType, state?.isRedacting, setPendingCount, setActiveType, setIsRedacting]); // Expose the EmbedPDF API through our context's ref + // Uses v2.5.0 unified redaction mode useImperativeHandle(redactionApiRef, () => ({ - toggleRedactSelection: () => { - provides?.toggleRedactSelection(); + // Unified redaction methods (v2.5.0) + toggleRedact: () => { + provides?.toggleRedact(); }, - toggleMarqueeRedact: () => { - provides?.toggleMarqueeRedact(); + enableRedact: () => { + provides?.enableRedact(); }, + isRedactActive: () => { + return provides?.isRedactActive() ?? false; + }, + endRedact: () => { + provides?.endRedact(); + }, + // Common methods commitAllPending: () => { provides?.commitAllPending(); // Don't set redactionsApplied here - it should only be set after the file is saved diff --git a/frontend/src/core/components/viewer/RedactionSelectionMenu.tsx b/frontend/src/core/components/viewer/RedactionSelectionMenu.tsx index aa2043c04..949492a55 100644 --- a/frontend/src/core/components/viewer/RedactionSelectionMenu.tsx +++ b/frontend/src/core/components/viewer/RedactionSelectionMenu.tsx @@ -8,32 +8,30 @@ import CheckCircleIcon from '@mui/icons-material/CheckCircle'; import { useRedaction } from '@app/contexts/RedactionContext'; import { useActiveDocumentId } from '@app/components/viewer/useActiveDocumentId'; -// Use the official EmbedPDF v2.3.0 types export type { RedactionSelectionMenuProps }; export function RedactionSelectionMenu(props: RedactionSelectionMenuProps) { const activeDocumentId = useActiveDocumentId(); - + // Don't render until we have a valid document ID if (!activeDocumentId) { return null; } - + return ( - ); } -function RedactionSelectionMenuInner({ +function RedactionSelectionMenuInner({ documentId, context, - selected, + selected, menuWrapperProps, }: RedactionSelectionMenuProps & { documentId: string }) { - // Extract item and pageIndex from context (EmbedPDF v2.3.0 API) const item = context?.item; const pageIndex = context?.pageIndex; const { t } = useTranslation(); @@ -41,14 +39,14 @@ function RedactionSelectionMenuInner({ const { setRedactionsApplied } = useRedaction(); const wrapperRef = useRef(null); const [menuPosition, setMenuPosition] = useState<{ top: number; left: number } | null>(null); - + // Merge refs - menuWrapperProps.ref is a callback ref const setRef = useCallback((node: HTMLDivElement | null) => { wrapperRef.current = node; // Call the EmbedPDF ref callback menuWrapperProps?.ref?.(node); }, [menuWrapperProps]); - + const handleRemove = useCallback(() => { if (provides?.removePending && item && pageIndex !== undefined) { provides.removePending(pageIndex, item.id); @@ -89,17 +87,17 @@ function RedactionSelectionMenuInner({ }; updatePosition(); - + // Update position on scroll/resize window.addEventListener('scroll', updatePosition, true); window.addEventListener('resize', updatePosition); - + return () => { window.removeEventListener('scroll', updatePosition, true); window.removeEventListener('resize', updatePosition); }; }, [selected, item]); - + // Early return AFTER all hooks have been called if (!selected || !item) return null; @@ -146,8 +144,8 @@ function RedactionSelectionMenuInner({ - - {/* Invisible wrapper that provides positioning - uses EmbedPDF's menuWrapperProps */} -
{typeof document !== 'undefined' && menuContent ? createPortal(menuContent, document.body) diff --git a/frontend/src/core/components/viewer/viewerTypes.ts b/frontend/src/core/components/viewer/viewerTypes.ts index ac6647520..6901b66d2 100644 --- a/frontend/src/core/components/viewer/viewerTypes.ts +++ b/frontend/src/core/components/viewer/viewerTypes.ts @@ -25,6 +25,7 @@ export interface AnnotationAPI { deactivateTools: () => void; onAnnotationEvent?: (listener: (event: AnnotationEvent) => void) => void | (() => void); getActiveTool?: () => { id: AnnotationToolId } | null; + purgeAnnotation?: (pageIndex: number, annotationId: string) => void; } export interface HistoryAPI { @@ -33,6 +34,15 @@ export interface HistoryAPI { canUndo: () => boolean; canRedo: () => boolean; subscribe?: (listener: () => void) => () => void; + /** + * Purges history entries that match the given predicate based on command metadata. + * Useful for removing commands that are no longer valid (e.g., after a permanent redaction commit). + * Added in embedPDF v2.4.0+ + * @param predicate A function that returns true for commands that should be purged + * @param topic If provided, only purges entries for that specific topic + * @returns The number of entries that were purged + */ + purgeByMetadata?: (predicate: (metadata: T | undefined) => boolean, topic?: string) => number; } export type AnnotationToolId = diff --git a/frontend/src/core/contexts/RedactionContext.tsx b/frontend/src/core/contexts/RedactionContext.tsx index d35794782..32289bfdf 100644 --- a/frontend/src/core/contexts/RedactionContext.tsx +++ b/frontend/src/core/contexts/RedactionContext.tsx @@ -1,20 +1,25 @@ import React, { createContext, useContext, useState, ReactNode, useCallback, useRef, useEffect } from 'react'; import { RedactParameters } from '@app/hooks/tools/redact/useRedactParameters'; import { useNavigationGuard } from '@app/contexts/NavigationContext'; +import { RedactionMode } from '@embedpdf/plugin-redaction'; /** * API interface that the EmbedPDF bridge will implement */ export interface RedactionAPI { - toggleRedactSelection: () => void; - toggleMarqueeRedact: () => void; + toggleRedact: () => void; + enableRedact: () => void; + isRedactActive: () => boolean; + endRedact: () => void; + // Common methods commitAllPending: () => void; - getActiveType: () => 'redactSelection' | 'marqueeRedact' | null; + getActiveType: () => RedactionMode | null; getPendingCount: () => number; } /** * State interface for redaction operations + * Uses embedPDF v2.5.0 unified redaction mode */ interface RedactionState { // Current redaction configuration from the tool @@ -25,7 +30,8 @@ interface RedactionState { redactionsApplied: boolean; // Synced state from EmbedPDF pendingCount: number; - activeType: 'redactSelection' | 'marqueeRedact' | null; + // Uses RedactionMode enum from v2.5.0 + activeType: RedactionMode | null; isRedacting: boolean; // Whether the redaction API bridge is ready (API ref is populated) isBridgeReady: boolean; @@ -33,6 +39,7 @@ interface RedactionState { /** * Actions interface for redaction operations + * Uses embedPDF v2.5.0 unified redaction mode */ interface RedactionActions { setRedactionConfig: (config: RedactParameters | null) => void; @@ -40,13 +47,16 @@ interface RedactionActions { setRedactionsApplied: (applied: boolean) => void; // Synced state setters (called from inside EmbedPDF) setPendingCount: (count: number) => void; - setActiveType: (type: 'redactSelection' | 'marqueeRedact' | null) => void; + setActiveType: (type: RedactionMode | null) => void; setIsRedacting: (isRedacting: boolean) => void; setBridgeReady: (ready: boolean) => void; - // Actions that call through to EmbedPDF API + // Unified redaction actions (v2.5.0) + activateRedact: () => void; + deactivateRedact: () => void; + commitAllPending: () => void; + // Legacy UI actions (for backwards compatibility with UI) activateTextSelection: () => void; activateMarquee: () => void; - commitAllPending: () => void; } /** @@ -110,7 +120,7 @@ export const RedactionProvider: React.FC<{ children: ReactNode }> = ({ children })); }, []); - const setActiveType = useCallback((type: 'redactSelection' | 'marqueeRedact' | null) => { + const setActiveType = useCallback((type: RedactionMode | null) => { setState(prev => ({ ...prev, activeType: type, @@ -143,16 +153,16 @@ export const RedactionProvider: React.FC<{ children: ReactNode }> = ({ children } }, [state.pendingCount, state.redactionsApplied, state.isRedactionMode, setHasUnsavedChanges]); - // Actions that call through to EmbedPDF API - const activateTextSelection = useCallback(() => { + // Unified redaction actions (v2.5.0) + const activateRedact = useCallback(() => { if (redactionApiRef.current) { - redactionApiRef.current.toggleRedactSelection(); + redactionApiRef.current.enableRedact(); } }, []); - const activateMarquee = useCallback(() => { + const deactivateRedact = useCallback(() => { if (redactionApiRef.current) { - redactionApiRef.current.toggleMarqueeRedact(); + redactionApiRef.current.endRedact(); } }, []); @@ -165,6 +175,23 @@ export const RedactionProvider: React.FC<{ children: ReactNode }> = ({ children } }, [setRedactionsApplied]); + // Legacy UI actions for backwards compatibility + // In v2.5.0, both text selection and marquee use the same unified mode + // These just activate the unified redact mode and set the active type for UI state + const activateTextSelection = useCallback(() => { + if (redactionApiRef.current) { + redactionApiRef.current.enableRedact(); + setActiveType('redactSelection' as RedactionMode); + } + }, [setActiveType]); + + const activateMarquee = useCallback(() => { + if (redactionApiRef.current) { + redactionApiRef.current.enableRedact(); + setActiveType('marqueeRedact' as RedactionMode); + } + }, [setActiveType]); + const contextValue: RedactionContextValue = { ...state, redactionApiRef, @@ -175,9 +202,11 @@ export const RedactionProvider: React.FC<{ children: ReactNode }> = ({ children setActiveType, setIsRedacting, setBridgeReady, + activateRedact, + deactivateRedact, + commitAllPending, activateTextSelection, activateMarquee, - commitAllPending, }; return (