Merge branch 'main' into winui

# Conflicts:
#	CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPicker.cs
#	CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPicker.xaml
#	CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPickerButton.cs

Author: azchohfi

CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPicker.cs

@@ -16,6 +16,7 @@
 using Microsoft.UI.Xaml.Media;
 using Windows.UI;
 using ColorPickerSlider = CommunityToolkit.WinUI.UI.Controls.Primitives.ColorPickerSlider;
+using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
 
 namespace CommunityToolkit.WinUI.UI.Controls
 {

CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPicker.xaml

@@ -4,7 +4,8 @@
                     xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
                     xmlns:localconverters="using:CommunityToolkit.WinUI.UI.Controls.ColorPickerConverters"
                     xmlns:primitives="using:CommunityToolkit.WinUI.UI.Controls.Primitives"
-                    xmlns:ui="using:CommunityToolkit.WinUI.UI">
+                    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+                    xmlns:winuiprimitives="using:Microsoft.UI.Xaml.Controls.Primitives">
 
     <SolidColorBrush x:Key="CheckerboardColor0">
         <SolidColorBrush.Color>
@@ -120,23 +121,23 @@
                                                       Orientation="Vertical" />
                         <!--  Keep in mind the spectrum is always HSV  -->
                         <!--  This must also not be named 'ColorSpectrum' to differentiate from the base class  -->
-                        <ColorSpectrum x:Name="ColorSpectrumControl"
-                                       Grid.Row="0"
-                                       Grid.RowSpan="2"
-                                       Grid.Column="1"
-                                       MinWidth="256"
-                                       MinHeight="256"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       AutomationProperties.Name="Third Dimension"
-                                       Components="{TemplateBinding ColorSpectrumComponents}"
-                                       MaxHue="{TemplateBinding MaxHue}"
-                                       MaxSaturation="{TemplateBinding MaxSaturation}"
-                                       MaxValue="{TemplateBinding MaxValue}"
-                                       MinHue="{TemplateBinding MinHue}"
-                                       MinSaturation="{TemplateBinding MinSaturation}"
-                                       MinValue="{TemplateBinding MinValue}"
-                                       Shape="{TemplateBinding ColorSpectrumShape}" />
+                        <winuiprimitives:ColorSpectrum x:Name="ColorSpectrumControl"
+                                                       Grid.Row="0"
+                                                       Grid.RowSpan="2"
+                                                       Grid.Column="1"
+                                                       MinWidth="256"
+                                                       MinHeight="256"
+                                                       HorizontalAlignment="Stretch"
+                                                       VerticalAlignment="Stretch"
+                                                       AutomationProperties.Name="Third Dimension"
+                                                       Components="{TemplateBinding ColorSpectrumComponents}"
+                                                       MaxHue="{TemplateBinding MaxHue}"
+                                                       MaxSaturation="{TemplateBinding MaxSaturation}"
+                                                       MaxValue="{TemplateBinding MaxValue}"
+                                                       MinHue="{TemplateBinding MinHue}"
+                                                       MinSaturation="{TemplateBinding MinSaturation}"
+                                                       MinValue="{TemplateBinding MinValue}"
+                                                       Shape="{TemplateBinding ColorSpectrumShape}" />
                         <primitives:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
                                                       Grid.Row="1"
                                                       Grid.RowSpan="2"

CommunityToolkit.WinUI.UI.Controls.Input/ColorPicker/ColorPickerButton.cs

@@ -140,7 +140,7 @@ protected override void OnApplyTemplate()
             }
         }
 
-        private void ColorPicker_ColorChanged(Microsoft.UI.Xaml.Controls.ColorPicker sender, ColorChangedEventArgs args)
+        private void ColorPicker_ColorChanged(Microsoft.UI.Xaml.Controls.ColorPicker sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
         {
             SelectedColor = args.NewColor;
         }

CommunityToolkit.WinUI.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs

@@ -145,14 +145,16 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size
             double availableWidth = availableSize.Width;
             double availableHeight = availableSize.Height;
 
-            double columnWidth = Math.Min(DesiredColumnWidth, availableWidth);
+            // This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
+            double columnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
             if (columnWidth != state.ColumnWidth)
             {
                 // The items will need to be remeasured
                 state.Clear();
             }
 
-            state.ColumnWidth = Math.Min(DesiredColumnWidth, availableWidth);
+            // This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
+            state.ColumnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
             int numColumns = Math.Max(1, (int)Math.Floor(availableWidth / state.ColumnWidth));
 
             // adjust for column spacing on all columns expect the first