FIX: Allow Copy/Paste between windows (ISX-1823).

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -49,6 +49,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed InputManager.asset file growing in size on each Reset call.
 - Fixed Opening InputDebugger throws 'Action map must have state at this point' error.
 - Fixed Cut/Paste behaviour to match Editor - Cut items will now be cleared from clipboard after pasting.
+- Fixed Pasting items between Input Action Editor windows having no effect until an item in the Action Map/Action lists was selected.
 - Improved window layout to avoid elements being hidden (both the Input Actions in Project Settings, and standalone Input Actions Editor windows).
 - Fixed InputAction asset appearing dirty after rename [ISXB-695](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-749).
 - Fixed Error logged when InputActionEditor window opened without a valid asset.

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorState.cs

@@ -190,7 +190,7 @@ public InputActionsEditorState SelectBinding(int index)
             //if no binding selected (due to no bindings in list) set selection type to action
             if (index == -1)
                 return With(selectedBindingIndex: index, selectionType: SelectionType.Action);
-            return With(selectedBindingIndex: index);
+            return With(selectedBindingIndex: index, selectionType: SelectionType.Binding);
         }
 
         public InputActionsEditorState SelectAction(int index)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

@@ -250,6 +250,12 @@ private bool HasAssetChanged(SerializedObject serializedAsset)
             return newAssetJson != m_AssetJson;
         }
 
+        private void OnFocus()
+        {
+            // Apply focus here so that Paste works when users tab into the window (handled in InputActionsEditorView)
+            rootVisualElement.Focus();
+        }
+
         private void OnLostFocus()
         {
             // Auto-save triggers on focus-lost instead of on every change

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs

@@ -155,6 +155,7 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
 
             if (allowUICommandExecution)
             {
+                // NB: Paste is handled in InputActionsEditorView.
                 switch (evt.commandName)
                 {
                     case CmdEvents.Rename:
@@ -173,11 +174,6 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
                     case CmdEvents.Cut:
                         CutItems();
                         break;
-                    case CmdEvents.Paste:
-                        var isActionCopied = CopyPasteHelper.GetCopiedClipboardType() == typeof(InputAction);
-                        if (CopyPasteHelper.HasPastableClipboardData(typeof(InputActionMap)))
-                            PasteItems(isActionCopied);
-                        break;
                     default:
                         return; // Skip StopPropagation if we didn't execute anything
                 }
@@ -191,6 +187,7 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
         private void OnValidateCommand(ValidateCommandEvent evt)
         {
             // Mark commands as supported for Execute by stopping propagation of the event
+            // Paste is handled in InputActionsEditorView.
             switch (evt.commandName)
             {
                 case CmdEvents.Rename:
@@ -199,7 +196,6 @@ private void OnValidateCommand(ValidateCommandEvent evt)
                 case CmdEvents.Duplicate:
                 case CmdEvents.Copy:
                 case CmdEvents.Cut:
-                case CmdEvents.Paste:
                     evt.StopPropagation();
                     break;
             }
@@ -211,7 +207,8 @@ private void OnPointerDown(PointerDownEvent evt)
             if (evt.button == (int)MouseButton.RightMouse && evt.clickCount == 1)
             {
                 var actionMap = (evt.target as VisualElement).GetFirstAncestorOfType<InputActionMapsTreeViewItem>();
-                m_ListView.SetSelection(actionMap.parent.IndexOf(actionMap));
+                if (actionMap != null)
+                    m_ListView.SetSelection(actionMap.parent.IndexOf(actionMap));
             }
         }
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs

@@ -387,6 +387,7 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
 
             if (allowUICommandExecution)
             {
+                // NB: Paste is handled in InputActionsEditorView.
                 var data = (ActionOrBindingData)m_ActionsTreeView.selectedItem;
                 switch (evt.commandName)
                 {
@@ -409,11 +410,6 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
                     case CmdEvents.Cut:
                         CutItems();
                         break;
-                    case CmdEvents.Paste:
-                        var hasPastableData = CopyPasteHelper.HasPastableClipboardData(data.isAction ? typeof(InputAction) : typeof(InputBinding));
-                        if (hasPastableData)
-                            PasteItems();
-                        break;
                     default:
                         return; // Skip StopPropagation if we didn't execute anything
                 }
@@ -427,6 +423,7 @@ private void OnExecuteCommand(ExecuteCommandEvent evt)
         private void OnValidateCommand(ValidateCommandEvent evt)
         {
             // Mark commands as supported for Execute by stopping propagation of the event
+            // Paste is handled in InputActionsEditorView.
             switch (evt.commandName)
             {
                 case CmdEvents.Rename:
@@ -435,7 +432,6 @@ private void OnValidateCommand(ValidateCommandEvent evt)
                 case CmdEvents.Duplicate:
                 case CmdEvents.Copy:
                 case CmdEvents.Cut:
-                case CmdEvents.Paste:
                     evt.StopPropagation();
                     break;
             }

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs

@@ -211,9 +211,13 @@ private static void PasteActionsFromClipboard(InputActionsEditorState state, boo
                 : Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var actionArray = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Actions));
             if (actionArray == null) return;
+
             var index = state.selectedActionIndex;
-            if (addLast)
+            if (addLast || index >= actionArray.arraySize)
                 index = actionArray.arraySize - 1;
+            if (index < 0)
+                index = 0;
+
             PasteData(EditorHelpers.GetSystemCopyBufferContents(), new[] {index}, actionArray);
         }
 
@@ -222,6 +226,11 @@ private static void PasteBindingsFromClipboard(InputActionsEditorState state)
             var actionMap = Selectors.GetSelectedActionMap(state)?.wrappedProperty;
             var bindingsArray = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Bindings));
             var actions = actionMap?.FindPropertyRelative(nameof(InputActionMap.m_Actions));
