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
8 changes: 7 additions & 1 deletion packages/@react-aria/calendar/src/useCalendarCell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,13 @@ export function useCalendarCell(props: AriaCalendarCellProps, state: CalendarSta
// outside the original pressed element.
// (JSDOM does not support this)
if ('releasePointerCapture' in e.target) {
e.target.releasePointerCapture(e.pointerId);
if ('hasPointerCapture' in e.target) {
if (e.target.hasPointerCapture(e.pointerId)) {
e.target.releasePointerCapture(e.pointerId);
}
} else {
e.target.releasePointerCapture(e.pointerId);
}
}
},
onContextMenu(e) {
Expand Down
8 changes: 7 additions & 1 deletion packages/@react-aria/interactions/src/usePress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,13 @@ export function usePress(props: PressHookProps): PressResult {
// This enables onPointerLeave and onPointerEnter to fire.
let target = getEventTarget(e.nativeEvent);
if ('releasePointerCapture' in target) {
target.releasePointerCapture(e.pointerId);
if ('hasPointerCapture' in target) {
if (target.hasPointerCapture(e.pointerId)) {
target.releasePointerCapture(e.pointerId);
}
} else {
(target as Element).releasePointerCapture(e.pointerId);
}
}
}

Expand Down
18 changes: 16 additions & 2 deletions packages/@react-aria/interactions/test/usePress.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,10 @@ describe('usePress', function () {

let el = res.getByText('test');
el.releasePointerCapture = jest.fn();
el.hasPointerCapture = jest.fn().mockReturnValue(true);
fireEvent(el, pointerEvent('pointerdown', {pointerId: 1, pointerType: 'mouse', clientX: 0, clientY: 0}));
expect(el.releasePointerCapture).toHaveBeenCalled();
expect(el.hasPointerCapture).toHaveBeenCalledWith(1);
expect(el.releasePointerCapture).toHaveBeenCalledWith(1);
// react listens for pointerout and pointerover instead of pointerleave and pointerenter...
fireEvent(el, pointerEvent('pointerout', {pointerId: 1, pointerType: 'mouse', clientX: 100, clientY: 100}));
fireEvent(document, pointerEvent('pointerup', {pointerId: 1, pointerType: 'mouse', clientX: 100, clientY: 100}));
Expand Down Expand Up @@ -560,6 +562,16 @@ describe('usePress', function () {
]);
});

it('should not call releasePointerCapture when hasPointerCapture returns false', function () {
let res = render(<Example />);
let el = res.getByText('test');
el.releasePointerCapture = jest.fn();
el.hasPointerCapture = jest.fn().mockReturnValue(false);
fireEvent(el, pointerEvent('pointerdown', {pointerId: 1, pointerType: 'mouse', clientX: 0, clientY: 0}));
expect(el.hasPointerCapture).toHaveBeenCalledWith(1);
expect(el.releasePointerCapture).not.toHaveBeenCalled();
});

it('should handle pointer cancel events', function () {
let events = [];
let addEvent = (e) => events.push(e);
Expand Down Expand Up @@ -4011,8 +4023,10 @@ describe('usePress', function () {

const el = shadowRoot.getElementById('testElement');
el.releasePointerCapture = jest.fn();
el.hasPointerCapture = jest.fn().mockReturnValue(true);
fireEvent(el, pointerEvent('pointerdown', {pointerId: 1, pointerType: 'mouse', clientX: 0, clientY: 0}));
expect(el.releasePointerCapture).toHaveBeenCalled();
expect(el.hasPointerCapture).toHaveBeenCalledWith(1);
expect(el.releasePointerCapture).toHaveBeenCalledWith(1);
// react listens for pointerout and pointerover instead of pointerleave and pointerenter...
fireEvent(el, pointerEvent('pointerout', {pointerId: 1, pointerType: 'mouse', clientX: 100, clientY: 100}));
fireEvent(document, pointerEvent('pointerup', {pointerId: 1, pointerType: 'mouse', clientX: 100, clientY: 100}));
Expand Down