MaterialDesignInXAML · Keboo · Dec 8, 2023 · Nov 23, 2023 · Nov 27, 2023 · Nov 27, 2023
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
diff --git a/MaterialDesign3.Demo.Wpf/Buttons.xaml b/MaterialDesign3.Demo.Wpf/Buttons.xaml
diff --git a/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBinding.xaml b/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBinding.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.SplitButton.SplitButtonWithCommandBinding"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.SplitButton"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             d:DataContext="{d:DesignInstance Type={x:Type local:SplitButtonWithCommandBindingViewModel}, IsDesignTimeCreatable= False}">
+    <StackPanel>
+      <materialDesign:SplitButton Command="{Binding LeftSideButtonClickedCommand}"
+                                  Content="Split Button" />
+    </StackPanel>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBinding.xaml.cs b/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBinding.xaml.cs
@@ -0,0 +1,38 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace MaterialDesignThemes.UITests.Samples.SplitButton;
+
+/// <summary>
+/// Interaction logic for SplitButtonWithCommandBinding.xaml
+/// </summary>
+public partial class SplitButtonWithCommandBinding
+{
+    private SplitButtonWithCommandBindingViewModel ViewModel { get; }
+
+    public bool CommandInvoked => ViewModel.CommandInvoked;
+
+    public bool CommandCanExecute
+    {
+        get => ViewModel.CommandCanExecute;
+        set => ViewModel.CommandCanExecute = value;
+    }
+
+    public SplitButtonWithCommandBinding()
+    {
+        DataContext = ViewModel = new SplitButtonWithCommandBindingViewModel();
+        InitializeComponent();
+    }
+}
+
+public partial class SplitButtonWithCommandBindingViewModel : ObservableObject
+{
+    public bool CommandInvoked { get; private set; }
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(LeftSideButtonClickedCommand))]
+    private bool _commandCanExecute = true;
+
+    [RelayCommand(CanExecute = nameof(CommandCanExecute))]
+    private void LeftSideButtonClicked() => CommandInvoked = true;
+}
diff --git a/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBindingWindow.xaml b/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBindingWindow.xaml
@@ -0,0 +1,10 @@
+<Window x:Class="MaterialDesignThemes.UITests.Samples.SplitButton.SplitButtonWithCommandBindingWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.SplitButton"
+        mc:Ignorable="d"
+        Title="SplitButtonWithCommandBindingWindow" Height="450" Width="800">
+    <local:SplitButtonWithCommandBinding />
+</Window>
diff --git a/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBindingWindow.xaml.cs b/MaterialDesignThemes.UITests/Samples/SplitButton/SplitButtonWithCommandBindingWindow.xaml.cs
@@ -0,0 +1,12 @@
+namespace MaterialDesignThemes.UITests.Samples.SplitButton;
+
+/// <summary>
+/// Interaction logic for SplitButtonWithCommandBindingWindow.xaml
+/// </summary>
+public partial class SplitButtonWithCommandBindingWindow
+{
+    public SplitButtonWithCommandBindingWindow()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/MaterialDesignThemes.UITests/TestBase.cs b/MaterialDesignThemes.UITests/TestBase.cs
@@ -1,30 +1,27 @@
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Media;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
-[assembly: GenerateHelpers(typeof(SmartHint))]
-[assembly: GenerateHelpers(typeof(TimePicker))]
-[assembly: GenerateHelpers(typeof(DrawerHost))]
+[assembly: GenerateHelpers(typeof(AutoSuggestBox))]
 [assembly: GenerateHelpers(typeof(ColorPicker))]
 [assembly: GenerateHelpers(typeof(DialogHost))]
-[assembly: GenerateHelpers(typeof(AutoSuggestBox))]
+[assembly: GenerateHelpers(typeof(DrawerHost))]
+[assembly: GenerateHelpers(typeof(PopupBox))]
+[assembly: GenerateHelpers(typeof(SmartHint))]
+[assembly: GenerateHelpers(typeof(TimePicker))]
 [assembly: GenerateHelpers(typeof(TreeListView))]
 [assembly: GenerateHelpers(typeof(TreeListViewItem))]
 
 namespace MaterialDesignThemes.UITests;
 
-public abstract class TestBase : IAsyncLifetime
+public abstract class TestBase(ITestOutputHelper output) : IAsyncLifetime
 {
     protected bool AttachedDebuggerToRemoteProcess { get; set; } = true;
-    protected ITestOutputHelper Output { get; }
+    protected ITestOutputHelper Output { get; } = output ?? throw new ArgumentNullException(nameof(output));
 
     [NotNull]
     protected IApp? App { get; set; }
 
-    public TestBase(ITestOutputHelper output)
-        => Output = output ?? throw new ArgumentNullException(nameof(output));
-
     protected async Task<Color> GetThemeColor(string name)
     {
         IResource resource = await App.GetResource(name);
@@ -51,7 +48,7 @@ public async Task InitializeAsync() =>
         App = await XamlTest.App.StartRemote(new AppOptions
         {
 #if !DEBUG
-            MinimizeOtherWindows = !Debugger.IsAttached,
+            MinimizeOtherWindows = !System.Diagnostics.Debugger.IsAttached,
 #endif
             AllowVisualStudioDebuggerAttach = AttachedDebuggerToRemoteProcess,
             LogMessage = Output.WriteLine

diff --git a/...mes.UITests/WPF/PopupBox/PopupBoxTests.cs → ...s.UITests/WPF/PopupBoxes/PopupBoxTests.cs b/...mes.UITests/WPF/PopupBox/PopupBoxTests.cs → ...s.UITests/WPF/PopupBoxes/PopupBoxTests.cs
@@ -2,7 +2,7 @@
 using System.Windows.Media;
 using MaterialDesignThemes.UITests.Samples.PopupBox;
 
-namespace MaterialDesignThemes.UITests.WPF.PopupBox;
+namespace MaterialDesignThemes.UITests.WPF.PopupBoxes;
 
 public class PopupBoxTests : TestBase
 {
@@ -20,7 +20,7 @@ public async Task PopupBox_WithElevation_AppliesElevationToNestedCard(Elevation
         await using var recorder = new TestRecorder(App);
 
         //Arrange
-        IVisualElement<Wpf.PopupBox> popupBox = await LoadXaml<Wpf.PopupBox>($@"
+        IVisualElement<PopupBox> popupBox = await LoadXaml<PopupBox>($@"
 <materialDesign:PopupBox VerticalAlignment=""Top""
                          PopupElevation=""{elevation}"">
   <StackPanel>
@@ -46,7 +46,7 @@ public async Task PopupBox_WithContentTemplateSelector_ChangesContent()
         IVisualElement grid = (await LoadUserControl<PopupBoxWithTemplateSelector>());
 
         IVisualElement<Button> button = await grid.GetElement<Button>();
-        IVisualElement<Wpf.PopupBox> popupBox = await grid.GetElement<Wpf.PopupBox>();
+        IVisualElement<PopupBox> popupBox = await grid.GetElement<PopupBox>();
 
 
         // Assert

diff --git a/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs b/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
@@ -0,0 +1,155 @@
+using MaterialDesignThemes.UITests.Samples.SplitButton;
+
+[assembly:GenerateHelpers(typeof(SplitButtonWithCommandBinding))]
+
+namespace MaterialDesignThemes.UITests.WPF.SplitButtons;
+
+
+public class SplitButtonTests : TestBase
+{
+    public SplitButtonTests(ITestOutputHelper output)
+        : base(output)
+    {
+    }
+
+    [Fact]
+    public async Task SplitButton_ClickingSplitButton_ShowsPopup()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
+            <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
+              <materialDesign:SplitButton.PopupContent>
+                <TextBlock x:Name="PopupContent" Text="Popup Content"/>
+              </materialDesign:SplitButton.PopupContent>
+            </materialDesign:SplitButton>
+            """);
+
+        IVisualElement<PopupBox> popupBox = await splitButton.GetElement<PopupBox>();
+        IVisualElement<TextBlock> popupContent = await popupBox.GetElement<TextBlock>("PopupContent");
+
+        //Act
+        await popupBox.LeftClick();
+
+        // Assert
+        await Wait.For(async () => await popupBox.GetIsPopupOpen());
+        await Wait.For(async () => await popupContent.GetIsVisible());
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task SplitButton_RegisterForClick_RaisesEvent()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
+            <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
+              <materialDesign:SplitButton.PopupContent>
+                <TextBlock x:Name="PopupContent" Text="Popup Content"/>
+              </materialDesign:SplitButton.PopupContent>
+            </materialDesign:SplitButton>
+            """);
+
+        IEventRegistration clickEvent = await splitButton.RegisterForEvent(ButtonBase.ClickEvent.Name);
+
+        IVisualElement<Button> leftButton = await splitButton.GetElement<Button>("PART_LeftButton");
+        IVisualElement<PopupBox> popupBox = await splitButton.GetElement<PopupBox>();
+
+        //Act
+        await leftButton.LeftClick();
+        await Task.Delay(50);
+        int leftButtonCount = (await clickEvent.GetInvocations()).Count;
+        await popupBox.LeftClick();
+        await Task.Delay(50);
+        int rightButtonCount = (await clickEvent.GetInvocations()).Count;
+
+        // Assert
+        Assert.Equal(1, leftButtonCount);
+        //NB: The popup box button should only show the popup not trigger the click event
+        Assert.Equal(1, rightButtonCount);
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task SplitButton_WithButtonInPopup_CanBeInvoked()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        IVisualElement<SplitButton> splitButton = await LoadXaml<SplitButton>("""
+            <materialDesign:SplitButton Content="Split Button" VerticalAlignment="Center" HorizontalAlignment="Center">
+              <materialDesign:SplitButton.PopupContent>
+                <Button x:Name="PopupContent" Content="Popup Content" />
+              </materialDesign:SplitButton.PopupContent>
+            </materialDesign:SplitButton>
+            """);
+
+        IVisualElement<Button> popupContent = await splitButton.GetElement<Button>("PopupContent");
+        IVisualElement<PopupBox> popupBox = await splitButton.GetElement<PopupBox>();
+
+        IEventRegistration clickEvent = await popupContent.RegisterForEvent(ButtonBase.ClickEvent.Name);
+
+        //Act
+        await popupBox.LeftClick();
+        //NB: give the popup some time to show
+        await Wait.For(async () => await popupContent.GetIsVisible());
+        await Wait.For(async () => await popupContent.GetActualHeight() > 10);
+        await popupContent.LeftClick();
+        await Task.Delay(50);
+
+        // Assert
+        var invocations = await clickEvent.GetInvocations();
+        Assert.Single(invocations);
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task SplitButton_RegisterCommandBinding_InvokesCommand()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        await App.InitializeWithMaterialDesign();
+        IWindow window = await App.CreateWindow<SplitButtonWithCommandBindingWindow>();
+        IVisualElement<SplitButtonWithCommandBinding> userControl = await window.GetElement<SplitButtonWithCommandBinding>();
+        IVisualElement<SplitButton> splitButton = await userControl.GetElement<SplitButton>();
+
+        Assert.False(await userControl.GetCommandInvoked());
+
+        //Act
+        await splitButton.LeftClick();
+        await Task.Delay(50);
+
+        // Assert
+        Assert.True(await userControl.GetCommandInvoked());
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task SplitButton_CommandCanExecuteFalse_DisablesButton()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        await App.InitializeWithMaterialDesign();
+        IWindow window = await App.CreateWindow<SplitButtonWithCommandBindingWindow>();
+        IVisualElement<SplitButtonWithCommandBinding> userControl = await window.GetElement<SplitButtonWithCommandBinding>();
+        IVisualElement<SplitButton> splitButton = await userControl.GetElement<SplitButton>();
+
+        Assert.True(await splitButton.GetIsEnabled());
+
+        //Act
+        await userControl.SetProperty(nameof(SplitButtonWithCommandBinding.CommandCanExecute), false);
+
+        // Assert
+        Assert.False(await splitButton.GetIsEnabled());
+
+        recorder.Success();
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/Converters/CornerRadiusCloneConverter.cs b/MaterialDesignThemes.Wpf/Converters/CornerRadiusCloneConverter.cs
@@ -0,0 +1,28 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters;
+
+public class CornerRadiusCloneConverter : IValueConverter
+{
+    public double? FixedTopLeft { get; set; }
+    public double? FixedTopRight { get; set; }
+    public double? FixedBottomLeft { get; set; }
+    public double? FixedBottomRight { get; set; }
+
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is CornerRadius cornerRadius)
+        {
+            return new CornerRadius(
+                FixedTopLeft ?? cornerRadius.TopLeft,
+                FixedTopRight ?? cornerRadius.TopRight,
+                FixedBottomRight ?? cornerRadius.BottomRight,
+                FixedBottomLeft ?? cornerRadius.BottomLeft);
+        }
+        return new CornerRadius();
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/MaterialDesignThemes.Wpf/Converters/FirstNonNullConverter.cs b/MaterialDesignThemes.Wpf/Converters/FirstNonNullConverter.cs
@@ -0,0 +1,13 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters;
+
+public class FirstNonNullConverter : IMultiValueConverter
+{
+    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
+        => values?.FirstOrDefault(v => v is not null);
+
+    public object?[] ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/MaterialDesignThemes.Wpf/PopupBox.cs b/MaterialDesignThemes.Wpf/PopupBox.cs
@@ -292,6 +292,15 @@ public PopupBoxPlacementMode PlacementMode
         set => SetValue(PlacementModeProperty, value);
     }
 
+    internal static readonly DependencyProperty PlacementTargetProperty = DependencyProperty.Register(
+        nameof(PlacementTarget), typeof(UIElement), typeof(PopupBox), new PropertyMetadata(default(UIElement)));
+
+    internal UIElement? PlacementTarget
+    {
+        get => (UIElement?)GetValue(PlacementTargetProperty);
+        set => SetValue(PlacementTargetProperty, value);
+    }
+
     public static readonly DependencyProperty PopupModeProperty = DependencyProperty.Register(
         nameof(PopupMode), typeof(PopupBoxPopupMode), typeof(PopupBox), new PropertyMetadata(default(PopupBoxPopupMode)));