From 326a44240730db6772cc59bea287b07b875111c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Freire?= <joao.freire@unity3d.com>
Date: Mon, 14 Aug 2023 13:11:10 +0200
Subject: [PATCH 01/39] DROP Enable UITK Asset Editor

---
 .../Editor/UITKAssetEditor/InputActionsEditorWindow.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
index e76064f195..a418a820a8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
@@ -17,7 +17,7 @@ internal static class EnableUITKEditor
         static EnableUITKEditor()
         {
             // set this feature flag to true to enable the UITK editor
-            InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kUseUIToolkitEditor, false);
+            InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kUseUIToolkitEditor, true);
         }
     }
 

From c8f3ea557cf8ef6a3144a7ac6abafe4d48ad642e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Freire?= <joao.freire@unity3d.com>
Date: Mon, 14 Aug 2023 13:12:00 +0200
Subject: [PATCH 02/39] WIP Add Drag And Drop UI functionality

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   |  2 +
 .../UITKAssetEditor/Views/ActionsTreeView.cs  |  1 +
 .../UITKAssetEditor/Views/DragManipulator.cs  | 62 ++++++++++++++++
 .../Views/DragManipulator.cs.meta             |  3 +
 .../UITKAssetEditor/Views/DropManipulator.cs  | 74 +++++++++++++++++++
 .../Views/DropManipulator.cs.meta             |  3 +
 .../Views/InputActionsTreeViewItem.cs         | 57 +++++++++++++-
 7 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
 create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta
 create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
 create mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 33f0408a06..967eb23713 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -50,6 +50,8 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             };
 
             m_ListView.RegisterCallback<KeyDownEvent>(OnKeyDownEvent);
+            m_ListView.AddManipulator(new DropManipulator());
+
 
             CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),
                 (actionMapNames, state) => new ViewState(Selectors.GetSelectedActionMap(state), actionMapNames));
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index f636b20cb9..8d84429ece 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -115,6 +115,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             };
 
             m_ActionsTreeView.RegisterCallback<KeyDownEvent>(OnKeyDownEvent);
+            m_ActionsTreeView.AddManipulator(new DragManipulator());
 
             CreateSelector(Selectors.GetActionsForSelectedActionMap, Selectors.GetActionMapCount,
                 (_, count, state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
new file mode 100644
index 0000000000..a53c298d84
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
@@ -0,0 +1,62 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEngine.InputSystem.Editor
+{
+    public class DragManipulator : Manipulator
+    {
+        String initialLabelText;
+
+        public static bool dragging;
+        private bool m_IsPointerDown;
+        protected override void RegisterCallbacksOnTarget()
+        {
+            Debug.Log("Registering callbacks");
+            target.RegisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.RegisterCallback<PointerDownEvent>(OnPointerDown);
+            target.RegisterCallback<PointerUpEvent>(OnPointerUp);
+        }
+
+        void OnPointerMove(PointerMoveEvent evt)
+        {
+            if (!dragging && m_IsPointerDown)
+            {
+                m_IsPointerDown = false;
+                Debug.Log("Starting drag!");
+                DragAndDrop.PrepareStartDrag();
+                DragAndDrop.SetGenericData("string", "dropped");
+                DragAndDrop.StartDrag(string.Empty);
+                dragging = true;
+            }
+        }
+
+        void OnPointerUp(PointerUpEvent evt)
+        {
+            Debug.Log("Pointer up");
+            m_IsPointerDown = false;
+            if (dragging)
+            {
+                dragging = false;
+                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
+            }
+        }
+
+        void OnPointerDown(PointerDownEvent evt)
+        {
+            if (evt.isPrimary && evt.button == 0)
+            {
+                Debug.Log("Pointer down");
+                m_IsPointerDown = true;
+            }
+        }
+
+        protected override void UnregisterCallbacksFromTarget()
+        {
+            target.UnregisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.UnregisterCallback<PointerDownEvent>(OnPointerDown);
+            target.UnregisterCallback<PointerUpEvent>(OnPointerUp);
+        }
+    }
+}
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta
new file mode 100644
index 0000000000..6e5bd071c4
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 60dc7f6666ce47e3acc6d121313fd2f9
+timeCreated: 1691760360
\ No newline at end of file
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
new file mode 100644
index 0000000000..108daba6d4
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -0,0 +1,74 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEngine.InputSystem.Editor
+{
+    public class DropManipulator : Manipulator
+    {
+        protected override void RegisterCallbacksOnTarget()
+        {
+            Debug.Log("Registering callbacks for DropManipulator");
+            target.RegisterCallback<DragEnterEvent>(OnDragEnterEvent);
+            target.RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
+            target.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
+            target.RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
+            target.RegisterCallback<DragExitedEvent>(OnDragExitedEvent);
+        }
+
+        protected override void UnregisterCallbacksFromTarget()
+        {
+            target.UnregisterCallback<DragEnterEvent>(OnDragEnterEvent);
+            target.UnregisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
+            target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
+            target.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent);
+            target.UnregisterCallback<DragExitedEvent>(OnDragExitedEvent);
+        }
+
+        void OnDragExitedEvent(DragExitedEvent evt)
+        {
+            Debug.Log("Drag exited");
+            // ((Label)evt.target).style.backgroundColor = Color.clear;
+            object draggedLabel = DragAndDrop.GetGenericData("string");
+            if (DragManipulator.dragging)
+            {
+                DragManipulator.dragging = false;
+            }
+        }
+
+        void OnDragPerformEvent(DragPerformEvent evt)
+        {
+            DragAndDrop.AcceptDrag();
+            object data = DragAndDrop.GetGenericData("string");
+            Debug.Log("Drag performed with data: " + data + "to target: " + evt.currentTarget);
+            DragManipulator.dragging = false;
+        }
+
+        void OnDragUpdatedEvent(DragUpdatedEvent evt)
+        {
+            DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+            // Unclear why we need this, but saw it in another example.
+            evt.StopPropagation();
+        }
+
+        void OnDragLeaveEvent(DragLeaveEvent evt)
+        {
+            Debug.Log("Drag leave");
+            // ((Label)evt.target).style.backgroundColor = Color.clear;
+        }
+
+        void OnDragEnterEvent(DragEnterEvent evt)
+        {
+            Debug.Log("Drag enter event " + evt.currentTarget);
+
+            // This makes sure that drop is only allowed on the correct type of element that started the drag.
+            // The drag element will set a string in the DragAndDrop generic data, which we can use to check if the
+            // drop is allowed.
+            if (DragAndDrop.GetGenericData("string") != null)
+            {
+                // ((Label)evt.target).style.backgroundColor = Color.gray;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta
new file mode 100644
index 0000000000..3ba3f9dca1
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b52a4b3b22334b02a4d22d942a479be6
+timeCreated: 1691762301
\ No newline at end of file
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
index e26a6bade7..1d6f2a90cb 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
@@ -24,6 +24,8 @@ internal class InputActionsTreeViewItem : VisualElement
 
         private bool m_IsEditing;
 
+        DropManipulator m_Manipulator;
+
         public InputActionsTreeViewItem()
         {
             var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -38,10 +40,63 @@ public InputActionsTreeViewItem()
             renameTextfield.selectAllOnFocus = true;
             renameTextfield.selectAllOnMouseUp = false;
 
-            RegisterCallback<MouseDownEvent>(OnMouseDownEventForRename);
+
+            // RegisterCallback<MouseDownEvent>(OnMouseDownEventForRename);
+            // RegisterCallback<DragEnterEvent>(OnDragEnterEvent);
+            // RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
+            // RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
+            // RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
+            // RegisterCallback<DragExitedEvent>(OnDragExitedEvent);
+
             renameTextfield.RegisterCallback<FocusOutEvent>(e => OnEditTextFinished());
         }
 
+        void OnDragExitedEvent(DragExitedEvent evt)
+        {
+            Debug.Log("Drag exited");
+            // ((Label)evt.target).style.backgroundColor = Color.clear;
+            object draggedLabel = DragAndDrop.GetGenericData("string");
+            if (DragManipulator.dragging)
+            {
+                DragManipulator.dragging = false;
+            }
+        }
+
+        void OnDragPerformEvent(DragPerformEvent evt)
+        {
+            DragAndDrop.AcceptDrag();
+            object data = DragAndDrop.GetGenericData("string");
+            Debug.Log("Drag performed with data: " + data + "to target: " + evt.currentTarget);
+            DragManipulator.dragging = false;
+        }
+
+        void OnDragUpdatedEvent(DragUpdatedEvent evt)
+        {
+            Debug.Log("Drag UPDATE event " + (evt.target as VisualElement));
+            DragAndDrop.visualMode = DragAndDropVisualMode.Move;
+            // Unclear why we need this, but saw it in another example.
+            // evt.StopPropagation();
+        }
+
+        void OnDragLeaveEvent(DragLeaveEvent evt)
+        {
+            Debug.Log("Drag leave");
+            // ((Label)evt.target).style.backgroundColor = Color.clear;
+        }
+
+        void OnDragEnterEvent(DragEnterEvent evt)
+        {
+            Debug.Log("Drag enter event " + (evt.target as VisualElement));
+
+            // This makes sure that drop is only allowed on the correct type of element that started the drag.
+            // The drag element will set a string in the DragAndDrop generic data, which we can use to check if the
+            // drop is allowed.
+            if (DragAndDrop.GetGenericData("string") != null)
+            {
+                // ((Label)evt.target).style.backgroundColor = Color.gray;
+            }
+        }
+
         public Label label => this.Q<Label>();
         private TextField renameTextfield => this.Q<TextField>(kRenameTextField);
 

From 5d4ae4c9392710c6fc7aa6872675f73c50c5dfde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Freire?= <joao.freire@unity3d.com>
Date: Wed, 16 Aug 2023 15:57:39 +0200
Subject: [PATCH 03/39] SQUASH

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs | 2 ++
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
index a53c298d84..c5490d1e0d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
@@ -48,7 +48,9 @@ void OnPointerDown(PointerDownEvent evt)
             if (evt.isPrimary && evt.button == 0)
             {
                 Debug.Log("Pointer down");
+                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
                 m_IsPointerDown = true;
+                dragging = false;
             }
         }
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 108daba6d4..dadc260e32 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -34,6 +34,7 @@ void OnDragExitedEvent(DragExitedEvent evt)
             if (DragManipulator.dragging)
             {
                 DragManipulator.dragging = false;
+                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
             }
         }
 
@@ -55,6 +56,7 @@ void OnDragUpdatedEvent(DragUpdatedEvent evt)
         void OnDragLeaveEvent(DragLeaveEvent evt)
         {
             Debug.Log("Drag leave");
+            DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
             // ((Label)evt.target).style.backgroundColor = Color.clear;
         }
 

From 7c18777ab2eab925db8d8101c368e2b08cef877a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Freire?= <joao.freire@unity3d.com>
Date: Thu, 17 Aug 2023 17:54:03 +0200
Subject: [PATCH 04/39] Add drag and drop respective manipulators to deal with
 UI events

---
 .../UITKAssetEditor/Views/DragManipulator.cs  | 11 ++++--
 .../UITKAssetEditor/Views/DropManipulator.cs  | 36 +++++++++----------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
index c5490d1e0d..212e697c63 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
@@ -9,6 +9,13 @@ public class DragManipulator : Manipulator
     {
         String initialLabelText;
 
+        EventCallback<PointerMoveEvent> DragStartedCallback;
+
+        public DragManipulator(EventCallback<PointerMoveEvent> dragStartedCallback)
+        {
+            DragStartedCallback = dragStartedCallback;
+        }
+
         public static bool dragging;
         private bool m_IsPointerDown;
         protected override void RegisterCallbacksOnTarget()
@@ -25,9 +32,7 @@ void OnPointerMove(PointerMoveEvent evt)
             {
                 m_IsPointerDown = false;
                 Debug.Log("Starting drag!");
-                DragAndDrop.PrepareStartDrag();
-                DragAndDrop.SetGenericData("string", "dropped");
-                DragAndDrop.StartDrag(string.Empty);
+                DragStartedCallback.Invoke(evt);
                 dragging = true;
             }
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index dadc260e32..79b34ae354 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -5,14 +5,24 @@
 
 namespace UnityEngine.InputSystem.Editor
 {
+    /// <summary>
+    /// Class to handle drop events on a UI element.
+    /// </summary>
+    /// Created by setting a callback to the constructor that will run only when the drop is performed.
     public class DropManipulator : Manipulator
     {
+        EventCallback<DragPerformEvent> DroppedPerformedCallback;
+
+        public DropManipulator(EventCallback<DragPerformEvent> droppedPerformedCallback)
+        {
+            DroppedPerformedCallback = droppedPerformedCallback;
+        }
+
         protected override void RegisterCallbacksOnTarget()
         {
-            Debug.Log("Registering callbacks for DropManipulator");
             target.RegisterCallback<DragEnterEvent>(OnDragEnterEvent);
             target.RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-            target.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
+            target.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
             target.RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
             target.RegisterCallback<DragExitedEvent>(OnDragExitedEvent);
         }
@@ -21,7 +31,7 @@ protected override void UnregisterCallbacksFromTarget()
         {
             target.UnregisterCallback<DragEnterEvent>(OnDragEnterEvent);
             target.UnregisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-            target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
+            target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
             target.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent);
             target.UnregisterCallback<DragExitedEvent>(OnDragExitedEvent);
         }
@@ -29,8 +39,6 @@ protected override void UnregisterCallbacksFromTarget()
         void OnDragExitedEvent(DragExitedEvent evt)
         {
             Debug.Log("Drag exited");
-            // ((Label)evt.target).style.backgroundColor = Color.clear;
-            object draggedLabel = DragAndDrop.GetGenericData("string");
             if (DragManipulator.dragging)
             {
                 DragManipulator.dragging = false;
@@ -41,36 +49,28 @@ void OnDragExitedEvent(DragExitedEvent evt)
         void OnDragPerformEvent(DragPerformEvent evt)
         {
             DragAndDrop.AcceptDrag();
-            object data = DragAndDrop.GetGenericData("string");
-            Debug.Log("Drag performed with data: " + data + "to target: " + evt.currentTarget);
+            DroppedPerformedCallback.Invoke(evt);
             DragManipulator.dragging = false;
         }
 
         void OnDragUpdatedEvent(DragUpdatedEvent evt)
         {
             DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
-            // Unclear why we need this, but saw it in another example.
-            evt.StopPropagation();
+            evt.StopImmediatePropagation();
         }
 
         void OnDragLeaveEvent(DragLeaveEvent evt)
         {
-            Debug.Log("Drag leave");
             DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-            // ((Label)evt.target).style.backgroundColor = Color.clear;
         }
 
         void OnDragEnterEvent(DragEnterEvent evt)
         {
             Debug.Log("Drag enter event " + evt.currentTarget);
 
-            // This makes sure that drop is only allowed on the correct type of element that started the drag.
-            // The drag element will set a string in the DragAndDrop generic data, which we can use to check if the
-            // drop is allowed.
-            if (DragAndDrop.GetGenericData("string") != null)
-            {
-                // ((Label)evt.target).style.backgroundColor = Color.gray;
-            }
+            //TODO
+            // This event can be used to mae sure that drop is only allowed on the correct type of element that started
+            // the drag.
         }
     }
 }

From 083b4d37b758b5021504104c132b2cfcbc65c442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Freire?= <joao.freire@unity3d.com>
Date: Thu, 17 Aug 2023 17:55:52 +0200
Subject: [PATCH 05/39] WIP Add data manipulation logic based on UI drag and
 drop actions

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   | 23 ++++++++++++++++++-
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 12 +++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 967eb23713..f1b67a97d7 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -1,6 +1,7 @@
 #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_UI_TK_ASSET_EDITOR
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.UIElements;
 
@@ -30,6 +31,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
                 treeViewItem.DuplicateCallback = _ => DuplicateActionMap(i);
                 treeViewItem.OnDeleteItem += treeViewItem.DeleteCallback;
                 treeViewItem.OnDuplicateItem += treeViewItem.DuplicateCallback;
+                treeViewItem.userData = i;
 
                 ContextMenu.GetContextMenuForActionMapItem(treeViewItem);
             };
@@ -50,7 +52,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             };
 
             m_ListView.RegisterCallback<KeyDownEvent>(OnKeyDownEvent);
-            m_ListView.AddManipulator(new DropManipulator());
+            m_ListView.AddManipulator(new DropManipulator(OnDroppedHandler));
 
 
             CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),
@@ -59,6 +61,25 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             addActionMapButton.clicked += AddActionMap;
         }
 
+        void OnDroppedHandler(DragPerformEvent evt)
+        {
+            Debug.Log("Dropped performed");
+
+            //TODO
+            //get treeview item (all tree or just an item? confirm this)
+            var actionOrBinding = (ActionOrBindingData)DragAndDrop.GetGenericData("tree");
+
+            // get destination action map index and name
+            var listView = (ListView)evt.target;
+            var destinationActionMapIndex = (int)listView.panel.Pick(evt.mousePosition).FindAncestorUserData();
+            var destinationActionMapName = (string)listView.itemsSource[destinationActionMapIndex];
+
+            // TODO get original data (copy)
+            Dispatch(Commands.SelectAction(actionOrBinding.name));
+            // TODO paste data into destination action map
+            // TODO remove action from source action map where it was before
+        }
+
         private Button addActionMapButton => m_Root?.Q<Button>("add-new-action-map-button");
 
         public override void RedrawUI(ViewState viewState)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 8d84429ece..bdb68573bc 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -115,7 +115,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             };
 
             m_ActionsTreeView.RegisterCallback<KeyDownEvent>(OnKeyDownEvent);
