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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@visactor/vtable-plugins",
"comment": "fix: keep wheel events cancelable after restoring a rotated table (GitHub #5235)",
"type": "patch"
}
],
"packageName": "@visactor/vtable-plugins",
"email": "biukam.w@gmail.com"
}
88 changes: 88 additions & 0 deletions packages/vtable-plugins/__tests__/rotate-table-plugin.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// @ts-nocheck
jest.mock('@visactor/vtable', () => {
const vrender = jest.requireActual('../../vtable/src/vrender');

return {
matrixAllocate: vrender.matrixAllocate,
transformPointForCanvas: vrender.transformPointForCanvas,
mapToCanvasPointForCanvas: vrender.mapToCanvasPointForCanvas,
registerGlobalEventTransformer: vrender.registerGlobalEventTransformer,
registerWindowEventTransformer: vrender.registerWindowEventTransformer,
vglobal: {
mapToCanvasPoint: jest.fn(),
setEventListenerTransformer: jest.fn()
},
TABLE_EVENT_TYPE: {
INITIALIZED: 'initialized'
}
};
});

import { vglobal } from '@visactor/vtable';
import { cancelTransform } from '../src/rotate-table';

global.__VERSION__ = 'none';

describe('RotateTablePlugin cancel transform - issue #5235', () => {
afterEach(() => {
jest.restoreAllMocks();
});

test('keeps wheel preventDefault connected to the native event after canceling rotation', () => {
const tableElement = document.createElement('div');
jest.spyOn(tableElement, 'getBoundingClientRect').mockReturnValue({
x: 40,
y: 80,
left: 40,
top: 80,
right: 640,
bottom: 480,
width: 600,
height: 400,
toJSON: () => ({})
});

const originalMapToCanvasPoint = vglobal.mapToCanvasPoint;
const windowSetEventListenerTransformer = jest.fn();
let globalTransformer;

jest.spyOn(vglobal, 'setEventListenerTransformer').mockImplementation(transformer => {
globalTransformer = transformer;
});

const table = {
rotateDegree: 90,
getElement: () => tableElement,
scenegraph: {
stage: {
window: {
setEventListenerTransformer: windowSetEventListenerTransformer
}
}
},
pluginManager: {
getPluginByName: () => ({
vglobal_mapToCanvasPoint: originalMapToCanvasPoint
})
}
};

cancelTransform.call(table, document.createElement('div'));

const nativeWheelEvent = new WheelEvent('wheel', {
cancelable: true,
clientX: 120,
clientY: 160,
deltaY: 40
});
const transformedWheelEvent = globalTransformer(nativeWheelEvent);

transformedWheelEvent.preventDefault();

expect(transformedWheelEvent).toBe(nativeWheelEvent);
expect(nativeWheelEvent.defaultPrevented).toBe(true);
expect(windowSetEventListenerTransformer).toHaveBeenCalledTimes(1);
expect(table.rotateDegree).toBe(0);
expect(vglobal.mapToCanvasPoint).toBe(originalMapToCanvasPoint);
});
});
1 change: 0 additions & 1 deletion packages/vtable-plugins/src/rotate-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ export function cancelTransform(this: ListTable, rotateDom: HTMLElement) {
};
const getMatrix = () => {
const matrix = matrixAllocate.allocate(1, 0, 0, 1, 0, 0);
matrix.translate(x1, y1);
return matrix;
};
registerGlobalEventTransformer(vglobal, this.getElement(), getMatrix, getRect as any, transformPointForCanvas);
Expand Down
Loading