Skip to content

Fix reordering for KDE, and dragging to the end #2729

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix reordering for KDE, and dragging to the end #2729

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
28 changes: 10 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 33 additions & 25 deletions src/js/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const DEFAULT_ICON = "circle";
const NEW_CONTAINER_ID = "new";

const ONBOARDING_STORAGE_KEY = "onboarding-stage";
const CONTAINER_DRAG_DATA_TYPE = "firefox-container";

// List of panels
const P_ONBOARDING_1 = "onboarding1";
Expand Down Expand Up @@ -129,7 +128,7 @@ const Logic = {
notificationCards.forEach(notificationCard => {
notificationCard.textContent = text;
notificationCard.classList.add("is-shown");

setTimeout(() => {
notificationCard.classList.remove("is-shown");
}, 2000);
Expand Down Expand Up @@ -1198,6 +1197,8 @@ Logic.registerPanel(MANAGE_CONTAINERS_PICKER, {

const identities = Logic.identities();

let dataBeingDragged = null;

for (const identity of identities) {
const tr = document.createElement("tr");
tr.classList.add("menu-item", "hover-highlight", "keyboard-nav");
Expand Down Expand Up @@ -1226,42 +1227,49 @@ Logic.registerPanel(MANAGE_CONTAINERS_PICKER, {

tr.appendChild(td);

tr.draggable = true;
tr.dataset.containerId = identity.cookieStoreId;
tr.addEventListener("dragstart", (e) => {
e.dataTransfer.setData(CONTAINER_DRAG_DATA_TYPE, identity.cookieStoreId);
});
tr.addEventListener("dragover", (e) => {
if (e.dataTransfer.types.includes(CONTAINER_DRAG_DATA_TYPE)) {
tr.classList.add("drag-over");
e.preventDefault();
// Note: The draggable API does not appear to work with this extension on KDE.
// Thus we use mouse events instead of drag events.
tr.addEventListener("mousedown", (e) => {
if (e.target.closest(".move-button")) {
dataBeingDragged = identity.cookieStoreId;
}
});
tr.addEventListener("dragenter", (e) => {
if (e.dataTransfer.types.includes(CONTAINER_DRAG_DATA_TYPE)) {
e.preventDefault();
tr.classList.add("drag-over");
}
tr.addEventListener("mouseover", () => {
if (dataBeingDragged !== null) tr.classList.add("drag-over");
});
tr.addEventListener("dragleave", (e) => {
if (e.dataTransfer.types.includes(CONTAINER_DRAG_DATA_TYPE)) {
e.preventDefault();
tr.classList.remove("drag-over");
}
tr.addEventListener("mouseleave", () => {
if (dataBeingDragged !== null) tr.classList.remove("drag-over");
});
tr.addEventListener("drop", async (e) => {
e.preventDefault();
tr.addEventListener("mouseup", async () => {
if (dataBeingDragged === null) return;
const parent = tr.parentNode;
const containerId = e.dataTransfer.getData(CONTAINER_DRAG_DATA_TYPE);
const containerId = dataBeingDragged;
dataBeingDragged = null;
let droppedElement;
let dropAfter = false;
parent.childNodes.forEach((node) => {
if (node === tr && droppedElement !== undefined) {
// If the element being dropped was before this tr, drop after this tr.
dropAfter = true;
}
if (node.dataset.containerId === containerId) {
droppedElement = node;
}
});
if (droppedElement && droppedElement !== tr) {
tr.classList.remove("drag-over");
parent.insertBefore(droppedElement, tr);
if (dropAfter) {
// Drop it after this tr.
const nextSibling = tr.nextSibling;
if (nextSibling) {
parent.insertBefore(droppedElement, nextSibling);
} else {
parent.appendChild(droppedElement);
}
} else {
parent.insertBefore(droppedElement, tr);
}
await Logic.saveContainerOrder(parent.childNodes);
await Logic.refreshIdentities();
}
Expand Down Expand Up @@ -2319,7 +2327,7 @@ Logic.registerPanel(P_CLEAR_CONTAINER_STORAGE, {
// This method is called when the panel is shown.
prepare() {
const identity = Logic.currentIdentity();

// Populating the panel: name, icon, and warning message
document.getElementById("container-clear-storage-title").textContent = identity.name;
return Promise.resolve(null);
Expand Down