-            m_ActionsTreeView.AddManipulator(new DragManipulator());
+            m_ActionsTreeView.AddManipulator(new DragManipulator(OnDragStarted));
 
             CreateSelector(Selectors.GetActionsForSelectedActionMap, Selectors.GetActionMapCount,
                 (_, count, state) =>
@@ -132,6 +132,16 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             addActionButton.clicked += AddAction;
         }
 
+        void OnDragStarted(PointerMoveEvent evt)
+        {
+            Debug.Log("Selected tree view Index item to drag: " + m_ActionsTreeView.selectedItem);
+
+            DragAndDrop.PrepareStartDrag();
+            DragAndDrop.SetGenericData("tree", m_ActionsTreeView.selectedItem);
+            DragAndDrop.SetGenericData("string", "dropped");
+            DragAndDrop.StartDrag(string.Empty);
+        }
+
         private int GetSelectedElementId(InputActionsEditorState state, List<TreeViewItemData<ActionOrBindingData>> treeData)
         {
             var id = -1;

From 68565d2c91278d053826e4f99d610265cd2b74c1 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 26 Jan 2024 14:44:21 +0100
Subject: [PATCH 06/39] fixed visualizations

---
 .../UITKAssetEditor/Views/ActionMapsView.cs      |  2 +-
 .../UITKAssetEditor/Views/ActionsTreeView.cs     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index d63509c6da..f438e78d31 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -20,7 +20,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
 
             m_ListView = m_Root?.Q<ListView>("action-maps-list-view");
             m_ListView.selectionType = UIElements.SelectionType.Single;
-
+            m_ListView.reorderable = true;
             m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);
             m_ListViewSelectionChangeFilter.selectedIndicesChanged += (selectedIndices) =>
             {
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index aae66bf7a4..5488981780 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -37,6 +37,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             m_GuidToTreeViewId = new Dictionary<Guid, int>();
             m_ActionsTreeView.selectionType = UIElements.SelectionType.Single;
             m_ActionsTreeView.makeItem = () => new InputActionsTreeViewItem();
+            m_ActionsTreeView.reorderable = true;
             m_ActionsTreeView.bindItem = (e, i) =>
             {
                 var item = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(i);
@@ -132,9 +133,12 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                 }
             };
 
+            m_ActionsTreeView.RegisterCallback<DragUpdatedEvent>(OnDrag);
+            m_ActionsTreeView.RegisterCallback<DragPerformEvent>(OnDragPerformed);
             m_ActionsTreeView.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
             m_ActionsTreeView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
-            m_ActionsTreeView.AddManipulator(new DragManipulator(OnDragStarted));
+            //m_ActionsTreeView.AddManipulator(new DragManipulator(OnDragStarted));
+            //m_ActionsTreeView.AddManipulator(new DropManipulator(OnDrop));
 
             CreateSelector(Selectors.GetActionsForSelectedActionMap, Selectors.GetActionMapCount,
                 (_, count, state) =>
@@ -151,6 +155,16 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             addActionButton.clicked += AddAction;
         }
 
+        void OnDrag(DragUpdatedEvent evt)
+        {
+            m_ActionsTreeView.ReleaseMouse();
+        }
+
+        void OnDragPerformed(DragPerformEvent evt)
+        {
+            m_ActionsTreeView.ReleaseMouse();
+        }
+
         void OnDragStarted(PointerMoveEvent evt)
         {
             Debug.Log("Selected tree view Index item to drag: " + m_ActionsTreeView.selectedItem);

From 560538293fc3896a6457ba483b8babe830369dba Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 29 Jan 2024 18:09:29 +0100
Subject: [PATCH 07/39] fixed reordering and drag between lists

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   |  4 +-
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 24 --------
 .../UITKAssetEditor/Views/DropManipulator.cs  | 58 +++++++------------
 3 files changed, 23 insertions(+), 63 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index f438e78d31..d7de29ca91 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -59,7 +59,9 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
 
             m_ListView.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
             m_ListView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
-            m_ListView.AddManipulator(new DropManipulator(OnDroppedHandler));
+            var treeView = m_Root.Q<TreeView>("actions-tree-view");
+            m_ListView.AddManipulator(new DropManipulator(OnDroppedHandler, treeView));
+
 
             CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),
                 (actionMapNames, state) => new ViewState(Selectors.GetSelectedActionMap(state), actionMapNames));
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 5488981780..7b9f89ffda 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -133,12 +133,8 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                 }
             };
 
-            m_ActionsTreeView.RegisterCallback<DragUpdatedEvent>(OnDrag);
-            m_ActionsTreeView.RegisterCallback<DragPerformEvent>(OnDragPerformed);
             m_ActionsTreeView.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
             m_ActionsTreeView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
-            //m_ActionsTreeView.AddManipulator(new DragManipulator(OnDragStarted));
-            //m_ActionsTreeView.AddManipulator(new DropManipulator(OnDrop));
 
             CreateSelector(Selectors.GetActionsForSelectedActionMap, Selectors.GetActionMapCount,
                 (_, count, state) =>
@@ -155,26 +151,6 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             addActionButton.clicked += AddAction;
         }
 
-        void OnDrag(DragUpdatedEvent evt)
-        {
-            m_ActionsTreeView.ReleaseMouse();
-        }
-
-        void OnDragPerformed(DragPerformEvent evt)
-        {
-            m_ActionsTreeView.ReleaseMouse();
-        }
-
-        void OnDragStarted(PointerMoveEvent evt)
-        {
-            Debug.Log("Selected tree view Index item to drag: " + m_ActionsTreeView.selectedItem);
-
-            DragAndDrop.PrepareStartDrag();
-            DragAndDrop.SetGenericData("tree", m_ActionsTreeView.selectedItem);
-            DragAndDrop.SetGenericData("string", "dropped");
-            DragAndDrop.StartDrag(string.Empty);
-        }
-
         private int GetSelectedElementId(InputActionsEditorState state, List<TreeViewItemData<ActionOrBindingData>> treeData)
         {
             var id = -1;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 79b34ae354..dcaaac93dc 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -12,65 +12,47 @@ namespace UnityEngine.InputSystem.Editor
     public class DropManipulator : Manipulator
     {
         EventCallback<DragPerformEvent> DroppedPerformedCallback;
+        VisualElement otherVerticalList;
 
-        public DropManipulator(EventCallback<DragPerformEvent> droppedPerformedCallback)
+        public DropManipulator(EventCallback<DragPerformEvent> droppedPerformedCallback, VisualElement otherVerticalList)
         {
             DroppedPerformedCallback = droppedPerformedCallback;
+            this.otherVerticalList = otherVerticalList;
         }
 
         protected override void RegisterCallbacksOnTarget()
         {
-            target.RegisterCallback<DragEnterEvent>(OnDragEnterEvent);
-            target.RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-            target.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
-            target.RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
-            target.RegisterCallback<DragExitedEvent>(OnDragExitedEvent);
+            otherVerticalList.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
+            otherVerticalList.RegisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
         }
 
         protected override void UnregisterCallbacksFromTarget()
         {
-            target.UnregisterCallback<DragEnterEvent>(OnDragEnterEvent);
-            target.UnregisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-            target.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
-            target.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent);
-            target.UnregisterCallback<DragExitedEvent>(OnDragExitedEvent);
-        }
-
-        void OnDragExitedEvent(DragExitedEvent evt)
-        {
-            Debug.Log("Drag exited");
-            if (DragManipulator.dragging)
-            {
-                DragManipulator.dragging = false;
-                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-            }
+            otherVerticalList.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
+            otherVerticalList.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
         }
 
         void OnDragPerformEvent(DragPerformEvent evt)
         {
+            if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is null) //TODO
+                return;
+            evt.StopImmediatePropagation();
             DragAndDrop.AcceptDrag();
             DroppedPerformedCallback.Invoke(evt);
-            DragManipulator.dragging = false;
         }
 
         void OnDragUpdatedEvent(DragUpdatedEvent evt)
         {
-            DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
-            evt.StopImmediatePropagation();
-        }
-
-        void OnDragLeaveEvent(DragLeaveEvent evt)
-        {
-            DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-        }
-
-        void OnDragEnterEvent(DragEnterEvent evt)
-        {
-            Debug.Log("Drag enter event " + evt.currentTarget);
-
-            //TODO
-            // This event can be used to mae sure that drop is only allowed on the correct type of element that started
-            // the drag.
+            if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is not null) //TODO
+            {
+                (target as ListView)?.Focus(); //TODO focus element on the listview
+                DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+                evt.StopImmediatePropagation();
+            }
+            else
+            {
+                otherVerticalList.Focus();
+            }
         }
     }
 }

From b843619f18f2cb2b109b5b58cac3f5af073397c7 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 29 Jan 2024 21:16:48 +0100
Subject: [PATCH 08/39] fixed focusing MapListItems during drag

---
 .../UITKAssetEditor/Views/ActionMapsView.cs   | 11 ++++-----
 .../UITKAssetEditor/Views/DropManipulator.cs  | 23 ++++++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index d7de29ca91..177327e9e0 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -2,7 +2,6 @@
 using CmdEvents = UnityEngine.InputSystem.Editor.InputActionsEditorConstants.CommandEvents;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEditor;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.UIElements;
 
@@ -76,15 +75,15 @@ void OnDroppedHandler(DragPerformEvent evt)
 
             //TODO
             //get treeview item (all tree or just an item? confirm this)
-            var actionOrBinding = (ActionOrBindingData)DragAndDrop.GetGenericData("tree");
+            // var actionOrBinding = (ActionOrBindingData)DragAndDrop.GetGenericData("tree");
 
             // get destination action map index and name
