Merge branch 'master' into jamesmcroft/tokenizingtextbox-automationpeer

Author: jamesmcroft

.github/ISSUE_TEMPLATE/feature_request.md

@@ -15,7 +15,7 @@ IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "I
 <!-- Please describe or link to any existing issues or discussions.
 A clear and concise description of what the problem is, starting with the user story. 
 Provide examples of the restrictions in the current environment that hinders the work your users or you want to perform. What are the ways this new feature will help transform and deliver those results?
-For example, I am currently using the InfiniteCanvas control which lacks the ribbon control feature. I am looking to improve user experience therefore i would like to use that in my project to provide ease of accessibility and a user-friendly interface. This new feature will provide quick access to the toolbar, enhance space utilization, etc [...] -->
+For example, I am currently using the InfiniteCanvas control which lacks the TabbedCommandBar control feature. I am looking to improve user experience therefore i would like to use that in my project to provide ease of accessibility and a user-friendly interface. This new feature will provide quick access to the toolbar, enhance space utilization, etc [...] -->
 
 
 ## Describe the solution

Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj

@@ -11,7 +11,7 @@
         - Guard: Helper methods to verify conditions when running code.
         - ThrowHelper: Helper methods to efficiently throw exceptions.
     </Description>
-    <PackageTags>UWP Toolkit Windows IncrementalLoadingCollection String Array extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers</PackageTags>
   </PropertyGroup>
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj

@@ -22,7 +22,7 @@
       - Ref<T>: a stack-only struct that can store a reference to a value of a specified type.
       - NullableRef<T>: a stack-only struct similar to Ref<T>, which also supports nullable references.
   </Description>
-    <PackageTags>UWP Toolkit Windows core standard unsafe span memory string array stream buffer extensions helpers parallel performance</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance</PackageTags>
   </PropertyGroup>
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

@@ -17,7 +17,7 @@
       - StrongReferenceMessenger: a high-performance messaging system that trades weak references for speed.
       - Ioc: a helper class to configure dependency injection service containers.
     </Description>
-    <PackageTags>UWP Toolkit Windows MVVM MVVMToolkit observable Ioc dependency injection services extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;WinUI;WPF;Xamarin;Forms;Uno;Platform;MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;observable;Ioc;dependency injection;services;extensions;helpers</PackageTags>
   </PropertyGroup>
 
   <!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->

Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Devices</Title>
     <Description>This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers.</Description>
-    <PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Devices;Bluetooth;LE;BluetoothLE;BLE;Networking</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>

Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs

@@ -34,19 +34,19 @@ public partial class FocusTracker : Control
 
         private static void OnIsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var focusTracker = d as FocusTracker;
-
-            if (e.NewValue != null && (bool)e.NewValue)
+            if (d is FocusTracker focusTracker)
             {
-                focusTracker?.Start();
-            }
-            else
-            {
-                focusTracker?.Stop();
+                if (e.NewValue != null && (bool)e.NewValue)
+                {
+                    focusTracker.Start();
+                }
+                else
+                {
+                    focusTracker.Stop();
+                }
             }
         }
 
-        private DispatcherQueueTimer updateTimer;
         private TextBlock controlName;
         private TextBlock controlType;
         private TextBlock controlAutomationName;
@@ -69,32 +69,42 @@ public FocusTracker()
             DefaultStyleKey = typeof(FocusTracker);
         }
 
+        /// <summary>
+        /// Update the visual state of the control when its template is changed.
+        /// </summary>
+        protected override void OnApplyTemplate()
+        {
+            controlName = GetTemplateChild("ControlName") as TextBlock;
+            controlType = GetTemplateChild("ControlType") as TextBlock;
+            controlAutomationName = GetTemplateChild("ControlAutomationName") as TextBlock;
+            controlFirstParentWithName = GetTemplateChild("ControlFirstParentWithName") as TextBlock;
+        }
+
         private void Start()
         {
-            if (updateTimer == null)
+            // Get currently focused control once when we start
+            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
             {
-                updateTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
-                updateTimer.Tick += UpdateTimer_Tick;
+                FocusOnControl(FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement);
+            }
+            else
+            {
+                FocusOnControl(FocusManager.GetFocusedElement() as FrameworkElement);
             }
 
-            updateTimer.Start();
+            // Then use FocusManager event from 1809 to listen to updates
+            FocusManager.GotFocus += FocusManager_GotFocus;
         }
 
         private void Stop()
         {
-            updateTimer?.Stop();
+            FocusManager.GotFocus -= FocusManager_GotFocus;
             ClearContent();
         }
 
-        /// <summary>
-        /// Update the visual state of the control when its template is changed.
-        /// </summary>
-        protected override void OnApplyTemplate()
+        private void FocusManager_GotFocus(object sender, FocusManagerGotFocusEventArgs e)
         {
-            controlName = GetTemplateChild("ControlName") as TextBlock;
-            controlType = GetTemplateChild("ControlType") as TextBlock;
-            controlAutomationName = GetTemplateChild("ControlAutomationName") as TextBlock;
-            controlFirstParentWithName = GetTemplateChild("ControlFirstParentWithName") as TextBlock;
+            FocusOnControl(e.NewFocusedElement as FrameworkElement);
         }
 
         private void ClearContent()
@@ -105,19 +115,8 @@ private void ClearContent()
             controlFirstParentWithName.Text = string.Empty;
         }
 
-        private void UpdateTimer_Tick(object sender, object e)
+        private void FocusOnControl(FrameworkElement focusedControl)
         {
-            FrameworkElement focusedControl;
-
-            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
-            {
-                focusedControl = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
-            }
-            else
-            {
-                focusedControl = FocusManager.GetFocusedElement() as FrameworkElement;
-            }
-
             if (focusedControl == null)
             {
                 ClearContent();

Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj

@@ -9,7 +9,7 @@
       -FocusTrackerControl : The FocusTracker Control is a feature that can be used to display information about the current focused XAML element.
       -Themes : Provides the source path of the resource dictionaries for the FocusTracker.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility AlignmentGrid</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
   </PropertyGroup>

Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>uap10.0.17134</TargetFramework>
     <Title>Windows Community Toolkit Eye Gaze Library</Title>
     <Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
-    <PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Gaze;Eye;Tracker;EyeTracker</PackageTags>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
   </PropertyGroup>

Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs

@@ -126,7 +126,7 @@ private static string HashAppId(string appId)
         private static string GetDisplayNameFromCurrentProcess(Process process)
         {
             // If AssemblyTitle is set, use that
-            var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
+            var assemblyTitleAttr = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyTitleAttribute>();
             if (assemblyTitleAttr != null)
             {
                 return assemblyTitleAttr.Title;

Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs

@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)
             // For apps that don't have identity...
             if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // If tag is specified
-                if (!string.IsNullOrEmpty(notification.Tag))
+                // If tag is specified and group isn't specified
+                if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
                 {
-                    // If group isn't specified, we have to add a group since otherwise can't remove without a group
+                    // We have to add a group since otherwise can't remove without a group
                     notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
                 }
             }
@@ -157,10 +157,10 @@ private void PreprocessScheduledToast(ScheduledToastNotification notification)
             // For apps that don't have identity...
             if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // If tag is specified
-                if (!string.IsNullOrEmpty(notification.Tag))
+                // If tag is specified and group isn't specified
+                if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
                 {
-                    // If group isn't specified, we have to add a group since otherwise can't remove without a group
+                    // We have to add a group since otherwise can't remove without a group
                     notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
                 }
             }