Skip to content

support for multiple drag targets fix #2711

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adumesny merged 1 commit into from
Jun 24, 2024
Merged

support for multiple drag targets fix #2711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ Change log
## 10.2.0-dev (TBD)
* fix: [#2683](https://github.com/gridstack/gridstack.js/issues/2683) check for fixed grid maxRow during resize
* fix: [#2694](https://github.com/gridstack/gridstack.js/issues/2694) prevent 'r' rotation to items that can't resize (locked, noResize, fixed sizes)
* fix: [#2709](https://github.com/gridstack/gridstack.js/pull/2709) support for multiple drag targets - Thank you [nickfulcher](https://github.com/nickfulcher)

## 10.2.0 (2024-06-02)
* feat: [#2682](https://github.com/gridstack/gridstack.js/pull/2682) You can now press 'Esc' to cancel a move|resize, 'r' to rotate during a drag. added `GridStack.rotate()` as well - Thank you John B. for this feature sponsor.
Expand Down
12 changes: 5 additions & 7 deletions src/dd-draggable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
/** @internal */
protected dragElementOriginStyle: Array<string>;
/** @internal */
protected dragEl: HTMLElement;
/** @internal */
protected dragEls: HTMLElement[];
/** @internal true while we are dragging an item around */
protected dragging: boolean;
Expand Down Expand Up @@ -152,7 +150,7 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
if (e.button !== 0) return true; // only left click

// make sure we are not clicking on known object that handles mouseDown, or ones supplied by the user
if (e.target !== this.dragEl && (e.target as HTMLElement).closest(skipMouseDown)) return true;
if (!this.dragEls.find(el => el === e.target) && (e.target as HTMLElement).closest(skipMouseDown)) return true;
if (this.option.cancel) {
if ((e.target as HTMLElement).closest(this.option.cancel)) return true;
}
Expand All @@ -173,8 +171,8 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
document.addEventListener('mousemove', this._mouseMove, { capture: true, passive: true }); // true=capture, not bubble
document.addEventListener('mouseup', this._mouseUp, true);
if (isTouch) {
this.dragEl.addEventListener('touchmove', touchmove);
this.dragEl.addEventListener('touchend', touchend);
e.target.addEventListener('touchmove', touchmove);
e.target.addEventListener('touchend', touchend);
}

e.preventDefault();
Expand Down Expand Up @@ -248,8 +246,8 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
document.removeEventListener('mousemove', this._mouseMove, true);
document.removeEventListener('mouseup', this._mouseUp, true);
if (isTouch) {
this.dragEl.removeEventListener('touchmove', touchmove, true);
this.dragEl.removeEventListener('touchend', touchend, true);
e.target.removeEventListener('touchmove', touchmove, true);
e.target.removeEventListener('touchend', touchend, true);
}
if (this.dragging) {
delete this.dragging;
Expand Down