mirror of
https://github.com/stablyai/orca.git
synced 2026-11-15 18:37:24 +00:00
fix(tab-group): end a lost divider drag on blur, hide or re-press
A release outside the window could be missed with no buttonless move to end the gesture, leaving guest passthrough held and letting a later pressed move resume the old drag. End the gesture when the window blurs or is hidden, and let a new press of the same pointer replace a gesture whose release was missed. Covers release outside the window, Linux false capture, multiple guest surfaces and unmount mid-drag. Co-authored-by: alpenshtokk <wawesandways@gmail.com>
This commit is contained in:
@@ -24,6 +24,7 @@ export function ResizeHandle({
|
||||
const isHorizontal = direction === 'horizontal'
|
||||
const [dragging, setDragging] = useState(false)
|
||||
const activeResizeCleanupRef = useRef<((updateDragging?: boolean) => void) | null>(null)
|
||||
const activePointerIdRef = useRef<number | null>(null)
|
||||
|
||||
useEffect(
|
||||
() => () => {
|
||||
@@ -35,9 +36,13 @@ export function ResizeHandle({
|
||||
const onPointerDown = useCallback(
|
||||
(event: React.PointerEvent<HTMLDivElement>) => {
|
||||
event.preventDefault()
|
||||
// Why: a second pointer must not steal or finalize the active gesture.
|
||||
if (activeResizeCleanupRef.current) {
|
||||
return
|
||||
const active = activeResizeCleanupRef.current
|
||||
if (active) {
|
||||
// Why: a second pointer must not steal the gesture, but a new press of the same pointer proves the old release was missed.
|
||||
if (activePointerIdRef.current !== event.pointerId) {
|
||||
return
|
||||
}
|
||||
active()
|
||||
}
|
||||
const handle = event.currentTarget
|
||||
const container = handle.parentElement
|
||||
@@ -108,6 +113,8 @@ export function ResizeHandle({
|
||||
window.removeEventListener('pointerup', onPointerUp)
|
||||
window.removeEventListener('pointercancel', onPointerCancel)
|
||||
handle.removeEventListener('lostpointercapture', onLostPointerCapture)
|
||||
window.removeEventListener('blur', onWindowBlur)
|
||||
document.removeEventListener('visibilitychange', onVisibilityChange)
|
||||
if (activeResizeCleanupRef.current === cleanup) {
|
||||
activeResizeCleanupRef.current = null
|
||||
}
|
||||
@@ -131,11 +138,22 @@ export function ResizeHandle({
|
||||
}
|
||||
}
|
||||
|
||||
// Why: a release outside a blurred or hidden window may never arrive; end the gesture so guests take input again.
|
||||
const onWindowBlur = (): void => cleanup()
|
||||
const onVisibilityChange = (): void => {
|
||||
if (document.visibilityState === 'hidden') {
|
||||
cleanup()
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener('pointermove', onPointerMove)
|
||||
window.addEventListener('pointerup', onPointerUp)
|
||||
window.addEventListener('pointercancel', onPointerCancel)
|
||||
handle.addEventListener('lostpointercapture', onLostPointerCapture)
|
||||
window.addEventListener('blur', onWindowBlur)
|
||||
document.addEventListener('visibilitychange', onVisibilityChange)
|
||||
activeResizeCleanupRef.current = cleanup
|
||||
activePointerIdRef.current = event.pointerId
|
||||
},
|
||||
[isHorizontal, onRatioChange, onResizeStart, onResizeEnd]
|
||||
)
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
// @vitest-environment happy-dom
|
||||
|
||||
// A divider drag must end, commit once and give guests their input back however the gesture is lost.
|
||||
import { act } from 'react'
|
||||
import { createRoot, type Root } from 'react-dom/client'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import {
|
||||
isWebviewDragPassthroughActive,
|
||||
registerWebviewDragPassthroughSurface
|
||||
} from '../browser-pane/host-guest/webview-drag-passthrough'
|
||||
|
||||
globalThis.IS_REACT_ACT_ENVIRONMENT = true
|
||||
|
||||
vi.mock('../../store', () => ({
|
||||
useAppStore: Object.assign(() => undefined, { getState: () => ({}) })
|
||||
}))
|
||||
vi.mock('./TabGroupPanel', () => ({ default: () => null }))
|
||||
|
||||
import { ResizeHandle } from './TabGroupSplitNodeTree'
|
||||
|
||||
function pointer(
|
||||
type: string,
|
||||
init: { pointerId?: number; clientX?: number; buttons?: number } = {}
|
||||
) {
|
||||
const event = new Event(type, { bubbles: true, cancelable: true })
|
||||
Object.defineProperty(event, 'pointerId', { value: init.pointerId ?? 1 })
|
||||
Object.defineProperty(event, 'clientX', { value: init.clientX ?? 0 })
|
||||
Object.defineProperty(event, 'clientY', { value: 0 })
|
||||
Object.defineProperty(event, 'buttons', { value: init.buttons ?? 1 })
|
||||
return event
|
||||
}
|
||||
|
||||
describe('tab-group ResizeHandle gesture lifecycle', () => {
|
||||
let host: HTMLDivElement
|
||||
let root: Root
|
||||
let handle: HTMLElement
|
||||
let firstPane: HTMLElement
|
||||
let surfaceCalls: boolean[][]
|
||||
let unregisterSurfaces: (() => void)[]
|
||||
const onRatioChange = vi.fn()
|
||||
|
||||
const press = (init: { pointerId?: number } = {}) =>
|
||||
act(() => {
|
||||
handle.dispatchEvent(pointer('pointerdown', init))
|
||||
})
|
||||
const dispatch = (target: EventTarget, event: Event) =>
|
||||
act(() => {
|
||||
target.dispatchEvent(event)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
onRatioChange.mockClear()
|
||||
vi.stubGlobal(
|
||||
'ResizeObserver',
|
||||
class {
|
||||
observe(): void {}
|
||||
unobserve(): void {}
|
||||
disconnect(): void {}
|
||||
}
|
||||
)
|
||||
// Two retained guests, as with two browser groups open beside the divider.
|
||||
surfaceCalls = [[], []]
|
||||
unregisterSurfaces = surfaceCalls.map((calls) =>
|
||||
registerWebviewDragPassthroughSurface((passthrough) => calls.push(passthrough))
|
||||
)
|
||||
host = document.createElement('div')
|
||||
document.body.appendChild(host)
|
||||
root = createRoot(host)
|
||||
await act(async () => {
|
||||
root.render(
|
||||
<div data-split="">
|
||||
<div />
|
||||
<ResizeHandle
|
||||
direction="horizontal"
|
||||
onResizeStart={() => {}}
|
||||
onRatioChange={onRatioChange}
|
||||
/>
|
||||
<div />
|
||||
</div>
|
||||
)
|
||||
})
|
||||
const split = host.querySelector<HTMLElement>('[data-split]')!
|
||||
split.getBoundingClientRect = () => new DOMRect(0, 0, 1000, 500)
|
||||
handle = host.querySelector<HTMLElement>('.tab-group-split-resize-handle')!
|
||||
firstPane = host.querySelector<HTMLElement>('[data-split] > div')!
|
||||
handle.setPointerCapture = () => {}
|
||||
handle.releasePointerCapture = () => {}
|
||||
// Linux Chromium: capture never reports as held while moves keep arriving (#34287).
|
||||
handle.hasPointerCapture = () => false
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
await act(async () => root.unmount())
|
||||
host.remove()
|
||||
for (const unregister of unregisterSurfaces) {
|
||||
unregister()
|
||||
}
|
||||
vi.unstubAllGlobals()
|
||||
})
|
||||
|
||||
it('tracks moves when capture is not confirmed and commits once on release', async () => {
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 300 }))
|
||||
await dispatch(window, pointer('pointermove', { clientX: 320 }))
|
||||
expect(firstPane.style.flex).toBe('0.32 1 0%')
|
||||
|
||||
await dispatch(window, pointer('pointerup', { clientX: 320 }))
|
||||
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.32]])
|
||||
expect(surfaceCalls).toEqual([
|
||||
[true, false],
|
||||
[true, false]
|
||||
])
|
||||
expect(isWebviewDragPassthroughActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('ends on a buttonless move after a release outside the window', async () => {
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 300 }))
|
||||
await dispatch(window, pointer('pointermove', { clientX: 700, buttons: 0 }))
|
||||
await dispatch(window, pointer('pointermove', { clientX: 800 }))
|
||||
|
||||
expect(firstPane.style.flex).toBe('0.3 1 0%')
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.3]])
|
||||
expect(isWebviewDragPassthroughActive()).toBe(false)
|
||||
})
|
||||
|
||||
it.each([
|
||||
['window blur', () => window.dispatchEvent(new Event('blur'))],
|
||||
[
|
||||
'the window being hidden',
|
||||
() => {
|
||||
Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'hidden' })
|
||||
document.dispatchEvent(new Event('visibilitychange'))
|
||||
Reflect.deleteProperty(document, 'visibilityState')
|
||||
}
|
||||
]
|
||||
])('ends on %s when the release never arrives', async (_name, loseWindow) => {
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 400 }))
|
||||
await act(() => loseWindow())
|
||||
// A pressed move from a later, unrelated gesture must not resume the lost one.
|
||||
await dispatch(window, pointer('pointermove', { clientX: 600 }))
|
||||
await dispatch(window, pointer('pointerup', { clientX: 600 }))
|
||||
|
||||
expect(firstPane.style.flex).toBe('0.4 1 0%')
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.4]])
|
||||
expect(surfaceCalls).toEqual([
|
||||
[true, false],
|
||||
[true, false]
|
||||
])
|
||||
})
|
||||
|
||||
it('lets a new press of the same pointer replace a gesture whose release was missed', async () => {
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 400 }))
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 600 }))
|
||||
await dispatch(window, pointer('pointerup', { clientX: 600 }))
|
||||
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.4], [0.6]])
|
||||
expect(isWebviewDragPassthroughActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('ignores a second pointer while the first one drags', async () => {
|
||||
await press({ pointerId: 1 })
|
||||
await press({ pointerId: 2 })
|
||||
await dispatch(window, pointer('pointermove', { pointerId: 2, clientX: 700 }))
|
||||
await dispatch(window, pointer('pointermove', { pointerId: 1, clientX: 250 }))
|
||||
await dispatch(window, pointer('pointerup', { pointerId: 2 }))
|
||||
|
||||
expect(firstPane.style.flex).toBe('0.25 1 0%')
|
||||
expect(onRatioChange).not.toHaveBeenCalled()
|
||||
expect(isWebviewDragPassthroughActive()).toBe(true)
|
||||
|
||||
await dispatch(window, pointer('pointerup', { pointerId: 1 }))
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.25]])
|
||||
expect(isWebviewDragPassthroughActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('releases passthrough exactly once when unmounted mid-drag', async () => {
|
||||
await press()
|
||||
await dispatch(window, pointer('pointermove', { clientX: 450 }))
|
||||
await act(async () => root.unmount())
|
||||
window.dispatchEvent(new Event('blur'))
|
||||
|
||||
expect(onRatioChange.mock.calls).toEqual([[0.45]])
|
||||
expect(surfaceCalls).toEqual([
|
||||
[true, false],
|
||||
[true, false]
|
||||
])
|
||||
root = createRoot(host)
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user