Merge branch 'MaterialDesignInXAML:master' into master

Author: mzy666888

.github/workflows/get_versions.yml

@@ -23,9 +23,9 @@ jobs:
   getting_versions:
     env:
       #Update these base version numbers
-      mdix-version: "5.1.1"
-      mdix-colors-version: "3.1.1"
-      mdix-mahapps-version: "3.1.1"
+      mdix-version: "5.2.1"
+      mdix-colors-version: "5.2.1"
+      mdix-mahapps-version: "5.2.1"
     name: Set version numbers
     runs-on: ubuntu-latest
     defaults:

.github/workflows/release.yml

@@ -258,14 +258,15 @@ jobs:
         steps:
             # Doing a checkout, until this issue is resolved.
             # https://github.com/valeriobelli/gh-milestone/issues/15
+            # As of version 2.1.0 the -R doesn't appear to output valid json when filtering. So still using the checkout.
             - uses: actions/checkout@v4
 
             - name: Close Milestone
               run: |
                   gh extension install valeriobelli/gh-milestone
                   Write-Host "Using extension version $(gh milestone --version)"
                   $milestones = $(gh milestone list --json number,title) | ConvertFrom-Json
-                  $milestoneNumber = ($milestones | Where-Object { $_.title -eq "5.1.0" }).number
+                  $milestoneNumber = ($milestones | Where-Object { $_.title -eq "${{ inputs.milestone }}" }).number
                   gh milestone edit $milestoneNumber --state closed
               env:
                 GITHUB_TOKEN: ${{ secrets.SA_PAT }}
@@ -277,7 +278,7 @@ jobs:
         environment: production
 
         permissions:
-            actions: write
+          actions: write
 
         steps:
             # Checkout is needed so that we can update the get_versions.yml file
@@ -312,6 +313,8 @@ jobs:
                   Update-Version -Prefix "mdix-mahapps-version"
 
             - name: Open Pull Request
+              env:
+                GITHUB_TOKEN: ${{ secrets.SA_PAT }}
               run: |
                   git config --local user.email "github-actions[bot]@users.noreply.github.com"
                   git config --local user.name "github-actions[bot]"

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml

@@ -184,7 +184,7 @@
 
   <Style x:Key="MaterialDesignFilledUpDownBase"
          TargetType="{x:Type wpf:UpDownBase}"
-         BasedOn="{StaticResource MaterialDesignFloatingHintNumericUpDown}">
+         BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}">
     <Style.Resources>
       <Style x:Key="NestedTextBoxStyle"
              TargetType="TextBox"
@@ -208,7 +208,7 @@
 
   <Style x:Key="MaterialDesignOutlinedUpDownBase"
          TargetType="{x:Type wpf:UpDownBase}"
-         BasedOn="{StaticResource MaterialDesignFloatingHintNumericUpDown}">
+         BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}">
     <Style.Resources>
       <Style x:Key="NestedTextBoxStyle"
              TargetType="TextBox"

src/MaterialDesignThemes.Wpf/UpDownBase.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Globalization;
 
 namespace MaterialDesignThemes.Wpf;
@@ -191,9 +191,7 @@ public override void OnApplyTemplate()
         if (_textBoxField != null)
             _textBoxField.TextChanged -= OnTextBoxFocusLost;
 
-        _increaseButton = GetTemplateChild(IncreaseButtonPartName) as RepeatButton;
-        _decreaseButton = GetTemplateChild(DecreaseButtonPartName) as RepeatButton;
-        _textBoxField = GetTemplateChild(TextBoxPartName) as TextBox;
+        base.OnApplyTemplate();
 
         if (_increaseButton != null)
             _increaseButton.Click += IncreaseButtonOnClick;
@@ -207,7 +205,6 @@ public override void OnApplyTemplate()
             _textBoxField.Text = Value?.ToString();
         }
 
-        base.OnApplyTemplate();
     }
 
     private void OnTextBoxFocusLost(object sender, EventArgs e)
@@ -279,6 +276,55 @@ public class UpDownBase : Control
     protected RepeatButton? _decreaseButton;
     protected RepeatButton? _increaseButton;
 