-            var listView = (ListView)evt.target;
-            var destinationActionMapIndex = (int)listView.panel.Pick(evt.mousePosition).FindAncestorUserData();
-            var destinationActionMapName = (string)listView.itemsSource[destinationActionMapIndex];
+            // var listView = (ListView)evt.target;
+            // var destinationActionMapIndex = (int)listView.panel.Pick(evt.mousePosition).FindAncestorUserData();
+            // var destinationActionMapName = (string)listView.itemsSource[destinationActionMapIndex];
 
             // TODO get original data (copy)
-            Dispatch(Commands.SelectAction(actionOrBinding.name));
+            // Dispatch(Commands.SelectAction(actionOrBinding.name));
             // TODO paste data into destination action map
             // TODO remove action from source action map where it was before
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index dcaaac93dc..77e3cef0d8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -1,6 +1,4 @@
-using System;
 using UnityEditor;
-using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Editor
@@ -39,20 +37,33 @@ void OnDragPerformEvent(DragPerformEvent evt)
             evt.StopImmediatePropagation();
             DragAndDrop.AcceptDrag();
             DroppedPerformedCallback.Invoke(evt);
+            Reset();
         }
 
+        private int initialIndex = -1;
         void OnDragUpdatedEvent(DragUpdatedEvent evt)
         {
             if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is not null) //TODO
             {
-                (target as ListView)?.Focus(); //TODO focus element on the listview
+                if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is not int) //TODO
+                    return;
+                (target as ListView)?.Focus();
+                if (initialIndex < 0)
+                    initialIndex = ((ListView)target).selectedIndex;
+                (target as ListView)?.SetSelectionWithoutNotify(new[] {(int)target.panel.Pick(evt.mousePosition).FindAncestorUserData()});
                 DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
                 evt.StopImmediatePropagation();
             }
             else
-            {
-                otherVerticalList.Focus();
-            }
+                Reset();
+        }
+
+        void Reset()
+        {
+            (otherVerticalList as TreeView)?.Focus();
+            if (initialIndex >= 0)
+                (target as ListView)?.SetSelectionWithoutNotify(new[] {initialIndex});
+            initialIndex = -1;
         }
     }
 }

From 5a4b176423340ea8a935f0e75459474b2780381b Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 30 Jan 2024 13:01:28 +0100
Subject: [PATCH 09/39] clean up branch

---
 .../UITKAssetEditor/Views/DragManipulator.cs  | 69 -------------------
 .../Views/DragManipulator.cs.meta             |  3 -
 .../Views/InputActionsTreeViewItem.cs         | 54 +--------------
 3 files changed, 1 insertion(+), 125 deletions(-)
 delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
 delete mode 100644 Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
deleted file mode 100644
index 212e697c63..0000000000
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace UnityEngine.InputSystem.Editor
-{
-    public class DragManipulator : Manipulator
-    {
-        String initialLabelText;
-
-        EventCallback<PointerMoveEvent> DragStartedCallback;
-
-        public DragManipulator(EventCallback<PointerMoveEvent> dragStartedCallback)
-        {
-            DragStartedCallback = dragStartedCallback;
-        }
-
-        public static bool dragging;
-        private bool m_IsPointerDown;
-        protected override void RegisterCallbacksOnTarget()
-        {
-            Debug.Log("Registering callbacks");
-            target.RegisterCallback<PointerMoveEvent>(OnPointerMove);
-            target.RegisterCallback<PointerDownEvent>(OnPointerDown);
-            target.RegisterCallback<PointerUpEvent>(OnPointerUp);
-        }
-
-        void OnPointerMove(PointerMoveEvent evt)
-        {
-            if (!dragging && m_IsPointerDown)
-            {
-                m_IsPointerDown = false;
-                Debug.Log("Starting drag!");
-                DragStartedCallback.Invoke(evt);
-                dragging = true;
-            }
-        }
-
-        void OnPointerUp(PointerUpEvent evt)
-        {
-            Debug.Log("Pointer up");
-            m_IsPointerDown = false;
-            if (dragging)
-            {
-                dragging = false;
-                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-            }
-        }
-
-        void OnPointerDown(PointerDownEvent evt)
-        {
-            if (evt.isPrimary && evt.button == 0)
-            {
-                Debug.Log("Pointer down");
-                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-                m_IsPointerDown = true;
-                dragging = false;
-            }
-        }
-
-        protected override void UnregisterCallbacksFromTarget()
-        {
-            target.UnregisterCallback<PointerMoveEvent>(OnPointerMove);
-            target.UnregisterCallback<PointerDownEvent>(OnPointerDown);
-            target.UnregisterCallback<PointerUpEvent>(OnPointerUp);
-        }
-    }
-}
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta
deleted file mode 100644
index 6e5bd071c4..0000000000
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DragManipulator.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 60dc7f6666ce47e3acc6d121313fd2f9
-timeCreated: 1691760360
\ No newline at end of file
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
index e9014c98ba..c073a319ef 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
@@ -41,62 +41,10 @@ public InputActionsTreeViewItem()
             renameTextfield.selectAllOnMouseUp = false;
 
 
-            // RegisterCallback<MouseDownEvent>(OnMouseDownEventForRename);
-            // RegisterCallback<DragEnterEvent>(OnDragEnterEvent);
-            // RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-            // RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
-            // RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
-            // RegisterCallback<DragExitedEvent>(OnDragExitedEvent);
-
+            RegisterCallback<MouseDownEvent>(OnMouseDownEventForRename);
             renameTextfield.RegisterCallback<FocusOutEvent>(e => OnEditTextFinished());
         }
 
-        void OnDragExitedEvent(DragExitedEvent evt)
-        {
-            Debug.Log("Drag exited");
-            // ((Label)evt.target).style.backgroundColor = Color.clear;
-            object draggedLabel = DragAndDrop.GetGenericData("string");
-            if (DragManipulator.dragging)
-            {
-                DragManipulator.dragging = false;
-            }
-        }
-
-        void OnDragPerformEvent(DragPerformEvent evt)
-        {
-            DragAndDrop.AcceptDrag();
-            object data = DragAndDrop.GetGenericData("string");
-            Debug.Log("Drag performed with data: " + data + "to target: " + evt.currentTarget);
-            DragManipulator.dragging = false;
-        }
-
-        void OnDragUpdatedEvent(DragUpdatedEvent evt)
-        {
-            Debug.Log("Drag UPDATE event " + (evt.target as VisualElement));
-            DragAndDrop.visualMode = DragAndDropVisualMode.Move;
-            // Unclear why we need this, but saw it in another example.
-            // evt.StopPropagation();
-        }
-
-        void OnDragLeaveEvent(DragLeaveEvent evt)
-        {
-            Debug.Log("Drag leave");
-            // ((Label)evt.target).style.backgroundColor = Color.clear;
-        }
-
-        void OnDragEnterEvent(DragEnterEvent evt)
-        {
-            Debug.Log("Drag enter event " + (evt.target as VisualElement));
-
-            // This makes sure that drop is only allowed on the correct type of element that started the drag.
-            // The drag element will set a string in the DragAndDrop generic data, which we can use to check if the
-            // drop is allowed.
-            if (DragAndDrop.GetGenericData("string") != null)
-            {
-                // ((Label)evt.target).style.backgroundColor = Color.gray;
-            }
-        }
-
         public Label label => this.Q<Label>();
         private TextField renameTextfield => this.Q<TextField>(kRenameTextField);
 

From d76cb234f41e604ab855ffbc1b322cccedfe38e3 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 30 Jan 2024 14:11:10 +0100
Subject: [PATCH 10/39] clean up drag/drop

---
 .../UITKAssetEditor/Views/DropManipulator.cs  | 49 ++++++++++---------
 .../Views/InputActionsTreeViewItem.cs         |  2 -
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 77e3cef0d8..6719cf397e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -4,33 +4,33 @@
 namespace UnityEngine.InputSystem.Editor
 {
     /// <summary>
-    /// Class to handle drop events on a UI element.
+    /// Class to handle drop from the actions tree view to the action maps list view.
     /// </summary>
-    /// Created by setting a callback to the constructor that will run only when the drop is performed.
     public class DropManipulator : Manipulator
     {
-        EventCallback<DragPerformEvent> DroppedPerformedCallback;
-        VisualElement otherVerticalList;
+        private EventCallback<DragPerformEvent> DroppedPerformedCallback;
+        private VisualElement m_OtherVerticalList;
+        private ListView listView => target as ListView;
 
         public DropManipulator(EventCallback<DragPerformEvent> droppedPerformedCallback, VisualElement otherVerticalList)
         {
             DroppedPerformedCallback = droppedPerformedCallback;
-            this.otherVerticalList = otherVerticalList;
+            m_OtherVerticalList = otherVerticalList;
         }
 
         protected override void RegisterCallbacksOnTarget()
         {
-            otherVerticalList.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
-            otherVerticalList.RegisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
+            m_OtherVerticalList.RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
+            m_OtherVerticalList.RegisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
         }
 
         protected override void UnregisterCallbacksFromTarget()
         {
-            otherVerticalList.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
-            otherVerticalList.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
+            m_OtherVerticalList.UnregisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent, TrickleDown.TrickleDown);
+            m_OtherVerticalList.UnregisterCallback<DragPerformEvent>(OnDragPerformEvent, TrickleDown.TrickleDown);
         }
 
-        void OnDragPerformEvent(DragPerformEvent evt)
+        private void OnDragPerformEvent(DragPerformEvent evt)
         {
             if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is null) //TODO
                 return;
@@ -40,17 +40,17 @@ void OnDragPerformEvent(DragPerformEvent evt)
             Reset();
         }
 
-        private int initialIndex = -1;
-        void OnDragUpdatedEvent(DragUpdatedEvent evt)
+        private int m_InitialIndex = -1;
+        private void OnDragUpdatedEvent(DragUpdatedEvent evt)
         {
-            if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is not null) //TODO
+            var treeViewItem = target.panel.Pick(evt.mousePosition)?.parent;
+            if (treeViewItem is InputActionMapsTreeViewItem mapItem)
             {
-                if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is not int) //TODO
-                    return;
-                (target as ListView)?.Focus();
-                if (initialIndex < 0)
-                    initialIndex = ((ListView)target).selectedIndex;
-                (target as ListView)?.SetSelectionWithoutNotify(new[] {(int)target.panel.Pick(evt.mousePosition).FindAncestorUserData()});
+                listView?.Focus();
+                if (m_InitialIndex < 0 && listView != null)
+                    m_InitialIndex = listView.selectedIndex;
+                //select map item to visualize the drop
+                listView?.SetSelectionWithoutNotify(new[] { (int)mapItem.userData }); //the user data contains the index of the map item
                 DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
                 evt.StopImmediatePropagation();
             }
@@ -58,12 +58,13 @@ void OnDragUpdatedEvent(DragUpdatedEvent evt)
                 Reset();
         }
 
-        void Reset()
+        private void Reset()
         {
-            (otherVerticalList as TreeView)?.Focus();
-            if (initialIndex >= 0)
-                (target as ListView)?.SetSelectionWithoutNotify(new[] {initialIndex});
-            initialIndex = -1;
+            var treeView = m_OtherVerticalList as TreeView;
+            treeView?.Focus();
+            if (m_InitialIndex >= 0)
+                listView?.SetSelectionWithoutNotify(new[] {m_InitialIndex});
+            m_InitialIndex = -1;
         }
     }
 }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
index c073a319ef..6c82aaf83d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs
@@ -24,8 +24,6 @@ internal class InputActionsTreeViewItem : VisualElement
 
         private bool m_IsEditing;
 
-        DropManipulator m_Manipulator;
-
         public InputActionsTreeViewItem()
         {
             var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(

From 420bf9eb0fb6fa26f08615418fb7b14aa826cf98 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 30 Jan 2024 16:03:11 +0100
Subject: [PATCH 11/39] implemented Drag & Drop between action tree view and
 action map list view

---
 .../UITKAssetEditor/Commands/Commands.cs      | 11 +++++++++++
 .../UITKAssetEditor/Views/ActionMapsView.cs   | 19 +++----------------
 .../UITKAssetEditor/Views/CopyPasteHelper.cs  |  9 +++++----
 .../UITKAssetEditor/Views/DropManipulator.cs  | 18 +++++++++++++-----
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index fe0f9763a4..7a7272fb0e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -149,6 +149,17 @@ public static Command PasteActionMaps()
             };
         }
 
