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

Already on GitHub? Sign in to your account

Jump to bottom

Fix sticky dragdrop on perspective-viewer #1185

Merged
merged 1 commit into from
Sep 8, 2020
Merged

Fix sticky dragdrop on perspective-viewer #1185

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
4 changes: 2 additions & 2 deletions packages/perspective-viewer/src/js/row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ class Row extends HTMLElement {
_set_data_transfer(event) {
if (this.hasAttribute("filter")) {
const {operator, operand} = JSON.parse(this.getAttribute("filter"));
event.dataTransfer.setData("text", JSON.stringify([this.getAttribute("name"), operator, operand, this.getAttribute("type"), this.getAttribute("aggregate")]));
event.dataTransfer.setData("text/plain", JSON.stringify([this.getAttribute("name"), operator, operand, this.getAttribute("type"), this.getAttribute("aggregate")]));
} else {
event.dataTransfer.setData(
"text",
"text/plain",
JSON.stringify([this.getAttribute("name"), get_type_config(this.getAttribute("type")).filter_operator, undefined, this.getAttribute("type"), this.getAttribute("aggregate")])
);
}
Expand Down
29 changes: 13 additions & 16 deletions packages/perspective-viewer/src/js/viewer/dragdrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export function dragend(event) {
export function drop(ev) {
ev.preventDefault();
ev.currentTarget.classList.remove("dropping");
DRAG_COUNT_MAP = new WeakMap();
if (this._drop_target_hover) {
this._drop_target_hover.removeAttribute("drop-target");
}
Expand Down Expand Up @@ -153,9 +154,6 @@ function column_replace(new_index) {
export function column_dragover(event) {
event.preventDefault();
event.dataTransfer.dropEffect = "move";
if (event.currentTarget.className !== "dropping") {
event.currentTarget.classList.add("dropping");
}
if (!this._drop_target_hover.hasAttribute("drop-target")) {
this._drop_target_hover.toggleAttribute("drop-target", true);
}
Expand Down Expand Up @@ -230,6 +228,7 @@ export function column_drop(ev) {
ev.preventDefault();
delete this._drop_target_null;
ev.currentTarget.classList.remove("dropping");
DRAG_COUNT_MAP = new WeakMap();
if (this._drop_target_hover.parentElement === this._active_columns) {
this._drop_target_hover.removeAttribute("drop-target");
}
Expand All @@ -239,23 +238,21 @@ export function column_drop(ev) {
this._update_column_view();
}

export function dragenter(ev) {
ev.stopPropagation();
ev.preventDefault();
ev.currentTarget.classList.add("dropping");
}

export function dragover(ev) {
ev.stopPropagation();
ev.preventDefault();
ev.currentTarget.classList.add("dropping");
ev.dataTransfer.dropEffect = "move";
}

export function dragleave(ev) {
if (ev.currentTarget == ev.target) {
ev.stopPropagation();
ev.preventDefault();
ev.currentTarget.classList.remove("dropping");
}
let DRAG_COUNT_MAP = new WeakMap();

function dragenterleave(event) {
let dragHoverCount = DRAG_COUNT_MAP.get(event.currentTarget) || 0;
event.type === "dragenter" ? dragHoverCount++ : dragHoverCount--;
DRAG_COUNT_MAP.set(event.currentTarget, dragHoverCount);
event.currentTarget.classList.toggle("dropping", dragHoverCount > 0);
event.preventDefault();
}

export const dragenter = dragenterleave;
export const dragleave = dragenterleave;