Merge branch 'main' into winui

# Conflicts:
#	CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
#	CommunityToolkit.WinUI.UI.Controls.Primitives/ConstrainedBox/ConstrainedBox.Properties.cs
#	CommunityToolkit.WinUI.UI.Controls.Primitives/ConstrainedBox/ConstrainedBox.cs
#	Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
#	UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs
#	UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
#	UITests/UITests.Tests.Shared/UITestBase.cs
#	UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt
#	UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt
#	Windows Community Toolkit.sln
#	build/Windows.Toolkit.WinUI.Controls.targets

Author: azchohfi

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs

@@ -443,7 +443,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                     AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
                     AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))))
                 .AddAttributeLists(validationAttributes.Select(static a => AttributeList(SingletonSeparatedList(a))).ToArray())
-                .WithLeadingTrivia(leadingTrivia)
+                .WithLeadingTrivia(leadingTrivia.Where(static trivia => !trivia.IsKind(SyntaxKind.RegionDirectiveTrivia) && !trivia.IsKind(SyntaxKind.EndRegionDirectiveTrivia)))
                 .AddModifiers(Token(SyntaxKind.PublicKeyword))
                 .AddAccessorListAccessors(
                     AccessorDeclaration(SyntaxKind.GetAccessorDeclaration)
@@ -459,7 +459,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
         /// <param name="fieldSymbol">The input <see cref="IFieldSymbol"/> instance to process.</param>
         /// <returns>The generated property name for <paramref name="fieldSymbol"/>.</returns>
         [Pure]
-        private static string GetGeneratedPropertyName(IFieldSymbol fieldSymbol)
+        public static string GetGeneratedPropertyName(IFieldSymbol fieldSymbol)
         {
             string propertyName = fieldSymbol.Name;
 

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs

@@ -16,6 +16,8 @@
 using static CommunityToolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
+#pragma warning disable SA1008
+
 namespace CommunityToolkit.Mvvm.SourceGenerators
 {
     /// <summary>
@@ -46,8 +48,10 @@ public void Execute(GeneratorExecutionContext context)
                 context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
             }
 
-            // Get the symbol for the ValidationAttribute type
-            INamedTypeSymbol validationSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute")!;
+            // Get the symbol for the required attributes
+            INamedTypeSymbol
+                validationSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute")!,
+                observablePropertySymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservablePropertyAttribute")!;
 
             // Prepare the attributes to add to the first class declaration
             AttributeListSyntax[] classAttributes = new[]
@@ -145,14 +149,14 @@ public void Execute(GeneratorExecutionContext context)
                                 Parameter(Identifier("obj")).WithType(PredefinedType(Token(SyntaxKind.ObjectKeyword))))
                             .WithBody(Block(
                                 LocalDeclarationStatement(
-                                    VariableDeclaration(IdentifierName("var")) // Cannot Token(SyntaxKind.VarKeyword) here (throws an ArgumentException)
+                                    VariableDeclaration(IdentifierName("var")) // Cannot use Token(SyntaxKind.VarKeyword) here (throws an ArgumentException)
                                     .AddVariables(
                                         VariableDeclarator(Identifier("instance"))
                                         .WithInitializer(EqualsValueClause(
                                             CastExpression(
                                                 IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
                                                 IdentifierName("obj")))))))
-                                .AddStatements(EnumerateValidationStatements(classSymbol, validationSymbol).ToArray())),
+                                .AddStatements(EnumerateValidationStatements(classSymbol, validationSymbol, observablePropertySymbol).ToArray())),
                             ReturnStatement(IdentifierName("ValidateAllProperties")))))))
                     .NormalizeWhitespace()
                     .ToFullString();
@@ -166,28 +170,47 @@ public void Execute(GeneratorExecutionContext context)
         }
 
         /// <summary>
-        /// Gets a sequence of statements to validate declared properties.
+        /// Gets a sequence of statements to validate declared properties (including generated ones).
         /// </summary>
         /// <param name="classSymbol">The input <see cref="INamedTypeSymbol"/> instance to process.</param>
         /// <param name="validationSymbol">The type symbol for the <c>ValidationAttribute</c> type.</param>
+        /// <param name="observablePropertySymbol">The type symbol for the <c>ObservablePropertyAttribute</c> type.</param>
         /// <returns>The sequence of <see cref="StatementSyntax"/> instances to validate declared properties.</returns>
         [Pure]