+        public static Command PasteActionIntoActionMap(int actionMapIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var lastPastedElement = CopyPasteHelper.PasteActionsOrBindingsFromClipboard(state, true, actionMapIndex);
+                if (lastPastedElement != null)
+                    state.serializedObject.ApplyModifiedProperties();
+                return state;
+            };
+        }
+
         public static Command PasteActionFromActionMap()
         {
             return (in InputActionsEditorState state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 177327e9e0..89b247084f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -69,23 +69,10 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             ContextMenu.GetContextMenuForActionMapListView(this, m_ListView.parent);
         }
 
-        void OnDroppedHandler(DragPerformEvent evt)
+        void OnDroppedHandler(int mapIndex)
         {
-            Debug.Log("Dropped performed");
-
-            //TODO
-            //get treeview item (all tree or just an item? confirm this)
-            // var actionOrBinding = (ActionOrBindingData)DragAndDrop.GetGenericData("tree");
-
-            // get destination action map index and name
-            // var listView = (ListView)evt.target;
-            // var destinationActionMapIndex = (int)listView.panel.Pick(evt.mousePosition).FindAncestorUserData();
-            // var destinationActionMapName = (string)listView.itemsSource[destinationActionMapIndex];
-
-            // TODO get original data (copy)
-            // Dispatch(Commands.SelectAction(actionOrBinding.name));
-            // TODO paste data into destination action map
-            // TODO remove action from source action map where it was before
+            Dispatch(Commands.CutActionsOrBindings());
+            Dispatch(Commands.PasteActionIntoActionMap(mapIndex));
         }
 
         private Button addActionMapButton => m_Root?.Q<Button>("add-new-action-map-button");
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
index 1765e0881a..31b651d90e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -155,21 +155,22 @@ public static SerializedProperty PasteActionMapsFromClipboard(InputActionsEditor
             return s_lastAddedElement;
         }
 
-        public static SerializedProperty PasteActionsOrBindingsFromClipboard(InputActionsEditorState state, bool addLast = false)
+        public static SerializedProperty PasteActionsOrBindingsFromClipboard(InputActionsEditorState state, bool addLast = false, int mapIndex = -1)
         {
             s_lastAddedElement = null;
             s_State = state;
             var typeOfCopiedData = GetCopiedClipboardType();
             if (typeOfCopiedData == typeof(InputAction))
-                PasteActionsFromClipboard(state, addLast);
+                PasteActionsFromClipboard(state, addLast, mapIndex);
             if (typeOfCopiedData == typeof(InputBinding))
                 PasteBindingsFromClipboard(state);
             return s_lastAddedElement;
         }
 
-        private static void PasteActionsFromClipboard(InputActionsEditorState state, bool addLast)
+        private static void PasteActionsFromClipboard(InputActionsEditorState state, bool addLast, int mapIndex)
         {
-            var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+            var actionMap = mapIndex >= 0 ? Selectors.GetActionMapAtIndex(state, mapIndex)?.wrappedProperty
+                : Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var actionArray = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Actions));
             if (actionArray == null) return;
             var index = state.selectedActionIndex;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 6719cf397e..6fce43d585 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
 using UnityEditor;
 using UnityEngine.UIElements;
 
@@ -8,11 +11,12 @@ namespace UnityEngine.InputSystem.Editor
     /// </summary>
     public class DropManipulator : Manipulator
     {
-        private EventCallback<DragPerformEvent> DroppedPerformedCallback;
+        private EventCallback<int> DroppedPerformedCallback;
         private VisualElement m_OtherVerticalList;
         private ListView listView => target as ListView;
+        private TreeView treeView => m_OtherVerticalList as TreeView;
 
-        public DropManipulator(EventCallback<DragPerformEvent> droppedPerformedCallback, VisualElement otherVerticalList)
+        public DropManipulator(EventCallback<int> droppedPerformedCallback, VisualElement otherVerticalList)
         {
             DroppedPerformedCallback = droppedPerformedCallback;
             m_OtherVerticalList = otherVerticalList;
@@ -32,11 +36,16 @@ protected override void UnregisterCallbacksFromTarget()
 
         private void OnDragPerformEvent(DragPerformEvent evt)
         {
-            if (target.panel.Pick(evt.mousePosition).FindAncestorUserData() is null) //TODO
+            var treeViewItem = target.panel.Pick(evt.mousePosition)?.parent;
+            if (treeViewItem is not InputActionMapsTreeViewItem mapItem)
+                return;
+            var index = treeView.selectedIndices.First();
+            var draggedItem = treeView.GetItemDataForIndex<ActionOrBindingData>(index);
+            if (!draggedItem.isAction)
                 return;
             evt.StopImmediatePropagation();
             DragAndDrop.AcceptDrag();
-            DroppedPerformedCallback.Invoke(evt);
+            DroppedPerformedCallback.Invoke((int)mapItem.userData);
             Reset();
         }
 
@@ -60,7 +69,6 @@ private void OnDragUpdatedEvent(DragUpdatedEvent evt)
 
         private void Reset()
         {
-            var treeView = m_OtherVerticalList as TreeView;
             treeView?.Focus();
             if (m_InitialIndex >= 0)
                 listView?.SetSelectionWithoutNotify(new[] {m_InitialIndex});

From e9aaa22f959b6b00beec36b85acea4537ca06e30 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 30 Jan 2024 16:13:10 +0100
Subject: [PATCH 12/39] cleared focus during drag/drop between lists

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 6fce43d585..4f74b0e70a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -55,7 +55,6 @@ private void OnDragUpdatedEvent(DragUpdatedEvent evt)
             var treeViewItem = target.panel.Pick(evt.mousePosition)?.parent;
             if (treeViewItem is InputActionMapsTreeViewItem mapItem)
             {
-                listView?.Focus();
                 if (m_InitialIndex < 0 && listView != null)
                     m_InitialIndex = listView.selectedIndex;
                 //select map item to visualize the drop
@@ -69,7 +68,6 @@ private void OnDragUpdatedEvent(DragUpdatedEvent evt)
 
         private void Reset()
         {
-            treeView?.Focus();
             if (m_InitialIndex >= 0)
                 listView?.SetSelectionWithoutNotify(new[] {m_InitialIndex});
             m_InitialIndex = -1;

From d5500b76a8a32fc9d186a76ce8134ec42d02156e Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 30 Jan 2024 16:16:28 +0100
Subject: [PATCH 13/39] fixed freeze after drag

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 4f74b0e70a..1e09819d98 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -47,6 +47,7 @@ private void OnDragPerformEvent(DragPerformEvent evt)
             DragAndDrop.AcceptDrag();
             DroppedPerformedCallback.Invoke((int)mapItem.userData);
             Reset();
+            treeView.ReleaseMouse();
         }
 
         private int m_InitialIndex = -1;

From 9f1bf835aa9cf9bd7080dd5b8e0798152d143ccd Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 31 Jan 2024 20:07:12 +0100
Subject: [PATCH 14/39] drag and drop of action maps to reorder ActionMap list

---
 .../Editor/Internal/InputActionSerializationHelpers.cs |  6 ++++++
 .../Editor/UITKAssetEditor/Commands/Commands.cs        | 10 ++++++++++
 .../Editor/UITKAssetEditor/Views/ActionMapsView.cs     |  6 ++++++
 .../Editor/UITKAssetEditor/Views/DropManipulator.cs    |  2 --
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
index a1c185a973..a7696c0b7f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
@@ -147,6 +147,12 @@ public static void DeleteActionMap(SerializedObject asset, Guid id)
                 throw new ArgumentException($"No map with id {id} in {asset}", nameof(id));
             mapArrayProperty.DeleteArrayElementAtIndex(mapIndex);
         }
+        
+        public static void MoveActionMap(SerializedObject asset, int fromIndex, int toIndex)
+        {
+            var mapArrayProperty = asset.FindProperty("m_ActionMaps");
+            mapArrayProperty.MoveArrayElement(fromIndex, toIndex);
+        }
 
         // Append a new action to the end of the set.
         public static SerializedProperty AddAction(SerializedProperty actionMap, int index = -1)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 7a7272fb0e..3841af9b27 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -241,6 +241,16 @@ private static InputActionsEditorState SelectPrevActionMap(InputActionsEditorSta
             return state.SelectActionMap(index);
         }
 
+        public static Command ReorderActionMap(int oldIndex, int newIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                InputActionSerializationHelpers.MoveActionMap(state.serializedObject, oldIndex, newIndex);
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectActionMap(newIndex);
+            };
+        }
+
         public static Command DeleteAction(int actionMapIndex, string actionName)
         {
             return (in InputActionsEditorState state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 89b247084f..93e5fb26f5 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -60,6 +60,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
             m_ListView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
             var treeView = m_Root.Q<TreeView>("actions-tree-view");
             m_ListView.AddManipulator(new DropManipulator(OnDroppedHandler, treeView));
+            m_ListView.itemIndexChanged += OnReorder;
 
 
             CreateSelector(s => new ViewStateCollection<string>(Selectors.GetActionMapNames(s)),
@@ -75,6 +76,11 @@ void OnDroppedHandler(int mapIndex)
             Dispatch(Commands.PasteActionIntoActionMap(mapIndex));
         }
 
+        void OnReorder(int oldIndex, int newIndex)
+        {
+            Dispatch(Commands.ReorderActionMap(oldIndex, newIndex));
+        }
+
         private Button addActionMapButton => m_Root?.Q<Button>("add-new-action-map-button");
 
         public override void RedrawUI(ViewState viewState)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 1e09819d98..44ac652d7d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using System.Linq;
-using NUnit.Framework;
 using UnityEditor;
 using UnityEngine.UIElements;
 

From 949077e24eb3e5e5c07d0c056b4f524590fbd50c Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Thu, 1 Feb 2024 16:42:07 +0100
Subject: [PATCH 15/39] WIP drag & drop of actions, bindings & composites

---
 .../InputActionSerializationHelpers.cs        | 12 ++++++
 .../UITKAssetEditor/Commands/Commands.cs      | 27 ++++++++++++
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 42 ++++++++++++++++---
 .../Editor/UITKAssetEditor/Views/Selectors.cs | 11 +++++
 4 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
index a7696c0b7f..8037be4355 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
@@ -152,6 +152,18 @@ public static void MoveActionMap(SerializedObject asset, int fromIndex, int toIn
         {
             var mapArrayProperty = asset.FindProperty("m_ActionMaps");
             mapArrayProperty.MoveArrayElement(fromIndex, toIndex);
+        } 
+        
+        public static void MoveAction(SerializedProperty actionMap, int fromIndex, int toIndex)
+        {
+            var actionArrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Actions));
+            actionArrayProperty.MoveArrayElement(fromIndex, toIndex);
+        }
+
+        public static void MoveBindingOrComposite(SerializedProperty actionMap, int fromIndex, int toIndex)
+        {
+            var actionArrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
+            actionArrayProperty.MoveArrayElement(fromIndex, toIndex);
         }
 
         // Append a new action to the end of the set.
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 3841af9b27..16a06a220c 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -251,6 +251,33 @@ public static Command ReorderActionMap(int oldIndex, int newIndex)
             };
         }
 
+        public static Command MoveAction(int oldIndex, int newIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+                InputActionSerializationHelpers.MoveAction(actionMap, oldIndex, newIndex);
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectAction(newIndex);
+            };
+        }
+
+        public static Command MoveBindingOrComposite(int oldIndex, int actionIndex, int childIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+                var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
+                var newBindingIndex = bindings[Math.Clamp(childIndex, 0, bindings.Count - 1)].GetIndexOfArrayElement();
+                var actionTo = Selectors.GetActionForIndex(state, actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
+                Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
+                InputActionSerializationHelpers.MoveBindingOrComposite(actionMap, oldIndex, newBindingIndex);
+                //TODO also move composite parts
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectBinding(newBindingIndex);
+            };
+        }
+
         public static Command DeleteAction(int actionMapIndex, string actionName)
         {
             return (in InputActionsEditorState state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 7b9f89ffda..5288c238a3 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -135,6 +135,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
 
             m_ActionsTreeView.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
             m_ActionsTreeView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
+            m_ActionsTreeView.RegisterCallback<DragPerformEvent>(OnDraggedItem);
 
             CreateSelector(Selectors.GetActionsForSelectedActionMap, Selectors.GetActionMapCount,
                 (_, count, state) =>
@@ -206,6 +207,33 @@ public override void RedrawUI(ViewState viewState)
             addActionButton.SetEnabled(viewState.actionMapCount > 0);
         }
 
+        private void OnDraggedItem(DragPerformEvent evt)
+        {
+            foreach (var index in m_ActionsTreeView.selectedIndices)
+            {
+                var data = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);
+                var itemID = m_ActionsTreeView.GetIdForIndex(index);
+                var childIndex = m_ActionsTreeView.viewController.GetChildIndexForId(itemID);
+                var parentId = m_ActionsTreeView.viewController.GetParentId(itemID);
+                ActionOrBindingData? directParent = parentId == -1 ? null : m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(m_ActionsTreeView.viewController.GetIndexForId(parentId));
+                if (data.isAction)
+                {
+                    if (directParent == null)
+                        Dispatch(Commands.MoveAction(data.actionIndex, childIndex));
+                    else
+                        break;
+                }
+                if (!data.isPartOfComposite)
+                {
+                    if (directParent != null && directParent.Value.isAction)
+                        Dispatch(Commands.MoveBindingOrComposite(data.bindingIndex, directParent.Value.actionIndex, childIndex));
+                    else
+                        break;
+                }
+                //TODO for part of composites
+            }
+        }
+
         private void RenameNewAction(int id)
         {
             if (!m_RenameOnActionAdded || id == -1)
@@ -435,22 +463,26 @@ internal class ViewState
 
     internal struct ActionOrBindingData
     {
-        public ActionOrBindingData(bool isAction, string name, int actionMapIndex, bool isComposite = false, string controlLayout = "", int bindingIndex = -1)
+        public ActionOrBindingData(bool isAction, string name, int actionMapIndex, bool isComposite = false, bool isPartOfComposite = false, string controlLayout = "", int bindingIndex = -1, int actionIndex = -1)
         {
             this.name = name;
             this.isComposite = isComposite;
+            this.isPartOfComposite = isPartOfComposite;
             this.actionMapIndex = actionMapIndex;
             this.controlLayout = controlLayout;
             this.bindingIndex = bindingIndex;
             this.isAction = isAction;
+            this.actionIndex = actionIndex;
         }
 
         public string name { get; }
         public bool isAction { get; }
         public int actionMapIndex { get; }
         public bool isComposite { get; }
+        public bool isPartOfComposite { get; }
         public string controlLayout { get; }
         public int bindingIndex { get; }
+        public int actionIndex { get; }
     }
 
     internal static partial class Selectors
@@ -498,7 +530,7 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                                 var compositeBindingId = new Guid(nextBinding.id);
                                 compositeItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(new Guid(nextBinding.id), idDictionary),
                                     new ActionOrBindingData(false, name, actionMapIndex, false,
-                                        GetControlLayout(nextBinding.path), nextBinding.indexOfBinding)));
+                                        true, GetControlLayout(nextBinding.path), nextBinding.indexOfBinding)));
                             }
 
                             if (++i >= actionBindings.Count)
