Improve annotation handling and UI stability
Updated `appsettings.UI.json` to adjust annotation properties for better alignment and positioning. Refactored `createAnnotations` and `createAnnotationFrameBlob` in `annotation.js` to improve readability, reusability, and asynchronous handling. Enhanced the `App` class in `app.js` by introducing `signatureWidgets` for stable frame placement and added logic to find and update the nearest signature widget. Improved bounding box calculations and removed widget backgrounds after signing. Refactored `handleAnnotationsCreate` to align with new logic and updated `app.min.js` to reflect these changes. General improvements include better code maintainability, reduced redundancy, and enhanced user experience.
This commit is contained in:
@@ -37,10 +37,15 @@ class App {
|
||||
});
|
||||
|
||||
// Load annotations into PSPDFKit
|
||||
this.signatureWidgets = [] // { pageIndex, boundingBox, id }
|
||||
if (!READ_AND_CONFIRM)
|
||||
try {
|
||||
let signatures = await createAnnotations(this.currentDocument, this.envelopeReceiver.envelopeId, this.envelopeReceiver.receiverId);
|
||||
await this.pdfKit.create(signatures);
|
||||
// Cache signature widget bounding boxes for stable frame placement
|
||||
this.signatureWidgets = signatures
|
||||
.filter(s => s instanceof PSPDFKit.Annotations.WidgetAnnotation && s.formFieldName?.includes('signature'))
|
||||
.map(s => ({ id: s.id, pageIndex: s.pageIndex, boundingBox: s.boundingBox.toJS() }))
|
||||
} catch (e) {
|
||||
console.error("Error loading annotations:", e);
|
||||
}
|
||||
@@ -66,8 +71,27 @@ class App {
|
||||
|
||||
if (isFormField === false && isSignature === true) {
|
||||
|
||||
const left = annotation.boundingBox.left - 20
|
||||
const top = annotation.boundingBox.top - 20
|
||||
// Find the nearest signature widget on the same page to use its stable bounding box
|
||||
const inkBBox = annotation.boundingBox
|
||||
const samePageWidgets = this.signatureWidgets.filter(w => w.pageIndex === annotation.pageIndex)
|
||||
const nearestWidget = samePageWidgets.reduce((nearest, w) => {
|
||||
const dx = w.boundingBox.left - inkBBox.left
|
||||
const dy = w.boundingBox.top - inkBBox.top
|
||||
const dist = Math.sqrt(dx * dx + dy * dy)
|
||||
return dist < nearest.dist ? { dist, widget: w } : nearest
|
||||
}, { dist: Infinity, widget: null }).widget
|
||||
|
||||
// 1. Remove widget background after signing
|
||||
if (nearestWidget) {
|
||||
const pageAnnots = await this.pdfKit.getAnnotations(annotation.pageIndex)
|
||||
const widgetAnnot = pageAnnots.find(a => a.id === nearestWidget.id)
|
||||
if (widgetAnnot)
|
||||
await this.pdfKit.update(widgetAnnot.set('backgroundColor', PSPDFKit.Color.TRANSPARENT))
|
||||
}
|
||||
|
||||
const bbox = nearestWidget?.boundingBox ?? inkBBox
|
||||
const left = bbox.left - 20
|
||||
const top = bbox.top - 12
|
||||
const width = 150
|
||||
const height = 75
|
||||
const timestamp = new Date()
|
||||
|
||||
Reference in New Issue
Block a user