-        private static IEnumerable<StatementSyntax> EnumerateValidationStatements(INamedTypeSymbol classSymbol, INamedTypeSymbol validationSymbol)
+        private static IEnumerable<StatementSyntax> EnumerateValidationStatements(INamedTypeSymbol classSymbol, INamedTypeSymbol validationSymbol, INamedTypeSymbol observablePropertySymbol)
         {
-            foreach (var propertySymbol in classSymbol.GetMembers().OfType<IPropertySymbol>())
+            foreach (var memberSymbol in classSymbol.GetMembers())
             {
-                if (propertySymbol.IsIndexer)
+                if (memberSymbol is not (IPropertySymbol { IsIndexer: false } or IFieldSymbol))
                 {
                     continue;
                 }
 
-                ImmutableArray<AttributeData> attributes = propertySymbol.GetAttributes();
+                ImmutableArray<AttributeData> attributes = memberSymbol.GetAttributes();
 
+                // Also include fields that are annotated with [ObservableProperty]. This is necessary because
+                // all generators run in an undefined order and looking at the same original compilation, so the
+                // current one wouldn't be able to see generated properties from other generators directly.
+                if (memberSymbol is IFieldSymbol &&
+                    !attributes.Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, observablePropertySymbol)))
+                {
+                    continue;
+                }
+
+                // Skip the current member if there are no validation attributes applied to it
                 if (!attributes.Any(a => a.AttributeClass?.InheritsFrom(validationSymbol) == true))
                 {
                     continue;
                 }
 
+                // Get the target property name either directly or matching the generated one
+                string propertyName = memberSymbol switch
+                {
+                    IPropertySymbol propertySymbol => propertySymbol.Name,
+                    IFieldSymbol fieldSymbol => ObservablePropertyGenerator.GetGeneratedPropertyName(fieldSymbol),
+                    _ => throw new InvalidOperationException("Invalid symbol type")
+                };
+
                 // This enumerator produces a sequence of statements as follows:
                 //
                 // __ObservableValidatorHelper.ValidateProperty(instance, instance.<PROPERTY_0>, nameof(instance.<PROPERTY_0>));
@@ -207,14 +230,14 @@ private static IEnumerable<StatementSyntax> EnumerateValidationStatements(INamed
                                 MemberAccessExpression(
                                     SyntaxKind.SimpleMemberAccessExpression,
                                     IdentifierName("instance"),
-                                    IdentifierName(propertySymbol.Name))),
+                                    IdentifierName(propertyName))),
                             Argument(
                                 InvocationExpression(IdentifierName("nameof"))
                                 .AddArgumentListArguments(Argument(
                                     MemberAccessExpression(
                                         SyntaxKind.SimpleMemberAccessExpression,
                                         IdentifierName("instance"),
-                                        IdentifierName(propertySymbol.Name)))))));
+                                        IdentifierName(propertyName)))))));
             }
         }
     }

CommunityToolkit.WinUI.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind

@@ -110,6 +110,7 @@
                 <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
                 <Setter Property="Width" Value="40" />
                 <Setter Property="Height" Value="40" />
+                <Setter Property="Padding" Value="4" />
                 <Setter Property="UseSystemFocusVisuals" Value="True" />
                 <Setter Property="HighContrastAdjustment" Value="None" />
                 <Setter Property="Template">
@@ -264,7 +265,7 @@
                         VerticalAlignment="Center"
                         Visibility="{Binding ShowDismissButton, ElementName=ExampleCustomInAppNotification}">
                       <Button.RenderTransform>
-                        <TranslateTransform x:Name="DismissButtonTransform" X="25" Y="-5"/>
+                        <TranslateTransform x:Name="DismissButtonTransform" X="20" Y="1"/>
                       </Button.RenderTransform>
                     </Button>
                   </Grid>

CommunityToolkit.WinUI.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs

@@ -89,7 +89,9 @@ public sealed partial class TokenizingTextBoxPage : Page, IXamlRenderListener
         private AdvancedCollectionView _acv;
         private AdvancedCollectionView _acvEmail;
 
