Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ Example:
### Events

- `pdf-elements:end-init` - Emitted when PDF is loaded
- `pdf-elements:adding-ended` - Emitted when interactive placement ends. Payload: `{ reason: 'placed', object, docIndex, pageIndex }` on success or `{ reason: 'cancelled' }` when the placement is cancelled.

### Exposed methods

- `startAddingElement(templateObject)` - Starts interactive placement mode.
- `cancelAdding()` - Cancels the current placement session and emits `pdf-elements:adding-ended` with `{ reason: 'cancelled' }` when a session was active.

### Slots

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@libresign/pdf-elements",
"description": "PDF viewer with draggable and resizable element overlays for Vue 3",
"version": "1.1.6",
"version": "1.2.0",
"author": "LibreCode <contact@librecode.coop>",
"private": false,
"main": "dist/index.mjs",
Expand Down
27 changes: 21 additions & 6 deletions src/components/PDFElements.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ import { getViewportWindow, isPageInViewport } from '../utils/pageBounds'
import { applyScaleToDocs } from '../utils/zoom'
import { objectIdExistsInDoc, findObjectPageIndex, updateObjectInDoc, removeObjectFromDoc } from '../utils/objectStore'
import { getCachedMeasurement } from '../utils/measurements'
import type { PDFDocumentEntry, PDFElementObject } from '../types'
import type { PDFDocumentEntry, PDFElementObject, PDFElementsAddingEndedPayload } from '../types'

