Skip to content

Implement layer rearranging using pointer instead of DnD API #3249

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

Implement layer rearranging using pointer instead of DnD API #3249

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
2 changes: 2 additions & 0 deletions frontend/src/components/layout/LayoutCol.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
on:pointerdown
on:pointerenter
on:pointerleave
on:pointermove
on:pointerup
on:scroll
{...$$restProps}
>
Expand Down
154 changes: 87 additions & 67 deletions frontend/src/components/panels/Layers.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { getContext, onMount, onDestroy, tick } from "svelte";

import type { Editor } from "@graphite/editor";
import { beginDraggingElement } from "@graphite/io-managers/drag";
import {
defaultWidgetLayout,
patchWidgetLayout,
Expand Down Expand Up @@ -50,10 +49,12 @@
let layers: LayerListingInfo[] = [];

// Interactive dragging
let draggable = true;
let draggingData: undefined | DraggingData = undefined;
let fakeHighlightOfNotYetSelectedLayerBeingDragged: undefined | bigint = undefined;
let dragInPanel = false;
let isDragging = false;
let dragStartPosition = { x: 0, y: 0 };
const dragThreshold = 5;

// Interactive clipping
let layerToClipUponClick: LayerListingInfo | undefined = undefined;
Expand Down Expand Up @@ -185,8 +186,6 @@

async function onEditLayerName(listing: LayerListingInfo) {
if (listing.editingName) return;

draggable = false;
listing.editingName = true;
layers = layers;

Expand All @@ -200,8 +199,6 @@
function onEditLayerNameChange(listing: LayerListingInfo, e: Event) {
// Eliminate duplicate events
if (!listing.editingName) return;

draggable = true;
listing.editingName = false;
layers = layers;

Expand All @@ -211,7 +208,6 @@
}

async function onEditLayerNameDeselect(listing: LayerListingInfo) {
draggable = true;
listing.editingName = false;
layers = layers;

Expand Down Expand Up @@ -371,87 +367,110 @@
};
}

async function dragStart(event: DragEvent, listing: LayerListingInfo) {
function handlePointerDown(event: PointerEvent, listing: LayerListingInfo) {
// Only handle primary button (left mouse button)
if (event.button !== 0) return;

const layer = listing.entry;
dragInPanel = true;
if (!$nodeGraph.selected.includes(layer.id)) {
fakeHighlightOfNotYetSelectedLayerBeingDragged = layer.id;
}
const select = () => {
if (!$nodeGraph.selected.includes(layer.id)) selectLayer(listing, false, false);
};

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);

// Set style of cursor for drag
if (event.dataTransfer) {
event.dataTransfer.dropEffect = "move";
event.dataTransfer.effectAllowed = "move";
}
// Store initial drag position and select function for later use
dragStartPosition = { x: event.clientX, y: event.clientY };
draggingData = { select, insertParentId: undefined, insertDepth: 0, insertIndex: undefined, highlightFolder: false, markerHeight: 0 };

if (list) draggingData = calculateDragIndex(list, event.clientY, select);
// Capture pointer to receive move events
(event.target as HTMLElement)?.setPointerCapture(event.pointerId);
}

function updateInsertLine(event: DragEvent) {
if (!draggable) return;
function updateInsertLine(event: PointerEvent) {
// If not dragging yet, check if we should start dragging
if (!isDragging && event.buttons === 1 && draggingData) {
const deltaX = event.clientX - dragStartPosition.x;
const deltaY = event.clientY - dragStartPosition.y;
const distance = Math.sqrt(deltaX * deltaX + deltaY * deltaY);

if (distance > dragThreshold) {
isDragging = true;
dragInPanel = true;
event.preventDefault();
}
}

if (!isDragging) return;

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

if (list) draggingData = calculateDragIndex(list, event.clientY, draggingData?.select);
}

function drop(e: DragEvent) {
function handlePointerUp(event: PointerEvent) {
const wasDragging = isDragging;

// If we were dragging, complete the move operation
if (isDragging && draggingData) {
const { select, insertParentId, insertIndex } = draggingData;

// Complete the layer move
select?.();
editor.handle.moveLayerInTree(insertParentId, insertIndex);
}

// Cleanup state
draggingData = undefined;
fakeHighlightOfNotYetSelectedLayerBeingDragged = undefined;
isDragging = false;
dragInPanel = false;

// Release pointer capture
if (wasDragging) {
try {
(event.target as HTMLElement)?.releasePointerCapture(event.pointerId);
} catch {
// Ignore errors - pointer might not be captured
}
}
}

function handleDrop(e: DragEvent) {
if (!draggingData) return;
const { select, insertParentId, insertIndex } = draggingData;
const { insertParentId, insertIndex } = draggingData;

e.preventDefault();

if (e.dataTransfer) {
// Moving layers
if (e.dataTransfer.items.length === 0) {
if (draggable && dragInPanel) {
select?.();
editor.handle.moveLayerInTree(insertParentId, insertIndex);
if (e.dataTransfer && e.dataTransfer.items.length > 0) {
// Handle file imports
Array.from(e.dataTransfer.items).forEach(async (item) => {
const file = item.getAsFile();
if (!file) return;

if (file.type.includes("svg")) {
const svgData = await file.text();
editor.handle.pasteSvg(file.name, svgData, undefined, undefined, insertParentId, insertIndex);
return;
}
}
// Importing files
else {
Array.from(e.dataTransfer.items).forEach(async (item) => {
const file = item.getAsFile();
if (!file) return;

if (file.type.includes("svg")) {
const svgData = await file.text();
editor.handle.pasteSvg(file.name, svgData, undefined, undefined, insertParentId, insertIndex);
return;
}

if (file.type.startsWith("image")) {
const imageData = await extractPixelData(file);
editor.handle.pasteImage(file.name, new Uint8Array(imageData.data), imageData.width, imageData.height, undefined, undefined, insertParentId, insertIndex);
return;
}
if (file.type.startsWith("image")) {
const imageData = await extractPixelData(file);
editor.handle.pasteImage(file.name, new Uint8Array(imageData.data), imageData.width, imageData.height, undefined, undefined, insertParentId, insertIndex);
return;
}

// When we eventually have sub-documents, this should be changed to import the document instead of opening it in a separate tab
const graphiteFileSuffix = "." + editor.handle.fileExtension();
if (file.name.endsWith(graphiteFileSuffix)) {
const content = await file.text();
const documentName = file.name.slice(0, -graphiteFileSuffix.length);
editor.handle.openDocumentFile(documentName, content);
return;
}
});
}
// When we eventually have sub-documents, this should be changed to import the document instead of opening it in a separate tab
const graphiteFileSuffix = "." + editor.handle.fileExtension();
if (file.name.endsWith(graphiteFileSuffix)) {
const content = await file.text();
const documentName = file.name.slice(0, -graphiteFileSuffix.length);
editor.handle.openDocumentFile(documentName, content);
return;
}
});
}

draggingData = undefined;
fakeHighlightOfNotYetSelectedLayerBeingDragged = undefined;
dragInPanel = false;
}

function rebuildLayerHierarchy(updateDocumentLayerStructure: DocumentLayerStructure) {
Expand Down Expand Up @@ -509,9 +528,11 @@
data-layer-panel
bind:this={list}
on:click={() => deselectAllLayers()}
on:dragover={updateInsertLine}
on:dragend={drop}
on:drop={drop}
on:pointermove={updateInsertLine}
on:pointerup={handlePointerUp}
on:pointercancel={handlePointerUp}
on:pointerleave={() => (dragInPanel = false)}
on:drop={handleDrop}
>
{#each layers as listing, index}
{@const selected = fakeHighlightOfNotYetSelectedLayerBeingDragged !== undefined ? fakeHighlightOfNotYetSelectedLayerBeingDragged === listing.entry.id : listing.entry.selected}
Expand All @@ -528,8 +549,7 @@
data-layer
data-index={index}
tooltip={listing.entry.tooltip}
{draggable}
on:dragstart={(e) => draggable && dragStart(e, listing)}
on:pointerdown={(e) => handlePointerDown(e, listing)}
on:click={(e) => selectLayerWithModifiers(e, listing)}
>
{#if listing.entry.childrenAllowed}
Expand Down
Loading