fix: guard delayed return ball drag cleanup

Author: MomiJiSan

static/avatar-ui-buttons.js

@@ -3929,7 +3929,8 @@ const AvatarButtonMixin = {
                 dragSafetyTimer = 0;
             };
 
-            const finishDragState = (moved) => {
+            const finishDragState = (moved, safetyToken) => {
+                if (safetyToken !== dragSafetyToken) return;
                 container.setAttribute('data-dragging', 'false');
                 if (moved) {
                     _dispatchNekoIdleReturnBallManualMove(container, 'return-ball-drag-end', {
@@ -3947,7 +3948,7 @@ const AvatarButtonMixin = {
                 isDragging = false;
                 dragActiveDispatched = false;
                 container.style.cursor = 'grab';
-                finishDragState(moved);
+                finishDragState(moved, safetyToken);
             };
 
             const handleStart = (clientX, clientY) => {
@@ -3995,12 +3996,13 @@ const AvatarButtonMixin = {
             const handleEnd = () => {
                 clearDragSafetyTimer();
                 if (isDragging) {
+                    const safetyToken = dragSafetyToken;
                     const moved = container.getAttribute('data-dragging') === 'true';
                     isDragging = false;
                     dragActiveDispatched = false;
                     container.style.cursor = 'grab';
                     setTimeout(() => {
-                        finishDragState(moved);
+                        finishDragState(moved, safetyToken);
                     }, 10);
                 }
             };

tests/unit/test_avatar_return_button_idle_tiers_static.py

@@ -547,17 +547,18 @@ def test_cat1_walk_is_blocked_while_return_ball_drag_is_active_or_pending():
         "const clearDragSafetyTimer = () => {",
         "const resetDragStateAfterMissingEnd = (safetyToken) => {",
         "if (dragSafetyToken !== safetyToken || !isDragging) return;",
-        "const finishDragState = (moved) => {",
+        "const finishDragState = (moved, safetyToken) => {",
+        "if (safetyToken !== dragSafetyToken) return;",
         "container.setAttribute('data-dragging', 'false');",
         "_dispatchNekoIdleReturnBallManualMove(container, 'return-ball-drag-end'",
     ):
         _assert_source_contains(drag_setup, expected, "return button drag setup")
     _assert_source_order(
         drag_setup,
         "return button drag setup helpers",
-        "const finishDragState = (moved) => {",
+        "const finishDragState = (moved, safetyToken) => {",
         "const resetDragStateAfterMissingEnd = (safetyToken) => {",
-        "finishDragState(moved);",
+        "finishDragState(moved, safetyToken);",
     )
     _assert_source_contains(
         handle_start,
@@ -580,17 +581,19 @@ def test_cat1_walk_is_blocked_while_return_ball_drag_is_active_or_pending():
         "dragSafetyTimer = setTimeout(() => {",
     )
     _assert_source_contains(handle_end, "clearDragSafetyTimer();", "return button drag end handler")
+    _assert_source_contains(handle_end, "const safetyToken = dragSafetyToken;", "return button drag end handler")
     _assert_source_contains(
         handle_end,
-        "finishDragState(moved);",
+        "finishDragState(moved, safetyToken);",
         "return button drag end handler",
     )
     _assert_source_order(
         handle_end,
         "return button drag end handler",
         "clearDragSafetyTimer();",
         "if (isDragging) {",
-        "finishDragState(moved);",
+        "const safetyToken = dragSafetyToken;",
+        "finishDragState(moved, safetyToken);",
     )
 
     sync_block = _source_slice_between(