Skip to content

Disallow invalid layer reorder placements as siblings of artboards #3289

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 4 commits into
base: master
Choose a base branch
from
Open

Disallow invalid layer reorder placements as siblings of artboards #3289

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a61db5
disallow invalid layer drop
Sahil-Gupta584 Oct 25, 2025
7d636de
Merge branch 'master' into enhance-artboard-layer-drop
Sahil-Gupta584 Oct 25, 2025
f191238
improve invalidDrag indicator behaviour
Sahil-Gupta584 Oct 31, 2025
87aec62
overall layer,artboard drag behaviour impr
Sahil-Gupta584 Nov 1, 2025
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
64 changes: 54 additions & 10 deletions frontend/src/components/panels/Layers.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
editor.handle.deselectAllLayers();
}

function calculateDragIndex(tree: LayoutCol, clientY: number, select?: () => void): DraggingData {
function calculateDragIndex(tree: LayoutCol, clientY: number, dataIndex: number, select?: () => void): DraggingData | undefined {
const treeChildren = tree.div()?.children;
const treeOffset = tree.div()?.getBoundingClientRect().top;

Expand All @@ -307,17 +307,47 @@

let markerHeight = 0;
const layerPanel = document.querySelector("[data-layer-panel]"); // Selects the element with the data-layer-panel attribute
let isInvalidDrag = false;

if (layerPanel !== null && treeChildren !== undefined && treeOffset !== undefined) {
const lastLayerDepth = layers[layers.length - 1]?.entry?.depth;
const draggingLayerDepth = layers[dataIndex]?.entry?.depth;

if (clientY > treeChildren[layers.length - 1].getBoundingClientRect().bottom - 10) {
if (lastLayerDepth === 1 && draggingLayerDepth > 1) isInvalidDrag = true;
}

let layerPanelTop = layerPanel.getBoundingClientRect().top;
Array.from(treeChildren).forEach((treeChild) => {
const indexAttribute = treeChild.getAttribute("data-index");
if (!indexAttribute) return;
const { folderIndex, entry: layer } = layers[parseInt(indexAttribute, 10)];

for (const treeChild of Array.from(treeChildren)) {
if (isInvalidDrag) break;
const indexAttribute = parseInt(treeChild.getAttribute("data-index") ?? "0", 10);
if (!indexAttribute) continue;
const { folderIndex, entry: layer } = layers[indexAttribute];

const rect = treeChild.getBoundingClientRect();
if (rect.top > clientY || rect.bottom < clientY) {
return;
continue;
}
if (draggingLayerDepth > 1) {
const prevLayer = layers[indexAttribute];
const nextLayer = layers[indexAttribute + 1];
if (prevLayer?.entry?.depth === 1) {
const prevRectTop = treeChildren?.[indexAttribute].getBoundingClientRect().top;
if (prevLayer?.entry?.depth === 1 && prevRectTop + 10 > clientY) {
isInvalidDrag = true;
break;
}
}

const isDraggingBtnArtBoards = nextLayer?.entry?.depth === 1 && prevLayer?.entry?.depth === 1;

if (isDraggingBtnArtBoards) {
isInvalidDrag = true;
break;
}
}

const pointerPercentage = (clientY - rect.top) / rect.height;
if (layer.childrenAllowed) {
if (pointerPercentage < 0.25) {
Expand Down Expand Up @@ -349,7 +379,8 @@
markerHeight = rect.bottom - layerPanelTop;
}
}
});
break;
}
// Dragging to the empty space below all layers
let lastLayer = treeChildren[treeChildren.length - 1];
if (lastLayer.getBoundingClientRect().bottom < clientY) {
Expand All @@ -359,6 +390,7 @@
insertIndex = numberRootLayers;
markerHeight = lastLayer.getBoundingClientRect().bottom - layerPanelTop;
}
if (isInvalidDrag) return;
}

return {
Expand All @@ -384,25 +416,36 @@
const target = (event.target instanceof HTMLElement && event.target) || undefined;
const closest = target?.closest("[data-layer]") || undefined;
const draggingELement = (closest instanceof HTMLElement && closest) || undefined;
if (draggingELement) beginDraggingElement(draggingELement);
if (draggingELement) {
beginDraggingElement(draggingELement);
// Store the index of the layer being dragged
draggedLayerIndex = parseInt(draggingELement.getAttribute("data-index") ?? "0", 10);
}

// Set style of cursor for drag
if (event.dataTransfer) {
event.dataTransfer.dropEffect = "move";
event.dataTransfer.effectAllowed = "move";
}

if (list) draggingData = calculateDragIndex(list, event.clientY, select);
if (list && draggedLayerIndex !== undefined) {
draggingData = calculateDragIndex(list, event.clientY, draggedLayerIndex, select);
}
}

let draggedLayerIndex: number | undefined;

function updateInsertLine(event: DragEvent) {
if (!draggable) return;

// Stop the drag from being shown as cancelled
event.preventDefault();
dragInPanel = true;

if (list) draggingData = calculateDragIndex(list, event.clientY, draggingData?.select);
// Use the stored index from dragStart
if (list && draggedLayerIndex !== undefined) {
draggingData = calculateDragIndex(list, event.clientY, draggedLayerIndex, draggingData?.select);
}
}

function drop(e: DragEvent) {
Expand Down Expand Up @@ -452,6 +495,7 @@
draggingData = undefined;
fakeHighlightOfNotYetSelectedLayerBeingDragged = undefined;
dragInPanel = false;
draggedLayerIndex = undefined;
}

function rebuildLayerHierarchy(updateDocumentLayerStructure: DocumentLayerStructure) {
Expand Down