Skip to content
Open
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
25 changes: 24 additions & 1 deletion projects/angular-gridster2/src/lib/gridsterEmptyCell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export class GridsterEmptyCell {
};

emptyCellMouseDown = (e: MouseEvent): void => {
if (GridsterUtils.checkContentClassForEmptyCellClickEvent(this.gridster, e)) {
if (GridsterUtils.checkContentClassForEmptyCellClickEvent(this.gridster, e) || this.isEventFromScrollbar(e)) {
return;
}
e.preventDefault();
Expand Down Expand Up @@ -250,4 +250,27 @@ export class GridsterEmptyCell {
}
return item;
}

private isEventFromScrollbar(e: MouseEvent): boolean {
const el = this.gridster.el;
const rect = el.getBoundingClientRect();
const verticalScrollbarWidth = el.offsetWidth - el.clientWidth;
const horizontalScrollbarHeight = el.offsetHeight - el.clientHeight;
const offsetX = e.clientX - rect.left;
const offsetY = e.clientY - rect.top;
const hasVerticalScrollbar = verticalScrollbarWidth > 0 && el.scrollHeight > el.clientHeight;
const hasHorizontalScrollbar = horizontalScrollbarHeight > 0 && el.scrollWidth > el.clientWidth;
const direction = getComputedStyle(el).direction;
const withinElementWidth = offsetX >= 0 && offsetX <= el.offsetWidth;
const withinElementHeight = offsetY >= 0 && offsetY <= el.offsetHeight;
const onVerticalScrollbar =
hasVerticalScrollbar &&
withinElementWidth &&
withinElementHeight &&
(direction === 'rtl' ? offsetX <= verticalScrollbarWidth : offsetX >= el.clientWidth) &&
offsetX <= el.offsetWidth;
const onHorizontalScrollbar = hasHorizontalScrollbar && withinElementWidth && offsetY >= el.clientHeight && offsetY <= el.offsetHeight;

return onVerticalScrollbar || onHorizontalScrollbar;
}
}
108 changes: 108 additions & 0 deletions projects/angular-gridster2/src/lib/tests/gridsterEmptyCell.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import { GridsterEmptyCell } from '../gridsterEmptyCell';

function setElementGeometry(
el: HTMLElement,
geometry: {
clientHeight: number;
clientWidth: number;
offsetHeight: number;
offsetWidth: number;
scrollHeight: number;
scrollWidth: number;
}
): void {
for (const [key, value] of Object.entries(geometry)) {
Object.defineProperty(el, key, { configurable: true, value });
}
el.getBoundingClientRect = () =>
({
bottom: geometry.offsetHeight,
height: geometry.offsetHeight,
left: 0,
right: geometry.offsetWidth,
top: 0,
width: geometry.offsetWidth
}) as DOMRect;
}

function createMouseDownEvent(clientX: number, clientY: number): MouseEvent {
const event = new MouseEvent('mousedown', {
buttons: 1,
clientX,
clientY
});
vi.spyOn(event, 'preventDefault');
vi.spyOn(event, 'stopPropagation');

return event;
}

function createEmptyCell() {
const el = document.createElement('div');
document.body.appendChild(el);
setElementGeometry(el, {
clientHeight: 200,
clientWidth: 200,
offsetHeight: 200,
offsetWidth: 217,
scrollHeight: 500,
scrollWidth: 200
});

const removeListener = vi.fn();
const gridster = {
$options: () => ({
draggable: {
dragHandleClass: 'drag-handler',
ignoreContentClass: 'gridster-item-content'
}
}),
cdRef: {
markForCheck: vi.fn()
},
el,
movingItem: null,
previewStyle: vi.fn(),
renderer: {
listen: vi.fn(() => removeListener)
},
zone: {
runOutsideAngular: (callback: () => void) => callback()
}
};

return {
emptyCell: new GridsterEmptyCell(gridster as never),
gridster,
removeListener
};
}

describe('gridster empty cell drag', () => {
it('does not start empty cell drag when the mousedown starts on the vertical scrollbar', () => {
const { emptyCell, gridster } = createEmptyCell();
const event = createMouseDownEvent(210, 80);

emptyCell.emptyCellMouseDown(event);

expect(event.preventDefault).not.toHaveBeenCalled();
expect(event.stopPropagation).not.toHaveBeenCalled();
expect(gridster.renderer.listen).not.toHaveBeenCalled();
expect(gridster.movingItem).toBeNull();
});

it('still starts empty cell drag when the mousedown starts inside the grid content', () => {
const { emptyCell, gridster } = createEmptyCell();
const item = { cols: 1, rows: 1, x: 0, y: 0 };
const event = createMouseDownEvent(100, 80);
vi.spyOn(emptyCell, 'getValidItemFromEvent').mockReturnValue(item);

emptyCell.emptyCellMouseDown(event);

expect(event.preventDefault).toHaveBeenCalled();
expect(event.stopPropagation).toHaveBeenCalled();
expect(gridster.movingItem).toBe(item);
expect(gridster.previewStyle).toHaveBeenCalled();
expect(gridster.renderer.listen).toHaveBeenCalledTimes(4);
});
});