@@ -508,7 +540,7 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                         }
                         i--;
                         bindingItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(inputBindingId, idDictionary),
-                            new ActionOrBindingData(false, serializedInputBinding.name, actionMapIndex, true, action.expectedControlType, serializedInputBinding.indexOfBinding),
+                            new ActionOrBindingData(false, serializedInputBinding.name, actionMapIndex, true, false, action.expectedControlType, serializedInputBinding.indexOfBinding),
                             compositeItems.Count > 0 ? compositeItems : null));
                     }
                     else
@@ -517,11 +549,11 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                         if (isVisible)
                             bindingItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(inputBindingId, idDictionary),
                                 new ActionOrBindingData(false, GetHumanReadableBindingName(serializedInputBinding, state.selectedControlScheme, controlSchemes), actionMapIndex,
-                                    false, GetControlLayout(serializedInputBinding.path), serializedInputBinding.indexOfBinding)));
+                                    false, false, GetControlLayout(serializedInputBinding.path), serializedInputBinding.indexOfBinding)));
                     }
                 }
                 actionItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(actionId, idDictionary),
-                    new ActionOrBindingData(true, action.name, actionMapIndex, false, action.expectedControlType), bindingItems.Count > 0 ? bindingItems : null));
+                    new ActionOrBindingData(true, action.name, actionMapIndex, false, false, action.expectedControlType, actionIndex: action.wrappedProperty.GetIndexOfArrayElement()), bindingItems.Count > 0 ? bindingItems : null));
             }
             return actionItems;
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
index dad207f2e3..499e66115b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
@@ -67,6 +67,12 @@ private static List<SerializedProperty> GetBindingsForAction(string actionName,
             return bindingsOfAction;
         }
 
+        public static List<SerializedProperty> GetBindingsForAction(InputActionsEditorState state, SerializedProperty actionMap, int actionIndex)
+        {
+            var action = GetActionForIndex(state, actionMap, actionIndex);
+            return GetBindingsForAction(action.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue, state);
+        }
+
         public static int GetLastBindingIndexForSelectedAction(InputActionsEditorState state)
         {
             var actionName = GetSelectedAction(state)?.wrappedProperty.FindPropertyRelative("m_Name").stringValue;
@@ -98,6 +104,11 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
             return state.serializedObject?.FindProperty(nameof(InputActionAsset.m_ActionMaps))?.arraySize;
         }
 
+        public static SerializedProperty GetActionForIndex(InputActionsEditorState state, SerializedProperty actionMap, int actionIndex)
+        {
+            return actionMap.FindPropertyRelative(nameof(InputActionMap.m_Actions)).GetArrayElementAtIndex(actionIndex);
+        }
+
         public static SerializedInputAction GetActionInMap(InputActionsEditorState state, int mapIndex, string name)
         {
             return new SerializedInputAction(state.serializedObject

From e5f7d540b92b6b4fbe18d9b6a40aaa77c954be8e Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 2 Feb 2024 11:00:42 +0100
Subject: [PATCH 16/39] fix after merge

---
 .../InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
index 1e4aa06e47..2ede37ecf4 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs
@@ -56,7 +56,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
 
             m_ListView.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
             m_ListView.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
-            var treeView = m_Root.Q<TreeView>("actions-tree-view");
+            var treeView = root.Q<TreeView>("actions-tree-view");
             m_ListView.AddManipulator(new DropManipulator(OnDroppedHandler, treeView));
             m_ListView.itemIndexChanged += OnReorder;
 

From f9d2beacd4330ccbd48eaea99273f46038bc3216 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 2 Feb 2024 13:31:26 +0100
Subject: [PATCH 17/39] added moving of bindings and move composite (WIP)

---
 .../InputActionSerializationHelpers.cs        |  6 +++---
 .../UITKAssetEditor/Commands/Commands.cs      | 21 +++++++++++++++++++
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 11 +++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
index 8037be4355..a0833ab50c 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
@@ -147,13 +147,13 @@ public static void DeleteActionMap(SerializedObject asset, Guid id)
                 throw new ArgumentException($"No map with id {id} in {asset}", nameof(id));
             mapArrayProperty.DeleteArrayElementAtIndex(mapIndex);
         }
-        
+
         public static void MoveActionMap(SerializedObject asset, int fromIndex, int toIndex)
         {
             var mapArrayProperty = asset.FindProperty("m_ActionMaps");
             mapArrayProperty.MoveArrayElement(fromIndex, toIndex);
-        } 
-        
+        }
+
         public static void MoveAction(SerializedProperty actionMap, int fromIndex, int toIndex)
         {
             var actionArrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Actions));
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index e4582d6b6b..1b8be50327 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -278,6 +278,27 @@ public static Command MoveBindingOrComposite(int oldIndex, int actionIndex, int
             };
         }
 
+        public static Command MoveBinding(int oldIndex, int actionIndex, int childIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectBinding(newBindingIndex);
+            };
+        }
+
+        private static int MoveBindingOrComposite(InputActionsEditorState state, int oldIndex, int actionIndex, int childIndex)
+        {
+            var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+            var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
+            var newBindingIndex = bindings[Math.Clamp(childIndex, 0, bindings.Count - 1)].GetIndexOfArrayElement();
+            var actionTo = Selectors.GetActionForIndex(state, actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
+            Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
+            InputActionSerializationHelpers.MoveBindingOrComposite(actionMap, oldIndex, newBindingIndex);
+            return newBindingIndex;
+        }
+
         public static Command DeleteAction(int actionMapIndex, string actionName)
         {
             return (in InputActionsEditorState state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 94a09cfe98..3b14e3d6f1 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -229,7 +229,16 @@ private void OnDraggedItem(DragPerformEvent evt)
                 if (!data.isPartOfComposite)
                 {
                     if (directParent != null && directParent.Value.isAction)
-                        Dispatch(Commands.MoveBindingOrComposite(data.bindingIndex, directParent.Value.actionIndex, childIndex));
+                    {
+                        if (data.isComposite)
+                            Dispatch(Commands.MoveComposite(data.bindingIndex, directParent.Value.actionIndex,
+                                childIndex));
+                        else
+                        {
+                            Dispatch(
+                                Commands.MoveBinding(data.bindingIndex, directParent.Value.actionIndex, childIndex));
+                        }
+                    }
                     else
                         break;
                 }

From 0a6a44c0844be439b783b23d69782875d0c6d378 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 2 Feb 2024 15:02:20 +0100
Subject: [PATCH 18/39] implemented move part of composites and fixed move
 binding to empty actions

---
 .../InputActionSerializationHelpers.cs        |  6 +--
 .../UITKAssetEditor/Commands/Commands.cs      | 37 +++++++++----
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 52 ++++++++++++-------
 .../UITKAssetEditor/Views/CopyPasteHelper.cs  | 18 +------
 .../Editor/UITKAssetEditor/Views/Selectors.cs | 18 ++++++-
 5 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
index a0833ab50c..1eaaefccaa 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
@@ -160,10 +160,10 @@ public static void MoveAction(SerializedProperty actionMap, int fromIndex, int t
             actionArrayProperty.MoveArrayElement(fromIndex, toIndex);
         }
 
-        public static void MoveBindingOrComposite(SerializedProperty actionMap, int fromIndex, int toIndex)
+        public static void MoveBindings(SerializedProperty actionMap, int fromIndex, int toIndex)
         {
-            var actionArrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
-            actionArrayProperty.MoveArrayElement(fromIndex, toIndex);
+            var arrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
+            arrayProperty.MoveArrayElement(fromIndex, toIndex);
         }
 
         // Append a new action to the end of the set.
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 1b8be50327..2f0bdc234d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -262,17 +262,18 @@ public static Command MoveAction(int oldIndex, int newIndex)
             };
         }
 
-        public static Command MoveBindingOrComposite(int oldIndex, int actionIndex, int childIndex)
+        public static Command MoveComposite(int oldIndex, int actionIndex, int childIndex)
         {
             return (in InputActionsEditorState state) =>
             {
                 var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
-                var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
-                var newBindingIndex = bindings[Math.Clamp(childIndex, 0, bindings.Count - 1)].GetIndexOfArrayElement();
-                var actionTo = Selectors.GetActionForIndex(state, actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
-                Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
-                InputActionSerializationHelpers.MoveBindingOrComposite(actionMap, oldIndex, newBindingIndex);
-                //TODO also move composite parts
+                var compositeBindings = CopyPasteHelper.GetBindingsForComposite(actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)), oldIndex);
+                var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
+                foreach (var compositePart in compositeBindings)
+                {
+                    Debug.Log(compositePart.FindPropertyRelative("m_Name").stringValue);
+                    InputActionSerializationHelpers.MoveBindings(actionMap, compositePart.GetIndexOfArrayElement(), ++newBindingIndex);
+                }
                 state.serializedObject.ApplyModifiedProperties();
                 return state.SelectBinding(newBindingIndex);
             };
@@ -288,14 +289,30 @@ public static Command MoveBinding(int oldIndex, int actionIndex, int childIndex)
             };
         }
 
+        public static Command MovePartOfComposite(int oldIndex, int newIndex, int compositeIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+                var actionTo = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)).GetArrayElementAtIndex(compositeIndex).FindPropertyRelative("m_Action").stringValue;
+                InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newIndex);
+                Selectors.GetCompositeOrBindingInMap(actionMap, newIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectBinding(newIndex);
+            };
+        }
+
         private static int MoveBindingOrComposite(InputActionsEditorState state, int oldIndex, int actionIndex, int childIndex)
         {
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
-            var newBindingIndex = bindings[Math.Clamp(childIndex, 0, bindings.Count - 1)].GetIndexOfArrayElement();
-            var actionTo = Selectors.GetActionForIndex(state, actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
+            var allBindings = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
+            var newBindingIndex = bindings.Count == 0 ?
+                Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings)
+                : bindings[Math.Clamp(childIndex, 0, bindings.Count == 0 ? 0 : bindings.Count - 1)].GetIndexOfArrayElement();
+            var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
             Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
-            InputActionSerializationHelpers.MoveBindingOrComposite(actionMap, oldIndex, newBindingIndex);
+            InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newBindingIndex);
             return newBindingIndex;
         }
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 3b14e3d6f1..890933b5b3 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -214,38 +214,52 @@ private void OnDraggedItem(DragPerformEvent evt)
         {
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
-                var data = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);
+                var draggedItemData = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);
                 var itemID = m_ActionsTreeView.GetIdForIndex(index);
                 var childIndex = m_ActionsTreeView.viewController.GetChildIndexForId(itemID);
                 var parentId = m_ActionsTreeView.viewController.GetParentId(itemID);
                 ActionOrBindingData? directParent = parentId == -1 ? null : m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(m_ActionsTreeView.viewController.GetIndexForId(parentId));
-                if (data.isAction)
+                if (draggedItemData.isAction)
                 {
-                    if (directParent == null)
-                        Dispatch(Commands.MoveAction(data.actionIndex, childIndex));
-                    else
+                    if (!MoveAction(directParent, draggedItemData, childIndex))
                         break;
                 }
-                if (!data.isPartOfComposite)
+                if (!draggedItemData.isPartOfComposite)
                 {
-                    if (directParent != null && directParent.Value.isAction)
-                    {
-                        if (data.isComposite)
-                            Dispatch(Commands.MoveComposite(data.bindingIndex, directParent.Value.actionIndex,
-                                childIndex));
-                        else
-                        {
-                            Dispatch(
-                                Commands.MoveBinding(data.bindingIndex, directParent.Value.actionIndex, childIndex));
-                        }
-                    }
-                    else
+                    if (!MoveBindingOrComposite(directParent, draggedItemData, childIndex))
                         break;
                 }
-                //TODO for part of composites
+                MoveCompositeParts(directParent, childIndex, draggedItemData);
             }
         }
 
