From 348c991c54def4da83377782e00306a18bd5f3c3 Mon Sep 17 00:00:00 2001
From: Peaceultime <clem31470@gmail.com>
Date: Tue, 14 Jan 2025 17:57:57 +0100
Subject: [PATCH] Add edge editor, generalize selection and edition to both
 node and edge. Still trying to find a proper tween.

---
 components/CanvasEditor.vue            | 371 +++++++++++++------------
 components/canvas/CanvasEdgeEditor.vue |  67 +++++
 components/canvas/CanvasNodeEditor.vue |  29 +-
 composables/useTween.ts                |  76 +++--
 db.sqlite-shm                          | Bin 32768 -> 32768 bytes
 db.sqlite-wal                          | Bin 0 -> 1236032 bytes
 6 files changed, 329 insertions(+), 214 deletions(-)
 create mode 100644 components/canvas/CanvasEdgeEditor.vue

diff --git a/components/CanvasEditor.vue b/components/CanvasEditor.vue
index 6c1b3a5..66bffea 100644
--- a/components/CanvasEditor.vue
+++ b/components/CanvasEditor.vue
@@ -1,22 +1,13 @@
 <script lang="ts">
-import type { Box, Position } from '#shared/canvas.util';
+import type { Position } from '#shared/canvas.util';
 import type CanvasNodeEditor from './canvas/CanvasNodeEditor.vue';
-type Direction = 'bottom' | 'top' | 'left' | 'right';
-const rotation: Record<Direction, string> = {
-    top: "180",
-    bottom: "0",
-    left: "90",
-    right: "270"
-};
-type Element = { type: 'node' | 'edge', id: string };
+import type CanvasEdgeEditor from './canvas/CanvasEdgeEditor.vue';
+export type Element = { type: 'node' | 'edge', id: string };
 
 interface ActionMap {
-    move: Position;
-    edit: string;
-    resize: Box;
-    remove: CanvasNode | undefined;
-    create: CanvasNode | undefined;
-    property: CanvasNode;
+    remove: CanvasNode | CanvasEdge | undefined;
+    create: CanvasNode | CanvasEdge | undefined;
+    property: CanvasNode | CanvasEdge;
 }
 type Action = keyof ActionMap;
 interface HistoryEvent<T extends Action = Action>
@@ -26,11 +17,16 @@ interface HistoryEvent<T extends Action = Action>
 }
 interface HistoryAction<T extends Action>
 {
-    element: string;
+    element: Element;
     from: ActionMap[T];
     to: ActionMap[T];
 }
 
+type NodeEditor = InstanceType<typeof CanvasNodeEditor>;
+type EdgeEditor = InstanceType<typeof CanvasEdgeEditor>;
+
+const TWEEN_DURATION = 200;
+
 const cancelEvent = (e: Event) => e.preventDefault();
 const stopPropagation = (e: Event) => e.stopImmediatePropagation();
 function getID(length: number)
@@ -67,27 +63,18 @@ function contains(group: CanvasNode, node: CanvasNode): boolean
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
 import { clamp } from '#shared/general.utils';
-import type { CanvasContent, CanvasNode } from '~/types/canvas';
-import { labelCenter, getPath } from '#shared/canvas.util';
+import type { CanvasContent, CanvasEdge, CanvasNode } from '~/types/canvas';
 
 const canvas = defineModel<CanvasContent>({ required: true, });
 
 const dispX = ref(0), dispY = ref(0), minZoom = ref(0.1), zoom = ref(0.5);
-const focusing = ref<string>(), editing = ref<string>();
+const focusing = ref<Element>(), editing = ref<Element>();
 const canvasRef = useTemplateRef('canvasRef'), transformRef = useTemplateRef('transformRef');
-const nodes = useTemplateRef<InstanceType<typeof CanvasNodeEditor>[]>('nodes');
+const nodes = useTemplateRef<NodeEditor[]>('nodes'), edges = useTemplateRef<EdgeEditor[]>('edges');
 
 const xTween = useTween(dispX, linear, updateTransform), yTween = useTween(dispY, linear, updateTransform), zoomTween = useTween(zoom, linear, updateTransform);
 
-const focusedNode = computed(() => nodes.value?.find(e => !!e && e.id === focusing.value)), editedNode = computed(() => nodes.value?.find(e => !!e && e.id === editing.value));
-
-const edges = computed(() => {
-    return canvas.value.edges?.map(e => { 
-        const from = canvas.value.nodes!.find(f => f.id === e.fromNode), to = canvas.value.nodes!.find(f => f.id === e.toNode);
-        const path = getPath(from!, e.fromSide, to!, e.toSide)!;
-        return { ...e, from, to, path };
-    });
-});
+const focused = computed(() => focusing.value ? focusing.value?.type === 'node' ? nodes.value?.find(e => !!e && e.id === focusing.value!.id) : edges.value?.find(e => !!e && e.id === focusing.value!.id) : undefined), edited = computed(() => editing.value ? editing.value?.type === 'node' ? nodes.value?.find(e => !!e && e.id === editing.value!.id) : edges.value?.find(e => !!e && e.id === editing.value!.id) : undefined);
 
 const history = ref<HistoryEvent[]>([]);
 const historyPos = ref(-1);
