From 004dd98cbb3bc3897913cb95ca61b18474ade51d Mon Sep 17 00:00:00 2001
From: qinware <qinware@163.com>
Date: Fri, 8 Aug 2025 16:23:16 +0800
Subject: [PATCH] Refactor ComboBox dark theme

---
 .../Themes/ArrowDecoratedBoxTheme.axaml       |  2 +-
 src/AtomUI.Controls/ComboBox/ComboBox.cs      | 41 +++++++++++--------
 .../ComboBox/ComboBoxReflectionExtensions.cs  | 23 +++++++++++
 src/AtomUI.Controls/ComboBox/ComboBoxToken.cs |  3 +-
 .../ComboBox/Themes/ComboBoxTheme.axaml       |  2 +-
 .../Themes/MenuFlyoutPresenterTheme.axaml     |  2 +-
 src/AtomUI.Controls/Menu/MenuToken.cs         |  3 +-
 .../Menu/Themes/MenuTheme.axaml               |  2 +-
 src/AtomUI.Controls/Popup/Popup.cs            |  8 +++-
 src/AtomUI.Controls/Segmented/Segmented.cs    |  3 +-
 src/AtomUI.Controls/Tag/Tag.cs                | 24 +++++------
 src/AtomUI.IconPkg/Icon.cs                    |  2 +
 .../Styling/DarkThemeVariantCalculator.cs     |  4 ++
 13 files changed, 80 insertions(+), 39 deletions(-)
 create mode 100644 src/AtomUI.Controls/ComboBox/ComboBoxReflectionExtensions.cs

diff --git a/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxTheme.axaml b/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxTheme.axaml
index 8571f7c00..fcf3e8d85 100644
--- a/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxTheme.axaml
+++ b/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxTheme.axaml
@@ -40,7 +40,7 @@
     <Style Selector="^:is(atom|ArrowDecoratedBox)">
         <Setter Property="IsMotionEnabled" Value="{DynamicResource {x:Static atom:SharedTokenKey.EnableMotion}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorText}}" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBgContainer}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBgElevated}}" />
         <Setter Property="MinHeight" Value="{DynamicResource {x:Static atom:SharedTokenKey.ControlHeight}}" />
         <Setter Property="Padding" Value="{DynamicResource {x:Static atom:ArrowDecoratedBoxTokenKey.Padding}}" />
         <Setter Property="ArrowSize" Value="{DynamicResource {x:Static atom:ArrowDecoratedBoxTokenKey.ArrowSize}}" />
diff --git a/src/AtomUI.Controls/ComboBox/ComboBox.cs b/src/AtomUI.Controls/ComboBox/ComboBox.cs
index a2acb9ded..d645c34b8 100644
--- a/src/AtomUI.Controls/ComboBox/ComboBox.cs
+++ b/src/AtomUI.Controls/ComboBox/ComboBox.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Diagnostics;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 using Avalonia.Layout;
 
 namespace AtomUI.Controls;
@@ -161,7 +162,6 @@ public class ComboBox : AvaloniaComboBox,
     #endregion
     
     private Popup? _popup;
-    private IconButton? _openIndicatorButton;
 
     static ComboBox()
     {
@@ -177,25 +177,23 @@ public class ComboBox : AvaloniaComboBox,
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
+        this.SetPopup(null); // 情况父类，方式鼠标点击的错误处理
         _popup               = e.NameScope.Find<Popup>(ComboBoxThemeConstants.PopupPart);
-        _openIndicatorButton = e.NameScope.Find<IconButton>(ComboBoxThemeConstants.OpenIndicatorButtonPart);
-
-        if (_openIndicatorButton is not null)
-        {
-            _openIndicatorButton.Click += (sender, args) => { SetCurrentValue(IsDropDownOpenProperty, true); };
-        }
         var spinnerHandle = e.NameScope.Find<ComboBoxSpinnerInnerBox>(ComboBoxThemeConstants.SpinnerInnerBoxPart);
         if (spinnerHandle?.SpinnerContent is ComboBoxHandle handle)
         {
-            handle.HandleClick += (sender, args) =>
-            {
-                SetCurrentValue(IsDropDownOpenProperty, !IsDropDownOpen);
-            };
+            handle.HandleClick += HandleOpenPopupClicked;
         }
         if (_popup is IPopupHostProvider popupHostProvider)
         {
             popupHostProvider.PopupHostChanged += HandlePopupHostChanged;
         }
+        UpdatePseudoClasses();
+    }
+
+    private void HandleOpenPopupClicked(object? sender, EventArgs e)
+    {
+        SetCurrentValue(IsDropDownOpenProperty, !IsDropDownOpen);
     }
     
     private void HandlePopupHostChanged(IPopupHost? host)