+        private bool MoveAction(ActionOrBindingData? directParent, ActionOrBindingData draggedItemData, int childIndex)
+        {
+            if (directParent != null)
+                return false;
+            Dispatch(Commands.MoveAction(draggedItemData.actionIndex, childIndex));
+            return true;
+        }
+
+        private bool MoveBindingOrComposite(ActionOrBindingData? directParent, ActionOrBindingData draggedItemData, int childIndex)
+        {
+            if (directParent == null || !directParent.Value.isAction)
+                return false;
+            if (draggedItemData.isComposite)
+                Dispatch(Commands.MoveComposite(draggedItemData.bindingIndex, directParent.Value.actionIndex, childIndex));
+            else
+                Dispatch(Commands.MoveBinding(draggedItemData.bindingIndex, directParent.Value.actionIndex, childIndex));
+            return true;
+        }
+
+        private void MoveCompositeParts(ActionOrBindingData? directParent, int childIndex, ActionOrBindingData draggedItemData)
+        {
+            if (directParent == null || !directParent.Value.isComposite)
+                return;
+            var newBindingIndex = directParent.Value.bindingIndex + childIndex + (directParent.Value.bindingIndex > draggedItemData.bindingIndex ? 0 : 1);
+            Dispatch(Commands.MovePartOfComposite(draggedItemData.bindingIndex, newBindingIndex, directParent.Value.bindingIndex));
+        }
+
         private void RenameNewAction(int id)
         {
             if (!m_RenameOnActionAdded || id == -1)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
index 31b651d90e..3a2947310f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -247,7 +247,7 @@ private static void PasteAction(SerializedProperty arrayProperty, string jsonToI
             var newId = property.FindPropertyRelative("m_Id").stringValue;
             var actionMapTo = Selectors.GetActionMapForAction(s_State, newId);
             var bindingArrayToInsertTo = actionMapTo.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
-            var index = GetBindingIndexBeforeAction(arrayProperty, indexToInsert, bindingArrayToInsertTo);
+            var index = Selectors.GetBindingIndexBeforeAction(arrayProperty, indexToInsert, bindingArrayToInsertTo);
             foreach (var bindingJson in bindingJsons)
             {
                 var newIndex = PasteBindingOrComposite(bindingArrayToInsertTo, bindingJson, index, newName, false);
@@ -256,20 +256,6 @@ private static void PasteAction(SerializedProperty arrayProperty, string jsonToI
             s_lastAddedElement = property;
         }
 
-        private static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)
-        {
-            var offset = 1; //previous action offset
-            while (indexToInsert - offset >= 0)
-            {
-                var prevActionName = PropertyName(arrayProperty.GetArrayElementAtIndex(indexToInsert - offset));
-                var lastBindingOfAction = bindingArrayToInsertTo.FindLast(b => b.FindPropertyRelative("m_Action").stringValue.Equals(prevActionName));
-                if (lastBindingOfAction != null) //if action has no bindings lastBindingOfAction will be null
-                    return lastBindingOfAction.GetIndexOfArrayElement() + 1;
-                offset++;
-            }
-            return 0; //no actions with bindings before paste index
-        }
-
         private static int PasteBindingOrComposite(SerializedProperty arrayProperty, string json, int index, string actionName, bool createCompositeParts = true)
         {
             var pastePartOfComposite = IsPartOfComposite(json);
@@ -386,7 +372,7 @@ public static SerializedProperty DuplicateElement(SerializedProperty arrayProper
 
         #endregion
 
-        private static List<SerializedProperty> GetBindingsForComposite(SerializedProperty bindingsArray, int indexOfComposite)
+        public static List<SerializedProperty> GetBindingsForComposite(SerializedProperty bindingsArray, int indexOfComposite)
         {
             var compositeBindings = new List<SerializedProperty>();
             var compositeStartIndex = InputActionSerializationHelpers.GetCompositeStartIndex(bindingsArray, indexOfComposite);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
index 499e66115b..a42c6eaad7 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
@@ -69,7 +69,7 @@ private static List<SerializedProperty> GetBindingsForAction(string actionName,
 
         public static List<SerializedProperty> GetBindingsForAction(InputActionsEditorState state, SerializedProperty actionMap, int actionIndex)
         {
-            var action = GetActionForIndex(state, actionMap, actionIndex);
+            var action = GetActionForIndex(actionMap, actionIndex);
             return GetBindingsForAction(action.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue, state);
         }
 
@@ -93,6 +93,20 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
             }
             return state.selectedBindingIndex + toSkip;
         }
+        
+        public static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)
+        {
+            var offset = 1; //previous action offset
+            while (indexToInsert - offset >= 0)
+            {
+                var prevActionName = arrayProperty.GetArrayElementAtIndex(indexToInsert - offset).FindPropertyRelative("m_Name").stringValue;
+                var lastBindingOfAction = bindingArrayToInsertTo.FindLast(b => b.FindPropertyRelative("m_Action").stringValue.Equals(prevActionName));
+                if (lastBindingOfAction != null) //if action has no bindings lastBindingOfAction will be null
+                    return lastBindingOfAction.GetIndexOfArrayElement() + 1;
+                offset++;
+            }
+            return 0; //no actions with bindings before paste index
+        }
 
         public static int? GetActionCount(SerializedProperty actionMap)
         {
@@ -104,7 +118,7 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
             return state.serializedObject?.FindProperty(nameof(InputActionAsset.m_ActionMaps))?.arraySize;
         }
 
-        public static SerializedProperty GetActionForIndex(InputActionsEditorState state, SerializedProperty actionMap, int actionIndex)
+        public static SerializedProperty GetActionForIndex(SerializedProperty actionMap, int actionIndex)
         {
             return actionMap.FindPropertyRelative(nameof(InputActionMap.m_Actions)).GetArrayElementAtIndex(actionIndex);
         }

From 4e70360b939117824e3c8766dabc1fd6cfe199f1 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 2 Feb 2024 15:40:23 +0100
Subject: [PATCH 19/39] fixed moving bindings

---
 .../UITKAssetEditor/Commands/Commands.cs      | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 2f0bdc234d..e2cc141795 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -306,16 +306,41 @@ private static int MoveBindingOrComposite(InputActionsEditorState state, int old
         {
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
-            var allBindings = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
-            var newBindingIndex = bindings.Count == 0 ?
-                Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings)
-                : bindings[Math.Clamp(childIndex, 0, bindings.Count == 0 ? 0 : bindings.Count - 1)].GetIndexOfArrayElement();
+            var allBindings = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
+            int newBindingIndex;
+            if (bindings.Count == 0)
+                newBindingIndex = Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings);
+            else
+            {
+                var toSkip = GetNumberOfCompositePartItemsToSkip(bindings, childIndex, oldIndex); //skip composite parts if there are
+                newBindingIndex = bindings[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindings.Count);;
+            }
+
             var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
             Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
             InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newBindingIndex);
             return newBindingIndex;
         }
 
+        private static int GetNumberOfCompositePartItemsToSkip(List<SerializedProperty> bindings, int childIndex, int oldIndex)
+        {
+            var toSkip = 0;
+            var normalBindings = 0;
+            foreach (var binding in bindings)
+            {
+                if (binding.GetIndexOfArrayElement() == oldIndex)
+                    continue;
+                if (normalBindings > childIndex)
+                    break;
+                if (binding.FindPropertyRelative(nameof(InputBinding.m_Flags)).intValue ==
+                    (int)InputBinding.Flags.PartOfComposite)
+                    toSkip++;
+                else
+                    normalBindings++;
+            }
+            return toSkip;
+        }
+
         public static Command DeleteAction(int actionMapIndex, string actionName)
         {
             return (in InputActionsEditorState state) =>

From 23fef724dc9dcfcf6ccf2e0d4addc7ff33b31de6 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Fri, 2 Feb 2024 15:55:56 +0100
Subject: [PATCH 20/39] added discard drag on invalid

---
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 890933b5b3..30c30fdaca 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -212,6 +212,7 @@ public override void RedrawUI(ViewState viewState)
 
         private void OnDraggedItem(DragPerformEvent evt)
         {
+            bool discardDrag = false;
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
                 var draggedItemData = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);
@@ -222,14 +223,33 @@ private void OnDraggedItem(DragPerformEvent evt)
                 if (draggedItemData.isAction)
                 {
                     if (!MoveAction(directParent, draggedItemData, childIndex))
+                    {
+                        discardDrag = true;
                         break;
+                    }
                 }
                 if (!draggedItemData.isPartOfComposite)
                 {
                     if (!MoveBindingOrComposite(directParent, draggedItemData, childIndex))
+                    {
+                        discardDrag = true;
                         break;
+                    }
+                }
+                if (!MoveCompositeParts(directParent, childIndex, draggedItemData))
+                {
+                    discardDrag = true;
+                    break;
                 }
-                MoveCompositeParts(directParent, childIndex, draggedItemData);
+            }
+
+            if (discardDrag)
+            {
+                var selectedItem = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(m_ActionsTreeView.selectedIndices.First());
+                if (selectedItem.isAction)
+                    Dispatch(Commands.SelectAction(selectedItem.name));
+                else
+                    Dispatch(Commands.SelectBinding(selectedItem.bindingIndex));
             }
         }
 
@@ -252,12 +272,13 @@ private bool MoveBindingOrComposite(ActionOrBindingData? directParent, ActionOrB
             return true;
         }
 
-        private void MoveCompositeParts(ActionOrBindingData? directParent, int childIndex, ActionOrBindingData draggedItemData)
+        private bool MoveCompositeParts(ActionOrBindingData? directParent, int childIndex, ActionOrBindingData draggedItemData)
         {
             if (directParent == null || !directParent.Value.isComposite)
-                return;
+                return false;
             var newBindingIndex = directParent.Value.bindingIndex + childIndex + (directParent.Value.bindingIndex > draggedItemData.bindingIndex ? 0 : 1);
             Dispatch(Commands.MovePartOfComposite(draggedItemData.bindingIndex, newBindingIndex, directParent.Value.bindingIndex));
+            return true;
         }
 
         private void RenameNewAction(int id)

From 7fd00785240752fac55ee8d7746cbed920a865c9 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 10:04:02 +0100
Subject: [PATCH 21/39] fixed selection after drag & dragging bindings into
 actionMapView

---
 .../UITKAssetEditor/Views/ActionsTreeView.cs  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 30c30fdaca..1243024842 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -215,6 +215,12 @@ private void OnDraggedItem(DragPerformEvent evt)
             bool discardDrag = false;
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
+                var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.parent;
+                if (treeViewItem is not InputActionsTreeViewItem)
+                {
+                    discardDrag = true;
+                    break;
+                }
                 var draggedItemData = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);
                 var itemID = m_ActionsTreeView.GetIdForIndex(index);
                 var childIndex = m_ActionsTreeView.viewController.GetChildIndexForId(itemID);
@@ -228,7 +234,7 @@ private void OnDraggedItem(DragPerformEvent evt)
                         break;
                     }
                 }
-                if (!draggedItemData.isPartOfComposite)
+                else if (!draggedItemData.isPartOfComposite)
                 {
                     if (!MoveBindingOrComposite(directParent, draggedItemData, childIndex))
                     {
@@ -236,21 +242,18 @@ private void OnDraggedItem(DragPerformEvent evt)
                         break;
                     }
                 }
-                if (!MoveCompositeParts(directParent, childIndex, draggedItemData))
+                else if (!MoveCompositeParts(directParent, childIndex, draggedItemData))
                 {
                     discardDrag = true;
                     break;
                 }
             }
 
-            if (discardDrag)
-            {
-                var selectedItem = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(m_ActionsTreeView.selectedIndices.First());
-                if (selectedItem.isAction)
-                    Dispatch(Commands.SelectAction(selectedItem.name));
-                else
-                    Dispatch(Commands.SelectBinding(selectedItem.bindingIndex));
-            }
+            if (!discardDrag) return;
+            var selectedItem = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(m_ActionsTreeView.selectedIndices.First());
+            Dispatch(selectedItem.isAction
+                ? Commands.SelectAction(selectedItem.name)
+                : Commands.SelectBinding(selectedItem.bindingIndex));
         }
 
         private bool MoveAction(ActionOrBindingData? directParent, ActionOrBindingData draggedItemData, int childIndex)

From aa60f590f85108c191a756516bc9b116d9b06361 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 11:21:57 +0100
Subject: [PATCH 22/39] refactor & fixed not allow drag of composites to action
 maps

---
 .../Editor/UITKAssetEditor/Commands/Commands.cs           | 8 ++++----
 .../Editor/UITKAssetEditor/Views/ActionsTreeView.cs       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index e2cc141795..082703366b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -305,15 +305,15 @@ public static Command MovePartOfComposite(int oldIndex, int newIndex, int compos
         private static int MoveBindingOrComposite(InputActionsEditorState state, int oldIndex, int actionIndex, int childIndex)
         {
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
-            var bindings = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
+            var bindingsForAction = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
             var allBindings = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
             int newBindingIndex;
-            if (bindings.Count == 0)
+            if (bindingsForAction.Count == 0)
                 newBindingIndex = Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings);
             else
             {
-                var toSkip = GetNumberOfCompositePartItemsToSkip(bindings, childIndex, oldIndex); //skip composite parts if there are
-                newBindingIndex = bindings[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindings.Count);;
+                var toSkip = GetNumberOfCompositePartItemsToSkip(bindingsForAction, childIndex, oldIndex); //skip composite parts if there are
+                newBindingIndex = bindingsForAction[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindingsForAction.Count);;
             }
 
             var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 1243024842..71c020665e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -216,9 +216,9 @@ private void OnDraggedItem(DragPerformEvent evt)
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
                 var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.parent;
-                if (treeViewItem is not InputActionsTreeViewItem)
+                if (treeViewItem is not InputActionsTreeViewItem && treeViewItem?.parent is not InputActionsTreeViewItem)
                 {
-                    discardDrag = true;
+                    discardDrag = true; //TODO also allow edge cases dragging between - TreeViewItem not hit
                     break;
                 }
                 var draggedItemData = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);

From 7f1dd90dc8321c50c3502db48e60f75cbfe49825 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 12:03:09 +0100
Subject: [PATCH 23/39] fixed moving of composites

---
 .../InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 082703366b..c6046f3ac4 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -269,10 +269,12 @@ public static Command MoveComposite(int oldIndex, int actionIndex, int childInde
                 var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
                 var compositeBindings = CopyPasteHelper.GetBindingsForComposite(actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)), oldIndex);
                 var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
+                var toIndex = newBindingIndex;
                 foreach (var compositePart in compositeBindings)
                 {
-                    Debug.Log(compositePart.FindPropertyRelative("m_Name").stringValue);
-                    InputActionSerializationHelpers.MoveBindings(actionMap, compositePart.GetIndexOfArrayElement(), ++newBindingIndex);
+                    var from = oldIndex < newBindingIndex ? oldIndex : compositePart.GetIndexOfArrayElement();
+                    var to = oldIndex < newBindingIndex ? newBindingIndex : ++toIndex;
+                    InputActionSerializationHelpers.MoveBindings(actionMap, from, to);
                 }
                 state.serializedObject.ApplyModifiedProperties();
                 return state.SelectBinding(newBindingIndex);

