Delay first execution of ICommand.CanExecute(object parameter) until …

…after initialization. Issue #316 Revert changes to Hyperlink.cs
dotnet · Jul 5, 2019 · 0c6b967 · 0c6b967
1 parent 33df9e1
commit 0c6b967
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Commands/CommandHelpers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Commands/CommandHelpers.cs
@@ -118,6 +118,14 @@ private static void PrivateRegisterCommandHandler(Type controlType, RoutedComman
 
         internal static bool CanExecuteCommandSource(ICommandSource commandSource)
         {
+            if (commandSource is FrameworkElement fe)
+            {
+                if (!fe.IsInitialized)
+                {
+                    return false;
+                }
+            }
+
             ICommand command = commandSource.Command;
             if (command != null)
             {

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
@@ -1282,6 +1282,7 @@ protected override System.Windows.Automation.Peers.AutomationPeer OnCreateAutoma
         /// </summary>
         protected override void OnInitialized(EventArgs e)
         {
+            UpdateCanExecute();
             base.OnInitialized(e);
             UpdateRole();
 #if OLD_AUTOMATION

diff --git a/...oft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs b/...oft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs
@@ -329,6 +329,12 @@ private void UpdateCanExecute()
             }
         }
 
+        protected override void OnInitialized(EventArgs e)
+        {
+            UpdateCanExecute();
+            base.OnInitialized(e);
+        }
+
         /// <summary>
         ///     Fetches the value of the IsEnabled property
         /// </summary>