From 976ddc4a5e3c01afeca0ec18ff21081c2b171f62 Mon Sep 17 00:00:00 2001
From: Samuel Bergeron-Drouin <sbergerondrouin@devolutions.net>
Date: Mon, 18 Aug 2025 15:08:42 -0400
Subject: [PATCH] Fix MultiComboBox to works with items added in axaml

---
 demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml | 71 ++++++++++++--------
 src/Ursa/Controls/ComboBox/MultiComboBox.cs  |  8 +++
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml
index c7b29c7..7b4dce5 100644
--- a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml
+++ b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml
@@ -11,37 +11,52 @@
     x:CompileBindings="True"
     x:DataType="vm:MultiComboBoxDemoViewModel"
     mc:Ignorable="d">
-    <StackPanel Orientation="Horizontal">
+    <StackPanel Orientation="Vertical" Spacing="10">
+        <TextBlock>Binded ItemsSource</TextBlock>
+        <StackPanel Orientation="Horizontal">
+            <u:MultiComboBox
+                Watermark="Please Select"
+                Width="300"
+                MaxHeight="200"
+                SelectedItems="{Binding SelectedItems}"
+                ItemsSource="{Binding Items}" >
+            </u:MultiComboBox>
+            
+            <u:MultiComboBox
+                Name="combo"
+                Watermark="Please Select"
+                Width="300"
+                InnerLeftContent="Left"
+                InnerRightContent="Right"
+                Classes="ClearButton"
+                MaxHeight="200"
+                SelectedItems="{Binding SelectedItems}"
+                ItemsSource="{Binding Items}" >
+                <u:MultiComboBox.PopupInnerTopContent>
+                    <StackPanel Margin="0" Orientation="Horizontal">
+                        <Button Theme="{DynamicResource BorderlessButton}" Content="Select All" Command="{Binding SelectAllCommand}"/>
+                        <Button Theme="{DynamicResource BorderlessButton}" Content="Unselect All" Command="{Binding ClearAllCommand}"/>
+                        <Button Theme="{DynamicResource BorderlessButton}" Content="Inverse" Command="{Binding InvertSelectionCommand}"/>
+                    </StackPanel>
+                </u:MultiComboBox.PopupInnerTopContent>
+                <u:MultiComboBox.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuItem Header="Select All" Command="{Binding SelectAllCommand}"/>
+                    </MenuFlyout>
+                </u:MultiComboBox.ContextFlyout>
+            </u:MultiComboBox>
+            
+            <ListBox ItemsSource="{Binding SelectedItems}" />
+        </StackPanel>
+        
+        <TextBlock>Items inside axaml (u:MultiComboBox's tag content)</TextBlock>
         <u:MultiComboBox
             Watermark="Please Select"
             Width="300"
-            MaxHeight="200"
-            SelectedItems="{Binding SelectedItems}"
-            ItemsSource="{Binding Items}" >
+            MaxHeight="200">
+            <u:MultiComboBoxItem>option 1</u:MultiComboBoxItem>
+            <u:MultiComboBoxItem>option 2</u:MultiComboBoxItem>
+            <u:MultiComboBoxItem>option 3</u:MultiComboBoxItem>
         </u:MultiComboBox>
-        <u:MultiComboBox
-            Name="combo"
-            Watermark="Please Select"
-            Width="300"
-            InnerLeftContent="Left"
-            InnerRightContent="Right"
-            Classes="ClearButton"
-            MaxHeight="200"
-            SelectedItems="{Binding SelectedItems}"
-            ItemsSource="{Binding Items}" >
-            <u:MultiComboBox.PopupInnerTopContent>
-                <StackPanel Margin="0" Orientation="Horizontal">
-                    <Button Theme="{DynamicResource BorderlessButton}" Content="Select All" Command="{Binding SelectAllCommand}"/>
-                    <Button Theme="{DynamicResource BorderlessButton}" Content="Unselect All" Command="{Binding ClearAllCommand}"/>
-                    <Button Theme="{DynamicResource BorderlessButton}" Content="Inverse" Command="{Binding InvertSelectionCommand}"/>
-                </StackPanel>
-            </u:MultiComboBox.PopupInnerTopContent>
-            <u:MultiComboBox.ContextFlyout>
-                <MenuFlyout>
-                    <MenuItem Header="Select All" Command="{Binding SelectAllCommand}"/>
-                </MenuFlyout>
-            </u:MultiComboBox.ContextFlyout>
-        </u:MultiComboBox>
-        <ListBox ItemsSource="{Binding SelectedItems}" />
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa/Controls/ComboBox/MultiComboBox.cs b/src/Ursa/Controls/ComboBox/MultiComboBox.cs
index eb7fee8..0107d3f 100644
--- a/src/Ursa/Controls/ComboBox/MultiComboBox.cs
+++ b/src/Ursa/Controls/ComboBox/MultiComboBox.cs
@@ -178,6 +178,14 @@ public class MultiComboBox : SelectingItemsControl, IInnerContentControl, IPopup
     {
         return new MultiComboBoxItem();
     }
+    
+    protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
+    {
+        if (item is MultiComboBoxItem containerItem)
+        {
+            container.DataContext = containerItem.Content;
+        }
+    }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {