Skip to content

fix Safari bug with dropping element inside grid #1738

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 3 commits into from
Apr 23, 2021
Merged

fix Safari bug with dropping element inside grid #1738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cede730
fix Safari bug with dropping element inside grid
Apr 21, 2021
d168d2d
update logic to check if element is being dragged out of grid
Apr 22, 2021
9bcbb93
fix typo
Apr 22, 2021
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
5 changes: 5 additions & 0 deletions src/h5/dd-droppable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ export class DDDroppable extends DDBaseImplement implements HTMLElementExtendOpt

/** @internal called when the item is leaving our area, stop tracking if we had moving item */
private _dragLeave(event: DragEvent): void {
// Note: Safari Mac has null relatedTarget which causes #1684 so check if DragEvent is inside the grid instead
if (!event.relatedTarget) {
const { bottom, left, right, top } = this.el.getBoundingClientRect();
if (event.x < right && event.x > left && event.y < bottom && event.y > top) return;

@adumesny adumesny Apr 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be <=

}
if (this.el.contains(event.relatedTarget as HTMLElement)) return;

@adumesny adumesny Apr 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

else if (this.el.contains(event.relatedTarget as HTMLElement)) return;
no reason to check with null value.

this._removeLeaveCallbacks();
if (this.moving) {
Expand Down