From 7b6ccef18ab2570f52bf3254051921d809aa970c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 22 Jan 2022 00:03:29 -0500
Subject: [PATCH] Merge pull request #7321 from ltetak/datagrid_osx_hotkeys

[macOS] DataGrid - handle OSX key modifiers (ctrl vs cmd)
---
 .../DataGridColumn.cs                         |  2 +-
 .../Utils/KeyboardHelper.cs                   | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 8501ce3896..a77b482436 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -680,7 +680,7 @@ namespace Avalonia.Controls
         public void ClearSort()
         {
             //InvokeProcessSort is already validating if sorting is possible
-            _headerCell?.InvokeProcessSort(Input.KeyModifiers.Control);
+            _headerCell?.InvokeProcessSort(KeyboardHelper.GetPlatformCtrlOrCmdKeyModifier());
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
index 351deceb48..d2b1fd4b8e 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
@@ -4,22 +4,29 @@
 // All other rights reserved.
 
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 
 namespace Avalonia.Controls.Utils
 {
     internal static class KeyboardHelper
     {
-        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrlOrCmd, out bool shift)
         {
-            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
-            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
+            ctrlOrCmd = modifiers.HasFlag(GetPlatformCtrlOrCmdKeyModifier());
+            shift = modifiers.HasFlag(KeyModifiers.Shift);
         }
 
-        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift, out bool alt)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrlOrCmd, out bool shift, out bool alt)
         {
-            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
-            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
-            alt = (modifiers & KeyModifiers.Alt) == KeyModifiers.Alt;
+            ctrlOrCmd = modifiers.HasFlag(GetPlatformCtrlOrCmdKeyModifier());
+            shift = modifiers.HasFlag(KeyModifiers.Shift);
+            alt = modifiers.HasFlag(KeyModifiers.Alt);
+        }
+
+        public static KeyModifiers GetPlatformCtrlOrCmdKeyModifier()
+        {                
+            var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
+            return keymap?.CommandModifiers ?? KeyModifiers.Control;
         }
     }
 }