@@ -159,10 +146,10 @@ onMounted(() => {
         const centerX = (box.x + box.width / 2), centerY = (box.y + box.height / 2);
         const mousex = centerX - e.clientX, mousey = centerY - e.clientY;
 
-        xTween.update(dispX.value - (mousex / (diff * zoom.value) - mousex / zoom.value), 250);
-        yTween.update(dispY.value - (mousey / (diff * zoom.value) - mousey / zoom.value), 250);
+        xTween.update(dispX.value - (mousex / (diff * zoom.value) - mousex / zoom.value), TWEEN_DURATION);
+        yTween.update(dispY.value - (mousey / (diff * zoom.value) - mousey / zoom.value), TWEEN_DURATION);
 
-        zoomTween.update(clamp(zoom.value * diff, minZoom.value, 3), 250);
+        zoomTween.update(clamp(zoom.value * diff, minZoom.value, 3), TWEEN_DURATION);
 
         updateTransform();
     }, { passive: true });
@@ -233,47 +220,53 @@ function updateTransform()
 }
 function moveNode(ids: string[], deltax: number, deltay: number)
 {
-    const actions: HistoryAction<'move'>[] = [];
+    if(ids.length === 0)
+        return;
+    
+    const actions: HistoryAction<'property'>[] = [];
     for(const id of ids)
     {
         const node = canvas.value.nodes!.find(e => e.id === id)!;
 
-        actions.push({ element: id, from: { x: node.x - deltax, y: node.y - deltay }, to: { x: node.x, y: node.y } });
+        actions.push({ element: { type: 'node', id }, from: { ...node, x: node.x - deltax, y: node.y - deltay }, to: { ...node } });
     }
 
-    addAction('move', actions);
+    addAction('property', actions);
 }
 function resizeNode(ids: string[], deltax: number, deltay: number, deltaw: number, deltah: number)
 {
-    const actions: HistoryAction<'resize'>[] = [];
+    if(ids.length === 0)
+        return;
+    
+    const actions: HistoryAction<'property'>[] = [];
     for(const id of ids)
     {
         const node = canvas.value.nodes!.find(e => e.id === id)!;
 
-        actions.push({ element: id, from: { x: node.x - deltax, y: node.y - deltay, w: node.width - deltaw, h: node.height - deltah }, to: { x: node.x, y: node.y, w: node.width, h: node.height } });
+        actions.push({ element: { type: 'node', id }, from: { ...node, x: node.x - deltax, y: node.y - deltay, width: node.width - deltaw, height: node.height - deltah }, to: { ...node } });
     }
 
-    addAction('resize', actions);
+    addAction('property', actions);
 }
-function selectNode(id: string)
+function select(element: Element)
 {
-    if(focusing.value !== id)
+    if(focusing.value && (focusing.value.id !== element.id || focusing.value.type !== element.type))
     {
-        unselectNode();
+        unselect();
     }
 
-    focusing.value = id;
+    focusing.value = element;
 
-    focusedNode.value?.dom?.addEventListener('click', stopPropagation, { passive: true });
-    canvasRef.value?.addEventListener('click', unselectNode, { once: true });
+    focused.value?.dom?.addEventListener('click', stopPropagation, { passive: true });
+    canvasRef.value?.addEventListener('click', unselect, { once: true });
 }
-function editNode(id: string)
+function edit(element: Element)
 {
-    editing.value = id;
+    editing.value = element;
 
-    focusedNode.value?.dom?.addEventListener('wheel', stopPropagation, { passive: true });
-    focusedNode.value?.dom?.addEventListener('dblclick', stopPropagation, { passive: true });
-    canvasRef.value?.addEventListener('click', unselectNode, { once: true });
+    focused.value?.dom?.addEventListener('wheel', stopPropagation, { passive: true });
+    focused.value?.dom?.addEventListener('dblclick', stopPropagation, { passive: true });
+    canvasRef.value?.addEventListener('click', unselect, { once: true });
 }
 function createNode(e: MouseEvent)
 {
@@ -285,49 +278,74 @@ function createNode(e: MouseEvent)
     else
         canvas.value.nodes.push(node);
 
-    addAction('create', [{ element: node.id, from: undefined, to: node }]);
+    addAction('create', [{ element: { type: 'node', id: node.id }, from: undefined, to: node }]);
 }
