Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HeaderCell: remove iframe edge case handling #2613

Merged
merged 3 commits into from Aug 26, 2021
Merged

HeaderCell: remove iframe edge case handling #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38c76da
HeaderCell: remove iframe edge case handling
nstepien Aug 26, 2021
d8bb7f6
pointerup -> lostpointercapture
nstepien Aug 26, 2021
d0584db
test lostpointercapture
nstepien Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 3 additions & 12 deletions src/HeaderCell.tsx
View file
Open in desktop
Expand Up @@ -77,29 +77,20 @@ export default function HeaderCell<R, SR>({
}

function onPointerMove(event: PointerEvent) {
if (event.pointerType === 'mouse' && event.buttons !== 1) {
// handle case where the pointer `up`'d outside an iframe
// https://bugs.chromium.org/p/chromium/issues/detail?id=606896
// https://bugs.chromium.org/p/chromium/issues/detail?id=693494
onPointerUp();
return;
}

const width = event.clientX + offset - currentTarget.getBoundingClientRect().left;
if (width > 0) {
onColumnResize(column, width);
}
}

function onPointerUp() {
function onLostPointerCapture() {
currentTarget.removeEventListener('pointermove', onPointerMove);
currentTarget.removeEventListener('pointerup', onPointerUp);
currentTarget.removeEventListener('lostpointercapture', onLostPointerCapture);
}

event.preventDefault();
currentTarget.setPointerCapture(pointerId);
currentTarget.addEventListener('pointermove', onPointerMove);
currentTarget.addEventListener('pointerup', onPointerUp);
currentTarget.addEventListener('lostpointercapture', onLostPointerCapture);
}

function onSort(ctrlClick: boolean) {
Expand Down
30 changes: 4 additions & 26 deletions test/column/resizable.test.tsx
View file
Open in desktop
Expand Up @@ -7,19 +7,12 @@ const pointerId = 1;
// TODO: https://github.com/jsdom/jsdom/issues/2527
class PointerEvent extends Event {
pointerId: number | undefined;
pointerType: string | undefined;
clientX: number | undefined;
buttons: number | undefined;

constructor(
type: string,
{ pointerId, pointerType, clientX, buttons, ...rest }: PointerEventInit
) {
constructor(type: string, { pointerId, clientX, ...rest }: PointerEventInit) {
super(type, rest);
this.pointerId = pointerId;
this.pointerType = pointerType;
this.clientX = clientX;
this.buttons = buttons;
}
}

Expand Down Expand Up @@ -51,25 +44,10 @@ function resize<K extends keyof DOMRect>({
});
fireEvent.pointerDown(
column,
new PointerEvent('pointerdown', {
pointerId,
buttons: 1,
clientX: clientXStart
})
);
fireEvent.pointerMove(
column,
new PointerEvent('pointermove', {
pointerId,
clientX: clientXEnd
})
);
fireEvent.pointerUp(
column,
new PointerEvent('pointerup', {
pointerId
})
new PointerEvent('pointerdown', { pointerId, clientX: clientXStart })
);
fireEvent.pointerMove(column, new PointerEvent('pointermove', { clientX: clientXEnd }));
fireEvent.lostPointerCapture(column, new PointerEvent('lostpointercapture', {}));
}

const columns: readonly Column<Row>[] = [
Expand Down