From fe04998f1706ef40010a61c6ae62ea0e7222b357 Mon Sep 17 00:00:00 2001
From: zsviczian <viczian.zsolt@gmail.com>
Date: Mon, 26 May 2025 19:32:50 +0000
Subject: [PATCH] fix: unlocked hit elements to take priority

---
 packages/excalidraw/components/App.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index c8f16af9e4..f7bd7f5ee0 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -7253,7 +7253,12 @@ class App extends React.Component<AppProps, AppState> {
           });
         }
 
-        if (
+        // Prioritize unlocked elements over locked ones
+        if (unlockedHitElements.length > 0) {
+          // If there are unlocked elements, use the topmost one
+          pointerDownState.hit.element =
+            unlockedHitElements[unlockedHitElements.length - 1];
+        } else if (
           hitElementMightBeLocked &&
           hitElementMightBeLocked.locked &&
           !unlockedHitElements.some(