From 0173ee7c9cbdd974409fe9d340dc1d7927c21aac Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Tue, 16 Sep 2025 19:20:02 +0800
Subject: [PATCH] feat: implement inner content interface.

---
 .../Pages/MultiAutoCompleteBoxDemo.axaml      |  4 +-
 .../MultiAutoCompleteBoxDemoViewModel.cs      | 10 +--
 .../Controls/MultiAutoCompleteBox.axaml       | 70 +++++++++++++------
 .../MultiAutoCompleteBox.Properties.cs        | 20 +++++-
 .../AutoCompleteBox/MultiAutoCompleteBox.cs   |  2 +-
 5 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml b/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml
index 98f8db5..80ed76f 100644
--- a/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml
+++ b/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml
@@ -7,9 +7,11 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:MultiAutoCompleteBoxDemoViewModel"
              x:Class="Ursa.Demo.Pages.MultiAutoCompleteBoxDemo">
-    <StackPanel Spacing="20">
+    <StackPanel Spacing="20" HorizontalAlignment="Left">
         <TextBlock Text="Multi-AutoCompleteBox"/>
         <u:MultiAutoCompleteBox ItemsSource="{Binding Items}" 
+                                MaxWidth="400"
+                                InnerLeftContent="Controls"
                                 SelectedItems="{Binding SelectedItems}"
                                 ItemFilter="{Binding FilterPredicate }"
                                 FilterMode="Custom">
diff --git a/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs
index d9cf138..e8cfa31 100644
--- a/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -82,12 +83,13 @@ public class MultiAutoCompleteBoxDemoViewModel: ObservableObject
     {
         if (text is null) return true;
         if (data is not ControlData control) return false;
-        return control.MenuHeader.Contains(text )|| control.Chinese.Contains(text);
+        return control.MenuHeader.Contains(text, StringComparison.InvariantCultureIgnoreCase) ||
+               control.Chinese.Contains(text, StringComparison.InvariantCultureIgnoreCase);
     }
 }
 
 public class ControlData
 {
-    public string MenuHeader { get; set; }
-    public string Chinese { get; set; }
+    public required string MenuHeader { get; init; }
+    public required string Chinese { get; init; }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml
index 0e7a22b..b406c69 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml
@@ -12,27 +12,47 @@
                     <Border
                         Name="PART_RootBorder"
                         MinHeight="30"
-                        Padding="{DynamicResource TextBoxContentPadding}"
                         VerticalAlignment="Stretch"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         Background="{DynamicResource TextBoxDefaultBackground}"
                         BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}">
-                        <u:MultiComboBoxSelectedItemList 
-                            Name="{x:Static u:MultiAutoCompleteBox.PART_SelectedItemsControl}"
-                            VerticalAlignment="Center"
-                            RemoveCommand="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Remove}"
-                            ItemTemplate="{TemplateBinding SelectedItemTemplate}"
-                            ItemsSource="{TemplateBinding SelectedItems}" >
-                            <u:MultiComboBoxSelectedItemList.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <u:WrapPanelWithTrailingItem>
-                                        <u:WrapPanelWithTrailingItem.TrailingItem>
-                                            <TextBox VerticalAlignment="Center" Theme="{DynamicResource TagInputTextBoxTheme}"/>
-                                        </u:WrapPanelWithTrailingItem.TrailingItem>
-                                    </u:WrapPanelWithTrailingItem>
-                                </ItemsPanelTemplate>
-                            </u:MultiComboBoxSelectedItemList.ItemsPanel>
-                        </u:MultiComboBoxSelectedItemList>
+                        <Grid ColumnDefinitions="Auto, *, Auto">
+                            <ContentPresenter
+                                Grid.Column="0"
+                                Margin="8,0"
+                                IsHitTestVisible="False"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding InnerLeftContent}"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{TemplateBinding InnerLeftContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <u:MultiComboBoxSelectedItemList
+                                Grid.Column="1"
+                                Name="{x:Static u:MultiAutoCompleteBox.PART_SelectedItemsControl}"
+                                VerticalAlignment="Center"
+                                RemoveCommand="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Remove}"
+                                ItemTemplate="{TemplateBinding SelectedItemTemplate}"
+                                ItemsSource="{TemplateBinding SelectedItems}" >
+                                <u:MultiComboBoxSelectedItemList.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <u:WrapPanelWithTrailingItem>
+                                            <u:WrapPanelWithTrailingItem.TrailingItem>
+                                                <TextBox VerticalAlignment="Center" Theme="{DynamicResource TagInputTextBoxTheme}"/>
+                                            </u:WrapPanelWithTrailingItem.TrailingItem>
+                                        </u:WrapPanelWithTrailingItem>
+                                    </ItemsPanelTemplate>
+                                </u:MultiComboBoxSelectedItemList.ItemsPanel>
+                            </u:MultiComboBoxSelectedItemList>
+                            <ContentPresenter
+                                Grid.Column="2"
+                                Margin="8,0"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False"
+                                Content="{TemplateBinding InnerRightContent}"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{TemplateBinding InnerRightContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
+                        </Grid>
                     </Border>
                     <Popup
                         Name="PART_Popup"
@@ -49,12 +69,16 @@
                             BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
                             BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
                             CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-                            <ListBox
-                                Name="PART_SelectingItemsControl"
-                                Foreground="{TemplateBinding Foreground}"
-                                ItemTemplate="{TemplateBinding ItemTemplate}"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                            <DockPanel LastChildFill="True">
+                                <ContentPresenter Content="{TemplateBinding PopupInnerTopContent}" DockPanel.Dock="Top" />
+                                <ContentPresenter Content="{TemplateBinding PopupInnerBottomContent}" DockPanel.Dock="Bottom" />
+                                <ListBox
+                                    Name="PART_SelectingItemsControl"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                            </DockPanel>
                         </Border>
                     </Popup>
                 </Panel>
diff --git a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs
index 2736134..a4c249b 100644
--- a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs
+++ b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs
@@ -511,5 +511,23 @@ public partial class MultiAutoCompleteBox
         {
             get => GetValue(InnerRightContentProperty);
             set => SetValue(InnerRightContentProperty, value);
-        }      
+        }
+        
+        public static readonly StyledProperty<object?> PopupInnerTopContentProperty = AvaloniaProperty.Register<MultiAutoCompleteBox, object?>(
+            nameof(PopupInnerTopContent));
+
+        public object? PopupInnerTopContent
+        {
+            get => GetValue(PopupInnerTopContentProperty);
+            set => SetValue(PopupInnerTopContentProperty, value);
+        }
+
+        public static readonly StyledProperty<object?> PopupInnerBottomContentProperty = AvaloniaProperty.Register<MultiAutoCompleteBox, object?>(
+            nameof(PopupInnerBottomContent));
+
+        public object? PopupInnerBottomContent
+        {
+            get => GetValue(PopupInnerBottomContentProperty);
+            set => SetValue(PopupInnerBottomContentProperty, value);
+        }
     }
\ No newline at end of file
diff --git a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs
index c5b8030..829ccd0 100644
--- a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs
+++ b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs
@@ -30,7 +30,7 @@ namespace Ursa.Controls;
 [TemplatePart(ElementSelectionAdapter, typeof(ISelectionAdapter))]
 [TemplatePart(ElementTextBox, typeof(TextBox))]
 [PseudoClasses(":dropdownopen")]
-public partial class MultiAutoCompleteBox : TemplatedControl, IInnerContentControl
+public partial class MultiAutoCompleteBox : TemplatedControl, IInnerContentControl, IPopupInnerContent
 {
     /// <summary>
     ///     Specifies the name of the selection adapter TemplatePart.