+
+            // Don't do anything if there's no valid array to paste into.
+            if (state.selectedActionIndex == -1 || actions == null || actions.arraySize == 0 || bindingsArray == null)
+                return;
+
             var index = state.selectionType == SelectionType.Action ? Selectors.GetBindingIndexBeforeAction(actions, state.selectedActionIndex, bindingsArray) : state.selectedBindingIndex;
             PasteData(EditorHelpers.GetSystemCopyBufferContents(), new[] {index}, bindingsArray);
         }
@@ -298,13 +307,16 @@ 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);
-            if (index > 0)
+            var currentPropertyIndex = index - 1;
+            // We don't care about these checks if the array index is invalid
+            if (currentPropertyIndex >= 0 && currentPropertyIndex < arrayProperty.arraySize)
             {
-                var currentProperty = arrayProperty.GetArrayElementAtIndex(index - 1);
+                var currentProperty = arrayProperty.GetArrayElementAtIndex(currentPropertyIndex);
                 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);
@@ -361,7 +373,7 @@ private static bool IsPartOfComposite(string json)
         private static SerializedProperty AddElement(SerializedProperty arrayProperty, string name, int index = -1)
         {
             var uniqueName = InputActionSerializationHelpers.FindUniqueName(arrayProperty, name);
-            if (index < 0)
+            if (index < 0 || index > arrayProperty.arraySize)
                 index = arrayProperty.arraySize;
 
             arrayProperty.InsertArrayElementAtIndex(index);

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.cs

@@ -1,4 +1,5 @@
 #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+using CmdEvents = UnityEngine.InputSystem.Editor.InputActionsEditorConstants.CommandEvents;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -86,6 +87,10 @@ public InputActionsEditorView(VisualElement root, StateContainer stateContainer,
                     selectedControlSchemeIndex = state.selectedControlSchemeIndex,
                     selectedDeviceIndex = state.selectedDeviceRequirementIndex
                 });
+
+            root.RegisterCallback<ValidateCommandEvent>(OnValidateCommand);
+            root.RegisterCallback<ExecuteCommandEvent>(OnExecuteCommand);
+            root.focusable = true; // Required for CommandEvents to work
         }
 
         private void OnReset()
@@ -221,6 +226,36 @@ public class ViewState
             public int selectedControlSchemeIndex;
             public int selectedDeviceIndex;
         }
+
+        void OnExecuteCommand(ExecuteCommandEvent evt)
+        {
+            if (evt.commandName != CmdEvents.Paste)
+                return;
+
+            var copiedType = CopyPasteHelper.GetCopiedClipboardType();
+
+            if (copiedType == typeof(InputActionMap))
+            {
+                evt.StopPropagation();
+                Dispatch(Commands.PasteActionMaps());
+            }
+            else if (copiedType == typeof(InputAction) || copiedType == typeof(InputBinding))
+            {
+                evt.StopPropagation();
+                Dispatch(Commands.PasteActionsOrBindings());
+            }
+        }
+
+        void OnValidateCommand(ValidateCommandEvent evt)
+        {
+            // Mark commands as supported for Execute by stopping propagation of the event
+            switch (evt.commandName)
+            {
+                case CmdEvents.Paste:
+                    evt.StopPropagation();
+                    break;
+            }
+        }
     }
 
     internal static partial class Selectors

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs

@@ -79,7 +79,7 @@ public static int GetSelectedBindingIndexAfterCompositeBindings(InputActionsEdit
             var item = new SerializedInputBinding(bindings?.GetArrayElementAtIndex(state.selectedBindingIndex));
             var index = state.selectedBindingIndex + (item.isComposite || item.isPartOfComposite ? 1 : 0);
             var toSkip = 0;
-            while (new SerializedInputBinding(bindings?.GetArrayElementAtIndex(index)).isPartOfComposite)
+            while (index < bindings.arraySize && new SerializedInputBinding(bindings?.GetArrayElementAtIndex(index)).isPartOfComposite)
             {
                 toSkip++;
                 index++;