@@ -212,12 +210,6 @@ public class ComboBox : AvaloniaComboBox,
         }
     }
 
-    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        base.OnAttachedToVisualTree(e);
-        UpdatePseudoClasses();
-    }
-
     protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
     {
         base.PrepareContainerForItemOverride(container, item, index);
@@ -237,6 +229,21 @@ public class ComboBox : AvaloniaComboBox,
             UpdatePseudoClasses();
         }
     }
+    
+    protected override void OnPointerReleased(PointerReleasedEventArgs e)
+    {
+        if (!e.Handled && e.Source is Visual source)
+        {
+            if (_popup?.IsInsidePopup(source) == true)
+            {
+                if (UpdateSelectionFromEventSource(e.Source))
+                {
+                    e.Handled = true;
+                }
+            }
+        }
+        base.OnPointerReleased(e);
+    }
 
     private void UpdatePseudoClasses()
     {
diff --git a/src/AtomUI.Controls/ComboBox/ComboBoxReflectionExtensions.cs b/src/AtomUI.Controls/ComboBox/ComboBoxReflectionExtensions.cs
new file mode 100644
index 000000000..4f5cfee14
--- /dev/null
+++ b/src/AtomUI.Controls/ComboBox/ComboBoxReflectionExtensions.cs
@@ -0,0 +1,23 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using AtomUI.Reflection;
+
+using AvaloniaComboBox = Avalonia.Controls.ComboBox;
+
+namespace AtomUI.Controls;
+
+internal static class ComboBoxReflectionExtensions
+{
+    #region 反射信息定义
+    [DynamicDependency(DynamicallyAccessedMemberTypes.NonPublicFields, typeof(AvaloniaComboBox))]
+    private static readonly Lazy<FieldInfo> PopupFieldInfo = new Lazy<FieldInfo>(() => 
+        typeof(AvaloniaComboBox).GetFieldInfoOrThrow("_popup",
+            BindingFlags.Instance | BindingFlags.NonPublic));
+    #endregion
+    
+    public static void SetPopup(this AvaloniaComboBox comboBox, Popup? popup)
+    {
+        PopupFieldInfo.Value.SetValue(comboBox, popup);
+    }
+
+}
\ No newline at end of file
diff --git a/src/AtomUI.Controls/ComboBox/ComboBoxToken.cs b/src/AtomUI.Controls/ComboBox/ComboBoxToken.cs
index 667f4698c..c894035b4 100644
--- a/src/AtomUI.Controls/ComboBox/ComboBoxToken.cs
+++ b/src/AtomUI.Controls/ComboBox/ComboBoxToken.cs
@@ -95,7 +95,7 @@ internal class ComboBoxToken : ButtonSpinnerToken
         
         var colorTextDisabled  = SharedToken.ColorTextDisabled;
         var colorTextSecondary = SharedToken.ColorTextSecondary;
-        var colorBgContainer   = SharedToken.ColorBgContainer;
+        var colorBgContainer   = SharedToken.ColorBgElevated;
         var colorBgTextHover   = SharedToken.ColorBgTextHover;
 
         ItemColor         = colorTextSecondary;
@@ -105,7 +105,6 @@ internal class ComboBoxToken : ButtonSpinnerToken
         ItemBgColor         = colorBgContainer;
         ItemHoverBgColor    = colorBgTextHover;
         ItemSelectedBgColor = SharedToken.ControlItemBgActive;
-
         ItemDisabledColor = colorTextDisabled;
 
         ItemPadding = new Thickness(SharedToken.UniformlyPaddingSM, 0);
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml
index 187224856..64f71dea7 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml
+++ b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml
@@ -100,7 +100,7 @@
             <Setter Property="MaskShadows" Value="{DynamicResource {x:Static atom:ComboBoxTokenKey.PopupBoxShadows}}"/>
         </Style>
         <Style Selector="^ /template/ Border#PART_PopupFrame">
-            <Setter Property="Background" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBgContainer}}"/>
+            <Setter Property="Background" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBgElevated}}"/>
             <Setter Property="CornerRadius" Value="{DynamicResource {x:Static atom:ComboBoxTokenKey.PopupBorderRadius}}"/>
             <Setter Property="Padding" Value="{DynamicResource {x:Static atom:ComboBoxTokenKey.PopupContentPadding}}"/>
         </Style>