From 0e0f1e7d7e7eb7fb5cd9bd7e6f022b7463ceb624 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 12:12:01 +0100
Subject: [PATCH 24/39] fixed discard of drag between items

---
 .../Editor/UITKAssetEditor/Views/ActionsTreeView.cs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 71c020665e..6cfe234ad8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -215,10 +215,10 @@ private void OnDraggedItem(DragPerformEvent evt)
             bool discardDrag = false;
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
-                var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.parent;
-                if (treeViewItem is not InputActionsTreeViewItem && treeViewItem?.parent is not InputActionsTreeViewItem)
+                var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<TreeView>();
+                if (treeViewItem is null)
                 {
-                    discardDrag = true; //TODO also allow edge cases dragging between - TreeViewItem not hit
+                    discardDrag = true;
                     break;
                 }
                 var draggedItemData = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(index);

From 1dbad3a7b51d471be1484403726b9e0726ca13fe Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 14:39:11 +0100
Subject: [PATCH 25/39] change action name for composites

---
 .../InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index c6046f3ac4..1932fdaea8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -269,12 +269,14 @@ public static Command MoveComposite(int oldIndex, int actionIndex, int childInde
                 var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
                 var compositeBindings = CopyPasteHelper.GetBindingsForComposite(actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)), oldIndex);
                 var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
+                var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
                 var toIndex = newBindingIndex;
                 foreach (var compositePart in compositeBindings)
                 {
                     var from = oldIndex < newBindingIndex ? oldIndex : compositePart.GetIndexOfArrayElement();
                     var to = oldIndex < newBindingIndex ? newBindingIndex : ++toIndex;
                     InputActionSerializationHelpers.MoveBindings(actionMap, from, to);
+                    Selectors.GetCompositeOrBindingInMap(actionMap, to).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
                 }
                 state.serializedObject.ApplyModifiedProperties();
                 return state.SelectBinding(newBindingIndex);

From 7c3660b75bd651957d2e366f8875161422e5d649 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 15:14:26 +0100
Subject: [PATCH 26/39] fixed bindings are moved down one index to far

---
 .../InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 1932fdaea8..436409c1cf 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -311,6 +311,8 @@ private static int MoveBindingOrComposite(InputActionsEditorState state, int old
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var bindingsForAction = Selectors.GetBindingsForAction(state, actionMap, actionIndex);
             var allBindings = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
+            var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
+            var actionFrom = Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action");
             int newBindingIndex;
             if (bindingsForAction.Count == 0)
                 newBindingIndex = Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings);
@@ -318,10 +320,10 @@ private static int MoveBindingOrComposite(InputActionsEditorState state, int old
             {
                 var toSkip = GetNumberOfCompositePartItemsToSkip(bindingsForAction, childIndex, oldIndex); //skip composite parts if there are
                 newBindingIndex = bindingsForAction[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindingsForAction.Count);;
+                newBindingIndex -= newBindingIndex > oldIndex && !actionTo.Equals(actionFrom.stringValue) ? 1 : 0; // reduce index by one in case the moved binding will be shifted underneath to another action
             }
 
-            var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
-            Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
+            actionFrom.stringValue = actionTo;
             InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newBindingIndex);
             return newBindingIndex;
         }

From 1ea2ba9799f2ed06600b4e00d231f75133302001 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 15:19:40 +0100
Subject: [PATCH 27/39] added action item

---
 .../InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 6cfe234ad8..090c8d4d2a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -254,6 +254,7 @@ private void OnDraggedItem(DragPerformEvent evt)
             Dispatch(selectedItem.isAction
                 ? Commands.SelectAction(selectedItem.name)
                 : Commands.SelectBinding(selectedItem.bindingIndex));
+            //TODO find a better way to reject the drag (for better visual feedback & to not run an extra command)
         }
 
         private bool MoveAction(ActionOrBindingData? directParent, ActionOrBindingData draggedItemData, int childIndex)

From 3d02a5dc396e38349bcb94c6aea9c2b0bde0f923 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Mon, 5 Feb 2024 15:28:54 +0100
Subject: [PATCH 28/39] added changelog

---
 Packages/com.unity.inputsystem/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index 0695503d13..e5688ddfe2 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -20,6 +20,7 @@ however, it has to be formatted properly to pass verification tests.
   - [`InputAction.WasCompletedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasCompletedThisFrame) returns `true` on the frame that the action stopped being in the performed phase. This allows for similar functionality to [`WasPressedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasPressedThisFrame)/[`WasReleasedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasReleasedThisFrame) when paired with [`WasPerformedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasPerformedThisFrame) except it is directly based on the interactions driving the action. For example, you can use it to distinguish between the button being released or whether it was released after being held for long enough to perform when using the Hold interaction.
 - Added Copy, Paste and Cut support for Action Maps, Actions and Bindings via context menu and key command shortcuts.
 - Added Dual Sense Edge controller to be mapped to the same layout as the Dual Sense controller
+- Added Drag and Drop support in the Input Action Asset Editor for Action Maps, Actions and Bindings.
 
 ### Fixed
 - Fixed syntax of code examples in API documentation for [`AxisComposite`](xref:UnityEngine.InputSystem.Composites.AxisComposite).

From cfbd28b411320dc946953a23f868446fe86855f2 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Tue, 6 Feb 2024 13:28:20 +0100
Subject: [PATCH 29/39] fix formatting & adjusted changelog