-        private ObservableCollection<SampleEmailDataType> _selectedEmails;
+        public ObservableCollection<SampleDataType> SelectedTokens { get; set; }
+
+        public ObservableCollection<SampleEmailDataType> SelectedEmails { get; set; }
 
         public TokenizingTextBoxPage()
         {
@@ -111,7 +113,10 @@ public TokenizingTextBoxPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            _selectedEmails = new ObservableCollection<SampleEmailDataType>();
+            SelectedTokens = new();
+            SelectedEmails = new();
+
+            control.DataContext = this;
 
             if (_ttb != null)
             {
@@ -149,7 +154,6 @@ public void OnXamlRendered(FrameworkElement control)
             {
                 _ttbEmail = ttbEmail;
 
-                _ttbEmail.ItemsSource = _selectedEmails;
                 _ttbEmail.ItemClick += EmailTokenItemClick;
                 _ttbEmail.TokenItemAdding += EmailTokenItemAdding;
                 _ttbEmail.TokenItemAdded += EmailTokenItemAdded;

CommunityToolkit.WinUI.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind

@@ -37,6 +37,7 @@
       </TextBlock>
       <controls:TokenizingTextBox
           x:Name="TokenBox"
+          ItemsSource="{Binding SelectedTokens}"
           PlaceholderText="Add Actions"
           QueryIcon="{ui:SymbolIconSource Symbol=Setting}"
           MaxHeight="104"
@@ -65,14 +66,15 @@
         <Run>Current Edit: </Run>
         <Run Text="{Binding Text, ElementName=TokenBox}"/>
       </TextBlock>
-      <ItemsControl ItemsSource="{Binding ItemsSource, ElementName=TokenBox}"/>
+      <ItemsControl ItemsSource="{Binding SelectedTokens}"/>
     </StackPanel>
 
     <StackPanel Grid.Row="1">
       <TextBlock FontSize="32" Text="Select Email Addresses"
                  Margin="0,0,0,4"/>
       <controls:TokenizingTextBox
             x:Name="TokenBoxEmail"
+            ItemsSource="{Binding SelectedEmails}"
             PlaceholderText="Select Names"
             MaxHeight="104"
             HorizontalAlignment="Stretch"

CommunityToolkit.WinUI.UI.Behaviors/CommunityToolkit.WinUI.UI.Behaviors.csproj

@@ -9,15 +9,16 @@
     <Title>Windows Community Toolkit - UI Behaviors</Title>
     <Description>
       This library provides UI behaviors built on the XAML behaviors SDK. It is a part of the Windows Community Toolkit.
-
-      Behaviors:
-      - BehaviorBase: Helper for building Behaviors
+      
+      - Animation: Various helpers for integration with the Toolkit's Animation package.
       - AutoFocusBehevior: Sets focus to the associated control.
-      - FocusBehavior: Sets focus to a specified control.
-      - ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport
+      - AutoSelectBehavior: Selects a TextBox's text automatically.
       - FadeHeaderBehavior, QuickReturnHeaderBehavior, StickyHeaderBehavior: Helpers for ListViewBase Header Behavior
+      - FocusBehavior: Sets focus to a specified control.
+      - KeyDownTriggerBehavior: Trigger behaviors when a key is pressed.
+      - ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport      
     </Description>
-    <PackageTags>UI;XAML;Behaviors;Interactivity;Interaction;Focus;Header;Viewport</PackageTags>
+    <PackageTags>UI;XAML;Behaviors;Interactivity;Interaction;Focus;Header;Viewport;Selection;Focus;KeyDown;Triggers;Viewport</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>

CommunityToolkit.WinUI.UI.Controls.Core/CommunityToolkit.WinUI.UI.Controls.Core.csproj

@@ -16,6 +16,7 @@
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
+        - MetadataControl: Control for organizing text based categories with a separator, supports commands.
         - RadialProgressBar: Displays progress as a circle getting filled.
         - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
         - TabbedCommandBar: A command bar that organizes features of an application into a series of tabs.
@@ -29,6 +30,7 @@
         Image;Ex           ;ImageEx          ;
         In;App;Notification;InAppNotification;InApp       ;
         Loading            ;
+        Metadata;Tags;
         Radial;Progress;Bar;RadialProgressBar;ProgressBar ;
         Rotator;Tile       ;RotatorTile      ;
         Tabbed;Command;Bar ;TabbedCommandBar ;CommandBar  ;

CommunityToolkit.WinUI.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml

@@ -43,6 +43,7 @@
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
         <Setter Property="Width" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
         <Setter Property="Height" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
+        <Setter Property="Padding" Value="4" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="HighContrastAdjustment" Value="None" />
         <Setter Property="Template">
@@ -150,9 +151,10 @@
                         FontFamily="Segoe MDL2 Assets"
                         FontSize="12"
                         VerticalAlignment="Top"
+                        Padding="4"
                         Style="{StaticResource DismissTextBlockButtonStyle}">
                     <Button.RenderTransform>
-                        <TranslateTransform x:Name="DismissButtonTransform" X="25" Y="-5"/>
+                        <TranslateTransform x:Name="DismissButtonTransform" X="20" Y="1"/>
                     </Button.RenderTransform>
                 </Button>
             </Grid>

CommunityToolkit.WinUI.UI.Controls.Input/CommunityToolkit.WinUI.UI.Controls.Input.csproj

@@ -15,6 +15,7 @@
         - RadialGauge: Displays a value within a range, using a needle on a circular face.
         - RangeSelector: "Double slider" control for range values.
         - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
+        - RichSuggestBox: RichEditBox which supports at mentioning or tags.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
     <PackageTags>
@@ -23,6 +24,7 @@
         Radial;Gauge        ;RadialGauge       ;
         Range;Selector      ;RangeSelector     ;
         Remote;Device;Picker;RemoteDevicePicker;DevicePicker;RemoteDevice;
+        RichEditBox;RichSuggestBox;Suggestions;Mentions;Tags;
         Tokenizing;Text;Box ;TokenizingTextBox ;TextBox     ;
     </PackageTags>
   </PropertyGroup>

CommunityToolkit.WinUI.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs

@@ -163,6 +163,7 @@ private void OnSelectedItemChanged(DependencyPropertyChangedEventArgs e)
 
             OnSelectionChanged(new SelectionChangedEventArgs(new List<object> { e.OldValue }, new List<object> { e.NewValue }));
             UpdateView(true);
+            SetFocus(ViewState);
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -413,7 +414,7 @@ private void FocusFirstFocusableElementInDetails()
         /// </summary>
         private void FocusItemList()
         {
-            if (GetTemplateChild("PartMainList") is Control list)
+            if (GetTemplateChild(PartMainList) is Control list)
             {
                 list.Focus(FocusState.Programmatic);
             }