Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing call to ICommand.CanExecute() in HyperlinkExtensions #3172

Merged
merged 3 commits into from
Mar 19, 2020
Merged

Add missing call to ICommand.CanExecute() in HyperlinkExtensions #3172

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fc6df7
Merge pull request #1 from windows-toolkit/master
vgromfeld Mar 13, 2020
714b2e9
add can execute check
vgromfeld Mar 18, 2020
1c0d5cf
Merge branch 'master' into u/vgromfeld/hyperlinkCommand
vgromfeld Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 14 additions & 27 deletions Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace Microsoft.Toolkit.Uwp.UI
{
/// <summary>
/// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> content element that allows
/// Provides attached dependency properties for the <see cref="Hyperlink"/> content element that allows
/// it to invoke a <see cref="ICommand"/> when clicked
/// </summary>
public static class HyperlinkExtensions
Expand All @@ -29,64 +29,51 @@ public static class HyperlinkExtensions
/// </summary>
/// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="ICommand"/> instance</param>
/// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
public static ICommand GetCommand(Windows.UI.Xaml.Documents.Hyperlink obj)
{
return (ICommand)obj.GetValue(CommandProperty);
}
public static ICommand GetCommand(Hyperlink obj) => (ICommand)obj.GetValue(CommandProperty);

/// <summary>
/// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
/// </summary>
/// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="ICommand"/> instance to</param>
/// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/></param>
public static void SetCommand(Windows.UI.Xaml.Documents.Hyperlink obj, ICommand value)
{
obj.SetValue(CommandProperty, value);
}
public static void SetCommand(Hyperlink obj, ICommand value) => obj.SetValue(CommandProperty, value);

/// <summary>
/// Gets the <see cref="CommandProperty"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
/// </summary>
/// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="CommandProperty"/> value</param>
/// <returns>The <see cref="CommandProperty"/> value associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
public static object GetCommandParameter(Windows.UI.Xaml.Documents.Hyperlink obj)
{
return obj.GetValue(CommandParameterProperty);
}
public static object GetCommandParameter(Hyperlink obj) => obj.GetValue(CommandParameterProperty);

/// <summary>
/// Sets the <see cref="CommandProperty"/> assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
/// </summary>
/// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="CommandProperty"/> instance to</param>
/// <param name="value">The <see cref="object"/> to set the <see cref="CommandProperty"/> to</param>
public static void SetCommandParameter(Windows.UI.Xaml.Documents.Hyperlink obj, object value)
{
obj.SetValue(CommandParameterProperty, value);
}
public static void SetCommandParameter(Hyperlink obj, object value) => obj.SetValue(CommandParameterProperty, value);

private static void OnCommandPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
{
Windows.UI.Xaml.Documents.Hyperlink hyperlink = sender as Windows.UI.Xaml.Documents.Hyperlink;

if (hyperlink != null)
if (sender is Hyperlink hyperlink)
{
hyperlink.Click -= OnHyperlinkClicked;

ICommand command = args.NewValue as ICommand;

if (command != null)
if (args.NewValue is ICommand)
{
hyperlink.Click += OnHyperlinkClicked;
}
}
}

private static void OnHyperlinkClicked(Windows.UI.Xaml.Documents.Hyperlink sender, Windows.UI.Xaml.Documents.HyperlinkClickEventArgs args)
private static void OnHyperlinkClicked(Hyperlink sender, HyperlinkClickEventArgs args)
{
ICommand command = GetCommand(sender);
object parameter = GetCommandParameter(sender);
var command = GetCommand(sender);
var parameter = GetCommandParameter(sender);

command?.Execute(parameter);
if (command?.CanExecute(parameter) == true)
{
command.Execute(parameter);
}
}
}
}