Merge branch 'dev' into main

Author: gustavotoyota

apps/client/src/code/pages/page/arrows/arrow-creation.ts

@@ -148,4 +148,24 @@ export class PageArrowCreation {
 
     return arrow;
   }
+
+  create(input: {
+    sourceNote: PageNote;
+    targetNote: PageNote;
+    event: PointerEvent;
+    baseArrow?: PageArrow;
+    anchor: IVec2 | null;
+  }) {
+    this.start({
+      anchorNote: input.sourceNote,
+      looseEndpoint: 'target',
+      baseArrow: input.baseArrow,
+      event: input.event,
+    });
+
+    this.finish({
+      note: input.targetNote,
+      anchor: null,
+    });
+  }
 }

apps/client/src/code/pages/page/arrows/arrow.ts

@@ -363,15 +363,15 @@ export const PageArrow = once(
           }),
           targetHeadPos: computed(() => {
             if (this.react.collab.bodyType === 'line') {
-              return (
-                getLineRectIntersection(
-                  new Line(this.react.sourcePos, this.react.targetPos),
-                  (this.react.interregional
-                    ? this.react.targetNote.react.islandRect
-                    : this.react.targetNote.react.relativeRect
-                  ).grow(new Vec2(ARROW_OFFSET)),
-                ) ?? this.react.targetPos
-              );
+              return this.react.targetNote != null
+                ? getLineRectIntersection(
+                    new Line(this.react.sourcePos, this.react.targetPos),
+                    (this.react.interregional
+                      ? this.react.targetNote.react.islandRect
+                      : this.react.targetNote.react.relativeRect
+                    ).grow(new Vec2(ARROW_OFFSET)),
+                  ) ?? this.react.targetPos
+                : this.react.targetPos;
             } else {
               return this.react.targetPos.add(
                 this.react.halfSizes.target

apps/client/src/code/pages/page/notes/dropping.ts

@@ -30,9 +30,15 @@ export class NoteDropping {
 
         selectedNote.react.collab.pos.x = newPos.x;
         selectedNote.react.collab.pos.y = newPos.y;
+      }
 
-        if (date !== this.page.collab.store.notes[selectedNote.id]?.movedAt) {
-          this.page.collab.store.notes[selectedNote.id].movedAt = date;
+      if (
+        this.page.dragging.finalRegionId !== this.page.dragging.initialRegionId
+      ) {
+        for (const selectedNote of this.page.selection.react.notes) {
+          if (date !== this.page.collab.store.notes[selectedNote.id]?.movedAt) {
+            this.page.collab.store.notes[selectedNote.id].movedAt = date;
+          }
         }
       }
     });

apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayArrow/ArrowLabel.vue

@@ -5,6 +5,7 @@
       left: `${arrow.react.centerPos.x}px`,
       top: `${arrow.react.centerPos.y}px`,
       cursor: arrow.react.editing || page.react.readOnly ? 'auto' : 'grab',
+      display: page.dragging.react.active ? 'none' : undefined,
     }"
   >
     <div

apps/client/src/layouts/PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayArrow/DisplayArrow.vue

@@ -9,12 +9,10 @@
     <component
       :is="arrow.react.collab.bodyType === 'curve' ? CurveArrow : LineArrow"
       :style="{
-        'pointer-events':
-          page.arrowCreation.react.active || page.dragging.react.active
-            ? 'none'
-            : undefined,
+        'pointer-events': page.arrowCreation.react.active ? 'none' : undefined,
       }"
       @pointerdown.left.stop="onLeftPointerDown"
+      @pointerup.left="onLeftPointerUp"
       @click.left="onLeftClick"
     ></component>
 
@@ -36,6 +34,7 @@
 
 <script setup lang="ts">
 import type { PageArrow } from 'src/code/pages/page/arrows/arrow';
+import { PageNote } from 'src/code/pages/page/notes/note';
 import type { Page } from 'src/code/pages/page/page';
 import { createDoubleClickChecker } from 'src/code/utils/misc';
 
@@ -72,6 +71,35 @@ function onLeftPointerDown(event: PointerEvent) {
   props.arrow.grab(event);
 }
 
+async function onLeftPointerUp(event: PointerEvent) {
+  if (
+    page.dragging.react.active &&
+    page.selection.react.elems.length === 1 &&
+    page.selection.react.elems[0].type === 'note'
+  ) {
+    if (props.arrow.react.region instanceof PageNote) {
+      await page.dropping.perform(props.arrow.react.region);
+    } else {
+      page.dragging.cancel();
+    }
+
+    const targetNote = props.arrow.react.targetNote;
+
+    const middleNote = page.selection.react.elems[0];
+
+    // eslint-disable-next-line vue/no-mutating-props
+    props.arrow.react.collab.target = middleNote.id;
+
+    page.arrowCreation.create({
+      sourceNote: middleNote,
+      targetNote: targetNote,
+      anchor: null,
+      baseArrow: props.arrow,
+      event,
+    });
+  }
+}
+
 const checkDoubleClick = createDoubleClickChecker();
 
 async function onLeftClick(event: MouseEvent) {