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
81 changes: 74 additions & 7 deletions src/extensions/core/simpleTouchSupport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ type Viewport = Pick<
'scale' | 'offset' | 'min_scale' | 'max_scale'
>

const { canvasEl, container, canvasAvailability } = vi.hoisted(() => {
const { canvasEl, container, canvasAvailability, ds } = vi.hoisted(() => {
const container = document.createElement('div')
const canvasEl = document.createElement('canvas')
container.append(canvasEl)
return { container, canvasEl, canvasAvailability: { missing: false } }
})

const processMouseDown = vi.fn()

vi.mock(import('@/scripts/app'), () => {
const ds: Viewport = {
scale: 1,
offset: [0, 0],
min_scale: 0.1,
max_scale: 10
}
return { container, canvasEl, canvasAvailability: { missing: false }, ds }
})

const processMouseDown = vi.fn()

vi.mock(import('@/scripts/app'), () => {
const canvas = fromPartial<LGraphCanvas>({
ds,
pointer: { isDown: false },
Expand Down Expand Up @@ -153,12 +153,79 @@ describe('Comfy.SimpleTouchSupport', () => {

it('ignores a pinch when no canvas exists', () => {
withoutCanvas()
const listenerErrors = vi.fn()
window.addEventListener('error', listenerErrors)
onTestFinished(() => window.removeEventListener('error', listenerErrors))
const twoFingers = [touchAt(canvasEl), touchAt(canvasEl, 100)]

dispatchTouch('touchstart', twoFingers)
dispatchTouch('touchmove', twoFingers)
pressPointer({ isPrimary: true })

expect(listenerErrors).not.toHaveBeenCalled()
expect(processMouseDown).toHaveBeenCalledOnce()
})

describe('pinch zoom', () => {
function resetViewport() {
ds.scale = 1
ds.offset[0] = 0
ds.offset[1] = 0
}

it.for([
{ name: 'start on the same point', start: 0, move: 100 },
{ name: 'start and stay on the same point', start: 0, move: 0 },
{ name: 'end on the same point', start: 100, move: 0 }
])(
'leaves the viewport unchanged when two fingers $name',
({ start, move }) => {
resetViewport()

dispatchTouch('touchstart', [
touchAt(canvasEl),
touchAt(canvasEl, start)
])
dispatchTouch('touchmove', [touchAt(canvasEl), touchAt(canvasEl, move)])

expect({ scale: ds.scale, offset: [...ds.offset] }).toEqual({
scale: 1,
offset: [0, 0]
})
}
)

it('waits for a usable distance before measuring a pinch', () => {
resetViewport()

dispatchTouch('touchstart', [touchAt(canvasEl), touchAt(canvasEl)])
dispatchTouch('touchmove', [touchAt(canvasEl), touchAt(canvasEl, 7)])
dispatchTouch('touchmove', [touchAt(canvasEl), touchAt(canvasEl, 50)])

expect(ds.scale).toBe(1)
})

it('zooms once fingers that started on the same point move apart', () => {
resetViewport()

dispatchTouch('touchstart', [touchAt(canvasEl), touchAt(canvasEl)])
dispatchTouch('touchmove', [touchAt(canvasEl), touchAt(canvasEl, 50)])
dispatchTouch('touchmove', [touchAt(canvasEl), touchAt(canvasEl, 100)])

expect(ds.scale).toBe(2)
})

it('uses the minimum scale when converting pinch movement to an offset', () => {
resetViewport()
ds.scale = ds.min_scale

dispatchTouch('touchstart', [touchAt(canvasEl), touchAt(canvasEl, 100)])
dispatchTouch('touchmove', [touchAt(canvasEl, 20), touchAt(canvasEl, 70)])

expect({ scale: ds.scale, offset: [...ds.offset] }).toEqual({
scale: 0.1,
offset: [-50, 0]
})
})
})
})
51 changes: 32 additions & 19 deletions src/extensions/core/simpleTouchSupport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@ let touchCount = 0

type TouchPoint = { clientX: number; clientY: number }

const MIN_PINCH_DISTANCE = 8

function zoomCanvasAroundPinch(
canvas: LGraphCanvas,
requestedScale: number,
center: TouchPoint,
lastTouch: TouchPoint
) {
let scale = requestedScale
const newX = (center.clientX - lastTouch.clientX) / requestedScale
const newY = (center.clientY - lastTouch.clientY) / requestedScale

if (scale < canvas.ds.min_scale) {
scale = canvas.ds.min_scale
} else if (scale > canvas.ds.max_scale) {
scale = canvas.ds.max_scale
}

const newX = (center.clientX - lastTouch.clientX) / scale
const newY = (center.clientY - lastTouch.clientY) / scale
const oldScale = canvas.ds.scale

canvas.ds.scale = scale
Expand Down Expand Up @@ -149,6 +151,32 @@ app.registerExtension({
// Also handle touchcancel which fires when touch is interrupted
app.canvasEl.parentElement?.addEventListener('touchcancel', resetTouchState)

function handlePinchMove(e: TouchEvent) {
if (!lastTouch) return
const canvas = canvasOrReport('touchmove', e)
if (!canvas) return
e.preventDefault()
canvas.pointer.isDown = false
touchZooming = true

LiteGraph.closeAllContextMenus(window)
canvas.search_box?.close()
const newTouchDist = getMultiTouchPos(e)
const center = getMultiTouchCenter(e)

if (lastScale === null || touchDist === null) return
if (touchDist < MIN_PINCH_DISTANCE) {
touchDist = newTouchDist
lastScale = canvas.ds.scale
lastTouch = center
return
}
const scale = (lastScale * newTouchDist) / touchDist
if (!Number.isFinite(scale) || scale <= 0) return

zoomCanvasAroundPinch(canvas, scale, center, lastTouch)
}

app.canvasEl.parentElement?.addEventListener(
'touchmove',
(e) => {
Expand All @@ -161,23 +189,8 @@ app.registerExtension({
touchTime = null
}
}
if (e.touches.length === 2 && lastTouch && !e.ctrlKey && !e.shiftKey) {
const canvas = canvasOrReport('touchmove', e)
if (!canvas) return
e.preventDefault() // Prevent browser from zooming when two textareas are touched
canvas.pointer.isDown = false
touchZooming = true

LiteGraph.closeAllContextMenus(window)
canvas.search_box?.close()
const newTouchDist = getMultiTouchPos(e)

const center = getMultiTouchCenter(e)

if (lastScale === null || touchDist === null) return
const scale = (lastScale * newTouchDist) / touchDist

zoomCanvasAroundPinch(canvas, scale, center, lastTouch)
if (e.touches.length === 2 && !e.ctrlKey && !e.shiftKey) {
handlePinchMove(e)
}
},
true
Expand Down
Loading
Loading