diff --git a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml
index dd5dec34c..217162305 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml
+++ b/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml
@@ -20,7 +20,7 @@
     </Setter>
 
     <Style Selector="^:is(atom|MenuFlyoutPresenter)">
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBgElevated}}" />
         <Setter Property="CornerRadius" Value="{DynamicResource {x:Static atom:MenuTokenKey.MenuPopupBorderRadius}}" />
         <Setter Property="IsMotionEnabled" Value="{DynamicResource {x:Static atom:SharedTokenKey.EnableMotion}}" />
 
diff --git a/src/AtomUI.Controls/Menu/MenuToken.cs b/src/AtomUI.Controls/Menu/MenuToken.cs
index bc3ae6e97..695cd4e6d 100644
--- a/src/AtomUI.Controls/Menu/MenuToken.cs
+++ b/src/AtomUI.Controls/Menu/MenuToken.cs
@@ -250,7 +250,6 @@ internal class MenuToken : AbstractControlDesignToken
         var colorTextSecondary = SharedToken.ColorTextQuaternary;
         var colorBgContainer   = SharedToken.ColorBgContainer;
         var colorBgTextHover   = SharedToken.ColorBgTextHover;
-        var colorBgElevated    = SharedToken.ColorBgElevated;
         var padding            = SharedToken.UniformlyPadding;
         var controlHeight      = SharedToken.ControlHeight;
         var controlHeightSM    = SharedToken.ControlHeightSM;
@@ -275,7 +274,7 @@ internal class MenuToken : AbstractControlDesignToken
         DangerItemHoverColor = colorError;
 
         ItemHeight  = controlHeightSM;
-        MenuBgColor = colorBgElevated;
+        MenuBgColor = SharedToken.ColorBgContainer;
 
         ItemPaddingInline       = new Thickness(padding, SharedToken.UniformlyPaddingXXS);
         ItemIconSize            = SharedToken.IconSize;
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml b/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml
index d87ad533a..35826c3b7 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml
@@ -26,7 +26,7 @@
             </ControlTemplate>
         </Setter>
 
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="IsMotionEnabled" Value="{DynamicResource {x:Static atom:SharedTokenKey.EnableMotion}}" />
         <Setter Property="Background" Value="{DynamicResource {x:Static atom:MenuTokenKey.MenuBgColor}}" />
         <Setter Property="BorderBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBorder}}" />
diff --git a/src/AtomUI.Controls/Popup/Popup.cs b/src/AtomUI.Controls/Popup/Popup.cs
index a365d37a7..1ca7d33a1 100644
--- a/src/AtomUI.Controls/Popup/Popup.cs
+++ b/src/AtomUI.Controls/Popup/Popup.cs
@@ -653,13 +653,19 @@ public class Popup : AvaloniaPopup,
             return;
         }
         
+        // 防止干扰
+        if (!popupRoot.IsVisible)
+        {
+            return;
+        }
+        
         using (BeginIgnoringIsOpen())
         {
             SetCurrentValue(IsMotionAwareOpenProperty, false);
         }
         
         _closeAnimating    = true;
-        
+
         var shadowAwareLayer = _buddyLayer as IShadowAwareLayer;
         Debug.Assert(shadowAwareLayer != null);
         
diff --git a/src/AtomUI.Controls/Segmented/Segmented.cs b/src/AtomUI.Controls/Segmented/Segmented.cs
index c9f87fa4a..dd46ec90a 100644
--- a/src/AtomUI.Controls/Segmented/Segmented.cs
+++ b/src/AtomUI.Controls/Segmented/Segmented.cs
@@ -144,8 +144,9 @@ public class Segmented : SelectingItemsControl,
         {
             SelectedIndex = 0;
         }