+    static UpDownBase()
+    {
+        EventManager.RegisterClassHandler(typeof(UpDownBase), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
+    }
+
+    // Based on work in MahApps
+    // https://github.com/MahApps/MahApps.Metro/blob/f7ba30586e9670f07c2f7b6553d129a9e32fc673/src/MahApps.Metro/Controls/NumericUpDown.cs#L966
+    private static void OnGotFocus(object sender, RoutedEventArgs e)
+    {
+        // When NumericUpDown gets logical focus, select the text inside us.
+        // If we're an editable NumericUpDown, forward focus to the TextBox element
+        if (!e.Handled)
+        {
+            var numericUpDown = (UpDownBase)sender;
+            if (numericUpDown.Focusable && e.OriginalSource == numericUpDown)
+            {
+                // MoveFocus takes a TraversalRequest as its argument.
+                var focusDirection = Keyboard.Modifiers.HasFlag(ModifierKeys.Shift)
+                    ? FocusNavigationDirection.Previous
+                    : FocusNavigationDirection.Next;
+
+                var request = new TraversalRequest(focusDirection);
+                // Gets the element with keyboard focus.
+                // And change the keyboard focus.
+                if (Keyboard.FocusedElement is UIElement elementWithFocus)
+                {
+                    elementWithFocus.MoveFocus(request);
+                }
+                else
+                {
+                    numericUpDown.Focus();
+                }
+
+                e.Handled = true;
+            }
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        _increaseButton = GetTemplateChild(IncreaseButtonPartName) as RepeatButton;
+        _decreaseButton = GetTemplateChild(DecreaseButtonPartName) as RepeatButton;
+        _textBoxField = GetTemplateChild(TextBoxPartName) as TextBox;
+
+        base.OnApplyTemplate();
+    }
+
+    public void SelectAll() => _textBoxField?.SelectAll();
+
     public object? IncreaseContent
     {
         get => GetValue(IncreaseContentProperty);

tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs

@@ -1,4 +1,6 @@
-namespace MaterialDesignThemes.UITests.WPF.UpDownControls;
+using System.ComponentModel;
+
+namespace MaterialDesignThemes.UITests.WPF.UpDownControls;
 
 public class DecimalUpDownTests(ITestOutputHelper output) : TestBase(output)
 {
@@ -115,4 +117,34 @@ public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
         Assert.Equal(3, await numericUpDown.GetMinimum());
         Assert.Equal(3, await numericUpDown.GetMaximum());
     }
+
+    [Fact]
+    [Description("Issue 3654")]
+    public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        // Arrange
+        var stackPanel = await LoadXaml<StackPanel>("""
+        <StackPanel>
+          <TextBox />
+          <materialDesign:DecimalUpDown />
+        </StackPanel>
+        """);
+
+        var textBox = await stackPanel.GetElement<TextBox>("/TextBox");
+        var part_textBox = await stackPanel.GetElement<TextBox>("PART_TextBox");
+
+        // Act
+        await textBox.MoveKeyboardFocus();
+        await Task.Delay(50);
+        await textBox.SendInput(new KeyboardInput(Key.Tab));
+        await Task.Delay(50);
+
+        // Assert
+        Assert.False(await textBox.GetIsFocused());
+        Assert.True(await part_textBox.GetIsFocused());
+
+        recorder.Success();
+    }
 }

tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs

@@ -1,4 +1,6 @@
-namespace MaterialDesignThemes.UITests.WPF.UpDownControls;
+using System.ComponentModel;
+
+namespace MaterialDesignThemes.UITests.WPF.UpDownControls;
 
 
 public class NumericUpDownTests(ITestOutputHelper output) : TestBase(output)
@@ -116,4 +118,34 @@ public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
         Assert.Equal(3, await numericUpDown.GetMinimum());
         Assert.Equal(3, await numericUpDown.GetMaximum());
     }
+
+    [Fact]
+    [Description("Issue 3654")]
+    public async Task InternalTextBoxIsFocused_WhenGettingKeyboardFocus()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        // Arrange
+        var stackPanel = await LoadXaml<StackPanel>("""
+        <StackPanel>
+          <TextBox />
+          <materialDesign:NumericUpDown />
+        </StackPanel>
+        """);
+
+        var textBox = await stackPanel.GetElement<TextBox>("/TextBox");
+        var part_textBox = await stackPanel.GetElement<TextBox>("PART_TextBox");
+
+        // Act
+        await textBox.MoveKeyboardFocus();
+        await Task.Delay(50);
+        await textBox.SendInput(new KeyboardInput(Key.Tab));
+        await Task.Delay(50);
+
+        // Assert
+        Assert.False(await textBox.GetIsFocused());
+        Assert.True(await part_textBox.GetIsFocused());
+
+        recorder.Success();
+    }
 }