export default defineComponent({
name: 'PDFElements',
emits: ['pdf-elements:end-init', 'pdf-elements:delete-object', 'pdf-elements:object-click'],
emits: ['pdf-elements:end-init', 'pdf-elements:delete-object', 'pdf-elements:object-click', 'pdf-elements:adding-ended'],
components: {
PDFPage,
DraggableElement,
Expand Down Expand Up @@ -738,10 +738,14 @@ export default defineComponent({

handleKeyDown(event) {
if (event.key === 'Escape' && this.isAddingMode) {
this.cancelAdding()
this.cancelAdding({ reason: 'cancelled' })
}
},

emitAddingEnded(payload: PDFElementsAddingEndedPayload) {
this.$emit('pdf-elements:adding-ended', payload)
},

getOverlayAriaLabel(docIndex, pageIndex) {
const doc = this.pdfDocuments?.[docIndex]
const docName = doc?.name ?? `Document ${docIndex + 1}`
Expand Down Expand Up @@ -827,7 +831,7 @@ export default defineComponent({
if (objectToAdd.x < 0 || objectToAdd.y < 0 ||
objectToAdd.x + objectToAdd.width > pageWidth ||
objectToAdd.y + objectToAdd.height > pageHeight) {
this.cancelAdding()
this.cancelAdding({ reason: 'cancelled' })
return
}

Expand All @@ -837,7 +841,12 @@ export default defineComponent({
const docIndex = this.previewPageDocIndex
const objectId = objectToAdd.id

this.cancelAdding()
this.cancelAdding({
reason: 'placed',
object: objectToAdd,
docIndex,
pageIndex,
})

this.$nextTick(() => {
const refKey = `draggable${docIndex}-${pageIndex}-${objectId}`
Expand All @@ -848,11 +857,17 @@ export default defineComponent({
})
},

cancelAdding() {
cancelAdding(payload: PDFElementsAddingEndedPayload = { reason: 'cancelled' }) {
const hadPendingAdd = this.isAddingMode || this.previewElement !== null || this.previewVisible

this.isAddingMode = false
this.previewElement = null
this.previewVisible = false
this.detachAddingListeners()

if (hadPendingAdd) {
this.emitAddingEnded(payload)
}
},
generateObjectId() {
const counter = this.nextObjectCounter++
Expand Down
10 changes: 9 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ import type { App } from 'vue'
import PDFElements from './components/PDFElements.vue'

export { ensureWorkerReady, setWorkerPath } from './utils/asyncReader'
export type { PDFDocumentEntry, PDFElementObject, PDFElementsPublicApi } from './types'
export type {
PDFDocumentEntry,
PDFElementObject,
PDFElementsAddingEndedCancelledPayload,
PDFElementsAddingEndedPayload,
PDFElementsAddingEndedPlacedPayload,
PDFElementsAddingEndedReason,
PDFElementsPublicApi,
} from './types'

const install = (app: App) => {
const name = PDFElements.name || 'PDFElements'
Expand Down
18 changes: 18 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@ export interface PDFElementObject {
[key: string]: unknown
}

export type PDFElementsAddingEndedReason = 'placed' | 'cancelled'

export interface PDFElementsAddingEndedPlacedPayload {
reason: 'placed'
object: PDFElementObject
docIndex: number
pageIndex: number
}

export interface PDFElementsAddingEndedCancelledPayload {
reason: 'cancelled'
}

export type PDFElementsAddingEndedPayload =
| PDFElementsAddingEndedPlacedPayload
| PDFElementsAddingEndedCancelledPayload

export interface PDFDocumentEntry {
name: string
file: unknown
Expand All @@ -32,4 +49,5 @@ export interface PDFElementsPublicApi {
updateObject: (docIndex: number, objectId: string, payload: Partial<PDFElementObject>) => void
deleteObject: (docIndex: number, objectId: string) => void
duplicateObject: (docIndex: number, objectId: string) => void
cancelAdding: () => void
}
34 changes: 29 additions & 5 deletions tests/components/PDFElements.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ describe('PDFElements business rules', () => {
})

it('finishes adding only when preview is visible and within bounds', () => {
const { ctx } = makeWrapper()
const { wrapper, ctx } = makeWrapper()
const doc = makeDoc()
ctx.pdfDocuments = [doc]

Expand All @@ -316,6 +316,17 @@ describe('PDFElements business rules', () => {

ctx.finishAdding()
expect(doc.allObjects[0].length).toBe(1)
expect(wrapper.emitted()['pdf-elements:adding-ended']?.[0][0]).toEqual({
reason: 'placed',
object: expect.objectContaining({
x: 10,
y: 10,
width: 20,
height: 20,
}),
docIndex: 0,
pageIndex: 0,
})

ctx.isAddingMode = true
ctx.previewVisible = true
Expand All @@ -324,6 +335,9 @@ describe('PDFElements business rules', () => {

ctx.finishAdding()
expect(doc.allObjects[0].length).toBe(1)
expect(wrapper.emitted()['pdf-elements:adding-ended']?.[1][0]).toEqual({
reason: 'cancelled',
})
})

it('uses changedTouches coordinates on touchend pointer position', () => {
Expand Down Expand Up @@ -368,8 +382,8 @@ describe('PDFElements business rules', () => {
expect(doc.allObjects[0][0].y).toBe(20)
})

it('cancels adding resets preview state', () => {
const { ctx } = makeWrapper()
it('cancels adding resets preview state and emits cancellation once', () => {
const { wrapper, ctx } = makeWrapper()
ctx.isAddingMode = true
ctx.previewElement = { width: 10, height: 10 }
ctx.previewVisible = true
Expand All @@ -379,17 +393,27 @@ describe('PDFElements business rules', () => {
expect(ctx.isAddingMode).toBe(false)
expect(ctx.previewElement).toBeNull()
expect(ctx.previewVisible).toBe(false)
expect(wrapper.emitted()['pdf-elements:adding-ended']).toEqual([[{ reason: 'cancelled' }]])
})

it('cancels adding on escape key', () => {
const { ctx } = makeWrapper()
it('does not emit cancellation when no add session is active', () => {
const { wrapper, ctx } = makeWrapper()

ctx.cancelAdding()

expect(wrapper.emitted()['pdf-elements:adding-ended']).toBeUndefined()
})

it('cancels adding on escape key and emits cancellation', () => {
const { wrapper, ctx } = makeWrapper()
ctx.isAddingMode = true
ctx.previewElement = { width: 10, height: 10 }
ctx.previewVisible = true

ctx.handleKeyDown({ key: 'Escape' })

expect(ctx.isAddingMode).toBe(false)
expect(wrapper.emitted()['pdf-elements:adding-ended']).toEqual([[{ reason: 'cancelled' }]])
})

it('starts adding element and prepares preview state', () => {
Expand Down
Loading