-
+        
         SetupSelectedThumbRect();
+        ConfigureTransitions();
     }
     
     private void HandleSelectionChanged(object? sender, SelectionChangedEventArgs args)
diff --git a/src/AtomUI.Controls/Tag/Tag.cs b/src/AtomUI.Controls/Tag/Tag.cs
index 611ce64f3..1c0e278ca 100644
--- a/src/AtomUI.Controls/Tag/Tag.cs
+++ b/src/AtomUI.Controls/Tag/Tag.cs
@@ -47,24 +47,24 @@ public class Tag : TemplatedControl,
 {
     #region 公共属性定义
 
-    public static readonly StyledProperty<string?> TagColorProperty
-        = AvaloniaProperty.Register<Tag, string?>(
+    public static readonly StyledProperty<string?> TagColorProperty =
+        AvaloniaProperty.Register<Tag, string?>(
             nameof(Color));
 
-    public static readonly StyledProperty<bool> IsClosableProperty
-        = AvaloniaProperty.Register<Tag, bool>(nameof(IsClosable));
+    public static readonly StyledProperty<bool> IsClosableProperty =
+        AvaloniaProperty.Register<Tag, bool>(nameof(IsClosable));
 
-    public static readonly StyledProperty<bool> BorderedProperty
-        = AvaloniaProperty.Register<Tag, bool>(nameof(Bordered), true);
+    public static readonly StyledProperty<bool> BorderedProperty =
+        AvaloniaProperty.Register<Tag, bool>(nameof(Bordered), true);
 
-    public static readonly StyledProperty<Icon?> IconProperty
-        = AvaloniaProperty.Register<Tag, Icon?>(nameof(Icon));
+    public static readonly StyledProperty<Icon?> IconProperty =
+        AvaloniaProperty.Register<Tag, Icon?>(nameof(Icon));
 
-    public static readonly StyledProperty<Icon?> CloseIconProperty
-        = AvaloniaProperty.Register<Tag, Icon?>(nameof(CloseIcon));
+    public static readonly StyledProperty<Icon?> CloseIconProperty =
+        AvaloniaProperty.Register<Tag, Icon?>(nameof(CloseIcon));
 
-    public static readonly StyledProperty<string?> TagTextProperty
-        = AvaloniaProperty.Register<Tag, string?>(
+    public static readonly StyledProperty<string?> TagTextProperty =
+        AvaloniaProperty.Register<Tag, string?>(
             nameof(TagText));
 
     public string? TagColor
diff --git a/src/AtomUI.IconPkg/Icon.cs b/src/AtomUI.IconPkg/Icon.cs
index 719fa17f1..d31f494a7 100644
--- a/src/AtomUI.IconPkg/Icon.cs
+++ b/src/AtomUI.IconPkg/Icon.cs
@@ -1,5 +1,6 @@
 using AtomUI.Animations;
 using AtomUI.Controls;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;
@@ -191,6 +192,7 @@ public class Icon : Control, ICustomHitTest, IMotionAwareControl
         RenderTransform       = new RotateTransform();
         _sourceGeometriesData = new List<Geometry>();
         _transforms           = new List<Matrix>();
+        this.ConfigureMotionBindingStyle();
     }
 
     private void ConfigureTransitions()
diff --git a/src/AtomUI.Theme/Styling/DarkThemeVariantCalculator.cs b/src/AtomUI.Theme/Styling/DarkThemeVariantCalculator.cs
index 116a709bf..030ff83ff 100644
--- a/src/AtomUI.Theme/Styling/DarkThemeVariantCalculator.cs
+++ b/src/AtomUI.Theme/Styling/DarkThemeVariantCalculator.cs
@@ -34,6 +34,10 @@ public class DarkThemeVariantCalculator : AbstractThemeVariantCalculator
         // Dark tokens
         SetupColorPalettes(designToken);
         CalculateColorMapTokenValues(designToken);
+        // Customize selected item background color
+        // https://github.com/ant-design/ant-design/issues/30524#issuecomment-871961867
+        designToken.ColorPrimaryBg      = designToken.ColorPrimaryBorder;
+        designToken.ColorPrimaryBgHover = designToken.ColorPrimaryBorderHover;
     }
 
     protected override ColorMap GenerateColorPalettes(Color baseColor)