-function removeNode(ids: string[])
+function remove(elements: Element[])
 {
-    const actions: HistoryAction<'remove'>[] = [];
-    unselectNode();
+    if(elements.length === 0)
+        return;
 
-    for(const id of ids)
+    const actions: HistoryAction<'remove'>[] = [];
+    focusing.value = undefined;
+    editing.value = undefined;
+
+    const c = canvas.value;
+
+    for(const element of elements)
     {
-        const index = canvas.value.nodes!.findIndex(e => e.id === id);
-        actions.push({ element: id, from: canvas.value.nodes!.splice(index, 1)[0], to: undefined });
+        if(element.type === 'node')
+        {
+            const edges = c.edges?.map((e, i) => ({ id: e.id, from: e.fromNode, to: e.toNode, index: i }))?.filter(e => e.from === element.id || e.to === element.id) ?? [];
+            for(let i = edges.length - 1; i >= 0; i--)
+            {
+                actions.push({ element: { type: 'edge', id: edges[i].id }, from: c.edges!.splice(edges[i].index, 1)[0], to: undefined });
+            }
+
+            const index = c.nodes!.findIndex(e => e.id === element.id);
+            actions.push({ element: { type: 'node', id: element.id }, from: c.nodes!.splice(index, 1)[0], to: undefined });
+        }
+        else if(element.type === 'edge' && !actions.find(e => e.element.type === 'edge' && e.element.id === element.id))
+        {
+            const index = c.edges!.findIndex(e => e.id === element.id);
+            actions.push({ element: { type: 'edge', id: element.id }, from: c.edges!.splice(index, 1)[0], to: undefined });
+        }
     }
 
+    canvas.value = c;
+
     addAction('remove', actions);
 }
 function editNodeProperty<T extends keyof CanvasNode>(ids: string[], property: T, value: CanvasNode[T])
 {
-    const actions: HistoryAction<'remove'>[] = [];
+    if(ids.length === 0)
+        return;
+    
+    const actions: HistoryAction<'property'>[] = [];
 
     for(const id of ids)
     {
         const copy = JSON.parse(JSON.stringify(canvas.value.nodes!.find(e => e.id === id)!)) as CanvasNode;
         canvas.value.nodes!.find(e => e.id === id)![property] = value;
-        actions.push({ element: id, from: copy, to: canvas.value.nodes!.find(e => e.id === id)! });
+        actions.push({ element: { type: 'node', id }, from: copy, to: canvas.value.nodes!.find(e => e.id === id)! });
     }
 
     addAction('property', actions);
 }
 