---
 Packages/com.unity.inputsystem/CHANGELOG.md                     | 2 +-
 .../InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index e5688ddfe2..3a2dae6f63 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -20,7 +20,7 @@ however, it has to be formatted properly to pass verification tests.
   - [`InputAction.WasCompletedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasCompletedThisFrame) returns `true` on the frame that the action stopped being in the performed phase. This allows for similar functionality to [`WasPressedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasPressedThisFrame)/[`WasReleasedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasReleasedThisFrame) when paired with [`WasPerformedThisFrame`](xref:UnityEngine.InputSystem.InputAction.WasPerformedThisFrame) except it is directly based on the interactions driving the action. For example, you can use it to distinguish between the button being released or whether it was released after being held for long enough to perform when using the Hold interaction.
 - Added Copy, Paste and Cut support for Action Maps, Actions and Bindings via context menu and key command shortcuts.
 - Added Dual Sense Edge controller to be mapped to the same layout as the Dual Sense controller
-- Added Drag and Drop support in the Input Action Asset Editor for Action Maps, Actions and Bindings.
+- Added drag and drop support in the Input Action Asset Editor for Action Maps, Actions and Bindings.
 
 ### Fixed
 - Fixed syntax of code examples in API documentation for [`AxisComposite`](xref:UnityEngine.InputSystem.Composites.AxisComposite).
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
index a42c6eaad7..b82b164af1 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
@@ -93,7 +93,7 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
             }
             return state.selectedBindingIndex + toSkip;
         }
-        
+
         public static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)
         {
             var offset = 1; //previous action offset

From 0582d99af9f87fe2e5df1700fad9106ed8100438 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 11:49:16 +0100
Subject: [PATCH 30/39] refactor commands & fixed analyzer

---
 .../InputActionSerializationHelpers.cs        |  2 +-
 .../UITKAssetEditor/Commands/Commands.cs      | 61 ++++++++++---------
 .../UITKAssetEditor/Views/DropManipulator.cs  |  2 +
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
index 1eaaefccaa..bdff60268e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputActionSerializationHelpers.cs
@@ -160,7 +160,7 @@ public static void MoveAction(SerializedProperty actionMap, int fromIndex, int t
             actionArrayProperty.MoveArrayElement(fromIndex, toIndex);
         }
 
-        public static void MoveBindings(SerializedProperty actionMap, int fromIndex, int toIndex)
+        public static void MoveBinding(SerializedProperty actionMap, int fromIndex, int toIndex)
         {
             var arrayProperty = actionMap.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
             arrayProperty.MoveArrayElement(fromIndex, toIndex);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
index 436409c1cf..45f4a31d5a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
@@ -262,20 +262,35 @@ public static Command MoveAction(int oldIndex, int newIndex)
             };
         }
 
+        public static Command MoveBinding(int oldIndex, int actionIndex, int childIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectBinding(newBindingIndex);
+            };
+        }
+
         public static Command MoveComposite(int oldIndex, int actionIndex, int childIndex)
         {
             return (in InputActionsEditorState state) =>
             {
                 var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
                 var compositeBindings = CopyPasteHelper.GetBindingsForComposite(actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)), oldIndex);
+                //move the composite element
                 var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
                 var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
                 var toIndex = newBindingIndex;
                 foreach (var compositePart in compositeBindings)
                 {
+                    // the index of the composite part stays the same if composite was moved down as previous elements are shifted down (the index seems to update async so it's safer to use the oldIndex)
+                    // if the composite was moved up, the index of the composite part is not changing so we are safe to use it
                     var from = oldIndex < newBindingIndex ? oldIndex : compositePart.GetIndexOfArrayElement();
+                    // if added below the old position the array changes as composite parts are added on top (increase the index)
+                    // if added above the oldIndex, the index does not change
                     var to = oldIndex < newBindingIndex ? newBindingIndex : ++toIndex;
-                    InputActionSerializationHelpers.MoveBindings(actionMap, from, to);
+                    InputActionSerializationHelpers.MoveBinding(actionMap, from, to);
                     Selectors.GetCompositeOrBindingInMap(actionMap, to).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
                 }
                 state.serializedObject.ApplyModifiedProperties();
@@ -283,29 +298,6 @@ public static Command MoveComposite(int oldIndex, int actionIndex, int childInde
             };
         }
 
-        public static Command MoveBinding(int oldIndex, int actionIndex, int childIndex)
-        {
-            return (in InputActionsEditorState state) =>
-            {
-                var newBindingIndex = MoveBindingOrComposite(state, oldIndex, actionIndex, childIndex);
-                state.serializedObject.ApplyModifiedProperties();
-                return state.SelectBinding(newBindingIndex);
-            };
-        }
-
-        public static Command MovePartOfComposite(int oldIndex, int newIndex, int compositeIndex)
-        {
-            return (in InputActionsEditorState state) =>
-            {
-                var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
-                var actionTo = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)).GetArrayElementAtIndex(compositeIndex).FindPropertyRelative("m_Action").stringValue;
-                InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newIndex);
-                Selectors.GetCompositeOrBindingInMap(actionMap, newIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
-                state.serializedObject.ApplyModifiedProperties();
-                return state.SelectBinding(newIndex);
-            };
-        }
-
         private static int MoveBindingOrComposite(InputActionsEditorState state, int oldIndex, int actionIndex, int childIndex)
         {
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
@@ -314,17 +306,17 @@ private static int MoveBindingOrComposite(InputActionsEditorState state, int old
             var actionTo = Selectors.GetActionForIndex(actionMap, actionIndex).FindPropertyRelative(nameof(InputAction.m_Name)).stringValue;
             var actionFrom = Selectors.GetCompositeOrBindingInMap(actionMap, oldIndex).wrappedProperty.FindPropertyRelative("m_Action");
             int newBindingIndex;
-            if (bindingsForAction.Count == 0)
+            if (bindingsForAction.Count == 0) //if there are no bindings for an action retrieve the first binding index of a binding before (iterate previous actions)
                 newBindingIndex = Selectors.GetBindingIndexBeforeAction(allBindings, actionIndex, allBindings);
             else
             {
-                var toSkip = GetNumberOfCompositePartItemsToSkip(bindingsForAction, childIndex, oldIndex); //skip composite parts if there are
-                newBindingIndex = bindingsForAction[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindingsForAction.Count);;
+                var toSkip = GetNumberOfCompositePartItemsToSkip(bindingsForAction, childIndex, oldIndex); //skip composite parts if there are - avoid moving into a composite
+                newBindingIndex = bindingsForAction[0].GetIndexOfArrayElement() + Math.Clamp(childIndex + toSkip, 0, bindingsForAction.Count);
                 newBindingIndex -= newBindingIndex > oldIndex && !actionTo.Equals(actionFrom.stringValue) ? 1 : 0; // reduce index by one in case the moved binding will be shifted underneath to another action
             }
 
             actionFrom.stringValue = actionTo;
-            InputActionSerializationHelpers.MoveBindings(actionMap, oldIndex, newBindingIndex);
+            InputActionSerializationHelpers.MoveBinding(actionMap, oldIndex, newBindingIndex);
             return newBindingIndex;
         }
 
@@ -347,6 +339,19 @@ private static int GetNumberOfCompositePartItemsToSkip(List<SerializedProperty>
             return toSkip;
         }
 
+        public static Command MovePartOfComposite(int oldIndex, int newIndex, int compositeIndex)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
+                var actionTo = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings)).GetArrayElementAtIndex(compositeIndex).FindPropertyRelative("m_Action").stringValue;
+                InputActionSerializationHelpers.MoveBinding(actionMap, oldIndex, newIndex);
+                Selectors.GetCompositeOrBindingInMap(actionMap, newIndex).wrappedProperty.FindPropertyRelative("m_Action").stringValue = actionTo;
+                state.serializedObject.ApplyModifiedProperties();
+                return state.SelectBinding(newIndex);
+            };
+        }
+
         public static Command DeleteAction(int actionMapIndex, string actionName)
         {
             return (in InputActionsEditorState state) =>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 44ac652d7d..1af4569d97 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 using System.Linq;
 using UnityEditor;
 using UnityEngine.UIElements;
@@ -73,3 +74,4 @@ private void Reset()
         }
     }
 }
+#endif
\ No newline at end of file

From 32a3a649dfd5f67ddb511a9aa4659e88de27b84d Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 12:01:41 +0100
Subject: [PATCH 31/39] added comments and fixed accessibility

---
 .../InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs | 2 +-
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
index 3a2947310f..eee3b8166b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -372,7 +372,7 @@ public static SerializedProperty DuplicateElement(SerializedProperty arrayProper
 
         #endregion
 
-        public static List<SerializedProperty> GetBindingsForComposite(SerializedProperty bindingsArray, int indexOfComposite)
+        internal static List<SerializedProperty> GetBindingsForComposite(SerializedProperty bindingsArray, int indexOfComposite)
         {
             var compositeBindings = new List<SerializedProperty>();
             var compositeStartIndex = InputActionSerializationHelpers.GetCompositeStartIndex(bindingsArray, indexOfComposite);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 1af4569d97..d188e61f35 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -69,7 +69,7 @@ private void OnDragUpdatedEvent(DragUpdatedEvent evt)
         private void Reset()
         {
             if (m_InitialIndex >= 0)
-                listView?.SetSelectionWithoutNotify(new[] {m_InitialIndex});
+                listView?.SetSelectionWithoutNotify(new[] {m_InitialIndex}); //select the initial action map again
             m_InitialIndex = -1;
         }
     }

From 8031068a041df18b4715ca4b47ff5e10066529f5 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 12:48:01 +0100
Subject: [PATCH 32/39] added comments & named parameters to ActionsTreeView

---
 .../UITKAssetEditor/Views/ActionsTreeView.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 090c8d4d2a..2c34f690ef 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -215,6 +215,7 @@ private void OnDraggedItem(DragPerformEvent evt)
             bool discardDrag = false;
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
+                // currentTarget & target are always in TreeView as the event is registered on the TreeView - we need to discard drags into other parts of the editor (e.g. the maps list view)
                 var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<TreeView>();
                 if (treeViewItem is null)
                 {
@@ -578,10 +579,9 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                             if (isVisible)
                             {
                                 var name = GetHumanReadableCompositeName(nextBinding, state.selectedControlScheme, controlSchemes);
-                                var compositeBindingId = new Guid(nextBinding.id);
                                 compositeItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(new Guid(nextBinding.id), idDictionary),
-                                    new ActionOrBindingData(false, name, actionMapIndex, false,
-                                        true, GetControlLayout(nextBinding.path), nextBinding.indexOfBinding)));
+                                    new ActionOrBindingData(isAction: false, name, actionMapIndex, isComposite: false,
+                                        isPartOfComposite: true, GetControlLayout(nextBinding.path), bindingIndex: nextBinding.indexOfBinding)));
                             }
 
                             if (++i >= actionBindings.Count)
@@ -591,7 +591,7 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                         }
                         i--;
                         bindingItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(inputBindingId, idDictionary),
-                            new ActionOrBindingData(false, serializedInputBinding.name, actionMapIndex, true, false, action.expectedControlType, serializedInputBinding.indexOfBinding),
+                            new ActionOrBindingData(isAction: false, serializedInputBinding.name, actionMapIndex, isComposite: true, isPartOfComposite: false, action.expectedControlType, bindingIndex: serializedInputBinding.indexOfBinding),
                             compositeItems.Count > 0 ? compositeItems : null));
                     }
                     else
@@ -599,12 +599,12 @@ public static List<TreeViewItemData<ActionOrBindingData>> GetActionsAsTreeViewDa
                         var isVisible = ShouldBindingBeVisible(serializedInputBinding, state.selectedControlScheme);
                         if (isVisible)
                             bindingItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(inputBindingId, idDictionary),
-                                new ActionOrBindingData(false, GetHumanReadableBindingName(serializedInputBinding, state.selectedControlScheme, controlSchemes), actionMapIndex,
-                                    false, false, GetControlLayout(serializedInputBinding.path), serializedInputBinding.indexOfBinding)));
+                                new ActionOrBindingData(isAction: false, GetHumanReadableBindingName(serializedInputBinding, state.selectedControlScheme, controlSchemes), actionMapIndex,
+                                    isComposite: false, isPartOfComposite: false, GetControlLayout(serializedInputBinding.path), bindingIndex: serializedInputBinding.indexOfBinding)));
                     }
                 }
                 actionItems.Add(new TreeViewItemData<ActionOrBindingData>(GetIdForGuid(actionId, idDictionary),
-                    new ActionOrBindingData(true, action.name, actionMapIndex, false, false, action.expectedControlType, actionIndex: action.wrappedProperty.GetIndexOfArrayElement()), bindingItems.Count > 0 ? bindingItems : null));
+                    new ActionOrBindingData(isAction: true, action.name, actionMapIndex, isComposite: false, isPartOfComposite: false, action.expectedControlType, actionIndex: action.wrappedProperty.GetIndexOfArrayElement()), bindingItems.Count > 0 ? bindingItems : null));
             }
             return actionItems;
         }

From 30b7ed786f61477f8e96e88f0ac8b832bbc15e14 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 12:58:33 +0100
Subject: [PATCH 33/39] fixed formatting

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index d188e61f35..01e46262af 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -74,4 +74,4 @@ private void Reset()
         }
     }
 }
-#endif
\ No newline at end of file
+#endif

From de92b068b45b0d35d2b3303f675ea6b45adbf606 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 13:06:12 +0100
Subject: [PATCH 34/39] removed plus sign for dragging action to action map

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 01e46262af..fe222650f0 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -59,7 +59,7 @@ private void OnDragUpdatedEvent(DragUpdatedEvent evt)
                     m_InitialIndex = listView.selectedIndex;
                 //select map item to visualize the drop
                 listView?.SetSelectionWithoutNotify(new[] { (int)mapItem.userData }); //the user data contains the index of the map item
-                DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+                DragAndDrop.visualMode = DragAndDropVisualMode.Move;
                 evt.StopImmediatePropagation();
             }
             else

From 2175b70f05b47ee576adceb62138fa40c208288c Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 7 Feb 2024 14:09:34 +0100
Subject: [PATCH 35/39] added safety check - fixed nullpointer for adding
 actions in empty action map

---
 .../Editor/UITKAssetEditor/Views/CopyPasteHelper.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
index eee3b8166b..3e1e57a7b0 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -259,10 +259,13 @@ private static void PasteAction(SerializedProperty arrayProperty, string jsonToI
         private static int PasteBindingOrComposite(SerializedProperty arrayProperty, string json, int index, string actionName, bool createCompositeParts = true)
         {
             var pastePartOfComposite = IsPartOfComposite(json);
-            var currentProperty = arrayProperty.GetArrayElementAtIndex(index - 1);
-            var currentIsComposite = IsComposite(currentProperty) || IsPartOfComposite(currentProperty);
-            if (pastePartOfComposite && !currentIsComposite) //prevent pasting part of composite into non-composite
-                return index;
+            if (index > 0)
+            {
+                var currentProperty = arrayProperty.GetArrayElementAtIndex(index - 1);
+                var currentIsComposite = IsComposite(currentProperty) || IsPartOfComposite(currentProperty);
+                if (pastePartOfComposite && !currentIsComposite) //prevent pasting part of composite into non-composite
+                    return index;
+            }
             index = pastePartOfComposite || s_State.selectionType == SelectionType.Action ? index : Selectors.GetSelectedBindingIndexAfterCompositeBindings(s_State) + 1;
             if (json.Contains(k_BindingData)) //copied data is composite with bindings - only true for directly copied composites, not for composites from copied actions
                 return PasteCompositeFromJson(arrayProperty, json, index, actionName);

From 87faaefb70623bbf359621b9a8fcd0668375c5b1 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Thu, 8 Feb 2024 12:29:15 +0100
Subject: [PATCH 36/39] fix picking of elements for dropping on ActionMapView

---
 .../Editor/UITKAssetEditor/Views/DropManipulator.cs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index fe222650f0..53d5f3477f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -35,8 +35,8 @@ protected override void UnregisterCallbacksFromTarget()
 
         private void OnDragPerformEvent(DragPerformEvent evt)
         {
-            var treeViewItem = target.panel.Pick(evt.mousePosition)?.parent;
-            if (treeViewItem is not InputActionMapsTreeViewItem mapItem)
+            var mapsViewItem = target.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<InputActionMapsTreeViewItem>();
+            if (mapsViewItem == null)
                 return;
             var index = treeView.selectedIndices.First();
             var draggedItem = treeView.GetItemDataForIndex<ActionOrBindingData>(index);
@@ -44,7 +44,7 @@ private void OnDragPerformEvent(DragPerformEvent evt)
                 return;
             evt.StopImmediatePropagation();
             DragAndDrop.AcceptDrag();
-            DroppedPerformedCallback.Invoke((int)mapItem.userData);
+            DroppedPerformedCallback.Invoke((int)mapsViewItem.userData);
             Reset();
             treeView.ReleaseMouse();
         }
@@ -52,13 +52,13 @@ private void OnDragPerformEvent(DragPerformEvent evt)
         private int m_InitialIndex = -1;
         private void OnDragUpdatedEvent(DragUpdatedEvent evt)
         {
-            var treeViewItem = target.panel.Pick(evt.mousePosition)?.parent;
-            if (treeViewItem is InputActionMapsTreeViewItem mapItem)
+            var mapsViewItem = target.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<InputActionMapsTreeViewItem>();
+            if (mapsViewItem != null)
             {
                 if (m_InitialIndex < 0 && listView != null)
                     m_InitialIndex = listView.selectedIndex;
                 //select map item to visualize the drop
-                listView?.SetSelectionWithoutNotify(new[] { (int)mapItem.userData }); //the user data contains the index of the map item
+                listView?.SetSelectionWithoutNotify(new[] { (int)mapsViewItem.userData }); //the user data contains the index of the map item
                 DragAndDrop.visualMode = DragAndDropVisualMode.Move;
                 evt.StopImmediatePropagation();
             }

From 7e507fbb520da908253184ee809e9a0b811aea65 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Thu, 8 Feb 2024 12:29:54 +0100
Subject: [PATCH 37/39] fixed naming and enhanced break conditions for
 TreeViewDrag

---
 .../Editor/UITKAssetEditor/Views/ActionsTreeView.cs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 2c34f690ef..f445487dc6 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -216,8 +216,8 @@ private void OnDraggedItem(DragPerformEvent evt)
             foreach (var index in m_ActionsTreeView.selectedIndices)
             {
                 // currentTarget & target are always in TreeView as the event is registered on the TreeView - we need to discard drags into other parts of the editor (e.g. the maps list view)
-                var treeViewItem = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<TreeView>();
-                if (treeViewItem is null)
+                var treeView = m_ActionsTreeView.panel.Pick(evt.mousePosition)?.GetFirstAncestorOfType<TreeView>();
+                if (treeView is null || treeView != m_ActionsTreeView)
                 {
                     discardDrag = true;
                     break;

From b0f2c7d6ca6a7da335819045ee758d6aba086252 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 14 Feb 2024 12:41:27 +0100
Subject: [PATCH 38/39] added safety assert & debug pasting bindings

---
 .../Editor/UITKAssetEditor/Views/CopyPasteHelper.cs       | 3 ++-
 .../InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
index 3e1e57a7b0..b9e4a4b14d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs
@@ -183,7 +183,8 @@ private static void PasteBindingsFromClipboard(InputActionsEditorState state)
         {
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var bindingsArray = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
-            var index = state.selectionType == SelectionType.Action ? Selectors.GetLastBindingIndexForSelectedAction(state) : state.selectedBindingIndex;
+            var actions = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Actions));
+            var index = state.selectionType == SelectionType.Action ? Selectors.GetBindingIndexBeforeAction(actions, state.selectedActionIndex, bindingsArray) : state.selectedBindingIndex;
             PasteData(EditorGUIUtility.systemCopyBuffer, new[] {index}, bindingsArray);
         }
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
index b82b164af1..aa521f19f1 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
@@ -73,13 +73,6 @@ public static List<SerializedProperty> GetBindingsForAction(InputActionsEditorSt
             return GetBindingsForAction(action.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue, state);
         }
 
-        public static int GetLastBindingIndexForSelectedAction(InputActionsEditorState state)
-        {
-            var actionName = GetSelectedAction(state)?.wrappedProperty.FindPropertyRelative("m_Name").stringValue;
-            var bindingsOfAction = GetBindingsForAction(actionName, state);
-            return bindingsOfAction.Select(b => b.GetIndexOfArrayElement()).Max();
-        }
-
         public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEditorState state)
         {
             var bindings = GetSelectedActionMap(state)?.wrappedProperty.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
@@ -96,6 +89,7 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
 
         public static int GetBindingIndexBeforeAction(SerializedProperty arrayProperty, int indexToInsert, SerializedProperty bindingArrayToInsertTo)
         {
+            Debug.Assert(indexToInsert >= 0 && indexToInsert <= arrayProperty.arraySize, "Invalid action index to insert bindings before.");
             var offset = 1; //previous action offset
             while (indexToInsert - offset >= 0)
             {

From b06051871fb77e9150de20172a67321c2d4e5f00 Mon Sep 17 00:00:00 2001
From: Rita Merkl <rita.merkl@unity3d.com>
Date: Wed, 14 Feb 2024 14:53:57 +0100
Subject: [PATCH 39/39] changed dropManipulator to be internal

---
 .../InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
index 53d5f3477f..3500aa12dd 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/DropManipulator.cs
@@ -8,7 +8,7 @@ namespace UnityEngine.InputSystem.Editor
     /// <summary>
     /// Class to handle drop from the actions tree view to the action maps list view.
     /// </summary>
-    public class DropManipulator : Manipulator
+    internal class DropManipulator : Manipulator
     {
         private EventCallback<int> DroppedPerformedCallback;
         private VisualElement m_OtherVerticalList;