From 57e8734b3fcc354f2911f2e9b6abf57a1fde9c6c Mon Sep 17 00:00:00 2001
From: Mark Tolmacs <mark@lazycat.hu>
Date: Thu, 24 Jul 2025 14:57:13 +0200
Subject: [PATCH] Fix z-index so it works on hover

---
 packages/element/src/linearElementEditor.ts   | 53 +++++++++++++++----
 .../excalidraw/actions/actionFinalize.tsx     |  2 -
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts
index 2b3fa0605f..df306e24e0 100644
--- a/packages/element/src/linearElementEditor.ts
+++ b/packages/element/src/linearElementEditor.ts
@@ -24,9 +24,11 @@ import {
 
 import {
   bindingBorderTest,
+  CaptureUpdateAction,
   deconstructLinearOrFreeDrawElement,
   getHoveredElementForBinding,
   isPathALoop,
+  moveArrowAboveBindable,
   type Store,
 } from "@excalidraw/element";
 
@@ -55,12 +57,16 @@ import {
 
 import { headingIsHorizontal, vectorToHeading } from "./heading";
 import { mutateElement } from "./mutateElement";
-import { getBoundTextElement, handleBindTextResize } from "./textElement";
 import {
-  isArrowElement,
+  getBoundTextElement,
+  getContainerElement,
+  handleBindTextResize,
+} from "./textElement";
+import {
   isBindingElement,
   isElbowArrow,
   isSimpleArrow,
+  isTextElement,
 } from "./typeChecks";
 
 import { ShapeCache, toggleLinePolygonState } from "./shape";
@@ -383,7 +389,7 @@ export class LinearElementEditor {
             linearElementEditor,
             event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
             elements,
-            app.state,
+            app,
           ),
         );
       }
@@ -1930,7 +1936,7 @@ const pointDraggingUpdates = (
   linearElementEditor: LinearElementEditor,
   gridSize: NullableGridSize,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-  appState: AppState,
+  app: AppClassProperties,
 ): PointsPositionUpdates => {
   const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap, true);
   const hasMidPoints =
@@ -1971,7 +1977,7 @@ const pointDraggingUpdates = (
           newGlobalPointPosition,
           elements,
           elementsMap,
-          appState.zoom,
+          app.state.zoom,
         );
         const otherGlobalPoint =
           LinearElementEditor.getPointAtIndexGlobalCoordinates(
@@ -1985,14 +1991,14 @@ const pointDraggingUpdates = (
             hoveredElement,
             otherGlobalPoint,
             elementsMap,
-            appState.zoom,
+            app.state.zoom,
           );
 
         if (
-          isBindingEnabled(appState) &&
-          isArrowElement(element) &&
+          isBindingEnabled(app.state) &&
+          isBindingElement(element, false) &&
           hoveredElement &&
-          appState.bindMode === "orbit" &&
+          app.state.bindMode === "orbit" &&
           !otherPointInsideElement
         ) {
           newGlobalPointPosition = getOutlineAvoidingPoint(
@@ -2011,6 +2017,35 @@ const pointDraggingUpdates = (
           newGlobalPointPosition[1] - linearElementEditor.pointerOffset.y,
           null,
         );
+
+        // Update z-index of the arrow
+        if (
+          isBindingEnabled(app.state) &&
+          isBindingElement(element) &&
+          hoveredElement
+        ) {
+          const boundTextElement = getBoundTextElement(
+            hoveredElement,
+            elementsMap,
+          );
+          const containerElement = isTextElement(hoveredElement)
+            ? getContainerElement(hoveredElement, elementsMap)
+            : null;
+          const newElements = moveArrowAboveBindable(
+            element,
+            [
+              hoveredElement.id,
+              boundTextElement?.id,
+              containerElement?.id,
+            ].filter((id): id is NonDeletedExcalidrawElement["id"] => !!id),
+            app.scene,
+          );
+
+          app.syncActionResult({
+            elements: newElements,
+            captureUpdate: CaptureUpdateAction.IMMEDIATELY,
+          });
+        }
       }
 
       return [
diff --git a/packages/excalidraw/actions/actionFinalize.tsx b/packages/excalidraw/actions/actionFinalize.tsx
index ecd07300ae..17cbb49eb3 100644
--- a/packages/excalidraw/actions/actionFinalize.tsx
+++ b/packages/excalidraw/actions/actionFinalize.tsx
@@ -6,7 +6,6 @@ import {
   isArrowElement,
   isValidPolygon,
   LinearElementEditor,
-  moveArrowAboveBindable,
 } from "@excalidraw/element";
 
 import {
@@ -98,7 +97,6 @@ export const actionFinalize = register({
       const bindableIds = [];
       start.element && bindableIds.push(start.element.id);
       end.element && bindableIds.push(end.element.id);
-      newElements = moveArrowAboveBindable(element, bindableIds, scene);
 
       if (linearElementEditor !== appState.selectedLinearElement) {
         // `handlePointerUp()` updated the linear element instance,