-const unselectNode = () => {
+const unselect = () => {
     if(focusing.value !== undefined)
     {
-        focusedNode.value?.dom?.removeEventListener('click', stopPropagation);
-        focusedNode.value?.unselect();
+        focused.value?.dom?.removeEventListener('click', stopPropagation);
+        focused.value?.unselect();
     }
     focusing.value = undefined;
 
     if(editing.value !== undefined)
     {
-        editedNode.value?.dom?.removeEventListener('wheel', stopPropagation);
-        editedNode.value?.dom?.removeEventListener('dblclick', stopPropagation);
-        editedNode.value?.dom?.removeEventListener('click', stopPropagation);
-        editedNode.value?.unselect();
+        edited.value?.dom?.removeEventListener('wheel', stopPropagation);
+        edited.value?.dom?.removeEventListener('dblclick', stopPropagation);
+        edited.value?.dom?.removeEventListener('click', stopPropagation);
+        edited.value?.unselect();
     }
     editing.value = undefined;
 };
@@ -337,57 +355,61 @@ const undo = () => {
 
     for(const action of historyCursor.value.actions)
     {
-        const node = canvas.value.nodes!.find(e => e.id === action.element)!;
-        switch(historyCursor.value.event)
+        if(action.element.type === 'node')
         {
-            case 'move':
+            switch(historyCursor.value.event)
             {
-                const a = action as HistoryAction<'move'>;
-                node.x = a.from.x;
-                node.y = a.from.y;
-                break;
+                case 'create':
+                {
+                    const a = action as HistoryAction<'create'>;
+                    const index = canvas.value.nodes!.findIndex(e => e.id === action.element.id);
+                    canvas.value.nodes!.splice(index, 1);
+                    break;
+                }
+                case 'remove':
+                {
+                    const a = action as HistoryAction<'remove'>;
+                    canvas.value.nodes!.push(a.from as CanvasNode);
+                    break;
+                }
+                case 'property':
+                {
+                    const a = action as HistoryAction<'property'>;
+                    const index = canvas.value.nodes!.findIndex(e => e.id === action.element.id);
+                    canvas.value.nodes![index] = a.from as CanvasNode;
+                    break;
+                }
             }
-            case 'resize':
+        }
+        else if(action.element.type === 'edge')
+        {
+            switch(historyCursor.value.event)
             {
-                const a = action as HistoryAction<'resize'>;
-                node.x = a.from.x;
-                node.y = a.from.y;
-                node.width = a.from.w;
-                node.height = a.from.h;
-                break;
-            }
-            case 'edit':
-            {
-                const a = action as HistoryAction<'edit'>;
-                node.label = a.from;
-                break;
-            }
-            case 'create':
-            {
-                const a = action as HistoryAction<'create'>;
-                const index = canvas.value.nodes!.findIndex(e => e.id === action.element);
-                canvas.value.nodes!.splice(index, 1);
-                break;
-            }
-            case 'remove':
-            {
-                const a = action as HistoryAction<'remove'>;
-                canvas.value.nodes!.push(a.from!);
-                break;
-            }
-            case 'property':
-            {
-                const a = action as HistoryAction<'property'>;
-                const index = canvas.value.nodes!.findIndex(e => e.id === action.element);
-                canvas.value.nodes![index] = a.from;
-                break;
+                case 'create':
+                {
+                    const a = action as HistoryAction<'create'>;
+                    const index = canvas.value.edges!.findIndex(e => e.id === action.element.id);
+                    canvas.value.edges!.splice(index, 1);
+                    break;
+                }
+                case 'remove':
+                {
+                    const a = action as HistoryAction<'remove'>;
+                    canvas.value.edges!.push(a.from!  as CanvasEdge);
+                    break;
+                }
+                case 'property':
+                {
+                    const a = action as HistoryAction<'property'>;
+                    const index = canvas.value.edges!.findIndex(e => e.id === action.element.id);
+                    canvas.value.edges![index] = a.from as CanvasEdge;
+                    break;
+                }
             }
         }
     }
 
     historyPos.value--;
-
-    console.log(historyPos.value, history.value.length);
 };
 const redo = () => {
     if(!history.value || history.value.length - 1 <= historyPos.value)
@@ -402,62 +424,66 @@ const redo = () => {
     }
 
     for(const action of historyCursor.value.actions)
-    {
-        const node = canvas.value.nodes!.find(e => e.id === action.element)!;
-        switch(historyCursor.value.event)
+    {        
+        if(action.element.type === 'node')
         {
-            case 'move':
+            switch(historyCursor.value.event)
             {
-                const a = action as HistoryAction<'move'>;
-                node.x = a.to.x;
-                node.y = a.to.y;
-                break;
+                case 'create':
+                {
+                    const a = action as HistoryAction<'create'>;
+                    canvas.value.nodes!.push(a.to as CanvasNode);
+                    break;
+                }
+                case 'remove':
+                {
+                    const a = action as HistoryAction<'remove'>;
+                    const index = canvas.value.nodes!.findIndex(e => e.id === action.element.id);
+                    canvas.value.nodes!.splice(index, 1);
+                    break;
+                }
+                case 'property':
+                {
+                    const a = action as HistoryAction<'property'>;
+                    const index = canvas.value.nodes!.findIndex(e => e.id === action.element.id);
+                    canvas.value.nodes![index] = a.to as CanvasNode;
+                    break;
+                }
             }
-            case 'resize':
+        }
+        else if(action.element.type === 'edge')
+        {
+            switch(historyCursor.value.event)
             {
-                const a = action as HistoryAction<'resize'>;
-                node.x = a.to.x;
-                node.y = a.to.y;
-                node.width = a.to.w;
-                node.height = a.to.h;
-                break;
-            }
-            case 'edit':
-            {
-                const a = action as HistoryAction<'edit'>;
-                node.label = a.to;
-                break;
-            }
-            case 'create':
-            {
-                const a = action as HistoryAction<'remove'>;
-                canvas.value.nodes!.push(a.to!);
-                break;
-            }
-            case 'remove':
-            {
-                const a = action as HistoryAction<'remove'>;
-                const index = canvas.value.nodes!.findIndex(e => e.id === action.element);
-                canvas.value.nodes!.splice(index, 1);
-                break;
-            }
-            case 'property':
-            {
-                const a = action as HistoryAction<'property'>;
-                const index = canvas.value.nodes!.findIndex(e => e.id === action.element);
-                canvas.value.nodes![index] = a.to;
-                break;
+                case 'create':
+                {
+                    const a = action as HistoryAction<'create'>;
+                    canvas.value.edges!.push(a.to as CanvasEdge);
+                    break;
+                }
+                case 'remove':
+                {
+                    const a = action as HistoryAction<'remove'>;
+                    const index = canvas.value.edges!.findIndex(e => e.id === action.element.id);
+                    canvas.value.edges!.splice(index, 1);
+                    break;
+                }
+                case 'property':
+                {
+                    const a = action as HistoryAction<'property'>;
+                    const index = canvas.value.edges!.findIndex(e => e.id === action.element.id);
+                    canvas.value.edges![index] = a.to as CanvasEdge;
+                    break;
+                }
             }
         }
     }
-
-    console.log(historyPos.value, history.value.length);
 };
 
 useShortcuts({
     meta_z: undo,
     meta_y: redo,
-    Delete: () => { if(focusing.value !== undefined) { removeNode([focusing.value]) } }
+    Delete: () => { if(focusing.value !== undefined) { remove([focusing.value]) } }
 });
 </script>
 
@@ -466,7 +492,7 @@ useShortcuts({
         <div class="flex flex-col absolute sm:top-2 top-10 left-2 z-[35] overflow-hidden gap-4" @click="stopPropagation">
             <div class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10">
                 <Tooltip message="Zoom avant" side="right">
-                    <div @click="zoomTween.update(clamp(zoom * 1.1, minZoom, 3), 250); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                    <div @click="zoomTween.update(clamp(zoom * 1.1, minZoom, 3), TWEEN_DURATION); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                         <Icon icon="radix-icons:plus" />
                     </div>
                 </Tooltip>
@@ -481,7 +507,7 @@ useShortcuts({
                     </div>
                 </Tooltip>
                 <Tooltip message="Zoom arrière" side="right">
-                    <div @click="zoomTween.update(clamp(zoom / 1.1, minZoom, 3), 250); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                    <div @click="zoomTween.update(clamp(zoom / 1.1, minZoom, 3), TWEEN_DURATION); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                         <Icon icon="radix-icons:minus" />
                     </div>
                 </Tooltip>
@@ -532,7 +558,7 @@ useShortcuts({
             'transform-origin': 'center center',
         }" class="h-full">
             <div class="absolute top-0 left-0 w-full h-full pointer-events-none *:pointer-events-auto *:select-none touch-none">
-                <div v-if="focusing !== undefined && focusedNode !== undefined" class="absolute z-20 origin-bottom" :style="{transform: `translate(${focusedNode.x}px, ${focusedNode.y}px) translateY(-100%) translateY(-12px) translateX(-50%) translateX(${focusedNode.width / 2}px) scale(calc(1 / var(--tw-scale)))`}">
+                <div v-if="focusing !== undefined && focusing.type === 'node'" class="absolute z-20 origin-bottom" :style="{transform: `translate(${canvas.nodes!.find(e => e.id === focusing!.id)!.x}px, ${canvas.nodes!.find(e => e.id === focusing!.id)!.y}px) translateY(-100%) translateY(-12px) translateX(-50%) translateX(${canvas.nodes!.find(e => e.id === focusing!.id)!.width / 2}px) scale(calc(1 / var(--tw-scale)))`}">
                     <div class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10 flex flex-row">
                         <PopoverRoot>
                             <PopoverTrigger asChild>
@@ -547,30 +573,30 @@ useShortcuts({
                             <PopoverPortal disabled>
                                 <PopoverContent align="center" side="top" class="bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 m-2">
                                     <div class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10 flex flex-row *:cursor-pointer">
-                                        <div @click="editNodeProperty([focusing], 'color', undefined)" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', undefined)" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-40 dark:bg-dark-40 w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'red' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'red' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-red dark:bg-dark-red w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'orange' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'orange' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-orange dark:bg-dark-orange w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'yellow' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'yellow' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-yellow dark:bg-dark-yellow w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'green' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'green' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-green dark:bg-dark-green w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'cyan' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'cyan' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-cyan dark:bg-dark-cyan w-4 h-4 block"></span>
                                         </div>
-                                        <div @click="editNodeProperty([focusing], 'color', { class: 'purple' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
+                                        <div @click="editNodeProperty([focusing.id], 'color', { class: 'purple' })" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
                                             <span class="bg-light-purple dark:bg-dark-purple w-4 h-4 block"></span>
                                         </div>
                                         <label>
                                             <div @click="stopPropagation" class="p-2 hover:bg-light-35 hover:dark:bg-dark-35">
-                                                <span style="background: conic-gradient(red, yellow, green, blue, purple, red)" class="w-4 h-4 block relative"></span><input @change="(e: Event) => editNodeProperty([focusing!], 'color', { hex: (e.target as HTMLInputElement).value })" type="color" class="appearance-none w-0 h-0 absolute" />
+                                                <span style="background: conic-gradient(red, yellow, green, blue, purple, red)" class="w-4 h-4 block relative"></span><input @change="(e: Event) => editNodeProperty([focusing!.id], 'color', { hex: (e.target as HTMLInputElement).value })" type="color" class="appearance-none w-0 h-0 absolute" />
                                             </div>
                                         </label>
                                     </div>
@@ -578,29 +604,18 @@ useShortcuts({
                             </PopoverPortal>
                         </PopoverRoot>
                         <Tooltip message="Supprimer" side="top">
-                            <div @click="removeNode([focusing])" class="w-10 h-10 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                            <div @click="remove([focusing])" class="w-10 h-10 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                                 <Icon icon="radix-icons:trash" class="text-light-red dark:text-dark-red w-6 h-6" />
                             </div>
                         </Tooltip>
                     </div>
                 </div>
                 <div>
-                    <CanvasNodeEditor v-for="(node, index) of canvas.nodes" :key="node.id" ref="nodes" :node="node" :index="index" :zoom="zoom" @select="selectNode" @edit="editNode" @move="(i, x, y) => moveNode([i], x, y)" @resize="(i, x, y, w, h) => resizeNode([i], x, y, w, h)" />
+                    <CanvasNodeEditor v-for="node of canvas.nodes" :key="node.id" ref="nodes" :node="node" :zoom="zoom" @select="select" @edit="edit" @move="(i, x, y) => moveNode([i], x, y)" @resize="(i, x, y, w, h) => resizeNode([i], x, y, w, h)" @input="(id, text) => editNodeProperty([id], node.type === 'group' ? 'label' : 'text', text)" />
+                </div>
+                <div>
+                    <CanvasEdgeEditor v-for="edge of canvas.edges" :key="edge.id" ref="edges" :edge="edge" :nodes="canvas.nodes!" @select="select" @edit="edit" />
                 </div>
-                <template v-for="edge of edges">
-                    <div :key="edge.id" v-if="edge.label" class="absolute z-10"
-                        :style="{ transform: labelCenter(edge.from!, edge.fromSide, edge.to!, edge.toSide) }">
-                        <div class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 -translate-x-[50%] -translate-y-[50%]">{{ edge.label }}</div>
-                    </div>
-                </template>
-                <svg class="absolute top-0 left-0 w-1 h-1 overflow-visible">
-                    <g v-for="edge of edges" :key="edge.id" :style="{'--canvas-color': edge.color?.hex}" class="z-0">
-                        <path :style="`stroke-linecap: butt; stroke-width: calc(3px * var(--zoom-multiplier));`" :class="edge.color?.class ? `stroke-light-${edge.color.class} dark:stroke-dark-${edge.color.class}` : ((edge.color && edge.color?.hex !== undefined) ? 'stroke-[color:var(--canvas-color)]' : 'stroke-light-40 dark:stroke-dark-40')" class="fill-none stroke-[4px]" :d="edge.path.path"></path>
-                        <g :style="`transform: translate(${edge.path.to.x}px, ${edge.path.to.y}px) scale(var(--zoom-multiplier)) rotate(${rotation[edge.path.side]}deg);`">
-                            <polygon :class="edge.color?.class ? `fill-light-${edge.color.class} dark:fill-dark-${edge.color.class}` : ((edge.color && edge.color?.hex !== undefined) ? 'fill-[color:var(--canvas-color)]' : 'fill-light-40 dark:fill-dark-40')" points="0,0 6.5,10.4 -6.5,10.4"></polygon>
-                        </g>
-                    </g>
-                </svg>
             </div>
         </div>
     </div>
diff --git a/components/canvas/CanvasEdgeEditor.vue b/components/canvas/CanvasEdgeEditor.vue
new file mode 100644
index 0000000..1ffda57
--- /dev/null
+++ b/components/canvas/CanvasEdgeEditor.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="absolute overflow-visible h-px w-px">
+        <div v-if="edge.label" :style="{ transform: labelPos }" class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 -translate-x-[50%] -translate-y-[50%]">{{ edge.label }}</div>
+        <input v-else-if="editing" @click="e => e.stopImmediatePropagation()" :style="{ transform: `${labelPos} translate(-50%, -50%)` }" class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 z-20" :v-model="edge.label" />
+        <svg ref="dom" class="absolute top-0 overflow-visible h-px w-px" @click="select" @dblclick="edit">
+            <g :style="{'--canvas-color': edge.color?.hex}" class="z-0">
+                <path :style="`stroke-linecap: butt; stroke-width: calc(3px * var(--zoom-multiplier));`" :class="[edge.color?.class ? `stroke-light-${edge.color.class} dark:stroke-dark-${edge.color.class}` : ((edge.color && edge.color?.hex !== undefined) ? 'stroke-[color:var(--canvas-color)]' : 'stroke-light-40 dark:stroke-dark-40'), { 'outline-4': focusing }]" class="fill-none stroke-[4px]" :d="path!.path"></path>
+                <g :style="`transform: translate(${path!.to.x}px, ${path!.to.y}px) scale(var(--zoom-multiplier)) rotate(${rotation[path!.side]}deg);`">
+                    <polygon :class="edge.color?.class ? `fill-light-${edge.color.class} dark:fill-dark-${edge.color.class}` : ((edge.color && edge.color?.hex !== undefined) ? 'fill-[color:var(--canvas-color)]' : 'fill-light-40 dark:fill-dark-40')" points="0,0 6.5,10.4 -6.5,10.4"></polygon>
+                </g>
+            </g>
+        </svg>                    
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getPath, labelCenter, type Direction } from '#shared/canvas.util';
+import type { Element } from '../CanvasEditor.vue';
+import type { CanvasEdge, CanvasNode } from '~/types/canvas';
+
+const rotation: Record<Direction, string> = {
+    top: "180",
+    bottom: "0",
+    left: "90",
+    right: "270"
+};
+
+const { edge, nodes } = defineProps<{
+    edge: CanvasEdge
+    nodes: CanvasNode[]
+}>();
+
+const emit = defineEmits<{
+    (e: 'select', id: Element): void,
+    (e: 'edit', id: Element): void,
+    (e: 'move', id: string, from: string, to: string): void,
+}>();
+
+const dom = useTemplateRef('dom');
+const focusing = ref(false), editing = ref(false);
+
+const from = computed(() => nodes!.find(f => f.id === edge.fromNode))
+const to = computed(() => nodes!.find(f => f.id === edge.toNode));
+const path = computed(() => getPath(from.value!, edge.fromSide, to.value!, edge.toSide));
+const labelPos = computed(() => labelCenter(from.value!, edge.fromSide, to.value!, edge.toSide));
+
+function select(e: Event) {
+    if(editing.value)
+        return;
+
+    focusing.value = true;
+    emit('select', { type: 'edge', id: edge.id });
+}
+function edit(e: Event) {
+    focusing.value = true;
+    editing.value = true;
+
+    e.stopImmediatePropagation();
+    emit('edit', { type: 'edge', id: edge.id });
+}
+function unselect() {
+    focusing.value = false;
+    editing.value = false;
+}
+
+defineExpose({ unselect, dom, id: edge.id });
+</script>
\ No newline at end of file
diff --git a/components/canvas/CanvasNodeEditor.vue b/components/canvas/CanvasNodeEditor.vue
index 7d25daa..0af2acc 100644
--- a/components/canvas/CanvasNodeEditor.vue
+++ b/components/canvas/CanvasNodeEditor.vue
@@ -34,7 +34,8 @@
 </template>
 
 <script setup lang="ts">
-import type { Direction } from '~/shared/canvas.util';
+import type { Direction } from '#shared/canvas.util';
+import type { Element } from '../CanvasEditor.vue';
 import FakeA from '../prose/FakeA.vue';
 import type { CanvasNode } from '~/types/canvas';
 
@@ -44,21 +45,23 @@ const { node, zoom } = defineProps<{
 }>();
 
 const emit = defineEmits<{
-    (e: 'select', id: string): void,
-    (e: 'edit', id: string): void,
+    (e: 'select', id: Element): void,
+    (e: 'edit', id: Element): void,
     (e: 'move', id: string, x: number, y: number): void,
     (e: 'resize', id: string, x: number, y: number, w: number, h: number): void,
+    (e: 'input', id: string, text: string): void,
 }>();
 
 const dom = useTemplateRef('dom');
 const focusing = ref(false), editing = ref(false);
+let oldText = node.type === 'group' ? node.label : node.text;
 
 function selectNode(e: Event) {
     if(editing.value)
         return;
 
     focusing.value = true;
-    emit('select', node.id);
+    emit('select', { type: 'node', id: node.id });
 
     dom.value?.addEventListener('mousedown', dragstart, { passive: true });
 }
@@ -66,10 +69,12 @@ function editNode(e: Event) {
     focusing.value = true;
     editing.value = true;
 
+    oldText = node.type === 'group' ? node.label : node.text;
+
     e.stopImmediatePropagation();
 
     dom.value?.removeEventListener('mousedown', dragstart);
-    emit('edit', node.id);
+    emit('edit', { type: 'node', id: node.id });
 }
 function resizeNode(e: MouseEvent, x: number, y: number, w: number, h: number) {
     e.stopImmediatePropagation();
@@ -100,6 +105,18 @@ function dragEdge(e: Event, direction: Direction) {
     e.stopImmediatePropagation();
 }
 function unselect() {
+    if(editing.value)
+    {
+        const text = node.type === 'group' ? node.label : node.text;
+        if(text !== oldText)
+        {
+            if(node.type === 'group')
+                node.label = oldText;
+            else
+                node.text = oldText;
+            emit('input', node.id, text);
+        }
+    }
     focusing.value = false;
     editing.value = false;
 
@@ -134,7 +151,7 @@ const dragstart = (e: MouseEvent) => {
     window.addEventListener('mouseup', dragend, { passive: true });
 };
 
-defineExpose({ unselect, dom, ...node });
+defineExpose({ unselect, dom, id: node.id });
 
 const style = computed(() => {
     return node.color ? node.color?.class ? 
diff --git a/composables/useTween.ts b/composables/useTween.ts
index fe9b7df..5ca3f37 100644
--- a/composables/useTween.ts
+++ b/composables/useTween.ts
@@ -1,54 +1,70 @@
-import { clamp, lerp } from "~/shared/general.utils";
+import { clamp } from "~/shared/general.utils";
 
 export const linear = (progress: number): number => progress;
 export const ease = (progress: number): number => -(Math.cos(Math.PI * progress) - 1) / 2;
 
 export function useTween(ref: Ref<number>, animation: (progress: number) => number, then: () => void)
 {
-    let initial = ref.value, current = ref.value, end = ref.value, progress = 0, time = 0, animationFrame: number, stop = true, last = 0;
-
-    function loop(t: DOMHighResTimeStamp)
-    {
-        const elapsed = t - last;
-        progress = clamp(progress + elapsed, 0, time);
+    // State variables for animation
+    let initial = ref.value;
+    let current = ref.value;
+    let end = ref.value;
+    let animationFrame: number;
+    let stop = true;
+    let last = 0;
+    
+    // Velocity tracking with sign preservation
+    let velocity = 0;
+    const velocityDecay = 0.92;  // Slightly faster decay for more responsive feel
+    
+    function loop(t: DOMHighResTimeStamp) {
+        // Cap the elapsed time to prevent jumps during lag or tab switches
+        const elapsed = Math.min(t - last, 32);
         last = t;
+        
+        // Update velocity considering the sign of the movement
+        velocity = velocity * velocityDecay + (end - current) * (1 - velocityDecay);
+        
+        // Apply velocity to current position
+        // Normalize by elapsed time to maintain consistent speed regardless of frame rate
+        current = clamp(current + velocity * (elapsed / 16), initial, end);
 
-        const step = animation(clamp(progress / time, 0, 1));
-        current = lerp(initial, end, step);
+        if(current === end)
+            stop = true;
+        
+        // Trigger callback
         then();
-
-        if(progress < time && !stop)
-        {
+        
+        // Continue animation if not stopped
+        if (!stop) {
             animationFrame = requestAnimationFrame(loop);
         }
-        else
-        {
-            progress = 0;
-            stop = true;
-        }
     }
-
+    
     return {
         stop: () => {
             cancelAnimationFrame(animationFrame);
             stop = true;
+            velocity = 0;  // Reset velocity when stopping
         },
         update: (target: number, duration: number) => {
-            initial = current;
-            time = duration + progress;
-            end = target;
-
-            ref.value = target;
-
-            if(stop)
-            {
-                stop = false;
+            if (stop) {
+                // Only reset initial position when starting a new animation
+                initial = current;
                 last = performance.now();
-
+            }
+            
+            end = target;
+            
+            if (stop) {
+                stop = false;
                 loop(performance.now());
             }
         },
-        refresh: () => { current = ref.value; },
-        current: () => { return current; },
+        refresh: () => {
+            current = ref.value;
+            velocity = 0;  // Reset velocity on refresh
+        },
+        current: () => current,
     };
 }
\ No newline at end of file
diff --git a/db.sqlite-shm b/db.sqlite-shm
index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..81f8072b00ca8a5c8c0cd787a846f94432768c57 100644
GIT binary patch
literal 32768
zcmeI)RcsbP6o%pVKnul7vEl_vad&sO;_mM5?i6>5YjJmXcXxMp_x%GG+yQrld?z_O
zvzyH%^JI4}Kku6<a8(bd4Lp-Oml4i<UeyZjfgdmR_222{+3S4Zt?B_mzKe>dzvKOv
z@4MD^m22H^ztoSXu=M97gfoV8+T&-t?p<?@a?p36|KMLc2b`lxB>@RYKmrnwfCMBU
z0SQPz0uqpb1SB8<2}nQ!5|DrdBp?9^NI(J-kbndvAOQ(TKmrnwfCMBU0SQPz0uqpb
z1SB8<2}nQ!5|DrdBp?9^NI(J-kbndvAOQ(TKmrnwfCMBU0SQRpw*rQ{leHL%FoYul
z5s5?;q7j{##3nBBNI*gok%VNVAQfpyM+P#Hg>2*?7kS7>0SZxsVw9j1r725!DpHxM
zRHr7jsY`tt(wL?+rzNdvOM5!fnXYuFC%x%Qe+Cl35QaHflcN~JI3_TW$xLNBGnq{g
z^H{(lmavQ!tYQu8*uW;Xu#Fw;Vh{T`z#)!sj1!#V4ClDOC9ZId8{Fa!_jte~p74wp
zyy6Y-_`oN=@C~!z=58S^l!dWy7QrG~B#UCvEV{+C*cR8~SprLFi7bgFb22Mc|C>Ot
z|7}Csj|Bc$AUJMLrmhE}2}^i9@gg!&@g@ebh=ULD@x_nCBqcd1NljYPlab71B|ACE
zO<wX-kirzDI3@9?4CSamC8|)38q}f=^=LpNn$V0Ew4x2|=s+jB(9Ovh?nNK^F@Qk~
zW+=lM$!Nwho<Jrsg=x%S7IT=(d=|3U$p&7|N>;O$^=xD_TiMP|cC(lL9ON)ZInGH=
zbC&a5<T6*e&P{G}m-{^AF;98UOJ4Jq_k83tU!92KVCH5a%)>%kSPO5S=4FvBs(D)s
zi)C@l$Kso>`B`F1YOcg$l>{Up0SQPz0uqpb1SB8<2}nQ!5|DrdBp?9^NI(J-kbndv
XAOQ(TKmrnwfCMBU0SQRp-xT-`aYMC!

delta 93
zcmZo@U}|V!;+1%$%K!t6lO0*5MJ?DR*i0wi=ERUufXTqr|3?Fx9a%T~Yz|<(Y6Jl3
Cjvj~r

diff --git a/db.sqlite-wal b/db.sqlite-wal
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bfd95b98c799e7069d286c7091e711485a253e08 100644
GIT binary patch
literal 1236032
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
B9)kb?

literal 0
HcmV?d00001