From 54208748d6c7e7c1498b92cddfa90378f2b8e133 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Thu, 18 Mar 2021 18:36:55 -0700
Subject: [PATCH 001/200] Adding control width trigger

---
 .../Triggers/ControlWidthTrigger.cs           | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs

diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
new file mode 100644
index 00000000000..75c89474c56
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
@@ -0,0 +1,145 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Triggers
+{
+    /// <summary>
+    /// A conditional state trigger that functions
+    /// based on the target control's width.
+    /// </summary>
+    public class ControlWidthTrigger : StateTriggerBase
+    {
+        /// <summary>
+        /// Gets or sets a value indicating
+        /// whether this trigger will be active or not.
+        /// </summary>
+        public bool CanTrigger
+        {
+            get => (bool)GetValue(CanTriggerProperty);
+            set => SetValue(CanTriggerProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="CanTrigger"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty CanTriggerProperty = DependencyProperty.Register(
+            nameof(CanTrigger),
+            typeof(bool),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(true, OnCanTriggerProperty));
+
+        private static void OnCanTriggerProperty(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ControlWidthTrigger)d).UpdateTrigger();
+        }
+
+        /// <summary>
+        /// Gets or sets the max size at which to trigger.
+        /// </summary>
+        public double MaxWidth
+        {
+            get => (double)GetValue(MaxWidthProperty);
+            set => SetValue(MaxWidthProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="MaxWidth"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MaxWidthProperty = DependencyProperty.Register(
+            nameof(MaxWidth),
+            typeof(double),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(double.PositiveInfinity, OnMaxWidthPropertyChanged));
+
+        private static void OnMaxWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ControlWidthTrigger)d).UpdateTrigger();
+        }
+
+        /// <summary>
+        /// Gets or sets the min size at which to trigger.
+        /// </summary>
+        public double MinWidth
+        {
+            get => (double)GetValue(MinWidthProperty);
+            set => SetValue(MinWidthProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="MinWidth"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MinWidthProperty = DependencyProperty.Register(
+            nameof(MinWidth),
+            typeof(double),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(0.0, OnMinWidthPropertyChanged));
+
+        private static void OnMinWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ControlWidthTrigger)d).UpdateTrigger();
+        }
+
+        /// <summary>
+        /// Gets or sets the element whose width will observed
+        /// for the trigger.
+        /// </summary>
+        public FrameworkElement TargetElement
+        {
+            get => (FrameworkElement)GetValue(TargetElementProperty);
+            set => SetValue(TargetElementProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="TargetElement"/> DependencyProperty.
+        /// </summary>
+        /// <remarks>
+        /// Using a DependencyProperty as the backing store for TargetElement. This enables animation, styling, binding, etc.
+        /// </remarks>
+        public static readonly DependencyProperty TargetElementProperty = DependencyProperty.Register(
+            nameof(TargetElement),
+            typeof(FrameworkElement),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(null, OnTargetElementPropertyChanged));
+
+        private static void OnTargetElementPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ControlWidthTrigger)d).UpdateTargetElement((FrameworkElement)e.OldValue, (FrameworkElement)e.NewValue);
+        }
+
+        // Handle event to get current values
+        private void OnTargetElementSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateTrigger();
+        }
+
+        private void UpdateTargetElement(FrameworkElement oldValue, FrameworkElement newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.SizeChanged -= OnTargetElementSizeChanged;
+            }
+
+            if (newValue != null)
+            {
+                newValue.SizeChanged += OnTargetElementSizeChanged;
+            }
+
+            UpdateTrigger();
+        }
+
+        // Logic to evaluate and apply trigger value
+        private void UpdateTrigger()
+        {
+            if (TargetElement == null || !CanTrigger)
+            {
+                SetActive(false);
+                return;
+            }
+
+            SetActive(MinWidth <= TargetElement.ActualWidth && TargetElement.ActualWidth < MaxWidth);
+        }
+    }
+}

From 8482a04f0e60c3db9826155648bd22a44c9c3969 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 12 May 2021 12:43:36 -0400
Subject: [PATCH 002/200] Paramitize pageSize and page count for unit tests

---
 .../Test_IncrementalLoadingCollection.cs      | 77 ++++++++++---------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Collection/Test_IncrementalLoadingCollection.cs b/UnitTests/UnitTests.UWP/UI/Collection/Test_IncrementalLoadingCollection.cs
index d845e1d9c7a..f6b213ba1c6 100644
--- a/UnitTests/UnitTests.UWP/UI/Collection/Test_IncrementalLoadingCollection.cs
+++ b/UnitTests/UnitTests.UWP/UI/Collection/Test_IncrementalLoadingCollection.cs
@@ -15,9 +15,6 @@ namespace UnitTests.UI
     [TestClass]
     public class Test_IncrementalLoadingCollection
     {
-        private const int PageSize = 20;
-        private const int Pages = 5;
-
         private static readonly DataSource<int>.PageOperation[] FailPassSequence
             = new DataSource<int>.PageOperation[]
             {
@@ -28,35 +25,36 @@ private static readonly DataSource<int>.PageOperation[] FailPassSequence
                 DataSource<int>.ThrowException, DataSource<int>.PassThrough,
             };
 
-        private static readonly int[] AllData
-            = Enumerable.Range(0, Pages * PageSize).ToArray();
-
-        [DataRow]
-        [DataRow(2500, 1000, 1000, 1000, 1000)]
         [TestMethod]
-        public async Task Requests(params int[] pageDelays)
+        [DataRow(20, 5)]
+        [DataRow(5, 5)]
+        [DataRow(20, 5, 2500, 1000, 1000, 1000, 1000)]
+        public async Task Requests(int pageSize, int pages, params int[] pageDelays)
         {
-            var source = new DataSource<int>(AllData, pageDelays.Select(DataSource<int>.MakeDelayOp));
-            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, PageSize);
+            var allData = Enumerable.Range(0, pages * pageSize).ToArray();
+            var source = new DataSource<int>(allData, pageDelays.Select(DataSource<int>.MakeDelayOp));
+            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, pageSize);
 
-            for (int pageNum = 1; pageNum <= Pages; pageNum++)
+            for (var pageNum = 1; pageNum <= pages; pageNum++)
             {
                 await collection.LoadMoreItemsAsync(0);
-                CollectionAssert.AreEqual(Enumerable.Range(0, PageSize * pageNum).ToArray(), collection);
+                CollectionAssert.AreEqual(Enumerable.Range(0, pageSize * pageNum).ToArray(), collection);
             }
         }
 
-        [DataRow]
-        [DataRow(2500, 1000, 1000, 1000, 1000)]
         [TestMethod]
-        public async Task RequestsAsync(params int[] pageDelays)
+        [DataRow(20, 5)]
+        [DataRow(5, 5)]
+        [DataRow(20, 5, 2500, 1000, 1000, 1000, 1000)]
+        public async Task RequestsAsync(int pageSize, int pages, params int[] pageDelays)
         {
-            var source = new DataSource<int>(AllData, pageDelays.Select(DataSource<int>.MakeDelayOp));
-            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, PageSize);
+            var allData = Enumerable.Range(0, pages * pageSize).ToArray();
+            var source = new DataSource<int>(allData, pageDelays.Select(DataSource<int>.MakeDelayOp));
+            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, pageSize);
 
             var requests = new List<Task>();
 
-            for (int pageNum = 1; pageNum <= Pages; pageNum++)
+            for (var pageNum = 1; pageNum <= pages; pageNum++)
             {
                 requests.Add(collection.LoadMoreItemsAsync(0).AsTask()
                     .ContinueWith(t => Assert.IsTrue(t.IsCompletedSuccessfully)));
@@ -64,14 +62,17 @@ public async Task RequestsAsync(params int[] pageDelays)
 
             await Task.WhenAll(requests);
 
-            CollectionAssert.AreEqual(AllData, collection);
+            CollectionAssert.AreEqual(allData, collection);
         }
 
         [TestMethod]
-        public async Task FirstRequestFails()
+        [DataRow(5, 5)]
+        [DataRow(20, 5)]
+        public async Task FirstRequestFails(int pageSize, int pages)
         {
-            var source = new DataSource<int>(AllData, DataSource<int>.ThrowException);
-            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, PageSize);
+            var allData = Enumerable.Range(0, pages * pageSize).ToArray();
+            var source = new DataSource<int>(allData, DataSource<int>.ThrowException);
+            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, pageSize);
 
             await Assert.ThrowsExceptionAsync<AggregateException>(collection.LoadMoreItemsAsync(0).AsTask);
 
@@ -79,7 +80,7 @@ public async Task FirstRequestFails()
 
             var requests = new List<Task>();
 
-            for (int pageNum = 1; pageNum <= Pages; pageNum++)
+            for (var pageNum = 1; pageNum <= pages; pageNum++)
             {
                 requests.Add(collection.LoadMoreItemsAsync(0).AsTask()
                     .ContinueWith(t => Assert.IsTrue(t.IsCompletedSuccessfully)));
@@ -87,17 +88,20 @@ public async Task FirstRequestFails()
 
             await Task.WhenAll(requests);
 
-            CollectionAssert.AreEqual(AllData, collection);
+            CollectionAssert.AreEqual(allData, collection);
         }
 
         [TestMethod]
-        public async Task EveryOtherRequestFails()
+        [DataRow(5, 5)]
+        [DataRow(20, 5)]
+        public async Task EveryOtherRequestFails(int pageSize, int pages)
         {
-            var source = new DataSource<int>(AllData, FailPassSequence);
-            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, PageSize);
+            var allData = Enumerable.Range(0, pages * pageSize).ToArray();
+            var source = new DataSource<int>(allData, FailPassSequence);
+            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, pageSize);
 
             var willFail = true;
-            for (int submitedRequests = 0; submitedRequests < Pages * 2; submitedRequests++)
+            for (var submitedRequests = 0; submitedRequests < pages * 2; submitedRequests++)
             {
                 if (willFail)
                 {
@@ -111,19 +115,22 @@ public async Task EveryOtherRequestFails()
                 willFail = !willFail;
             }
 
-            CollectionAssert.AreEqual(AllData, collection);
+            CollectionAssert.AreEqual(allData, collection);
         }
 
         [TestMethod]
-        public async Task EveryOtherRequestFailsAsync()
+        [DataRow(5, 5)]
+        [DataRow(20, 5)]
+        public async Task EveryOtherRequestFailsAsync(int pageSize, int pages)
         {
-            var source = new DataSource<int>(AllData, FailPassSequence);
-            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, PageSize);
+            var allData = Enumerable.Range(0, pages * pageSize).ToArray();
+            var source = new DataSource<int>(allData, FailPassSequence);
+            var collection = new IncrementalLoadingCollection<DataSource<int>, int>(source, pageSize);
 
             var requests = new List<Task>();
 
             var willFail = true;
-            for (int submitedRequests = 0; submitedRequests < Pages * 2; submitedRequests++)
+            for (var submitedRequests = 0; submitedRequests < pages * 2; submitedRequests++)
             {
                 if (willFail)
                 {
@@ -139,7 +146,7 @@ public async Task EveryOtherRequestFailsAsync()
 
             await Task.WhenAll(requests);
 
-            CollectionAssert.AreEqual(AllData, collection);
+            CollectionAssert.AreEqual(allData, collection);
         }
     }
 }
\ No newline at end of file

From f6c65a535e02ed3cf1d94b51b74548fbbfa688d7 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Thu, 8 Jul 2021 21:31:56 +0200
Subject: [PATCH 003/200] Fix TokenizingTextBox header to behave like normal
 headers

---
 .../TokenizingTextBox/TokenizingTextBox.xaml  | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index 237969fc387..203f629c0ff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
@@ -65,18 +65,34 @@
     <ControlTemplate x:Key="TokenizingTextBoxTemplate"
                      TargetType="controls:TokenizingTextBox">
         <Grid Name="RootPanel">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <ContentPresenter Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              Transitions="{TemplateBinding HeaderTransitions}"
+                              FontWeight="Normal"
+                              Foreground="{ThemeResource TextControlHeaderForeground}"
+                              Margin="{ThemeResource TextBoxTopHeaderMargin}"
+                              TextWrapping="Wrap"
+                              VerticalAlignment="Top" />
             <Border x:Name="BackgroundVisual"
+                    Grid.Row="1"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}" />
 
             <Border x:Name="FocusVisual"
+                    Grid.Row="1"
                     Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
                     BorderBrush="{ThemeResource TextControlBorderBrushFocused}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Opacity="0" /> <!-- Background in WinUI is TextControlBackgroundFocused, but that uses a different resource in WinUI than system -->
 
             <ScrollViewer x:Name="ScrollViewer"
+                          Grid.Row="1"
                           AutomationProperties.AccessibilityView="Raw"
                           BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
                           HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -95,10 +111,7 @@
                                 Margin="{StaticResource TokenizingTextBoxPresenterMargin}"
                                 Footer="{TemplateBinding Footer}"
                                 FooterTemplate="{TemplateBinding FooterTemplate}"
-                                FooterTransitions="{TemplateBinding FooterTransitions}"
-                                Header="{TemplateBinding Header}"
-                                HeaderTemplate="{TemplateBinding HeaderTemplate}"
-                                HeaderTransitions="{TemplateBinding HeaderTransitions}" />
+                                FooterTransitions="{TemplateBinding FooterTransitions}"/>
             </ScrollViewer>
 
             <VisualStateManager.VisualStateGroups>
@@ -106,14 +119,14 @@
                     <VisualState x:Name="Disabled">
                         <Storyboard>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                           Storyboard.TargetProperty="Background">
+                                                               Storyboard.TargetProperty="Background">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource TextControlBackgroundDisabled}" />
+                                                            Value="{ThemeResource TextControlBackgroundDisabled}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                           Storyboard.TargetProperty="BorderBrush">
+                                                               Storyboard.TargetProperty="BorderBrush">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource TextControlBorderBrushDisabled}" />
+                                                            Value="{ThemeResource TextControlBorderBrushDisabled}" />
                             </ObjectAnimationUsingKeyFrames>
 
                         </Storyboard>
@@ -122,14 +135,14 @@
                     <VisualState x:Name="PointerOver">
                         <Storyboard>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                           Storyboard.TargetProperty="BorderBrush">
+                                                               Storyboard.TargetProperty="BorderBrush">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource TextControlBorderBrushPointerOver}" />
+                                                            Value="{ThemeResource TextControlBorderBrushPointerOver}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                           Storyboard.TargetProperty="Background">
+                                                               Storyboard.TargetProperty="Background">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                        Value="{ThemeResource TextControlBackgroundPointerOver}" />
+                                                            Value="{ThemeResource TextControlBackgroundPointerOver}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>

From 684546419d204a453a9f528a38972b7c745c9010 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Thu, 8 Jul 2021 21:57:15 +0200
Subject: [PATCH 004/200] Fix formatting

---
 .../TokenizingTextBox/TokenizingTextBox.xaml     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index 203f629c0ff..d1b006e7b06 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
@@ -119,14 +119,14 @@
                     <VisualState x:Name="Disabled">
                         <Storyboard>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                               Storyboard.TargetProperty="Background">
+                                                           Storyboard.TargetProperty="Background">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                            Value="{ThemeResource TextControlBackgroundDisabled}" />
+                                                        Value="{ThemeResource TextControlBackgroundDisabled}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                               Storyboard.TargetProperty="BorderBrush">
+                                                           Storyboard.TargetProperty="BorderBrush">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                            Value="{ThemeResource TextControlBorderBrushDisabled}" />
+                                                        Value="{ThemeResource TextControlBorderBrushDisabled}" />
                             </ObjectAnimationUsingKeyFrames>
 
                         </Storyboard>
@@ -135,14 +135,14 @@
                     <VisualState x:Name="PointerOver">
                         <Storyboard>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                               Storyboard.TargetProperty="BorderBrush">
+                                                           Storyboard.TargetProperty="BorderBrush">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                            Value="{ThemeResource TextControlBorderBrushPointerOver}" />
+                                                        Value="{ThemeResource TextControlBorderBrushPointerOver}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundVisual"
-                                                               Storyboard.TargetProperty="Background">
+                                                           Storyboard.TargetProperty="Background">
                                 <DiscreteObjectKeyFrame KeyTime="0"
-                                                            Value="{ThemeResource TextControlBackgroundPointerOver}" />
+                                                        Value="{ThemeResource TextControlBackgroundPointerOver}" />
                             </ObjectAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>

From 7f040274215b0c680824d943dbaa28a87ebfb0e4 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Thu, 8 Jul 2021 21:58:04 +0200
Subject: [PATCH 005/200] Fix formatting the second

---
 .../TokenizingTextBox/TokenizingTextBox.xaml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index d1b006e7b06..7b689061d63 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
@@ -111,7 +111,7 @@
                                 Margin="{StaticResource TokenizingTextBoxPresenterMargin}"
                                 Footer="{TemplateBinding Footer}"
                                 FooterTemplate="{TemplateBinding FooterTemplate}"
-                                FooterTransitions="{TemplateBinding FooterTransitions}"/>
+                                FooterTransitions="{TemplateBinding FooterTransitions}" />
             </ScrollViewer>
 
             <VisualStateManager.VisualStateGroups>

From 90e8a34aaba519a2aee86cc50284d30b47d0c096 Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Mon, 26 Jul 2021 22:50:01 -0400
Subject: [PATCH 006/200] Ensure only visible tabs are selected

---
 .../ColorPicker/ColorPicker.cs                | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
index 12a20c8f4cc..99523f15ecb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
@@ -40,6 +40,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground8Border),  Type = typeof(Border))]
     [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground9Border),  Type = typeof(Border))]
     [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground10Border), Type = typeof(Border))]
+    [TemplatePart(Name = nameof(ColorPicker.ColorPanelSelector),          Type = typeof(ListBox))]
     [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumControl),        Type = typeof(ColorSpectrum))]
     [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumAlphaSlider),    Type = typeof(ColorPickerSlider))]
     [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumThirdDimensionSlider), Type = typeof(ColorPickerSlider))]
@@ -78,6 +79,7 @@ public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
         private Color?          updatedRgbColor            = null;
         private DispatcherQueueTimer dispatcherQueueTimer            = null;
 
+        private ListBox           ColorPanelSelector;
         private ColorSpectrum     ColorSpectrumControl;
         private ColorPickerSlider ColorSpectrumAlphaSlider;
         private ColorPickerSlider ColorSpectrumThirdDimensionSlider;
@@ -177,6 +179,8 @@ protected override void OnApplyTemplate()
             // We need to disconnect old events first
             this.ConnectEvents(false);
 
+            this.ColorPanelSelector = this.GetTemplateChild<ListBox>(nameof(ColorPanelSelector));
+
             this.ColorSpectrumControl              = this.GetTemplateChild<ColorSpectrum>(nameof(ColorSpectrumControl));
             this.ColorSpectrumAlphaSlider          = this.GetTemplateChild<ColorPickerSlider>(nameof(ColorSpectrumAlphaSlider));
             this.ColorSpectrumThirdDimensionSlider = this.GetTemplateChild<ColorPickerSlider>(nameof(ColorSpectrumThirdDimensionSlider));
@@ -216,6 +220,7 @@ protected override void OnApplyTemplate()
 
             base.OnApplyTemplate();
             this.UpdateVisualState(false);
+            this.ValidateSelectedPanel();
             this.isInitialized = true;
             this.SetActiveColorRepresentation(ColorRepresentation.Rgba);
             this.UpdateColorControlValues(); // TODO: This will also connect events after, can we optimize vs. doing it twice with the ConnectEvents above?
@@ -1065,6 +1070,48 @@ private void SetDefaultPalette()
             return;
         }
 
+        /// <summary>
+        /// Validates and updates the current 'tab' or 'panel' selection.
+        /// If the currently selected tab is collapsed, the next visible tab will be selected.
+        /// </summary>
+        private void ValidateSelectedPanel()
+        {
+            object selectedItem = null;
+
+            if (this.ColorPanelSelector != null)
+            {
+                if (this.ColorPanelSelector.SelectedItem == null &&
+                    this.ColorPanelSelector.Items.Count > 0)
+                {
+                    // As a failsafe, forcefully select the first item
+                    selectedItem = this.ColorPanelSelector.Items[0];
+                }
+                else
+                {
+                    selectedItem = this.ColorPanelSelector.SelectedItem;
+                }
+
+                if (selectedItem is UIElement selectedElement &&
+                    selectedElement.Visibility == Visibility.Collapsed)
+                {
+                    // Select the first visible item instead
+                    foreach (object item in this.ColorPanelSelector.Items)
+                    {
+                        if (item is UIElement element &&
+                            element.Visibility == Visibility.Visible)
+                        {
+                            selectedItem = item;
+                            break;
+                        }
+                    }
+                }
+
+                this.ColorPanelSelector.SelectedItem = selectedItem;
+            }
+
+            return;
+        }
+
         /***************************************************************************************
          *
          * Color Update Timer

From f448ee31c6292bf8a96923c5cdd0f91c8e7aa6bc Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Mon, 26 Jul 2021 22:50:46 -0400
Subject: [PATCH 007/200] Add additional color picker samples showing only a
 palette

---
 .../ColorPicker/ColorPickerButtonXaml.bind    | 38 +++++++++++++++++++
 .../ColorPicker/ColorPickerXaml.bind          | 25 +++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
index 8a84e01b04e..654d66c346a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
@@ -131,5 +131,43 @@
         </controls:ColorPickerButton.ColorPickerStyle>
       </controls:ColorPickerButton>
     </StackPanel>
+    <!-- Example 5 -->
+    <StackPanel Grid.Row="3"
+                Orientation="Vertical"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Spacing="20">
+        <Border Background="{ThemeResource SystemChromeMediumColor}"
+                CornerRadius="4"
+                Height="100"
+                Width="300"
+                Padding="10">
+            <TextBlock TextAlignment="Center"
+                        VerticalAlignment="Center">
+                Ring-shaped spectrum <LineBreak />
+                Alpha channel enabled <LineBreak />
+                Only Color Palette Shown
+            </TextBlock>
+        </Border>
+        <controls:ColorPickerButton x:Name="ColorPickerButton5"
+                                    SelectedColor="Teal">
+            <controls:ColorPickerButton.ColorPickerStyle>
+                <Style TargetType="controls:ColorPicker">
+                    <Setter Property="ColorSpectrumShape"
+                            Value="Ring"/>
+                    <Setter Property="IsAlphaEnabled"
+                            Value="True"/>
+                    <Setter Property="IsHexInputVisible"
+                            Value="True"/>
+                    <Setter Property="IsColorSpectrumVisible"
+                            Value="False"/>
+                    <Setter Property="IsColorPaletteVisible"
+                            Value="True"/>
+                    <Setter Property="IsColorChannelTextInputVisible"
+                            Value="False"/>
+                </Style>
+            </controls:ColorPickerButton.ColorPickerStyle>
+        </controls:ColorPickerButton>
+    </StackPanel>
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
index 59d3454d6c0..c3116470e48 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
@@ -60,7 +60,7 @@
           Alpha channel enabled
         </TextBlock>
       </Border>
-      <controls:ColorPicker x:Name="ColorPickerButton3"
+      <controls:ColorPicker x:Name="ColorPicker3"
                             Color="Transparent"
                             ColorSpectrumShape="Ring"
                             IsAlphaEnabled="True"
@@ -78,12 +78,33 @@
           Saturation+Value spectrum channels
         </TextBlock>
       </Border>
-      <controls:ColorPicker x:Name="ColorPickerButton4"
+      <controls:ColorPicker x:Name="ColorPicker4"
                             Color="Maroon"
                             ColorSpectrumShape="Ring"
                             ColorSpectrumComponents="SaturationValue"
                             IsAlphaEnabled="True"
                             IsHexInputVisible="True"/>
+        <!-- Example 5 -->
+        <Border Background="{ThemeResource SystemChromeMediumColor}"
+                CornerRadius="4"
+                Height="100"
+                Width="300"
+                Padding="10">
+            <TextBlock TextAlignment="Center"
+                       VerticalAlignment="Center">
+                Ring-shaped spectrum <LineBreak />
+                Alpha channel enabled <LineBreak />
+                Only Color Palette Shown
+            </TextBlock>
+        </Border>
+        <controls:ColorPicker x:Name="ColorPicker5"
+                              Color="Teal"
+                              ColorSpectrumShape="Ring"
+                              IsAlphaEnabled="True"
+                              IsHexInputVisible="True"
+                              IsColorSpectrumVisible="False"
+                              IsColorPaletteVisible="True"
+                              IsColorChannelTextInputVisible="False"/>
     </StackPanel>
   </ScrollViewer>
 </Page>
\ No newline at end of file

From bc05c86bf0bb708cfc60f131b3b9c442492780b0 Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Mon, 26 Jul 2021 23:30:36 -0400
Subject: [PATCH 008/200] Make tabs automatically size uniformly to width

This improves the design when some tabs are hidden
---
 .../ColorPicker/ColorPicker.xaml                          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
index 370be9af979..3641acb2e3c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
@@ -69,12 +69,13 @@
                     CornerRadius="4" />
             <ListBox x:Name="ColorPanelSelector"
                      Grid.Row="0"
-                     HorizontalAlignment="Center"
+                     HorizontalAlignment="Stretch"
                      Background="Transparent"
+                     ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                      ItemContainerStyle="{StaticResource UnderlineListBoxItemStyle}">
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" />
+                        <controls:UniformGrid Rows="1" />
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
                 <ListBoxItem x:Name="SpectrumListBoxItem"
@@ -1180,9 +1181,6 @@
         <Setter Property="Padding" Value="{StaticResource ListBoxItemPadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="Margin" Value="8,0,8,0" />
-        <Setter Property="Padding" Value="24,0,24,0" />
-        <Setter Property="MinWidth" Value="100" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="Template" Value="{StaticResource UnderlineListBoxItemTemplate}" />
     </Style>

From e23a8952a98de3b984e2c22acf616cc9479c30ec Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Mon, 26 Jul 2021 23:32:40 -0400
Subject: [PATCH 009/200] Set slider DefaultForeground value in style

This fixes potential issues with shared instances of the brush
---
 .../ColorPicker/ColorPickerSlider.Properties.cs                 | 2 +-
 .../ColorPicker/ColorPickerSlider.xaml                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
index bf99d884dfd..2a0471a420a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
@@ -104,7 +104,7 @@ public ColorRepresentation ColorRepresentation
                 typeof(Brush),
                 typeof(ColorPickerSlider),
                 new PropertyMetadata(
-                    new SolidColorBrush(Colors.Gray),
+                    null,
                     (s, e) => (s as ColorPickerSlider)?.OnDependencyPropertyChanged(s, e)));
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
index 439e7040f2b..51027d2d0be 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
@@ -9,6 +9,7 @@
            TargetType="controls:ColorPickerSlider">
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="IsThumbToolTipEnabled" Value="False" />
+        <Setter Property="DefaultForeground" Value="Gray" />
         <Setter Property="Template">
             <Setter.Value>
                 <!--  Based on WinUI version 2.4.2  -->

From dde93f33c8d68f1b4dcd2f869836caf01155ad6d Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Mon, 26 Jul 2021 23:55:19 -0400
Subject: [PATCH 010/200] Add central OnDependencyPropertyChanged method in
 ColorPicker

---
 .../ColorPicker/ColorPicker.Properties.cs     | 16 +++-
 .../ColorPicker/ColorPicker.cs                | 94 +++++++++----------
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
index 1c6e2cdd469..641e83131f5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
@@ -20,7 +20,9 @@ public partial class ColorPicker
                 nameof(CustomPaletteColors),
                 typeof(ObservableCollection<Windows.UI.Color>),
                 typeof(ColorPicker),
-                new PropertyMetadata(null));
+                new PropertyMetadata(
+                    null,
+                    (s, e) => (s as ColorPicker)?.OnDependencyPropertyChanged(s, e)));
 
         /// <summary>
         /// Gets the list of custom palette colors.
@@ -38,7 +40,9 @@ public ObservableCollection<Windows.UI.Color> CustomPaletteColors
                 nameof(CustomPaletteColumnCount),
                 typeof(int),
                 typeof(ColorPicker),
-                new PropertyMetadata(4));
+                new PropertyMetadata(
+                    4,
+                    (s, e) => (s as ColorPicker)?.OnDependencyPropertyChanged(s, e)));
 
         /// <summary>
         /// Gets or sets the number of colors in each row (section) of the custom color palette.
@@ -64,7 +68,9 @@ public int CustomPaletteColumnCount
                 nameof(CustomPalette),
                 typeof(IColorPalette),
                 typeof(ColorPicker),
-                new PropertyMetadata(null));
+                new PropertyMetadata(
+                    null,
+                    (s, e) => (s as ColorPicker)?.OnDependencyPropertyChanged(s, e)));
 
         /// <summary>
         /// Gets or sets the custom color palette.
@@ -91,7 +97,9 @@ public IColorPalette CustomPalette
                 nameof(IsColorPaletteVisible),
                 typeof(bool),
                 typeof(ColorPicker),
-                new PropertyMetadata(true));
+                new PropertyMetadata(
+                    true,
+                    (s, e) => (s as ColorPicker)?.OnDependencyPropertyChanged(s, e)));
 
         /// <summary>
         /// Gets or sets a value indicating whether the color palette is visible.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
index 99523f15ecb..7a22dbc8f70 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
@@ -66,8 +66,6 @@ public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
         private const int ColorUpdateInterval = 30; // Milliseconds
 
         private long tokenColor;
-        private long tokenCustomPalette;
-        private long tokenIsColorPaletteVisible;
 
         private bool callbacksConnected = false;
         private bool eventsConnected    = false;
@@ -252,23 +250,19 @@ private T GetTemplateChild<T>(string childName, bool isRequired = false)
         /// <param name="connected">True to connect callbacks, otherwise false.</param>
         private void ConnectCallbacks(bool connected)
         {
-            if ((connected == true) &&
-                (this.callbacksConnected == false))
+            if (connected == true &&
+                this.callbacksConnected == false)
             {
                 // Add callbacks for dependency properties
-                this.tokenColor                 = this.RegisterPropertyChangedCallback(ColorProperty,                 OnColorChanged);
-                this.tokenCustomPalette         = this.RegisterPropertyChangedCallback(CustomPaletteProperty,         OnCustomPaletteChanged);
-                this.tokenIsColorPaletteVisible = this.RegisterPropertyChangedCallback(IsColorPaletteVisibleProperty, OnIsColorPaletteVisibleChanged);
+                this.tokenColor = this.RegisterPropertyChangedCallback(ColorProperty, OnColorChanged);
 
                 this.callbacksConnected = true;
             }
-            else if ((connected == false) &&
-                     (this.callbacksConnected == true))
+            else if (connected == false &&
+                     this.callbacksConnected == true)
             {
                 // Remove callbacks for dependency properties
-                this.UnregisterPropertyChangedCallback(ColorProperty,                 this.tokenColor);
-                this.UnregisterPropertyChangedCallback(CustomPaletteProperty,         this.tokenCustomPalette);
-                this.UnregisterPropertyChangedCallback(IsColorPaletteVisibleProperty, this.tokenIsColorPaletteVisible);
+                this.UnregisterPropertyChangedCallback(ColorProperty, this.tokenColor);
 
                 this.callbacksConnected = false;
             }
@@ -282,8 +276,8 @@ private void ConnectCallbacks(bool connected)
         /// <param name="connected">True to connect event handlers, otherwise false.</param>
         private void ConnectEvents(bool connected)
         {
-            if ((connected == true) &&
-                (this.eventsConnected == false))
+            if (connected == true &&
+                this.eventsConnected == false)
             {
                 // Add all events
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged += ColorSpectrum_ColorChanged; }
@@ -336,8 +330,8 @@ private void ConnectEvents(bool connected)
 
                 this.eventsConnected = true;
             }
-            else if ((connected == false) &&
-                     (this.eventsConnected == true))
+            else if (connected == false &&
+                     this.eventsConnected == true)
             {
                 // Remove all events
                 if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged -= ColorSpectrum_ColorChanged; }
@@ -1112,6 +1106,41 @@ private void ValidateSelectedPanel()
             return;
         }
 
+        private void OnDependencyPropertyChanged(object sender, DependencyPropertyChangedEventArgs args)
+        {
+            DependencyObject senderControl = sender as DependencyObject;
+
+            /* Note: ColorProperty is defined in the base class and cannot be used here
+             * See the OnColorChanged callback below
+             */
+
+            if (object.ReferenceEquals(args.Property, CustomPaletteProperty))
+            {
+                IColorPalette palette = this.CustomPalette;
+
+                if (palette != null)
+                {
+                    this.CustomPaletteColumnCount = palette.ColorCount;
+                    this.CustomPaletteColors.Clear();
+
+                    for (int shadeIndex = 0; shadeIndex < palette.ShadeCount; shadeIndex++)
+                    {
+                        for (int colorIndex = 0; colorIndex < palette.ColorCount; colorIndex++)
+                        {
+                            this.CustomPaletteColors.Add(palette.GetColor(colorIndex, shadeIndex));
+                        }
+                    }
+                }
+            }
+            else if (object.ReferenceEquals(args.Property, IsColorPaletteVisibleProperty))
+            {
+                this.UpdateVisualState(false);
+                this.ValidateSelectedPanel();
+            }
+
+            return;
+        }
+
         /***************************************************************************************
          *
          * Color Update Timer
@@ -1194,39 +1223,6 @@ private void OnColorChanged(DependencyObject d, DependencyProperty e)
             return;
         }
 
-        /// <summary>
-        /// Callback for when the <see cref="CustomPalette"/> dependency property value changes.
-        /// </summary>
-        private void OnCustomPaletteChanged(DependencyObject d, DependencyProperty e)
-        {
-            IColorPalette palette = this.CustomPalette;
-
-            if (palette != null)
-            {
-                this.CustomPaletteColumnCount = palette.ColorCount;
-                this.CustomPaletteColors.Clear();
-
-                for (int shadeIndex = 0; shadeIndex < palette.ShadeCount; shadeIndex++)
-                {
-                    for (int colorIndex = 0; colorIndex < palette.ColorCount; colorIndex++)
-                    {
-                        this.CustomPaletteColors.Add(palette.GetColor(colorIndex, shadeIndex));
-                    }
-                }
-            }
-
-            return;
-        }
-
-        /// <summary>
-        /// Callback for when the <see cref="IsColorPaletteVisible"/> dependency property value changes.
-        /// </summary>
-        private void OnIsColorPaletteVisibleChanged(DependencyObject d, DependencyProperty e)
-        {
-            this.UpdateVisualState(false);
-            return;
-        }
-
         /***************************************************************************************
          *
          * Event Handling

From 5540ecef2e35d0d9440964ec3e7aef55e11ada70 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 27 Jul 2021 20:49:21 +0200
Subject: [PATCH 011/200] Add footer templatepart

---
 .../TokenizingTextBox/TokenizingTextBox.xaml       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index 7b689061d63..04661d9d1e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
@@ -68,6 +68,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
             <ContentPresenter Content="{TemplateBinding Header}"
@@ -108,12 +109,17 @@
                           ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
 
                 <ItemsPresenter Padding="{TemplateBinding Padding}"
-                                Margin="{StaticResource TokenizingTextBoxPresenterMargin}"
-                                Footer="{TemplateBinding Footer}"
-                                FooterTemplate="{TemplateBinding FooterTemplate}"
-                                FooterTransitions="{TemplateBinding FooterTransitions}" />
+                                Margin="{StaticResource TokenizingTextBoxPresenterMargin}"/>
             </ScrollViewer>
 
+            <ContentPresenter Grid.Row="2"
+                              Content="{TemplateBinding Footer}"
+                              ContentTemplate="{TemplateBinding FooterTemplate}"
+                              Transitions="{TemplateBinding FooterTransitions}"
+                              FontWeight="Normal"
+                              TextWrapping="Wrap"
+                              VerticalAlignment="Top" />
+            
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Disabled">

From 5564df3d61b1a9ffdafa2f0c74d69941640d8f35 Mon Sep 17 00:00:00 2001
From: Shane Weaver <shweaver@microsoft.com>
Date: Mon, 9 Aug 2021 15:21:05 -0700
Subject: [PATCH 012/200] Added TryRenameItemAsync and TryDeleteItemAsync to
 IFileStorageHelper

---
 ...pplicationDataStorageHelper.CacheFolder.cs | 23 ++++++---
 .../ApplicationDataStorageHelper.cs           | 48 ++++++++++++-------
 .../ObjectStorage/IFileStorageHelper.cs       | 10 +++-
 3 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
index 78a73a566a9..40a51057bcc 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
@@ -29,7 +29,7 @@ public partial class ApplicationDataStorageHelper
         /// <returns>Waiting task until completion with the object in the file.</returns>
         public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         {
-            return ReadFileAsync<T>(CacheFolder, filePath, @default);
+            return ReadFileAsync<T>(this.CacheFolder, filePath, @default);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>A list of file types and names in the target folder.</returns>
         public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadCacheFolderAsync(string folderPath)
         {
-            return ReadFolderAsync(CacheFolder, folderPath);
+            return ReadFolderAsync(this.CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFileAsync<T>(string filePath, T value)
         {
-            return SaveFileAsync<T>(CacheFolder, filePath, value);
+            return CreateFileAsync<T>(this.CacheFolder, filePath, value);
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ public Task CreateCacheFileAsync<T>(string filePath, T value)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFolderAsync(string folderPath)
         {
-            return CreateFolderAsync(CacheFolder, folderPath);
+            return CreateFolderAsync(this.CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -69,9 +69,20 @@ public Task CreateCacheFolderAsync(string folderPath)
         /// </summary>
         /// <param name="itemPath">The path to the item for deletion.</param>
         /// <returns>Waiting task until completion.</returns>
-        public Task DeleteCacheItemAsync(string itemPath)
+        public Task<bool> TryDeleteCacheItemAsync(string itemPath)
         {
-            return DeleteItemAsync(CacheFolder, itemPath);
+            return TryDeleteItemAsync(CacheFolder, itemPath);
+        }
+
+        /// <summary>
+        /// Rename an item in the LocalCacheFolder.
+        /// </summary>
+        /// <param name="itemPath">The path to the target item.</param>
+        /// <param name="newName">The new nam for the target item.</param>
+        /// <returns>Waiting task until completion.</returns>
+        public Task<bool> TryRenameCacheItemAsync(string itemPath, string newName)
+        {
+            return TryRenameItemAsync(this.CacheFolder, itemPath, newName);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
index 2cf1c568f54..ab915e39026 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -259,7 +259,7 @@ public bool TryDelete(string compositeKey, string key)
         /// <inheritdoc />
         public Task CreateFileAsync<T>(string filePath, T value)
         {
-            return this.SaveFileAsync<T>(this.Folder, filePath, value);
+            return this.CreateFileAsync<T>(this.Folder, filePath, value);
         }
 
         /// <inheritdoc />
@@ -269,21 +269,15 @@ public Task CreateFolderAsync(string folderPath)
         }
 
         /// <inheritdoc />
-        public Task DeleteItemAsync(string itemPath)
+        public Task<bool> TryDeleteItemAsync(string itemPath)
         {
-            return this.DeleteItemAsync(this.Folder, itemPath);
+            return TryDeleteItemAsync(this.Folder, itemPath);
         }
 
-        /// <summary>
-        /// Saves an object inside a file.
-        /// </summary>
-        /// <typeparam name="T">Type of object saved.</typeparam>
-        /// <param name="filePath">Path to the file that will contain the object.</param>
-        /// <param name="value">Object to save.</param>
-        /// <returns>Waiting task until completion.</returns>
-        public Task<StorageFile> SaveFileAsync<T>(string filePath, T value)
+        /// <inheritdoc />
+        public Task<bool> TryRenameItemAsync(string itemPath, string newName)
         {
-            return this.SaveFileAsync(this.Folder, filePath, value);
+            return TryRenameItemAsync(this.Folder, itemPath, newName);
         }
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
@@ -307,7 +301,7 @@ public Task<StorageFile> SaveFileAsync<T>(string filePath, T value)
             });
         }
 
-        private Task<StorageFile> SaveFileAsync<T>(StorageFolder folder, string filePath, T value)
+        private Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
             return StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
         }
@@ -317,10 +311,32 @@ private async Task CreateFolderAsync(StorageFolder folder, string folderPath)
             await folder.CreateFolderAsync(folderPath, CreationCollisionOption.OpenIfExists);
         }
 
-        private async Task DeleteItemAsync(StorageFolder folder, string itemPath)
+        private async Task<bool> TryDeleteItemAsync(StorageFolder folder, string itemPath)
         {
-            var item = await folder.GetItemAsync(itemPath);
-            await item.DeleteAsync();
+            try
+            {
+                var item = await folder.GetItemAsync(itemPath);
+                await item.DeleteAsync();
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private async Task<bool> TryRenameItemAsync(StorageFolder folder, string itemPath, string newName)
+        {
+            try
+            {
+                var item = await folder.GetItemAsync(itemPath);
+                await item.RenameAsync(newName, NameCollisionOption.FailIfExists);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs
index df3b1600c39..7e45d82d7c9 100644
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs
+++ b/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs
@@ -55,6 +55,14 @@ public interface IFileStorageHelper
         /// </summary>
         /// <param name="itemPath">The path to the item for deletion.</param>
         /// <returns>Waiting task until completion.</returns>
-        Task DeleteItemAsync(string itemPath);
+        Task<bool> TryDeleteItemAsync(string itemPath);
+
+        /// <summary>
+        /// Rename an item.
+        /// </summary>
+        /// <param name="itemPath">The path to the target item.</param>
+        /// <param name="newName">The new nam for the target item.</param>
+        /// <returns>Waiting task until completion.</returns>
+        Task<bool> TryRenameItemAsync(string itemPath, string newName);
     }
 }

From a72b060db0ba27211f58a05609e8740246b49b28 Mon Sep 17 00:00:00 2001
From: Shane Weaver <shweaver@microsoft.com>
Date: Mon, 9 Aug 2021 16:56:39 -0700
Subject: [PATCH 013/200] wip

---
 .../ApplicationDataStorageHelper.cs           | 32 +++++++-
 .../Test_ApplicationDataStorageHelper.cs      | 75 +++++++++++++++++++
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
index ab915e39026..ffd4e60a1ab 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -282,12 +282,26 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
         {
+            var dirName = System.IO.Path.GetDirectoryName(filePath);
+            if (!string.IsNullOrEmpty(dirName))
+            {
+                folder = await folder.GetFolderAsync(dirName);
+                filePath = System.IO.Path.GetFileName(filePath);
+            }
+
             string value = await StorageFileHelper.ReadTextFromFileAsync(folder, filePath);
             return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;
         }
 
         private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)
         {
+            var dirName = System.IO.Path.GetDirectoryName(folderPath);
+            if (!string.IsNullOrEmpty(dirName))
+            {
+                folder = await folder.GetFolderAsync(dirName);
+                folderPath = System.IO.Path.GetFileName(folderPath);
+            }
+
             var targetFolder = await folder.GetFolderAsync(folderPath);
             var items = await targetFolder.GetItemsAsync();
 
@@ -301,13 +315,27 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
             });
         }
 
-        private Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
+        private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            return StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
+            var dirName = System.IO.Path.GetDirectoryName(filePath);
+            if (!string.IsNullOrEmpty(dirName))
+            {
+                folder = await folder.GetFolderAsync(dirName);
+                filePath = System.IO.Path.GetFileName(filePath);
+            }
+
+            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
         }
 
         private async Task CreateFolderAsync(StorageFolder folder, string folderPath)
         {
+            var dirName = System.IO.Path.GetDirectoryName(folderPath);
+            if (!string.IsNullOrEmpty(dirName))
+            {
+                folder = await folder.GetFolderAsync(dirName);
+                folderPath = System.IO.Path.GetFileName(folderPath);
+            }
+
             await folder.CreateFolderAsync(folderPath, CreationCollisionOption.OpenIfExists);
         }
 
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
index 3181736f824..fd8d4acd76e 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
@@ -171,6 +171,81 @@ public void Test_StorageHelper_NewPersonTest()
             Assert.AreEqual(input.Age, output.Age);
         }
 
+        [TestCategory("Helpers")]
+        [TestMethod]
+        public async Task Test_StorageHelper_FileCRUDTest()
+        {
+            var fileName = "TestFile.txt";
+            var fileName2 = "TestFile2.txt";
+            var fileContents = "this is a test";
+            var fileContents2 = "this is also a test";
+            var storageHelper = ApplicationDataStorageHelper.GetCurrent();
+
+            // Create a file
+            await storageHelper.CreateFileAsync(fileName, fileContents);
+
+            // Read a file
+            var readContents = await storageHelper.ReadFileAsync<string>(fileName);
+            Assert.AreEqual(fileContents, readContents);
+
+            // Update a file
+            await storageHelper.CreateFileAsync(fileName, fileContents2);
+            var readContents2 = await storageHelper.ReadFileAsync<string>(fileName);
+            Assert.AreEqual(fileContents2, readContents2);
+
+            // Rename a file
+            var itemRenamed = await storageHelper.TryRenameItemAsync(fileName, fileName2);
+            Assert.IsTrue(itemRenamed);
+
+            // Delete a file
+            var itemDeleted = await storageHelper.TryDeleteItemAsync(fileName2);
+            Assert.IsTrue(itemDeleted);
+        }
+
+        [TestCategory("Helpers")]
+        [TestMethod]
+        public async Task Test_StorageHelper_SubFolderCRUDTest()
+        {
+            var folderName = "TestFolder";
+            var subFolderName = "TestSubFolder";
+            var subFolderName2 = "TestSubFolder2";
+            var subFolderPath = $"{folderName}/{subFolderName}";
+            var subFolderPath2 = $"{folderName}/{subFolderName2}";
+            var fileName = "TestFile.txt";
+            var filePath = $"{subFolderPath}/{fileName}";
+
+            var fileContents = "this is a test";
+            var storageHelper = ApplicationDataStorageHelper.GetCurrent();
+
+            // Create a folder
+            await storageHelper.CreateFolderAsync(folderName);
+
+            // Create a subfolder
+            await storageHelper.CreateFolderAsync(subFolderPath);
+
+            // Create a file in the subfolder
+            await storageHelper.CreateFileAsync(filePath, fileContents);
+
+            // Read a file from the subfolder
+            var readContents = await storageHelper.ReadFileAsync<string>(filePath);
+            Assert.AreEqual(fileContents, readContents);
+
+            // List subfolder contents
+            var folderItems = await storageHelper.ReadFolderAsync(subFolderPath);
+            var folderItemsList = folderItems.ToList();
+            Assert.AreEqual(1, folderItemsList.Count());
+            Assert.AreEqual(fileName, folderItemsList[0].Name);
+            Assert.AreEqual(Microsoft.Toolkit.Helpers.DirectoryItemType.File, folderItemsList[0].ItemType);
+
+            // Rename a subfolder
+            var itemRenamed = await storageHelper.TryRenameItemAsync(subFolderPath, subFolderName2);
+            Assert.IsTrue(itemRenamed);
+
+            // Delete a subfolder
+            var itemDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
+            Assert.IsTrue(itemDeleted);
+        }
+
         public class Person
         {
             public string Name { get; set; }

From 9e9a223fc0a2d26ece1ae4d56b4d75aeea8a0fda Mon Sep 17 00:00:00 2001
From: Shane Weaver <shweaver@microsoft.com>
Date: Tue, 10 Aug 2021 13:16:38 -0700
Subject: [PATCH 014/200] Updated AppDataStorageHelper to better support items
 in sub-folders.

---
 .../ApplicationDataStorageHelper.cs           | 46 +++++--------------
 .../Test_ApplicationDataStorageHelper.cs      | 30 ++++++++----
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
index ffd4e60a1ab..7140dcfbd23 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Helpers;
@@ -282,27 +283,13 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
         {
-            var dirName = System.IO.Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                filePath = System.IO.Path.GetFileName(filePath);
-            }
-
-            string value = await StorageFileHelper.ReadTextFromFileAsync(folder, filePath);
+            string value = await StorageFileHelper.ReadTextFromFileAsync(folder, NormalizePath(filePath));
             return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;
         }
 
         private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)
         {
-            var dirName = System.IO.Path.GetDirectoryName(folderPath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                folderPath = System.IO.Path.GetFileName(folderPath);
-            }
-
-            var targetFolder = await folder.GetFolderAsync(folderPath);
+            var targetFolder = await folder.GetFolderAsync(NormalizePath(folderPath));
             var items = await targetFolder.GetItemsAsync();
 
             return items.Select((item) =>
@@ -317,33 +304,19 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            var dirName = System.IO.Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                filePath = System.IO.Path.GetFileName(filePath);
-            }
-
-            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
+            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
         }
 
         private async Task CreateFolderAsync(StorageFolder folder, string folderPath)
         {
-            var dirName = System.IO.Path.GetDirectoryName(folderPath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                folderPath = System.IO.Path.GetFileName(folderPath);
-            }
-
-            await folder.CreateFolderAsync(folderPath, CreationCollisionOption.OpenIfExists);
+            await folder.CreateFolderAsync(NormalizePath(folderPath), CreationCollisionOption.OpenIfExists);
         }
 
         private async Task<bool> TryDeleteItemAsync(StorageFolder folder, string itemPath)
         {
             try
             {
-                var item = await folder.GetItemAsync(itemPath);
+                var item = await folder.GetItemAsync(NormalizePath(itemPath));
                 await item.DeleteAsync();
                 return true;
             }
@@ -357,7 +330,7 @@ private async Task<bool> TryRenameItemAsync(StorageFolder folder, string itemPat
         {
             try
             {
-                var item = await folder.GetItemAsync(itemPath);
+                var item = await folder.GetItemAsync(NormalizePath(itemPath));
                 await item.RenameAsync(newName, NameCollisionOption.FailIfExists);
                 return true;
             }
@@ -366,5 +339,10 @@ private async Task<bool> TryRenameItemAsync(StorageFolder folder, string itemPat
                 return false;
             }
         }
+
+        private string NormalizePath(string path)
+        {
+            return Path.Combine(Path.GetDirectoryName(path), Path.GetFileName(path));
+        }
     }
 }
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
index fd8d4acd76e..35e472be805 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
@@ -206,19 +206,21 @@ public async Task Test_StorageHelper_FileCRUDTest()
         [TestMethod]
         public async Task Test_StorageHelper_SubFolderCRUDTest()
         {
-            var folderName = "TestFolder";
+            var folderName = "TestFolder1";
             var subFolderName = "TestSubFolder";
             var subFolderName2 = "TestSubFolder2";
             var subFolderPath = $"{folderName}/{subFolderName}";
             var subFolderPath2 = $"{folderName}/{subFolderName2}";
             var fileName = "TestFile.txt";
+            var fileName2 = "TestFile2.txt";
             var filePath = $"{subFolderPath}/{fileName}";
-
+            var filePath2 = $"{subFolderPath2}/{fileName2}";
             var fileContents = "this is a test";
+
             var storageHelper = ApplicationDataStorageHelper.GetCurrent();
 
-            // Create a folder
-            await storageHelper.CreateFolderAsync(folderName);
+            // Attempt to delete the folder to clean up from any previously failed test runs.
+            await storageHelper.TryDeleteItemAsync(folderName);
 
             // Create a subfolder
             await storageHelper.CreateFolderAsync(subFolderPath);
@@ -237,13 +239,25 @@ public async Task Test_StorageHelper_SubFolderCRUDTest()
             Assert.AreEqual(fileName, folderItemsList[0].Name);
             Assert.AreEqual(Microsoft.Toolkit.Helpers.DirectoryItemType.File, folderItemsList[0].ItemType);
 
-            // Rename a subfolder
-            var itemRenamed = await storageHelper.TryRenameItemAsync(subFolderPath, subFolderName2);
+            // Rename a file in a subfolder
+            var itemRenamed = await storageHelper.TryRenameItemAsync(filePath, fileName2);
             Assert.IsTrue(itemRenamed);
 
+            // Rename a subfolder
+            var folderRenamed = await storageHelper.TryRenameItemAsync(subFolderPath, subFolderName2);
+            Assert.IsTrue(folderRenamed);
+
+            // Delete a file in a subfolder
+            var fileDeleted = await storageHelper.TryDeleteItemAsync(filePath2);
+            Assert.IsTrue(fileDeleted);
+
             // Delete a subfolder
-            var itemDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
-            Assert.IsTrue(itemDeleted);
+            var subFolderDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
+            Assert.IsTrue(subFolderDeleted);
+
+            // Delete the folder to clean up.
+            var folderDeleted = await storageHelper.TryDeleteItemAsync(folderName);
+            Assert.IsTrue(folderDeleted);
         }
 
         public class Person

From 41b580a87984549c7e7eafb321c2d5c787694496 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:32:13 -0700
Subject: [PATCH 015/200] Adding support for height

---
 .../Triggers/ControlWidthTrigger.cs           | 63 +++++++++++++------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
index 75c89474c56..0aef0b9ecbd 100644
--- a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -29,15 +29,10 @@ public bool CanTrigger
             nameof(CanTrigger),
             typeof(bool),
             typeof(ControlWidthTrigger),
-            new PropertyMetadata(true, OnCanTriggerProperty));
-
-        private static void OnCanTriggerProperty(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ControlWidthTrigger)d).UpdateTrigger();
-        }
+            new PropertyMetadata(true, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
 
         /// <summary>
-        /// Gets or sets the max size at which to trigger.
+        /// Gets or sets the max width at which to trigger.
         /// </summary>
         public double MaxWidth
         {
@@ -52,15 +47,10 @@ public double MaxWidth
             nameof(MaxWidth),
             typeof(double),
             typeof(ControlWidthTrigger),
-            new PropertyMetadata(double.PositiveInfinity, OnMaxWidthPropertyChanged));
-
-        private static void OnMaxWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ControlWidthTrigger)d).UpdateTrigger();
-        }
+            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
 
         /// <summary>
-        /// Gets or sets the min size at which to trigger.
+        /// Gets or sets the min width at which to trigger.
         /// </summary>
         public double MinWidth
         {
@@ -75,13 +65,44 @@ public double MinWidth
             nameof(MinWidth),
             typeof(double),
             typeof(ControlWidthTrigger),
-            new PropertyMetadata(0.0, OnMinWidthPropertyChanged));
+            new PropertyMetadata(0.0, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
 
-        private static void OnMinWidthPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        /// <summary>
+        /// Gets or sets the max height at which to trigger.
+        /// </summary>
+        public double MaxHeight
         {
-            ((ControlWidthTrigger)d).UpdateTrigger();
+            get => (double)GetValue(MaxHeightProperty);
+            set => SetValue(MaxHeightProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the <see cref="MaxHeight"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MaxHeightProperty = DependencyProperty.Register(
+            nameof(MaxHeight),
+            typeof(double),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+
+        /// <summary>
+        /// Gets or sets the min height at which to trigger.
+        /// </summary>
+        public double MinHeight
+        {
+            get => (double)GetValue(MinHeightProperty);
+            set => SetValue(MinHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="MinHeight"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MinHeightProperty = DependencyProperty.Register(
+            nameof(MinHeight),
+            typeof(double),
+            typeof(ControlWidthTrigger),
+            new PropertyMetadata(0.0, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+
         /// <summary>
         /// Gets or sets the element whose width will observed
         /// for the trigger.
@@ -139,7 +160,11 @@ private void UpdateTrigger()
                 return;
             }
 
-            SetActive(MinWidth <= TargetElement.ActualWidth && TargetElement.ActualWidth < MaxWidth);
+            SetActive(
+                MinWidth <= TargetElement.ActualWidth &&
+                TargetElement.ActualWidth < MaxWidth &&
+                MinHeight <= TargetElement.ActualHeight &&
+                TargetElement.ActualHeight < MaxHeight);
         }
     }
 }

From c0f7ff368480b2ed3e668a6445946780db41fd17 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:33:25 -0700
Subject: [PATCH 016/200] Renamed trigger

---
 ...lWidthTrigger.cs => ControlSizeTrigger.cs} | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI/Triggers/{ControlWidthTrigger.cs => ControlSizeTrigger.cs} (86%)

diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
similarity index 86%
rename from Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
rename to Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
index 0aef0b9ecbd..2dc74655e44 100644
--- a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlWidthTrigger.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
@@ -8,9 +8,9 @@ namespace Microsoft.Toolkit.Uwp.UI.Triggers
 {
     /// <summary>
     /// A conditional state trigger that functions
-    /// based on the target control's width.
+    /// based on the target control's width or height.
     /// </summary>
-    public class ControlWidthTrigger : StateTriggerBase
+    public class ControlSizeTrigger : StateTriggerBase
     {
         /// <summary>
         /// Gets or sets a value indicating
@@ -28,8 +28,8 @@ public bool CanTrigger
         public static readonly DependencyProperty CanTriggerProperty = DependencyProperty.Register(
             nameof(CanTrigger),
             typeof(bool),
-            typeof(ControlWidthTrigger),
-            new PropertyMetadata(true, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+            typeof(ControlSizeTrigger),
+            new PropertyMetadata(true, (d, e) => ((ControlSizeTrigger)d).UpdateTrigger()));
 
         /// <summary>
         /// Gets or sets the max width at which to trigger.
@@ -46,8 +46,8 @@ public double MaxWidth
         public static readonly DependencyProperty MaxWidthProperty = DependencyProperty.Register(
             nameof(MaxWidth),
             typeof(double),
-            typeof(ControlWidthTrigger),
-            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+            typeof(ControlSizeTrigger),
+            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlSizeTrigger)d).UpdateTrigger()));
 
         /// <summary>
         /// Gets or sets the min width at which to trigger.
@@ -64,8 +64,8 @@ public double MinWidth
         public static readonly DependencyProperty MinWidthProperty = DependencyProperty.Register(
             nameof(MinWidth),
             typeof(double),
-            typeof(ControlWidthTrigger),
-            new PropertyMetadata(0.0, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+            typeof(ControlSizeTrigger),
+            new PropertyMetadata(0.0, (d, e) => ((ControlSizeTrigger)d).UpdateTrigger()));
 
         /// <summary>
         /// Gets or sets the max height at which to trigger.
@@ -82,8 +82,8 @@ public double MaxHeight
         public static readonly DependencyProperty MaxHeightProperty = DependencyProperty.Register(
             nameof(MaxHeight),
             typeof(double),
-            typeof(ControlWidthTrigger),
-            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+            typeof(ControlSizeTrigger),
+            new PropertyMetadata(double.PositiveInfinity, (d, e) => ((ControlSizeTrigger)d).UpdateTrigger()));
 
         /// <summary>
         /// Gets or sets the min height at which to trigger.
@@ -100,8 +100,8 @@ public double MinHeight
         public static readonly DependencyProperty MinHeightProperty = DependencyProperty.Register(
             nameof(MinHeight),
             typeof(double),
-            typeof(ControlWidthTrigger),
-            new PropertyMetadata(0.0, (d, e) => ((ControlWidthTrigger)d).UpdateTrigger()));
+            typeof(ControlSizeTrigger),
+            new PropertyMetadata(0.0, (d, e) => ((ControlSizeTrigger)d).UpdateTrigger()));
 
         /// <summary>
         /// Gets or sets the element whose width will observed
@@ -122,12 +122,12 @@ public FrameworkElement TargetElement
         public static readonly DependencyProperty TargetElementProperty = DependencyProperty.Register(
             nameof(TargetElement),
             typeof(FrameworkElement),
-            typeof(ControlWidthTrigger),
+            typeof(ControlSizeTrigger),
             new PropertyMetadata(null, OnTargetElementPropertyChanged));
 
         private static void OnTargetElementPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            ((ControlWidthTrigger)d).UpdateTargetElement((FrameworkElement)e.OldValue, (FrameworkElement)e.NewValue);
+            ((ControlSizeTrigger)d).UpdateTargetElement((FrameworkElement)e.OldValue, (FrameworkElement)e.NewValue);
         }
 
         // Handle event to get current values

From b31758da2d411b6f8fc5de98942596ddbf47bab4 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Wed, 11 Aug 2021 21:35:28 -0700
Subject: [PATCH 017/200] Added sample page

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  4 ++
 .../Triggers/ControlSizeTrigger.bind          | 43 +++++++++++++++++++
 .../SamplePages/XamlOnlyPage.xaml             |  1 +
 .../SamplePages/samples.json                  | 17 ++++++--
 4 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 07b878addb8..c94beaa13c1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1078,6 +1078,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Content>
+    <Content Include="SamplePages\Triggers\ControlSizeTrigger.bind">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Content>
     <Page Include="SamplePages\Triggers\FullScreenModeStateTriggerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
new file mode 100644
index 00000000000..8ffbf70a104
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
@@ -0,0 +1,43 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
+    mc:Ignorable="d">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <triggers:ControlSizeTrigger 
+                            TargetElement="ParentGrid" 
+                            MinWidth="400" 
+                            MaxWidth="500"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ResizingText.FontSize" Value="20"/>
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+
+        <StackPanel VerticalAlignment="Center" Width="500">
+            <Grid 
+                x:Name="ParentGrid"
+                Width="{Binding Value, ElementName=Slider, Mode=OneWay}"
+                Height="50"
+                Background="Blue"/>
+            <TextBlock 
+                x:Name="ResizingText" 
+                FontSize="12" 
+                Text="Windows Community Toolkit" 
+                HorizontalAlignment="Center"/>
+            <Slider 
+                x:Name="Slider" 
+                Minimum="0" 
+                Maximum="500" />
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 631cf5e5c95..5beea3c5e25 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -31,6 +31,7 @@
         <triggers:RegexStateTrigger x:Key="RegexStateTrigger" />
         <triggers:UserHandPreferenceStateTrigger x:Key="UserHandPreferenceStateTrigger" />
         <triggers:UserInteractionModeStateTrigger x:Key="UserInteractionModeStateTrigger" />
+        <triggers:ControlSizeTrigger x:Key="ControlSizeTrigger" />
         <behaviors:StartAnimationAction x:Key="StartAnimationAction" />
         <behaviors:AutoSelectBehavior x:Key="AutoSelectBehavior" />
         <controls:ColorPicker x:Key="ColorPicker" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index b07fedab76b..d0540fd83c0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -785,7 +785,7 @@
         "Type": "ThemeListenerPage",
         "Subcategory": "Systems",
         "About": "The ThemeListener allows you to keep track of changes to the System Theme.",
-        "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Helpers/ThemeListener.cs",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Helpers/ThemeListener.cs",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/ThemeListener.md"
       },
@@ -844,7 +844,7 @@
         "Type": "CanvasPathGeometryPage",
         "Subcategory": "Parser",
         "About": "CanvasPathGeometry class allows you to convert Win2d Path Mini Language string to CanvasGeometry, Brushes, CanvasStrokes or CanvasStrokeStyles.",
-        "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Media/Geometry",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Media/Geometry",
         "Icon": "/SamplePages/CanvasPathGeometry/CanvasPathGeometry.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/CanvasPathGeometry.md"
       },
@@ -882,7 +882,7 @@
         "Name": "Guard APIs",
         "Subcategory": "Developer",
         "About": "The Guard APIs can be used to validate method arguments in a streamlined manner, which is also faster, less verbose, more expressive and less error prone than manually writing checks and throwing exceptions.",
-        "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Diagnostics",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Diagnostics",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/developer-tools/Guard.md"
       },
@@ -890,7 +890,7 @@
         "Name": "High Performance APIs",
         "Subcategory": "Developer",
         "About": "The High Performance package contains a set of APIs that are heavily focused on optimization. All the new APIs have been carefully crafted to achieve the best possible performance when using them, either through reduced memory allocation, micro-optimizations at the assembly level, or by structuring the APIs in a way that facilitates writing performance oriented code in general.",
-        "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.HighPerformance",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.HighPerformance",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/high-performance/Introduction.md"
       },
@@ -911,6 +911,15 @@
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
       },
+      {
+        "Name": "ControlSizeTrigger",
+        "Subcategory": "State Triggers",
+        "About": "Enables a state if the target control meets the specified size.",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs",
+        "XamlCodeFile": "/SamplePages/Triggers/ControlSizeTrigger.bind",
+        "Icon": "/Assets/Helpers.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
+      },
       {
         "Name": "IsEqualStateTrigger",
         "Subcategory": "State Triggers",

From a582f346e2f4f30b17e4a998b67406121b2ae618 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Wed, 11 Aug 2021 21:52:40 -0700
Subject: [PATCH 018/200] Bug fix

---
 .../SamplePages/Triggers/ControlSizeTrigger.bind                | 2 +-
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
index 8ffbf70a104..534eb404fa2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
@@ -12,7 +12,7 @@
                 <VisualState>
                     <VisualState.StateTriggers>
                         <triggers:ControlSizeTrigger 
-                            TargetElement="ParentGrid" 
+                            TargetElement="{Binding ParentGrid}" 
                             MinWidth="400" 
                             MaxWidth="500"/>
                     </VisualState.StateTriggers>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index d0540fd83c0..adc8674db85 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -914,7 +914,7 @@
       {
         "Name": "ControlSizeTrigger",
         "Subcategory": "State Triggers",
-        "About": "Enables a state if the target control meets the specified size.",
+        "About": "Enables a state if the target control meets the specified size",
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/ControlSizeTrigger.bind",
         "Icon": "/Assets/Helpers.png",

From cdf48d04be8d2c2d29738fc03f397510e85b9c27 Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Wed, 11 Aug 2021 22:14:08 -0700
Subject: [PATCH 019/200] Fixed sample bug

---
 .../SamplePages/Triggers/ControlSizeTrigger.bind                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
index 534eb404fa2..50819d207c7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
@@ -12,7 +12,7 @@
                 <VisualState>
                     <VisualState.StateTriggers>
                         <triggers:ControlSizeTrigger 
-                            TargetElement="{Binding ParentGrid}" 
+                            TargetElement="{x:Bind ParentGrid}" 
                             MinWidth="400" 
                             MaxWidth="500"/>
                     </VisualState.StateTriggers>

From e62eb8bf8bcf2e1553ca8f94e8698aadafc0d29f Mon Sep 17 00:00:00 2001
From: Daniel <dpaulino@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:32:49 -0700
Subject: [PATCH 020/200] Improving comments

---
 Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
index 2dc74655e44..b7aead3c22b 100644
--- a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
@@ -33,6 +33,8 @@ public bool CanTrigger
 
         /// <summary>
         /// Gets or sets the max width at which to trigger.
+        /// This value is exclusive, meaning this trigger
+        /// could be active if the value is < MaxWidth.
         /// </summary>
         public double MaxWidth
         {
@@ -51,6 +53,8 @@ public double MaxWidth
 
         /// <summary>
         /// Gets or sets the min width at which to trigger.
+        /// This value is inclusive, meaning this trigger
+        /// could be active if the value is >= MinWidth.
         /// </summary>
         public double MinWidth
         {
@@ -69,6 +73,8 @@ public double MinWidth
 
         /// <summary>
         /// Gets or sets the max height at which to trigger.
+        /// This value is exclusive, meaning this trigger
+        /// could be active if the value is < MaxHeight.
         /// </summary>
         public double MaxHeight
         {
@@ -87,6 +93,8 @@ public double MaxHeight
 
         /// <summary>
         /// Gets or sets the min height at which to trigger.
+        /// This value is inclusive, meaning this trigger
+        /// could be active if the value is >= MinHeight.
         /// </summary>
         public double MinHeight
         {

From fd8aee572c46affb6d4abd47b2b4fb369b6b096b Mon Sep 17 00:00:00 2001
From: Daniel <dpaulino@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:33:41 -0700
Subject: [PATCH 021/200] Fixing xbind in sample

---
 .../SamplePages/Triggers/ControlSizeTrigger.bind                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
index 50819d207c7..583f4cbbbda 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Triggers/ControlSizeTrigger.bind
@@ -12,7 +12,7 @@
                 <VisualState>
                     <VisualState.StateTriggers>
                         <triggers:ControlSizeTrigger 
-                            TargetElement="{x:Bind ParentGrid}" 
+                            TargetElement="{Binding ElementName=ParentGrid}" 
                             MinWidth="400" 
                             MaxWidth="500"/>
                     </VisualState.StateTriggers>

From 5a523c9aaa44f65c9d897b2d726b906a01c69bbb Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Sat, 14 Aug 2021 18:44:10 -0700
Subject: [PATCH 022/200] Added unit test

---
 .../Triggers/ControlSizeTrigger.cs            | 21 +++++---
 .../UI/Triggers/Test_ControlSizeTrigger.cs    | 50 +++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  1 +
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs

diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
index b7aead3c22b..1fcbd28291e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Triggers/ControlSizeTrigger.cs
@@ -34,7 +34,7 @@ public bool CanTrigger
         /// <summary>
         /// Gets or sets the max width at which to trigger.
         /// This value is exclusive, meaning this trigger
-        /// could be active if the value is < MaxWidth.
+        /// could be active if the value is less than MaxWidth.
         /// </summary>
         public double MaxWidth
         {
@@ -74,7 +74,7 @@ public double MinWidth
         /// <summary>
         /// Gets or sets the max height at which to trigger.
         /// This value is exclusive, meaning this trigger
-        /// could be active if the value is < MaxHeight.
+        /// could be active if the value is less than MaxHeight.
         /// </summary>
         public double MaxHeight
         {
@@ -133,6 +133,11 @@ public FrameworkElement TargetElement
             typeof(ControlSizeTrigger),
             new PropertyMetadata(null, OnTargetElementPropertyChanged));
 
+        /// <summary>
+        /// Gets a value indicating whether the trigger is active.
+        /// </summary>
+        public bool IsActive { get; private set; }
+
         private static void OnTargetElementPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             ((ControlSizeTrigger)d).UpdateTargetElement((FrameworkElement)e.OldValue, (FrameworkElement)e.NewValue);
@@ -168,11 +173,13 @@ private void UpdateTrigger()
                 return;
             }
 
-            SetActive(
-                MinWidth <= TargetElement.ActualWidth &&
-                TargetElement.ActualWidth < MaxWidth &&
-                MinHeight <= TargetElement.ActualHeight &&
-                TargetElement.ActualHeight < MaxHeight);
+            bool activate = MinWidth <= TargetElement.ActualWidth &&
+                            TargetElement.ActualWidth < MaxWidth &&
+                            MinHeight <= TargetElement.ActualHeight &&
+                            TargetElement.ActualHeight < MaxHeight;
+
+            IsActive = activate;
+            SetActive(activate);
         }
     }
 }
diff --git a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
new file mode 100644
index 00000000000..7ccfad59f26
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
@@ -0,0 +1,50 @@
+using Microsoft.Toolkit.Uwp;
+using Microsoft.Toolkit.Uwp.UI.Triggers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+
+namespace UnitTests.UWP.UI.Triggers
+{
+    [TestClass]
+    [TestCategory("Test_ControlSizeTrigger")]
+    public class Test_ControlSizeTrigger : VisualUITestBase
+    {
+        [DataTestMethod]
+        [DataRow(450, 450, true)]
+        [DataRow(400, 400, true)]
+        [DataRow(500, 500, false)]
+        [DataRow(399, 400, false)]
+        [DataRow(400, 399, false)]
+        public async Task ControlSizeTriggerTest(double width, double height, bool expectedResult)
+        {
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                Grid grid = CreateGrid(width, height);
+                var trigger = new ControlSizeTrigger();
+
+                trigger.TargetElement = grid;
+                trigger.MaxHeight = 500;
+                trigger.MinHeight = 400;
+                trigger.MaxWidth = 500;
+                trigger.MinWidth = 400;
+
+                Assert.AreEqual(expectedResult, trigger.IsActive);
+            });
+        }
+
+        private Grid CreateGrid(double width, double height)
+        {
+            var grid = new Grid()
+            {
+                Height = height,
+                Width = width
+            };
+            grid.Measure(new Windows.Foundation.Size(1000, 1000));
+            grid.Arrange(new Windows.Foundation.Rect(0, 0, 1000, 1000));
+            grid.UpdateLayout();
+
+            return grid;
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 1659951ec88..8620e2c1234 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -250,6 +250,7 @@
     <Compile Include="UI\Extensions\Test_VisualExtensions.cs" />
     <Compile Include="UI\Person.cs" />
     <Compile Include="UI\Test_AdvancedCollectionView.cs" />
+    <Compile Include="UI\Triggers\Test_ControlSizeTrigger.cs" />
     <Compile Include="VisualUITestBase.cs" />
   </ItemGroup>
   <ItemGroup>

From a5fc9ebbe4a05a756a2f504f0b49b0b0ba92d1d4 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Sun, 15 Aug 2021 14:12:34 +0200
Subject: [PATCH 023/200] Windows 10X TwoPaneView for ListDetailsView

---
 .../Controls/ListDetailsView.Metadata.cs      |  12 +-
 .../Controls/ListDetailsView.Typedata.cs      |   9 +-
 .../ListDetailsView/BackButtonBehavior.cs     |   4 +-
 .../ListDetailsView.BackButton.cs             | 166 +++++++
 .../ListDetailsView/ListDetailsView.Events.cs |   6 +-
 .../ListDetailsView.Properties.cs             | 185 +++++++-
 .../ListDetailsView/ListDetailsView.cs        | 408 +++++++-----------
 .../ListDetailsView/ListDetailsView.xaml      | 262 +++++------
 .../ListDetailsView/ListDetailsViewState.cs   |   8 +-
 .../UI/Controls/Test_ListDetailsView.cs       |  94 +++-
 10 files changed, 734 insertions(+), 420 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
index 3013c7fdd2b..45bba363e2f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
@@ -2,12 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.ComponentModel;
-
 using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
 using Microsoft.VisualStudio.DesignTools.Extensibility;
 using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+using System.ComponentModel;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
@@ -25,6 +23,7 @@ public ListDetailsViewMetadata()
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
                     b.AddCustomAttributes(nameof(ListDetailsView.ListPaneBackground), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(ListDetailsView.DetailsPaneBackground), new CategoryAttribute(Resources.CategoryBrush));
                     b.AddCustomAttributes(nameof(ListDetailsView.ListHeader), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(ListDetailsView.ListHeaderTemplate),
                         new CategoryAttribute(Resources.CategoryAppearance),
@@ -36,6 +35,11 @@ public ListDetailsViewMetadata()
                         new CategoryAttribute(Resources.CategoryCommon),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
+                    AddCustomAttributes(nameof(ListDetailsView.ListPaneNoItemsContent), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListPaneNoItemsContentTemplate),
+                        new CategoryAttribute(Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
                     b.AddCustomAttributes(nameof(ListDetailsView.ViewState), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(ListDetailsView.ListCommandBar), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(ListDetailsView.DetailsCommandBar), new CategoryAttribute(Resources.CategoryCommon));
@@ -44,4 +48,4 @@ public ListDetailsViewMetadata()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
index 15c2bcb7d65..d2472467486 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
     internal static partial class ControlTypes
@@ -15,6 +13,11 @@ internal static class ListDetailsView
     {
         internal const string DetailsCommandBar = nameof(DetailsCommandBar);
         internal const string DetailsTemplate = nameof(DetailsTemplate);
+        internal const string DetailsPaneBackground = nameof(DetailsPaneBackground);
+        internal const string DetailsContentTemplateSelector = nameof(DetailsContentTemplateSelector);
+        internal const string ListPaneItemTemplateSelector = nameof(ListPaneItemTemplateSelector);
+        internal const string ListPaneNoItemsContentTemplate = nameof(ListPaneNoItemsContentTemplate);
+        internal const string ListPaneNoItemsContent = nameof(ListPaneNoItemsContent);
         internal const string ListCommandBar = nameof(ListCommandBar);
         internal const string ListHeader = nameof(ListHeader);
         internal const string ListHeaderTemplate = nameof(ListHeaderTemplate);
@@ -25,4 +28,4 @@ internal static class ListDetailsView
         internal const string SelectedItem = nameof(SelectedItem);
         internal const string ViewState = nameof(ViewState);
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
index d3c8093d7d2..9fa9ee80ce4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
@@ -14,7 +14,7 @@ public enum BackButtonBehavior
         /// </summary>
         /// <remarks>
         /// If the back button controlled by <see cref="Windows.UI.Core.SystemNavigationManager"/> is already visible, the <see cref="ListDetailsView"/> will hook into that button.
-        /// If the new NavigationView provided by the Windows UI nuget package is used, the <see cref="ListDetailsView"/> will enable and show that button.
+        /// If the new NavigationView provided by the Windows UI NuGet package is used, the <see cref="ListDetailsView"/> will enable and show that button.
         /// Otherwise the inline button is used.
         /// </remarks>
         Automatic,
@@ -34,4 +34,4 @@ public enum BackButtonBehavior
         /// </summary>
         Manual,
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs
new file mode 100644
index 00000000000..ff046c6781b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs
@@ -0,0 +1,166 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using Windows.ApplicationModel;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Panel that allows for a List/Details pattern.
+    /// </summary>
+    /// <seealso cref="ItemsControl" />
+    public partial class ListDetailsView
+    {
+        private AppViewBackButtonVisibility? _previousSystemBackButtonVisibility;
+        private bool _previousNavigationViewBackEnabled;
+
+        // Int used because the underlying type is an enum, but we don't have access to the enum
+        private int _previousNavigationViewBackVisibilty;
+        private Button _inlineBackButton;
+        private object _navigationView;
+        private Frame _frame;
+
+        /// <summary>
+        /// Sets the back button visibility based on the current visual state and selected item
+        /// </summary>
+        private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
+        {
+            const int backButtonVisible = 1;
+
+            if (DesignMode.DesignModeEnabled)
+            {
+                return;
+            }
+
+            if (ViewState == ListDetailsViewState.Details)
+            {
+                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
+                {
+                    _inlineBackButton.Visibility = Visibility.Visible;
+                }
+                else if (BackButtonBehavior == BackButtonBehavior.Automatic)
+                {
+                    // Continue to support the system back button if it is being used
+                    SystemNavigationManager navigationManager = SystemNavigationManager.GetForCurrentView();
+                    if (navigationManager.AppViewBackButtonVisibility == AppViewBackButtonVisibility.Visible)
+                    {
+                        // Setting this indicates that the system back button is being used
+                        _previousSystemBackButtonVisibility = navigationManager.AppViewBackButtonVisibility;
+                    }
+                    else if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
+                    {
+                        // We can only use the new NavigationView if we also have a Frame
+                        // If there is no frame we have to use the inline button
+                        _inlineBackButton.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        SetNavigationViewBackButtonState(backButtonVisible, true);
+                    }
+                }
+                else if (BackButtonBehavior != BackButtonBehavior.Manual)
+                {
+                    SystemNavigationManager navigationManager = SystemNavigationManager.GetForCurrentView();
+                    _previousSystemBackButtonVisibility = navigationManager.AppViewBackButtonVisibility;
+
+                    navigationManager.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible;
+                }
+            }
+            else if (previousState == ListDetailsViewState.Details)
+            {
+                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
+                {
+                    _inlineBackButton.Visibility = Visibility.Collapsed;
+                }
+                else if (BackButtonBehavior == BackButtonBehavior.Automatic)
+                {
+                    if (!_previousSystemBackButtonVisibility.HasValue)
+                    {
+                        if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
+                        {
+                            _inlineBackButton.Visibility = Visibility.Collapsed;
+                        }
+                        else
+                        {
+                            SetNavigationViewBackButtonState(_previousNavigationViewBackVisibilty, _previousNavigationViewBackEnabled);
+                        }
+                    }
+                }
+
+                if (_previousSystemBackButtonVisibility.HasValue)
+                {
+                    // Make sure we show the back button if the stack can navigate back
+                    SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = _previousSystemBackButtonVisibility.Value;
+                    _previousSystemBackButtonVisibility = null;
+                }
+            }
+        }
+
+        private void SetNavigationViewBackButtonState(int visible, bool enabled)
+        {
+            if (_navigationView == null)
+            {
+                return;
+            }
+
+            System.Type navType = _navigationView.GetType();
+            PropertyInfo visibleProperty = navType.GetProperty("IsBackButtonVisible");
+            if (visibleProperty != null)
+            {
+                _previousNavigationViewBackVisibilty = (int)visibleProperty.GetValue(_navigationView);
+                visibleProperty.SetValue(_navigationView, visible);
+            }
+
+            PropertyInfo enabledProperty = navType.GetProperty("IsBackEnabled");
+            if (enabledProperty != null)
+            {
+                _previousNavigationViewBackEnabled = (bool)enabledProperty.GetValue(_navigationView);
+                enabledProperty.SetValue(_navigationView, enabled);
+            }
+        }
+
+        /// <summary>
+        /// Closes the details pane if we are in narrow state
+        /// </summary>
+        /// <param name="sender">The sender</param>
+        /// <param name="args">The event args</param>
+        private void OnFrameNavigating(object sender, NavigatingCancelEventArgs args)
+        {
+            if ((args.NavigationMode == NavigationMode.Back) && (ViewState == ListDetailsViewState.Details))
+            {
+                ClearSelectedItem();
+                args.Cancel = true;
+            }
+        }
+
+        /// <summary>
+        /// Closes the details pane if we are in narrow state
+        /// </summary>
+        /// <param name="sender">The sender</param>
+        /// <param name="args">The event args</param>
+        private void OnBackRequested(object sender, BackRequestedEventArgs args)
+        {
+            if (ViewState == ListDetailsViewState.Details)
+            {
+                // let the OnFrameNavigating method handle it if
+                if (_frame == null || !_frame.CanGoBack)
+                {
+                    ClearSelectedItem();
+                }
+
+                args.Handled = true;
+            }
+        }
+
+        private void OnInlineBackButtonClicked(object sender, RoutedEventArgs e)
+        {
+            ClearSelectedItem();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
index ed3009f2ac5..d4ebd8a67cf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Panel that allows for a List/Details pattern.
     /// </summary>
-    /// <seealso cref="Windows.UI.Xaml.Controls.ItemsControl" />
+    /// <seealso cref="ItemsControl" />
     public partial class ListDetailsView
     {
         /// <summary>
@@ -19,7 +19,7 @@ public partial class ListDetailsView
         public event SelectionChangedEventHandler SelectionChanged;
 
         /// <summary>
-        /// Occurs when the view state changes
+        /// Occurs when the view state changes.
         /// </summary>
         public event EventHandler<ListDetailsViewState> ViewStateChanged;
 
@@ -28,4 +28,4 @@ private void OnSelectionChanged(SelectionChangedEventArgs e)
             SelectionChanged?.Invoke(this, e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
index 1cd9caa3c09..d9c5df75e5d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
@@ -45,6 +45,36 @@ public partial class ListDetailsView
             typeof(ListDetailsView),
             new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="DetailsContentTemplateSelector"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="DetailsContentTemplateSelector"/> dependency property.</returns>
+        public static readonly DependencyProperty DetailsContentTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(DetailsContentTemplateSelector),
+            typeof(DataTemplateSelector),
+            typeof(ListDetailsView),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="ListPaneItemTemplateSelector"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="ListPaneItemTemplateSelector"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneItemTemplateSelectorProperty = DependencyProperty.Register(
+            nameof(ListPaneItemTemplateSelector),
+            typeof(DataTemplateSelector),
+            typeof(ListDetailsView),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="DetailsPaneBackground"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="DetailsPaneBackground"/> dependency property.</returns>
+        public static readonly DependencyProperty DetailsPaneBackgroundProperty = DependencyProperty.Register(
+            nameof(DetailsPaneBackground),
+            typeof(Brush),
+            typeof(ListDetailsView),
+            new PropertyMetadata(null));
+
         /// <summary>
         /// Identifies the <see cref="ListPaneBackground"/> dependency property.
         /// </summary>
@@ -75,6 +105,26 @@ public partial class ListDetailsView
             typeof(ListDetailsView),
             new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="ListPaneNoItemsContent"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="ListPaneNoItemsContent"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneNoItemsContentProperty = DependencyProperty.Register(
+            nameof(ListPaneNoItemsContent),
+            typeof(object),
+            typeof(ListDetailsView),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="ListPaneNoItemsContentTemplate"/> dependency property.
+        /// </summary>
+        /// <returns>The identifier for the <see cref="ListPaneNoItemsContentTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneNoItemsContentTemplateProperty = DependencyProperty.Register(
+            nameof(ListPaneNoItemsContentTemplate),
+            typeof(DataTemplate),
+            typeof(ListDetailsView),
+            new PropertyMetadata(null));
+
         /// <summary>
         /// Identifies the <see cref="DetailsHeader"/> dependency property.
         /// </summary>
@@ -103,7 +153,7 @@ public partial class ListDetailsView
             nameof(ListPaneWidth),
             typeof(double),
             typeof(ListDetailsView),
-            new PropertyMetadata(320d));
+            new PropertyMetadata(320d, OnListPaneWidthChanged));
 
         /// <summary>
         /// Identifies the <see cref="NoSelectionContent"/> dependency property.
@@ -162,7 +212,7 @@ public partial class ListDetailsView
             nameof(CompactModeThresholdWidth),
             typeof(double),
             typeof(ListDetailsView),
-            new PropertyMetadata(720d, OnCompactModeThresholdWidthChanged));
+            new PropertyMetadata(640d));
 
         /// <summary>
         /// Identifies the <see cref="BackButtonBehavior"/> dependency property
@@ -202,6 +252,35 @@ public DataTemplate DetailsTemplate
             set { SetValue(DetailsTemplateProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplateSelector"/> for the details presenter.
+        /// </summary>
+        public DataTemplateSelector DetailsContentTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(DetailsContentTemplateSelectorProperty); }
+            set { SetValue(DetailsContentTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplateSelector"/> for the list pane items.
+        /// </summary>
+        public DataTemplateSelector ListPaneItemTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(ListPaneItemTemplateSelectorProperty); }
+            set { SetValue(ListPaneItemTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the content for the list pane's header
+        /// Gets or sets the Brush to apply to the background of the details area of the control.
+        /// </summary>
+        /// <returns>The Brush to apply to the background of the details area of the control.</returns>
+        public Brush DetailsPaneBackground
+        {
+            get { return (Brush)GetValue(DetailsPaneBackgroundProperty); }
+            set { SetValue(DetailsPaneBackgroundProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the Brush to apply to the background of the list area of the control.
         /// </summary>
@@ -236,6 +315,30 @@ public DataTemplate ListHeaderTemplate
             set { SetValue(ListHeaderTemplateProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the content for the list pane's no items presenter.
+        /// </summary>
+        /// <returns>
+        /// The content of the list pane's header. The default is null.
+        /// </returns>
+        public object ListPaneNoItemsContent
+        {
+            get { return GetValue(ListPaneNoItemsContentProperty); }
+            set { SetValue(ListPaneNoItemsContentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the DataTemplate used to display the list pane's no items presenter.
+        /// </summary>
+        /// <returns>
+        /// The template that specifies the visualization of the list pane no items object. The default is null.
+        /// </returns>
+        public DataTemplate ListPaneNoItemsContentTemplate
+        {
+            get { return (DataTemplate)GetValue(ListPaneNoItemsContentTemplateProperty); }
+            set { SetValue(ListPaneNoItemsContentTemplateProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the content for the details pane's header
         /// </summary>
@@ -346,5 +449,81 @@ public BackButtonBehavior BackButtonBehavior
         /// This new model will be the DataContext of the Details area.
         /// </summary>
         public Func<object, object> MapDetails { get; set; }
+
+        /// <summary>
+        /// Fired when the DetailsCommandBar changes.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnDetailsCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).OnDetailsCommandBarChanged();
+        }
+
+        /// <summary>
+        /// Fired when the <see cref="ListCommandBar"/> changes.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnListCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).OnListCommandBarChanged();
+        }
+
+        /// <summary>
+        /// Fired when the SelectedItem changes.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// Sets up animations for the DetailsPresenter for animating in/out.
+        /// </remarks>
+        private static void OnSelectedItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).OnSelectedItemChanged(e);
+        }
+
+        /// <summary>
+        /// Fired when the SelectedIndex changes.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// Sets up animations for the DetailsPresenter for animating in/out.
+        /// </remarks>
+        private static void OnSelectedIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).OnSelectedIndexChanged(e);
+        }
+
+        /// <summary>
+        /// Fired when the <see cref="BackButtonBehavior"/> is changed.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnBackButtonBehaviorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).SetBackButtonVisibility();
+        }
+
+        /// <summary>
+        /// Fired when the <see cref="ListHeader"/> is changed.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnListHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).SetListHeaderVisibility();
+        }
+
+        /// <summary>
+        /// Fired when the <see cref="ListPaneWidth"/> is changed.
+        /// </summary>
+        /// <param name="d">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private static void OnListPaneWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((ListDetailsView)d).OnListPaneWidthChanged();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
index 896a2c75a26..2dbcc0da1c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
@@ -3,13 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Linq;
 using Windows.ApplicationModel;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Navigation;
 using NavigationView = Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -23,32 +21,32 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplateVisualState(Name = NoSelectionWideState, GroupName = SelectionStates)]
     [TemplateVisualState(Name = HasSelectionWideState, GroupName = SelectionStates)]
     [TemplateVisualState(Name = HasSelectionNarrowState, GroupName = SelectionStates)]
-    [TemplateVisualState(Name = NarrowState, GroupName = WidthStates)]
-    [TemplateVisualState(Name = WideState, GroupName = WidthStates)]
     public partial class ListDetailsView : ItemsControl
     {
-        private const string PartDetailsPresenter = "DetailsPresenter";
-        private const string PartDetailsPanel = "DetailsPanel";
-        private const string PartBackButton = "ListDetailsBackButton";
-        private const string PartHeaderContentPresenter = "HeaderContentPresenter";
-        private const string NarrowState = "NarrowState";
-        private const string WideState = "WideState";
-        private const string WidthStates = "WidthStates";
+        // All view states:
         private const string SelectionStates = "SelectionStates";
-        private const string HasSelectionNarrowState = "HasSelectionNarrow";
+        private const string NoSelectionWideState = "NoSelectionWide";
         private const string HasSelectionWideState = "HasSelectionWide";
         private const string NoSelectionNarrowState = "NoSelectionNarrow";
-        private const string NoSelectionWideState = "NoSelectionWide";
+        private const string HasSelectionNarrowState = "HasSelectionNarrow";
+
+        private const string HasItemsStates = "HasItemsStates";
+        private const string HasItemsState = "HasItemsState";
+        private const string HasNoItemsState = "HasNoItemsState";
 
-        private AppViewBackButtonVisibility? _previousSystemBackButtonVisibility;
-        private bool _previousNavigationViewBackEnabled;
+        // Control names:
+        private const string PartRootPanel = "RootPanel";
+        private const string PartDetailsPresenter = "DetailsPresenter";
+        private const string PartDetailsPanel = "DetailsPanel";
+        private const string PartMasterList = "MasterList";
+        private const string PartBackButton = "ListDetailsBackButton";
+        private const string PartHeaderContentPresenter = "HeaderContentPresenter";
+        private const string PartListPaneCommandBarPanel = "ListPaneCommandBarPanel";
+        private const string PartDetailsPaneCommandBarPanel = "DetailsPaneCommandBarPanel";
 
-        private NavigationView.NavigationViewBackButtonVisible _previousNavigationViewBackVisibilty;
-        private NavigationView.NavigationView _navigationView;
         private ContentPresenter _detailsPresenter;
+        private NavigationView.TwoPaneView _twoPaneView;
         private VisualStateGroup _selectionStateGroup;
-        private Button _inlineBackButton;
-        private Frame _frame;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ListDetailsView"/> class.
@@ -61,6 +59,14 @@ public ListDetailsView()
             Unloaded += OnUnloaded;
         }
 
+        /// <summary>
+        /// Clears the <see cref="SelectedItem"/> and prevent flickering of the UI if only the order of the items changed.
+        /// </summary>
+        public void ClearSelectedItem()
+        {
+            SelectedItem = null;
+        }
+
         /// <summary>
         /// Invoked whenever application code or internal processes (such as a rebuilding layout pass) call
         /// ApplyTemplate. In simplest terms, this means the method is called just before a UI element displays
@@ -81,15 +87,25 @@ protected override void OnApplyTemplate()
                 _inlineBackButton.Click += OnInlineBackButtonClicked;
             }
 
+            _selectionStateGroup = (VisualStateGroup)GetTemplateChild(SelectionStates);
+            if (_selectionStateGroup != null)
+            {
+                _selectionStateGroup.CurrentStateChanged += OnSelectionStateChanged;
+            }
+
+            _twoPaneView = (NavigationView.TwoPaneView)GetTemplateChild(PartRootPanel);
+            if (_twoPaneView != null)
+            {
+                _twoPaneView.ModeChanged += OnModeChanged;
+            }
+
             _detailsPresenter = (ContentPresenter)GetTemplateChild(PartDetailsPresenter);
             SetDetailsContent();
 
             SetListHeaderVisibility();
             OnDetailsCommandBarChanged();
             OnListCommandBarChanged();
-
-            SizeChanged -= ListDetailsView_SizeChanged;
-            SizeChanged += ListDetailsView_SizeChanged;
+            OnListPaneWidthChanged();
 
             UpdateView(true);
         }
@@ -97,101 +113,61 @@ protected override void OnApplyTemplate()
         /// <summary>
         /// Fired when the SelectedIndex changes.
         /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
+        /// <param name="e">The event args.</param>
         /// <remarks>
         /// Sets up animations for the DetailsPresenter for animating in/out.
         /// </remarks>
-        private static void OnSelectedIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private void OnSelectedIndexChanged(DependencyPropertyChangedEventArgs e)
         {
-            var view = (ListDetailsView)d;
-
-            var newValue = (int)e.NewValue < 0 ? null : view.Items[(int)e.NewValue];
-            var oldValue = e.OldValue == null ? null : view.Items.ElementAtOrDefault((int)e.OldValue);
-
-            // check if selection actually changed
-            if (view.SelectedItem != newValue)
+            if (e.NewValue is int newIndex)
             {
-                // sync SelectedItem
-                view.SetValue(SelectedItemProperty, newValue);
-                view.UpdateSelection(oldValue, newValue);
+                object newItem = newIndex >= 0 && Items.Count > newIndex ? Items[newIndex] : null;
+                object oldItem = e.OldValue is int oldIndex && oldIndex >= 0 && Items.Count > oldIndex ? Items[oldIndex] : null;
+                if (SelectedItem != newItem)
+                {
+                    if (newItem is null)
+                    {
+                        ClearSelectedItem();
+                    }
+                    else
+                    {
+                        SetValue(SelectedItemProperty, newItem);
+                        UpdateSelection(oldItem, newItem);
+                    }
+                }
             }
         }
 
         /// <summary>
         /// Fired when the SelectedItem changes.
         /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
+        /// <param name="e">The event args.</param>
         /// <remarks>
         /// Sets up animations for the DetailsPresenter for animating in/out.
         /// </remarks>
-        private static void OnSelectedItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private void OnSelectedItemChanged(DependencyPropertyChangedEventArgs e)
         {
-            var view = (ListDetailsView)d;
-            var index = e.NewValue == null ? -1 : view.Items.IndexOf(e.NewValue);
+            int index = SelectedItem is null ? -1 : Items.IndexOf(SelectedItem);
 
-            // check if selection actually changed
-            if (view.SelectedIndex != index)
+            // If there is no selection, do not remove the DetailsPresenter content but let it animate out.
+            if (index >= 0)
             {
-                // sync SelectedIndex
-                view.SetValue(SelectedIndexProperty, index);
-                view.UpdateSelection(e.OldValue, e.NewValue);
+                SetDetailsContent();
             }
-        }
-
-        /// <summary>
-        /// Fired when the <see cref="ListHeader"/> is changed.
-        /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
-        private static void OnListHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var view = (ListDetailsView)d;
-            view.SetListHeaderVisibility();
-        }
-
-        /// <summary>
-        /// Fired when the DetailsCommandBar changes.
-        /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
-        private static void OnDetailsCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var view = (ListDetailsView)d;
-            view.OnDetailsCommandBarChanged();
-        }
-
-        /// <summary>
-        /// Fired when CompactModeThresholdWIdthChanged
-        /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
-        private static void OnCompactModeThresholdWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ListDetailsView)d).HandleStateChanges();
-        }
 
-        private static void OnBackButtonBehaviorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var view = (ListDetailsView)d;
-            view.SetBackButtonVisibility();
-        }
+            if (SelectedIndex != index)
+            {
+                SetValue(SelectedIndexProperty, index);
+                UpdateSelection(e.OldValue, e.NewValue);
+            }
 
-        /// <summary>
-        /// Fired when the <see cref="ListCommandBar"/> changes.
-        /// </summary>
-        /// <param name="d">The sender</param>
-        /// <param name="e">The event args</param>
-        private static void OnListCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var view = (ListDetailsView)d;
-            view.OnListCommandBarChanged();
+            OnSelectionChanged(new SelectionChangedEventArgs(new List<object> { e.OldValue }, new List<object> { e.NewValue }));
+            UpdateView(true);
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
-            if (DesignMode.DesignModeEnabled == false)
+            if (!DesignMode.DesignModeEnabled)
             {
                 SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
                 if (_frame != null)
@@ -205,14 +181,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
                 {
                     _frame.Navigating += OnFrameNavigating;
                 }
-
-                _selectionStateGroup = (VisualStateGroup)GetTemplateChild(SelectionStates);
-                if (_selectionStateGroup != null)
-                {
-                    _selectionStateGroup.CurrentStateChanged += OnSelectionStateChanged;
-                }
-
-                UpdateView(true);
             }
         }
 
@@ -235,21 +203,6 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
             }
         }
 
-        private void ListDetailsView_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            // if size is changing
-            if ((e.PreviousSize.Width < CompactModeThresholdWidth && e.NewSize.Width >= CompactModeThresholdWidth) ||
-                (e.PreviousSize.Width >= CompactModeThresholdWidth && e.NewSize.Width < CompactModeThresholdWidth))
-            {
-                HandleStateChanges();
-            }
-        }
-
-        private void OnInlineBackButtonClicked(object sender, RoutedEventArgs e)
-        {
-            SelectedItem = null;
-        }
-
         /// <summary>
         /// Raises SelectionChanged event and updates view.
         /// </summary>
@@ -268,45 +221,6 @@ private void UpdateSelection(object oldSelection, object newSelection)
             }
         }
 
-        private void HandleStateChanges()
-        {
-            UpdateView(true);
-            SetListSelectionWithKeyboardFocusOnVisualStateChanged(ViewState);
-        }
-
-        /// <summary>
-        /// Closes the details pane if we are in narrow state
-        /// </summary>
-        /// <param name="sender">The sender</param>
-        /// <param name="args">The event args</param>
-        private void OnFrameNavigating(object sender, NavigatingCancelEventArgs args)
-        {
-            if ((args.NavigationMode == NavigationMode.Back) && (ViewState == ListDetailsViewState.Details))
-            {
-                SelectedItem = null;
-                args.Cancel = true;
-            }
-        }
-
-        /// <summary>
-        /// Closes the details pane if we are in narrow state
-        /// </summary>
-        /// <param name="sender">The sender</param>
-        /// <param name="args">The event args</param>
-        private void OnBackRequested(object sender, BackRequestedEventArgs args)
-        {
-            if (ViewState == ListDetailsViewState.Details)
-            {
-                // let the OnFrameNavigating method handle it if
-                if (_frame == null || !_frame.CanGoBack)
-                {
-                    SelectedItem = null;
-                }
-
-                args.Handled = true;
-            }
-        }
-
         private void SetListHeaderVisibility()
         {
             if (GetTemplateChild(PartHeaderContentPresenter) is FrameworkElement headerPresenter)
@@ -323,88 +237,23 @@ private void UpdateView(bool animate)
             SetVisualState(animate);
         }
 
-        /// <summary>
-        /// Sets the back button visibility based on the current visual state and selected item
-        /// </summary>
-        private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
+        private void UpdateViewState()
         {
-            if (DesignMode.DesignModeEnabled)
-            {
-                return;
-            }
+            ListDetailsViewState previousState = ViewState;
 
-            if (ViewState == ListDetailsViewState.Details)
+            if (_twoPaneView == null)
             {
-                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
-                {
-                    _inlineBackButton.Visibility = Visibility.Visible;
-                }
-                else if (BackButtonBehavior == BackButtonBehavior.Automatic)
-                {
-                    // Continue to support the system back button if it is being used
-                    var navigationManager = SystemNavigationManager.GetForCurrentView();
-                    if (navigationManager.AppViewBackButtonVisibility == AppViewBackButtonVisibility.Visible)
-                    {
-                        // Setting this indicates that the system back button is being used
-                        _previousSystemBackButtonVisibility = navigationManager.AppViewBackButtonVisibility;
-                    }
-                    else if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
-                    {
-                        // We can only use the new NavigationView if we also have a Frame
-                        // If there is no frame we have to use the inline button
-                        _inlineBackButton.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        SetNavigationViewBackButtonState(NavigationView.NavigationViewBackButtonVisible.Visible, true);
-                    }
-                }
-                else if (BackButtonBehavior != BackButtonBehavior.Manual)
-                {
-                    var navigationManager = SystemNavigationManager.GetForCurrentView();
-                    _previousSystemBackButtonVisibility = navigationManager.AppViewBackButtonVisibility;
-
-                    navigationManager.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible;
-                }
-            }
-            else if (previousState == ListDetailsViewState.Details)
-            {
-                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
-                {
-                    _inlineBackButton.Visibility = Visibility.Collapsed;
-                }
-                else if (BackButtonBehavior == BackButtonBehavior.Automatic)
-                {
-                    if (_previousSystemBackButtonVisibility.HasValue == false)
-                    {
-                        if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
-                        {
-                            _inlineBackButton.Visibility = Visibility.Collapsed;
-                        }
-                        else
-                        {
-                            SetNavigationViewBackButtonState(_previousNavigationViewBackVisibilty, _previousNavigationViewBackEnabled);
-                        }
-                    }
-                }
-
-                if (_previousSystemBackButtonVisibility.HasValue)
-                {
-                    // Make sure we show the back button if the stack can navigate back
-                    SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = _previousSystemBackButtonVisibility.Value;
-                    _previousSystemBackButtonVisibility = null;
-                }
+                ViewState = ListDetailsViewState.Both;
             }
-        }
-
-        private void UpdateViewState()
-        {
-            var previousState = ViewState;
 
-            if (ActualWidth < CompactModeThresholdWidth)
+            // Single pane:
+            else if (_twoPaneView.Mode == NavigationView.TwoPaneViewMode.SinglePane)
             {
                 ViewState = SelectedItem == null ? ListDetailsViewState.List : ListDetailsViewState.Details;
+                _twoPaneView.PanePriority = SelectedItem == null ? NavigationView.TwoPaneViewPriority.Pane1 : NavigationView.TwoPaneViewPriority.Pane2;
             }
+
+            // Dual pane:
             else
             {
                 ViewState = ListDetailsViewState.Both;
@@ -419,44 +268,37 @@ private void UpdateViewState()
 
         private void SetVisualState(bool animate)
         {
-            string state;
             string noSelectionState;
             string hasSelectionState;
-            if (ActualWidth < CompactModeThresholdWidth)
-            {
-                state = NarrowState;
-                noSelectionState = NoSelectionNarrowState;
-                hasSelectionState = HasSelectionNarrowState;
-            }
-            else
+            if (ViewState == ListDetailsViewState.Both)
             {
-                state = WideState;
                 noSelectionState = NoSelectionWideState;
                 hasSelectionState = HasSelectionWideState;
             }
-
-            VisualStateManager.GoToState(this, state, animate);
-            VisualStateManager.GoToState(this, SelectedItem == null ? noSelectionState : hasSelectionState, animate);
-        }
-
-        private void SetNavigationViewBackButtonState(NavigationView.NavigationViewBackButtonVisible visibility, bool enabled)
-        {
-            if (_navigationView == null)
+            else
             {
-                return;
+                noSelectionState = NoSelectionNarrowState;
+                hasSelectionState = HasSelectionNarrowState;
             }
 
-            _previousNavigationViewBackVisibilty = _navigationView.IsBackButtonVisible;
-            _navigationView.IsBackButtonVisible = visibility;
-
-            _previousNavigationViewBackEnabled = _navigationView.IsBackEnabled;
-            _navigationView.IsBackEnabled = enabled;
+            VisualStateManager.GoToState(this, SelectedItem == null ? noSelectionState : hasSelectionState, animate);
+            VisualStateManager.GoToState(this, Items.Count > 0 ? HasItemsState : HasNoItemsState, animate);
         }
 
+        /// <summary>
+        /// Sets the content of the <see cref="SelectedItem"/> based on current <see cref="MapDetails"/> function.
+        /// </summary>
         private void SetDetailsContent()
         {
             if (_detailsPresenter != null)
             {
+                // Update the content template:
+                if (_detailsPresenter.ContentTemplateSelector != null)
+                {
+                    _detailsPresenter.ContentTemplate = _detailsPresenter.ContentTemplateSelector.SelectTemplate(SelectedItem, _detailsPresenter);
+                }
+
+                // Update the content:
                 _detailsPresenter.Content = MapDetails == null
                     ? SelectedItem
                     : SelectedItem != null ? MapDetails(SelectedItem) : null;
@@ -465,12 +307,12 @@ private void SetDetailsContent()
 
         private void OnListCommandBarChanged()
         {
-            OnCommandBarChanged("ListCommandBarPanel", ListCommandBar);
+            OnCommandBarChanged("ListCommandBar", ListCommandBar);
         }
 
         private void OnDetailsCommandBarChanged()
         {
-            OnCommandBarChanged("DetailsCommandBarPanel", DetailsCommandBar);
+            OnCommandBarChanged("DetailsCommandBar", DetailsCommandBar);
         }
 
         private void OnCommandBarChanged(string panelName, CommandBar commandbar)
@@ -509,7 +351,7 @@ private void SetListSelectionWithKeyboardFocusOnVisualStateChanged(ListDetailsVi
         /// </summary>
         private void SetListSelectionWithKeyboardFocus(bool singleSelectionFollowsFocus)
         {
-            if (GetTemplateChild("List") is Windows.UI.Xaml.Controls.ListViewBase list)
+            if (GetTemplateChild("List") is ListViewBase list)
             {
                 list.SingleSelectionFollowsFocus = singleSelectionFollowsFocus;
             }
@@ -563,10 +405,62 @@ private void FocusFirstFocusableElementInDetails()
         /// </summary>
         private void FocusItemList()
         {
-            if (GetTemplateChild("List") is Control list)
+            if (GetTemplateChild("PartMasterList") is Control list)
             {
                 list.Focus(FocusState.Programmatic);
             }
         }
+
+        /// <summary>
+        /// Fired when the <see cref="TwoPaneView"/> changed its view mode.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="args">The event args.</param>
+        private void OnModeChanged(NavigationView.TwoPaneView sender, object args)
+        {
+            UpdateView(true);
+            SetListSelectionWithKeyboardFocusOnVisualStateChanged(ViewState);
+        }
+
+        /// <summary>
+        /// Invoked once the items changed and ensures the visual state is constant.
+        /// </summary>
+        protected override void OnItemsChanged(object e)
+        {
+            base.OnItemsChanged(e);
+            UpdateView(true);
+
+            if (SelectedIndex < 0)
+            {
+                return;
+            }
+
+            // Ensure we still have the correct index and selected item for the new collection.
+            // This prevents flickering when the order of the collection changes.
+            int index = -1;
+            if (!(Items is null))
+            {
+                index = Items.IndexOf(SelectedItem);
+            }
+
+            if (index < 0)
+            {
+                ClearSelectedItem();
+            }
+            else if (SelectedIndex != index)
+            {
+                SetValue(SelectedIndexProperty, index);
+            }
+        }
+
+        /// <summary>
+        /// Updates the <see cref="TwoPaneView.Pane1Length"/> since it is of type <see cref="GridLength"/>,
+        /// but <see cref="ListPaneWidth"/> is of type <see cref="double"/>.
+        /// This should be changed in a further release.
+        /// </summary>
+        private void OnListPaneWidthChanged()
+        {
+            _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
index ebc218ada45..3fb14c4d4c1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
 
     <Style TargetType="controls:ListDetailsView">
         <Setter Property="Background" Value="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
@@ -13,99 +14,46 @@
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid x:Name="RootPanel">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="ListColumn"
-                                                  Width="Auto" />
-                                <ColumnDefinition x:Name="DetailsColumn"
-                                                  Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid x:Name="ListPanel"
-                                  Width="{TemplateBinding ListPaneWidth}"
-                                  Background="{TemplateBinding ListPaneBackground}"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  BorderThickness="0,0,1,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <ContentPresenter x:Name="HeaderContentPresenter"
-                                                  Margin="12,0"
-                                                  x:DeferLoadStrategy="Lazy"
-                                                  Content="{TemplateBinding ListHeader}"
-                                                  ContentTemplate="{TemplateBinding ListHeaderTemplate}"
-                                                  Visibility="Collapsed" />
-                                <ListView x:Name="List"
-                                          Grid.Row="1"
-                                          IsTabStop="False"
-                                          ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                                          ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
-                                          ItemTemplate="{TemplateBinding ItemTemplate}"
-                                          ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                          ItemsSource="{TemplateBinding ItemsSource}"
-                                          SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <Grid x:Name="ListCommandBarPanel" Grid.Row="2"></Grid>
-                            </Grid>
-                            <Grid x:Name="DetailsPanel"
-                                  Grid.Column="1">
-                                <ContentPresenter x:Name="NoSelectionPresenter"
-                                                  Content="{TemplateBinding NoSelectionContent}"
-                                                  ContentTemplate="{TemplateBinding NoSelectionContentTemplate}" />
-                                <Grid x:Name="SelectionDetailsPanel">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="*" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Grid Background="{TemplateBinding Background}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <Button x:Name="ListDetailsBackButton"
-                                                Background="Transparent"
-                                                Height="44"
-                                                Width="48"
-                                                Visibility="Collapsed">
-                                            <SymbolIcon Symbol="Back"/>
-                                        </Button>
-                                        <ContentPresenter x:Name="DetailsHeaderPresenter"
-                                                          Content="{TemplateBinding DetailsHeader}"
-                                                          ContentTemplate="{TemplateBinding DetailsHeaderTemplate}"
-                                                          Grid.Column="1"/>
-                                    </Grid>
-                                    <ContentPresenter x:Name="DetailsPresenter"
-                                                      Background="{TemplateBinding Background}"
-                                                      ContentTemplate="{TemplateBinding DetailsTemplate}"
-                                                      Grid.Row="1">
-                                    </ContentPresenter>
-                                    <Grid x:Name="DetailsCommandBarPanel" Grid.Row="2"></Grid>
-                                    <Grid.RenderTransform>
-                                        <TranslateTransform x:Name="DetailsPresenterTransform" />
-                                    </Grid.RenderTransform>
-                                </Grid>
-                            </Grid>
-                        </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="NoSelectionWide">
+                                    <VisualState.Setters>
+                                        <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="HasSelectionWide">
+                                    <VisualState.Setters>
+                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="NoSelectionNarrow">
+                                    <VisualState.Setters>
+                                        <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="HasSelectionNarrow">
+                                    <VisualState.Setters>
+                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition From="NoSelectionWide"
-                                                      To="HasSelection">
+                                                      To="HasSelectionWide">
                                         <Storyboard>
                                             <DrillInThemeAnimation EntranceTargetName="SelectionDetailsPanel"
                                                                    ExitTargetName="NoSelectionPresenter" />
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition From="NoSelectionNarrow"
-                                                      To="HasSelection">
+                                                      To="HasSelectionNarrow">
                                         <Storyboard>
                                             <DoubleAnimation BeginTime="0:0:0"
                                                              Storyboard.TargetName="DetailsPresenterTransform"
                                                              Storyboard.TargetProperty="X"
                                                              From="200"
                                                              To="0"
-                                                             Duration="0:0:0.25">
+                                                             Duration="0:0:0.17">
                                                 <DoubleAnimation.EasingFunction>
                                                     <QuarticEase EasingMode="EaseOut" />
                                                 </DoubleAnimation.EasingFunction>
@@ -115,97 +63,159 @@
                                                              Storyboard.TargetProperty="Opacity"
                                                              From="0"
                                                              To="1"
-                                                             Duration="0:0:0.25">
+                                                             Duration="0:0:0.17">
+                                                <DoubleAnimation.EasingFunction>
+                                                    <QuarticEase EasingMode="EaseOut" />
+                                                </DoubleAnimation.EasingFunction>
+                                            </DoubleAnimation>
+                                            <DoubleAnimation BeginTime="0:0:0"
+                                                             Storyboard.TargetName="NoSelectionPresenter"
+                                                             Storyboard.TargetProperty="Opacity"
+                                                             From="1"
+                                                             To="0"
+                                                             Duration="0:0:0">
                                                 <DoubleAnimation.EasingFunction>
                                                     <QuarticEase EasingMode="EaseOut" />
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
                                         </Storyboard>
                                     </VisualTransition>
-                                    <VisualTransition From="HasSelection"
+                                    <VisualTransition From="HasSelectionWide"
                                                       To="NoSelectionWide">
                                         <Storyboard>
                                             <DrillOutThemeAnimation EntranceTargetName="NoSelectionPresenter"
                                                                     ExitTargetName="SelectionDetailsPanel" />
                                         </Storyboard>
                                     </VisualTransition>
-                                    <VisualTransition From="HasSelection"
+                                    <VisualTransition From="HasSelectionNarrow"
                                                       To="NoSelectionNarrow">
                                         <Storyboard>
                                             <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="DetailsPresenterTransform"
+                                                             Storyboard.TargetName="MasterPresenterTransform"
                                                              Storyboard.TargetProperty="X"
-                                                             From="0"
-                                                             To="200"
-                                                             Duration="0:0:0.25" />
-                                            <DoubleAnimation BeginTime="0:0:0.08"
-                                                             Storyboard.TargetName="SelectionDetailsPanel"
-                                                             Storyboard.TargetProperty="Opacity"
-                                                             From="1"
+                                                             From="-200"
                                                              To="0"
                                                              Duration="0:0:0.17">
                                                 <DoubleAnimation.EasingFunction>
                                                     <QuarticEase EasingMode="EaseOut" />
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
-                                            <DoubleAnimation BeginTime="0:0:0.0"
+                                            <DoubleAnimation BeginTime="0:0:0"
                                                              Storyboard.TargetName="ListPanel"
                                                              Storyboard.TargetProperty="Opacity"
                                                              From="0"
                                                              To="1"
-                                                             Duration="0:0:0.25">
+                                                             Duration="0:0:0.17">
                                                 <DoubleAnimation.EasingFunction>
-                                                    <QuarticEase EasingMode="EaseIn" />
+                                                    <QuarticEase EasingMode="EaseOut" />
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
                                         </Storyboard>
                                     </VisualTransition>
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="NoSelectionWide">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
-                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="HasSelectionWide">
-                                    <VisualState.Setters>
-                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="HasSelectionNarrow">
-                                    <VisualState.Setters>
-                                        <Setter Target="ListPanel.Visibility" Value="Collapsed" />
-                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="NoSelectionNarrow">
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="HasItemsStates">
+                                <VisualState x:Name="HasItemsState">
                                     <VisualState.Setters>
-                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
-                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
+                                        <Setter Target="MasterList.Visibility" Value="Visible" />
+                                        <Setter Target="MasterNoItemsPresenter.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="WidthStates">
-                                <VisualState x:Name="NarrowState">
+                                <VisualState x:Name="HasNoItemsState">
                                     <VisualState.Setters>
-                                        <Setter Target="ListColumn.Width" Value="*" />
-                                        <Setter Target="DetailsColumn.Width" Value="0" />
-                                        <Setter Target="DetailsPanel.(Grid.Column)" Value="0" />
-                                        <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="ListPanel.BorderThickness" Value="0" />
-                                        <Setter Target="ListPanel.Width" Value="NaN" />
+                                        <Setter Target="MasterList.Visibility" Value="Collapsed" />
+                                        <Setter Target="MasterNoItemsPresenter.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="WideState">
-                                </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
+                        <muxc:TwoPaneView x:Name="RootPanel"
+                                          MinWideModeWidth="{TemplateBinding CompactModeThresholdWidth}"
+                                          PanePriority="Pane1"
+                                          TallModeConfiguration="SinglePane"
+                                          WideModeConfiguration="LeftRight">
+                            <muxc:TwoPaneView.Pane1>
+                                <Grid x:Name="ListPanel"
+                                      Background="{TemplateBinding ListPaneBackground}">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter x:Name="HeaderContentPresenter"
+                                                      Margin="12,0"
+                                                      x:DeferLoadStrategy="Lazy"
+                                                      Content="{TemplateBinding ListHeader}"
+                                                      ContentTemplate="{TemplateBinding ListHeaderTemplate}"
+                                                      Visibility="Collapsed" />
+                                    <ContentPresenter x:Name="MasterNoItemsPresenter"
+                                                      Grid.Row="1"
+                                                      Content="{TemplateBinding ListPaneNoItemsContent}"
+                                                      ContentTemplate="{TemplateBinding ListPaneNoItemsContentTemplate}" />
+                                    <ListView x:Name="MasterList"
+                                              Grid.Row="1"
+                                              IsTabStop="False"
+                                              ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                              ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
+                                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                                              ItemTemplateSelector="{TemplateBinding ListPaneItemTemplateSelector}"
+                                              ItemsSource="{TemplateBinding ItemsSource}"
+                                              SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Visibility="Collapsed" />
+                                    <Grid x:Name="ListCommandBar"
+                                          Grid.Row="2" />
+                                    <Grid.RenderTransform>
+                                        <TranslateTransform x:Name="MasterPresenterTransform" />
+                                    </Grid.RenderTransform>
+                                </Grid>
+                            </muxc:TwoPaneView.Pane1>
+                            <muxc:TwoPaneView.Pane2>
+                                <Grid x:Name="DetailsPanel"
+                                      Background="{TemplateBinding DetailsPaneBackground}">
+                                    <ContentPresenter x:Name="NoSelectionPresenter"
+                                                      Content="{TemplateBinding NoSelectionContent}"
+                                                      ContentTemplate="{TemplateBinding NoSelectionContentTemplate}" />
+                                    <Grid x:Name="SelectionDetailsPanel">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Button x:Name="ListDetailsBackButton"
+                                                    Width="48"
+                                                    Height="44"
+                                                    Background="Transparent"
+                                                    Visibility="Collapsed">
+                                                <SymbolIcon Symbol="Back" />
+                                            </Button>
+                                            <ContentPresenter x:Name="DetailsHeaderPresenter"
+                                                              Grid.Column="1"
+                                                              Content="{TemplateBinding DetailsHeader}"
+                                                              ContentTemplate="{TemplateBinding DetailsHeaderTemplate}" />
+                                        </Grid>
+                                        <ContentPresenter x:Name="DetailsPresenter"
+                                                          Grid.Row="1"
+                                                          ContentTemplate="{TemplateBinding DetailsTemplate}"
+                                                          ContentTemplateSelector="{TemplateBinding DetailsContentTemplateSelector}" />
+                                        <Grid x:Name="DetailsCommandBar"
+                                              Grid.Row="2" />
+                                        <Grid.RenderTransform>
+                                            <TranslateTransform x:Name="DetailsPresenterTransform" />
+                                        </Grid.RenderTransform>
+                                    </Grid>
+                                </Grid>
+                            </muxc:TwoPaneView.Pane2>
+                        </muxc:TwoPaneView>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
index 217511a5045..9a177605713 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
@@ -10,18 +10,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public enum ListDetailsViewState
     {
         /// <summary>
-        /// Only the List view is shown
+        /// Only the List view is shown-
         /// </summary>
         List,
 
         /// <summary>
-        /// Only the Details view is shown
+        /// Only the Details view is shown-
         /// </summary>
         Details,
 
         /// <summary>
-        /// Both the List and Details views are shown
+        /// Both the List and Details views are shown-
         /// </summary>
         Both
     }
-}
\ No newline at end of file
+}
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
index 13f1e938c76..c0166b6077f 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
@@ -5,9 +5,10 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace UnitTests.UWP.UI.Controls
+namespace UnitTests.UI.Controls
 {
     [TestClass]
     public class Test_ListDetailsView
@@ -17,8 +18,10 @@ public class Test_ListDetailsView
         public void Test_SelectedIndex_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items
+            };
             Assert.AreEqual(-1, listDetailsView.SelectedIndex);
         }
 
@@ -27,8 +30,10 @@ public void Test_SelectedIndex_Default()
         public void Test_SelectedItem_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items
+            };
             Assert.IsNull(listDetailsView.SelectedItem);
         }
 
@@ -37,9 +42,11 @@ public void Test_SelectedItem_Default()
         public void Test_SelectedIndex_Syncs_SelectedItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
-            listDetailsView.SelectedIndex = 6;
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedIndex = 6
+            };
             Assert.AreEqual(items[6], listDetailsView.SelectedItem);
         }
 
@@ -48,9 +55,11 @@ public void Test_SelectedIndex_Syncs_SelectedItem()
         public void Test_UnselectUsingIndex()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
-            listDetailsView.SelectedIndex = 5;
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedIndex = 5
+            };
             listDetailsView.SelectedIndex = -1;
             Assert.IsNull(listDetailsView.SelectedItem);
         }
@@ -60,9 +69,11 @@ public void Test_UnselectUsingIndex()
         public void Test_UnselectUsingItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
-            listDetailsView.SelectedItem = items[5];
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedItem = items[5]
+            };
             listDetailsView.SelectedItem = null;
             Assert.AreEqual(-1, listDetailsView.SelectedIndex);
         }
@@ -72,10 +83,57 @@ public void Test_UnselectUsingItem()
         public void Test_SelectedItem_Syncs_SelectedIndex()
         {
             var items = Enumerable.Range(0, 10).ToArray();
-            var listDetailsView = new ListDetailsView();
-            listDetailsView.ItemsSource = items;
-            listDetailsView.SelectedItem = items[3];
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedItem = items[3]
+            };
             Assert.AreEqual(3, listDetailsView.SelectedIndex);
         }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_Sorting_Keeps_SelectedIndex()
+        {
+            var items = Enumerable.Range(0, 10).ToArray();
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedItem = items[3]
+            };
+            Assert.AreEqual(3, listDetailsView.SelectedIndex);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_Sorting_Keeps_SelectedItem()
+        {
+            var items = new ObservableCollection<int>(Enumerable.Range(0, 10));
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedIndex = 3
+            };
+            var item = listDetailsView.SelectedItem;
+            listDetailsView.ItemsSource = new ObservableCollection<int>(items.OrderByDescending(i => i));
+            Assert.AreEqual(item, listDetailsView.SelectedItem);
+            listDetailsView.ItemsSource = new ObservableCollection<int>(items.OrderBy(i => i));
+            Assert.AreEqual(item, listDetailsView.SelectedItem);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_ItemsRemoved()
+        {
+            var items = new ObservableCollection<int>(Enumerable.Range(0, 10));
+            var listDetailsView = new ListDetailsView
+            {
+                ItemsSource = items,
+                SelectedIndex = 3
+            };
+            listDetailsView.ItemsSource = null;
+            Assert.AreEqual(null, listDetailsView.SelectedItem);
+            Assert.AreEqual(-1, listDetailsView.SelectedIndex);
+        }
     }
-}
\ No newline at end of file
+}

From e3f5a7f60b24f7caed6fb7945fe4df7ef00ee0c7 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Sun, 15 Aug 2021 14:43:25 +0200
Subject: [PATCH 024/200] Fixed ambiguous doc hint

---
 .../ListDetailsView/ListDetailsView.cs                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
index 2dbcc0da1c4..0fbefdeceb3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
@@ -454,7 +454,7 @@ protected override void OnItemsChanged(object e)
         }
 
         /// <summary>
-        /// Updates the <see cref="TwoPaneView.Pane1Length"/> since it is of type <see cref="GridLength"/>,
+        /// Updates the <see cref="TwoPaneView.Pane1Length"/> since it is of type 'GridLength',
         /// but <see cref="ListPaneWidth"/> is of type <see cref="double"/>.
         /// This should be changed in a further release.
         /// </summary>

From 435ec70088c4153125ab9dda2891b1dc91173878 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 2 Jan 2021 16:38:32 -0800
Subject: [PATCH 025/200] add RichSuggestBox to repo

---
 .../PlainTextCommandBarFlyout.cs              |  17 +
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  15 +
 .../RichSuggestBox.Properties.cs              | 137 +++++
 .../RichSuggestBox/RichSuggestBox.cs          | 554 ++++++++++++++++++
 .../RichSuggestBox/RichSuggestBox.xaml        | 110 ++++
 .../SuggestionChosenEventArgs.cs              |  20 +
 .../RichSuggestBox/SuggestionInfo.cs          |  59 ++
 .../RichSuggestBox/SuggestionTokenFormat.cs   |  18 +
 .../SuggestionsRequestedEventArgs.cs          |  11 +
 9 files changed, 941 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
new file mode 100644
index 00000000000..7adbc988c2e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
@@ -0,0 +1,17 @@
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    internal class PlainTextCommandBarFlyout : TextCommandBarFlyout
+    {
+        public PlainTextCommandBarFlyout()
+        {
+            Opening += (sender, o) =>
+            {
+                PrimaryCommands.Clear();
+
+                // TODO: Limit Pasting to plain-text only
+            };
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
new file mode 100644
index 00000000000..73f6229aa30
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
@@ -0,0 +1,15 @@
+using Windows.Foundation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public partial class RichSuggestBox
+    {
+        public event TypedEventHandler<RichSuggestBox, SuggestionsRequestedEventArgs> SuggestionsRequested;
+
+        public event TypedEventHandler<RichSuggestBox, SuggestionChosenEventArgs> SuggestionChosen;
+
+        public event TypedEventHandler<RichEditBox, RoutedEventArgs> TextChanged;
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
new file mode 100644
index 00000000000..b5083430df5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -0,0 +1,137 @@
+using System.Collections.ObjectModel;
+using Windows.UI.Text;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public partial class RichSuggestBox
+    {
+        public static readonly DependencyProperty PlaceholderTextProperty =
+            DependencyProperty.Register(
+                nameof(PlaceholderText),
+                typeof(string),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(string.Empty));
+
+        public static readonly DependencyProperty RichEditBoxStyleProperty =
+            DependencyProperty.Register(
+                nameof(RichEditBoxStyle),
+                typeof(Style),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty HeaderProperty =
+            DependencyProperty.Register(
+                nameof(Header),
+                typeof(object),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty DescriptionProperty =
+            DependencyProperty.Register(
+                nameof(Description),
+                typeof(object),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty TextWrappingProperty =
+            DependencyProperty.Register(
+                nameof(TextWrapping),
+                typeof(TextWrapping),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(TextWrapping.NoWrap));
+
+        public static readonly DependencyProperty ClipboardCopyFormatProperty =
+            DependencyProperty.Register(
+                nameof(ClipboardCopyFormat),
+                typeof(RichEditClipboardFormat),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(RichEditClipboardFormat.PlainText));
+
+        public static readonly DependencyProperty SuggestionBackgroundProperty =
+            DependencyProperty.Register(
+                nameof(SuggestionBackground),
+                typeof(SolidColorBrush),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty SuggestionForegroundProperty =
+            DependencyProperty.Register(
+                nameof(SuggestionForeground),
+                typeof(SolidColorBrush),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty PrefixesProperty =
+            DependencyProperty.Register(
+                nameof(Prefixes),
+                typeof(string),
+                typeof(RichSuggestBox),
+                new PropertyMetadata("@", OnPrefixesChanged));
+
+        public string PlaceholderText
+        {
+            get => (string)GetValue(PlaceholderTextProperty);
+            set => SetValue(PlaceholderTextProperty, value);
+        }
+
+        public Style RichEditBoxStyle
+        {
+            get => (Style)GetValue(RichEditBoxStyleProperty);
+            set => SetValue(RichEditBoxStyleProperty, value);
+        }
+
+        public object Header
+        {
+            get => GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        public object Description
+        {
+            get => GetValue(DescriptionProperty);
+            set => SetValue(DescriptionProperty, value);
+        }
+
+        public TextWrapping TextWrapping
+        {
+            get => (TextWrapping)GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
+        }
+
+        public RichEditClipboardFormat ClipboardCopyFormat
+        {
+            get => (RichEditClipboardFormat)GetValue(ClipboardCopyFormatProperty);
+            set => SetValue(ClipboardCopyFormatProperty, value);
+        }
+
+        public SolidColorBrush SuggestionBackground
+        {
+            get => (SolidColorBrush)GetValue(SuggestionBackgroundProperty);
+            set => SetValue(SuggestionBackgroundProperty, value);
+        }
+
+        public SolidColorBrush SuggestionForeground
+        {
+            get => (SolidColorBrush)GetValue(SuggestionForegroundProperty);
+            set => SetValue(SuggestionForegroundProperty, value);
+        }
+
+        public string Prefixes
+        {
+            get => (string)GetValue(PrefixesProperty);
+            set => SetValue(PrefixesProperty, value);
+        }
+
+        /// <summary>
+        /// Gets object used for lock
+        /// </summary>
+        protected object LockObj { get; }
+
+        public RichEditTextDocument TextDocument => _richEditBox?.TextDocument;
+
+        public ReadOnlyObservableCollection<SuggestionInfo> Tokens { get; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
new file mode 100644
index 00000000000..bd00ece615f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -0,0 +1,554 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Deferred;
+using Windows.System;
+using Windows.UI.Text;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Input;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    [TemplatePart(Name = PartRichEditBox, Type = typeof(RichEditBox))]
+    [TemplatePart(Name = PartSuggestionsPopup, Type = typeof(Popup))]
+    [TemplatePart(Name = PartSuggestionsList, Type = typeof(ListViewBase))]
+    public partial class RichSuggestBox : ItemsControl
+    {
+        private const string PartRichEditBox = "RichEditBox";
+        private const string PartSuggestionsPopup = "SuggestionsPopup";
+        private const string PartSuggestionsList = "SuggestionsList";
+
+        private Popup _suggestionPopup;
+        private RichEditBox _richEditBox;
+        private ListViewBase _suggestionsList;
+
+        private int _suggestionChoice;
+        private string _currentQuery;
+        private string _currentPrefix;
+        private bool _ignoreChange;
+        private ITextRange _currentRange;
+        private CancellationTokenSource _suggestionRequestedTokenSource;
+        private readonly Dictionary<string, SuggestionInfo> _tokens;
+        private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
+        /// </summary>
+        public RichSuggestBox()
+        {
+            _tokens = new Dictionary<string, SuggestionInfo>();
+            _visibleTokens = new ObservableCollection<SuggestionInfo>();
+            Tokens = new ReadOnlyObservableCollection<SuggestionInfo>(_visibleTokens);
+            LockObj = new object();
+
+            DefaultStyleKey = typeof(RichSuggestBox);
+
+            RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
+        }
+
+        public void ClearUndoRedoSuggestionHistory()
+        {
+            TextDocument.ClearUndoRedoHistory();
+            if (_tokens.Count == 0)
+            {
+                return;
+            }
+
+            var keysToDelete = _tokens.Where(pair => !pair.Value.Active).Select(pair => pair.Key).ToArray();
+            foreach (var key in keysToDelete)
+            {
+                _tokens.Remove(key);
+            }
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _suggestionPopup = (Popup)GetTemplateChild(PartSuggestionsPopup);
+            _richEditBox = (RichEditBox)GetTemplateChild(PartRichEditBox);
+            _suggestionsList = (ListViewBase)GetTemplateChild(PartSuggestionsList);
+
+            _richEditBox.SizeChanged += RichEditBox_SizeChanged;
+            _richEditBox.TextChanging += RichEditBox_TextChanging;
+            _richEditBox.TextChanged += RichEditBox_TextChanged;
+            _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
+            _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
+            _richEditBox.AddHandler(PointerPressedEvent, new PointerEventHandler(RichEditBoxPointerEventHandler), true);
+            AddKeyboardAccelerators();
+            _suggestionsList.ItemClick += SuggestionsList_ItemClick;
+
+            _suggestionsList.GotFocus += (sender, args) => _richEditBox.Focus(FocusState.Programmatic);
+            LostFocus += (sender, args) => ShowSuggestionsPopup(false);
+        }
+
+        private static void OnPrefixesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var view = (RichSuggestBox)d;
+
+            var newValue = (string)e.NewValue;
+            var prefixes = EnforcePrefixesRequirements(newValue);
+
+            if (newValue != prefixes)
+            {
+                view.SetValue(PrefixesProperty, prefixes);
+            }
+        }
+
+        private static string EnforcePrefixesRequirements(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return "@";
+            }
+
+            var possibles = string.Concat(value.Where(char.IsPunctuation));
+            return string.IsNullOrEmpty(possibles) ? "@" : possibles;
+        }
+
+        private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
+        {
+            TextDocument.BeginUndoGroup();
+
+            var selection = TextDocument.Selection;
+            if (selection.Type != SelectionType.InsertionPoint)
+            {
+                return;
+            }
+
+            var range = selection.GetClone();
+            range.Expand(TextRangeUnit.Link);
+            if (!_tokens.ContainsKey(range.Link))
+            {
+                return;
+            }
+
+            if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
+            {
+                // Prevent user from manually editing the link
+                selection.SetRange(range.StartPosition, range.EndPosition);
+            }
+            else if (selection.StartPosition == range.StartPosition)
+            {
+                // Reset formatting if selection is sandwiched between 2 adjacent links
+                // or if the link is at the beginning of the document
+                range.MoveStart(TextRangeUnit.Link, -1);
+                if (selection.StartPosition != range.StartPosition || selection.StartPosition == 0)
+                {
+                    ApplyDefaultFormatToRange(selection);
+                }
+            }
+        }
+
+        private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+            await RequestForSuggestionsAsync();
+        }
+
+        private void RichEditBoxPointerEventHandler(object sender, PointerRoutedEventArgs e)
+        {
+            ShowSuggestionsPopup(false);
+        }
+
+        private void AddKeyboardAccelerators()
+        {
+            var enterKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Enter };
+            var downKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Down };
+            var upKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Up };
+            var escapeKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Escape };
+
+            enterKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
+            downKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
+            upKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
+            escapeKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
+
+            _richEditBox.KeyboardAccelerators.Add(enterKeyAccelerator);
+            _richEditBox.KeyboardAccelerators.Add(downKeyAccelerator);
+            _richEditBox.KeyboardAccelerators.Add(upKeyAccelerator);
+            _richEditBox.KeyboardAccelerators.Add(escapeKeyAccelerator);
+        }
+
+        private void RichEditBoxKeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
+        {
+            var itemsList = _suggestionsList.Items;
+            if (!_suggestionPopup.IsOpen || itemsList == null || itemsList.Count == 0)
+            {
+                return;
+            }
+
+            var key = args.KeyboardAccelerator.Key;
+            switch (key)
+            {
+                case VirtualKey.Up when itemsList.Count == 1:
+                case VirtualKey.Down when itemsList.Count == 1:
+                    {
+                        _suggestionsList.SelectedItem = itemsList[0];
+                        break;
+                    }
+                case VirtualKey.Up:
+                    {
+                        _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
+                        _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                        args.Handled = true;
+                        break;
+                    }
+                case VirtualKey.Down:
+                    {
+                        _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
+                        _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                        args.Handled = true;
+                        break;
+                    }
+                case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
+                    {
+                        ShowSuggestionsPopup(false);
+                        _ = OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
+                        args.Handled = true;
+                        break;
+                    }
+                case VirtualKey.Escape:
+                    {
+                        ShowSuggestionsPopup(false);
+                        args.Handled = true;
+                        break;
+                    }
+            }
+        }
+
+        private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            var selectedItem = e.ClickedItem;
+            await OnSuggestionSelectedAsync(selectedItem);
+        }
+
+        private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangingEventArgs args)
+        {
+            if (_ignoreChange)
+            {
+                return;
+            }
+
+            _ignoreChange = true;
+            ValidateTokensInDocument();
+            TextDocument.EndUndoGroup();
+            TextDocument.BeginUndoGroup();
+            _ignoreChange = false;
+        }
+
+        private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
+        {
+            TextChanged?.Invoke((RichEditBox)sender, e);
+            UpdateVisibleTokenList();
+        }
+
+        private void RichEditBox_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            _suggestionPopup.VerticalOffset = e.NewSize.Height;
+            _suggestionsList.MaxWidth = e.NewSize.Width;
+        }
+
+        private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            _suggestionChoice = 0;
+            ShowSuggestionsPopup(ItemsSource is IEnumerable);
+        }
+
+        private async Task RequestForSuggestionsAsync()
+        {
+            _suggestionRequestedTokenSource?.Cancel();
+
+            if (TryExtractQueryFromSelection(out var prefix, out var query, out var range) &&
+                SuggestionsRequested != null)
+            {
+                _suggestionRequestedTokenSource = new CancellationTokenSource();
+                _currentPrefix = prefix;
+                _currentQuery = query;
+                _currentRange = range;
+
+                var cancellationToken = _suggestionRequestedTokenSource.Token;
+                var eventArgs = new SuggestionsRequestedEventArgs { Query = query, Prefix = prefix };
+                try
+                {
+                    await SuggestionsRequested.InvokeAsync(this, eventArgs, cancellationToken);
+                }
+                catch (TaskCanceledException)
+                {
+                    eventArgs.Cancel = true;
+                }
+            }
+            else
+            {
+                ShowSuggestionsPopup(false);
+            }
+        }
+
+        private async Task OnSuggestionSelectedAsync(object selectedItem)
+        {
+            var range = _currentRange;
+            var id = Guid.NewGuid();
+            var prefix = _currentPrefix;
+            var query = _currentQuery;
+
+            // range has length of 0 at the end of the commit.
+            // Checking length == 0 to avoid committing twice.
+            if (SuggestionChosen == null || prefix == null || query == null || range == null ||
+                range.Length == 0)
+            {
+                return;
+            }
+
+            var eventArgs = new SuggestionChosenEventArgs
+            {
+                Id = id,
+                Prefix = prefix,
+                Query = query,
+                SelectedItem = selectedItem,
+                Format = CreateSuggestionTokenFormat()
+            };
+            var textBefore = range.Text;
+            await SuggestionChosen.InvokeAsync(this, eventArgs);
+            var text = eventArgs.Text;
+
+            // Since this operation is async, the document may have changed at this point.
+            // Double check if the range still has the expected query.
+            if (string.IsNullOrEmpty(text) || textBefore != range.Text ||
+                !TryExtractQueryFromRange(range, out var testPrefix, out var testQuery) ||
+                testPrefix != prefix || testQuery != query)
+            {
+                return;
+            }
+
+            lock (LockObj)
+            {
+                var displayText = prefix + text;
+                var tokenRange = CommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
+
+                var token = new SuggestionInfo(id, displayText, this) { Active = true, Item = selectedItem };
+                token.UpdateTextRange(tokenRange);
+                _tokens.Add(tokenRange.Link, token);
+            }
+        }
+
+        private ITextRange CommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format)
+        {
+            _ignoreChange = true;
+            TextDocument.BeginUndoGroup();
+
+            range.SetText(TextSetOptions.Unhide, displayText);
+            range.Link = $"\"{id}\"";
+
+            range.CharacterFormat.BackgroundColor = format.Background;
+            range.CharacterFormat.ForegroundColor = format.Foreground;
+            range.CharacterFormat.Bold = format.Bold;
+            range.CharacterFormat.Italic = format.Italic;
+            range.CharacterFormat.Underline = format.Underline;
+
+            var returnRange = TextDocument.GetRange(range.StartPosition, range.EndPosition);
+
+            range.Collapse(false);
+            range.SetText(TextSetOptions.Unhide, " ");
+            range.Collapse(false);
+            TextDocument.Selection.SetRange(range.EndPosition, range.EndPosition);
+
+            TextDocument.EndUndoGroup();
+            _ignoreChange = false;
+            return returnRange;
+        }
+
+        private void ValidateTokensInDocument()
+        {
+            foreach (var (_, token) in _tokens)
+            {
+                token.Active = false;
+            }
+
+            var range = TextDocument.GetRange(0, 0);
+            range.SetIndex(TextRangeUnit.Character, -1, false);
+
+            // Handle link at the very end of the document where GetIndex fails to detect
+            range.Expand(TextRangeUnit.Link);
+            ValidateTokenFromRange(range);
+
+            var nextIndex = range.GetIndex(TextRangeUnit.Link);
+            while (nextIndex != 0 && nextIndex != 1)
+            {
+                range.Move(TextRangeUnit.Link, -1);
+
+                var validateRange = range.GetClone();
+                validateRange.Expand(TextRangeUnit.Link);
+
+                // Adjacent links have the same index. Manually check each link with Collapse and Expand.
+                var previousText = validateRange.Text;
+                var hasAdjacentToken = true;
+                while (hasAdjacentToken)
+                {
+                    ValidateTokenFromRange(validateRange);
+                    validateRange.Collapse(false);
+                    validateRange.Expand(TextRangeUnit.Link);
+
+                    hasAdjacentToken = validateRange.Text != previousText;
+                    previousText = validateRange.Text;
+                }
+
+                nextIndex = range.GetIndex(TextRangeUnit.Link);
+            }
+        }
+
+        private bool ValidateTokenFromRange(ITextRange range)
+        {
+            if (range.Length == 0 || string.IsNullOrEmpty(range.Link) ||
+                !_tokens.TryGetValue(range.Link, out var token))
+            {
+                // Handle case where range.Link is empty but it still recognized and rendered as a link
+                if (range.CharacterFormat.LinkType == LinkType.FriendlyLinkName)
+                {
+                    range.Link = string.Empty;
+                }
+                return false;
+            }
+
+            if (token.ToString() != range.Text)
+            {
+                //range.Link = string.Empty;
+                range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+                token.Active = false;
+                return false;
+            }
+
+            token.UpdateTextRange(range);
+            token.Active = true;
+            return true;
+        }
+
+        private void ShowSuggestionsPopup(bool show)
+        {
+            _suggestionPopup.IsOpen = show;
+            if (!show)
+            {
+                _suggestionChoice = 0;
+            }
+        }
+
+        private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
+        {
+            prefix = string.Empty;
+            query = string.Empty;
+            range = null;
+            if (TextDocument.Selection.Type != SelectionType.InsertionPoint)
+            {
+                return false;
+            }
+
+            // Check if selection is on existing link (suggestion)
+            var expandCount = TextDocument.Selection.GetClone().Expand(TextRangeUnit.Link);
+            if (expandCount != 0)
+            {
+                return false;
+            }
+
+            var selection = TextDocument.Selection.GetClone();
+            selection.MoveStart(TextRangeUnit.Word, -1);
+            if (selection.Length == 0)
+            {
+                return false;
+            }
+
+            range = selection;
+            if (TryExtractQueryFromRange(selection, out prefix, out query))
+            {
+                return true;
+            }
+
+            selection.MoveStart(TextRangeUnit.Word, -1);
+            if (TryExtractQueryFromRange(selection, out prefix, out query))
+            {
+                return true;
+            }
+
+            range = null;
+            return false;
+        }
+
+        private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out string query)
+        {
+            prefix = string.Empty;
+            query = string.Empty;
+            range.GetText(TextGetOptions.NoHidden, out var possibleQuery);
+            if (possibleQuery.Length > 0 && Prefixes.Contains(possibleQuery[0]) &&
+                !possibleQuery.Any(char.IsWhiteSpace) && string.IsNullOrEmpty(range.Link))
+            {
+                if (possibleQuery.Length == 1)
+                {
+                    prefix = possibleQuery;
+                    return true;
+                }
+
+                prefix = possibleQuery[0].ToString();
+                query = possibleQuery.Substring(1);
+                return true;
+            }
+
+            return false;
+        }
+
+        private SuggestionTokenFormat CreateSuggestionTokenFormat()
+        {
+            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
+            if (SuggestionBackground != null)
+            {
+                defaultFormat.BackgroundColor = SuggestionBackground.Color;
+            }
+
+            if (SuggestionForeground != null)
+            {
+                defaultFormat.ForegroundColor = SuggestionForeground.Color;
+            }
+
+            return new SuggestionTokenFormat
+            {
+                Foreground = defaultFormat.ForegroundColor,
+                Background = defaultFormat.BackgroundColor,
+                Italic = defaultFormat.Italic,
+                Bold = defaultFormat.Bold,
+                Underline = defaultFormat.Underline
+            };
+        }
+
+        private void ApplyDefaultFormatToRange(ITextRange range)
+        {
+            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
+            range.CharacterFormat.BackgroundColor = defaultFormat.BackgroundColor;
+            range.CharacterFormat.ForegroundColor = defaultFormat.ForegroundColor;
+            range.CharacterFormat.Bold = defaultFormat.Bold;
+            range.CharacterFormat.Italic = defaultFormat.Italic;
+            range.CharacterFormat.Underline = defaultFormat.Underline;
+        }
+
+        private void UpdateVisibleTokenList()
+        {
+            lock (LockObj)
+            {
+                var toBeRemoved = _visibleTokens.Where(x => !x.Active).ToArray();
+
+                foreach (var elem in toBeRemoved)
+                {
+                    _visibleTokens.Remove(elem);
+                }
+
+                var toBeAdded = _tokens.Where(pair => pair.Value.Active && !_visibleTokens.Contains(pair.Value))
+                    .Select(pair => pair.Value).ToArray();
+
+                foreach (var elem in toBeAdded)
+                {
+                    _visibleTokens.Add(elem);
+                }
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
new file mode 100644
index 00000000000..5f3cb590dd6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -0,0 +1,110 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
+    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+    xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="DodgerBlue" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="#FF21303A" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="{ThemeResource SystemColorButtonFaceColor}" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="DarkSlateBlue" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="#e8f5fb" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <controls:PlainTextCommandBarFlyout x:Key="SuppressedTextCommandBarFlyout" />
+
+    <Style x:Key="DefaultRichEditBoxStyle" TargetType="RichEditBox" />
+
+    <Style TargetType="controls:RichSuggestBox">
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
+        <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="SuggestionForeground" Value="{ThemeResource DefaultSuggestionForeground}" />
+        <Setter Property="SuggestionBackground" Value="{ThemeResource DefaultSuggestionBackground}" />
+        <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
+        <contract6Present:Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <contract7Present:Setter Property="ContextFlyout" Value="{StaticResource SuppressedTextCommandBarFlyout}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:RichSuggestBox">
+                    <Grid x:Name="LayoutRoot">
+                        <RichEditBox x:Name="RichEditBox"
+                                     Style="{TemplateBinding RichEditBoxStyle}"
+                                     PlaceholderText="{TemplateBinding PlaceholderText}"
+                                     Header="{TemplateBinding Header}"
+                                     Width="{TemplateBinding Width}"
+                                     contract7Present:Description="{TemplateBinding Description}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     Background="{TemplateBinding Background}"
+                                     BorderBrush="{TemplateBinding BorderBrush}"
+                                     BorderThickness="{TemplateBinding BorderThickness}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontWeight="{TemplateBinding FontWeight}"
+                                     FontStretch="{TemplateBinding FontStretch}"
+                                     TextWrapping="{TemplateBinding TextWrapping}"
+                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                     ScrollViewer.BringIntoViewOnFocusChange="False"
+                                     Canvas.ZIndex="0"
+                                     Margin="0"
+                                     DesiredCandidateWindowAlignment="BottomEdge"
+                                     DisabledFormattingAccelerators="All"
+                                     ClipboardCopyFormat="{TemplateBinding ClipboardCopyFormat}"
+                                     ContextFlyout="{TemplateBinding ContextFlyout}"
+                                     contract7Present:SelectionFlyout="{x:Null}"
+                                     UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}"
+                                     contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
+
+                        <Popup x:Name="SuggestionsPopup"
+                               contract8Present:ShouldConstrainToRootBounds="False">
+                            <Border x:Name="SuggestionsContainer"
+                                    Padding="{ThemeResource AutoSuggestListMargin}"
+                                    BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}"
+                                    BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
+                                    Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
+                                    CornerRadius="{ThemeResource OverlayCornerRadius}">
+                                <Border.RenderTransform>
+                                    <contract7NotPresent:TranslateTransform x:Name="UpwardTransform" />
+                                </Border.RenderTransform>
+                                <ListView
+                                    x:Name="SuggestionsList"
+                                    DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                    IsItemClickEnabled="True"
+                                    ItemsSource="{TemplateBinding ItemsSource}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                    ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                    MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
+                                    Margin="{ThemeResource AutoSuggestListPadding}">
+                                    <ListView.ItemContainerTransitions>
+                                        <contract7NotPresent:TransitionCollection />
+                                    </ListView.ItemContainerTransitions>
+                                </ListView>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
new file mode 100644
index 00000000000..6ba680e6a3b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -0,0 +1,20 @@
+using System;
+using Microsoft.Toolkit.Uwp.Deferred;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public class SuggestionChosenEventArgs : DeferredEventArgs
+    {
+        public string Query { get; internal set; }
+
+        public string Prefix { get; internal set; }
+
+        public string Text { get; set; }
+
+        public object SelectedItem { get; internal set; }
+
+        public Guid Id { get; internal set; }
+
+        public SuggestionTokenFormat Format { get; internal set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
new file mode 100644
index 00000000000..9893cde2ae5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using Windows.UI.Text;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public class SuggestionInfo : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public RichSuggestBox Owner { get; }
+
+        public Guid Id { get; }
+
+        public string DisplayText { get; }
+
+        public object Item { get; set; }
+
+        public int RangeStart { get; private set; }
+
+        public int RangeEnd { get; private set; }
+
+        public int Position => _range?.GetIndex(TextRangeUnit.Character) - 1 ?? 0;
+
+        internal bool Active { get; set; }
+
+        private ITextRange _range;
+
+        public SuggestionInfo(Guid id, string displayText, RichSuggestBox owner)
+        {
+            Id = id;
+            DisplayText = displayText;
+            Owner = owner;
+        }
+
+        internal void UpdateTextRange(ITextRange range)
+        {
+            if (_range == null)
+            {
+                _range = range;
+                RangeStart = _range.StartPosition;
+                RangeEnd = _range.EndPosition;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
+            }
+            else if (RangeStart != range.StartPosition || RangeEnd != range.EndPosition)
+            {
+                _range.SetRange(range.StartPosition, range.EndPosition);
+                RangeStart = _range.StartPosition;
+                RangeEnd = _range.EndPosition;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
+            }
+        }
+
+        public override string ToString()
+        {
+            return $"HYPERLINK \"{Id}\"{DisplayText}";
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
new file mode 100644
index 00000000000..61d7ad16720
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
@@ -0,0 +1,18 @@
+using Windows.UI;
+using Windows.UI.Text;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public class SuggestionTokenFormat
+    {
+        public Color Foreground { get; set; }
+
+        public Color Background { get; set; }
+
+        public FormatEffect Italic { get; set; }
+
+        public FormatEffect Bold { get; set; }
+
+        public UnderlineType Underline { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
new file mode 100644
index 00000000000..def23b9ec13
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -0,0 +1,11 @@
+using Microsoft.Toolkit.Uwp.Deferred;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
+    {
+        public string Prefix { get; set; }
+
+        public string Query { get; set; }
+    }
+}

From 4ee560666cb49cc186cd21c5149d2e5d9c89c0ba Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 14 Jan 2021 23:06:35 -0800
Subject: [PATCH 026/200] update headers

---
 .../RichSuggestBox/PlainTextCommandBarFlyout.cs             | 6 +++++-
 .../RichSuggestBox/RichSuggestBox.Events.cs                 | 6 +++++-
 .../RichSuggestBox/RichSuggestBox.Properties.cs             | 6 +++++-
 .../RichSuggestBox/RichSuggestBox.cs                        | 6 +++++-
 .../RichSuggestBox/SuggestionChosenEventArgs.cs             | 6 +++++-
 .../RichSuggestBox/SuggestionInfo.cs                        | 6 +++++-
 .../RichSuggestBox/SuggestionTokenFormat.cs                 | 6 +++++-
 .../RichSuggestBox/SuggestionsRequestedEventArgs.cs         | 6 +++++-
 8 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
index 7adbc988c2e..342514f5298 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
@@ -1,4 +1,8 @@
-using Windows.UI.Xaml.Controls;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
index 73f6229aa30..8b735c3935f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
@@ -1,4 +1,8 @@
-using Windows.Foundation;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index b5083430df5..882ac0138e5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -1,4 +1,8 @@
-using System.Collections.ObjectModel;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.ObjectModel;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index bd00ece615f..dd87d688355 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
index 6ba680e6a3b..1b10a12a9e5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using Microsoft.Toolkit.Uwp.Deferred;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
index 9893cde2ae5..f0332dc7176 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.ComponentModel;
 using Windows.UI.Text;
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
index 61d7ad16720..ebb1b48f99c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
@@ -1,4 +1,8 @@
-using Windows.UI;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI;
 using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index def23b9ec13..c9f7a71d43c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -1,4 +1,8 @@
-using Microsoft.Toolkit.Uwp.Deferred;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Toolkit.Uwp.Deferred;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {

From 583d5ae2e44932636bbbd92176b9413e5b0c2c60 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 19 Jan 2021 22:02:13 -0800
Subject: [PATCH 027/200] add comments

---
 .../RichSuggestBox/RichSuggestBox.Events.cs   | 13 ++++
 .../RichSuggestBox.Properties.cs              | 63 +++++++++++++++++++
 .../RichSuggestBox/RichSuggestBox.cs          |  8 +++
 .../SuggestionChosenEventArgs.cs              | 21 +++++++
 .../RichSuggestBox/SuggestionInfo.cs          | 32 ++++++++++
 .../RichSuggestBox/SuggestionTokenFormat.cs   | 18 ++++++
 .../SuggestionsRequestedEventArgs.cs          |  9 +++
 7 files changed, 164 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
index 8b735c3935f..3351c3d81c5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
@@ -8,12 +8,25 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
     public partial class RichSuggestBox
     {
+        /// <summary>
+        /// Event raised when the control needs to show suggestions.
+        /// </summary>
         public event TypedEventHandler<RichSuggestBox, SuggestionsRequestedEventArgs> SuggestionsRequested;
 
+        /// <summary>
+        /// Event raised when user click on a suggestion.
+        /// This event lets you customize the token appearance in the document.
+        /// </summary>
         public event TypedEventHandler<RichSuggestBox, SuggestionChosenEventArgs> SuggestionChosen;
 
+        /// <summary>
+        /// Event raised when text is changed, either by user or by internal formatting.
+        /// </summary>
         public event TypedEventHandler<RichEditBox, RoutedEventArgs> TextChanged;
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index 882ac0138e5..59b499e9e4f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -10,8 +10,14 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
     public partial class RichSuggestBox
     {
+        /// <summary>
+        /// Identifies the <see cref="PlaceholderText"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty PlaceholderTextProperty =
             DependencyProperty.Register(
                 nameof(PlaceholderText),
@@ -19,6 +25,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(string.Empty));
 
+        /// <summary>
+        /// Identifies the <see cref="RichEditBoxStyle"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty RichEditBoxStyleProperty =
             DependencyProperty.Register(
                 nameof(RichEditBoxStyle),
@@ -26,6 +35,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="Header"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty HeaderProperty =
             DependencyProperty.Register(
                 nameof(Header),
@@ -33,6 +45,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="Description"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty DescriptionProperty =
             DependencyProperty.Register(
                 nameof(Description),
@@ -40,6 +55,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="TextWrapping"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty TextWrappingProperty =
             DependencyProperty.Register(
                 nameof(TextWrapping),
@@ -47,6 +65,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(TextWrapping.NoWrap));
 
+        /// <summary>
+        /// Identifies the <see cref="ClipboardCopyFormat"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty ClipboardCopyFormatProperty =
             DependencyProperty.Register(
                 nameof(ClipboardCopyFormat),
@@ -54,6 +75,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(RichEditClipboardFormat.PlainText));
 
+        /// <summary>
+        /// Identifies the <see cref="SuggestionBackground"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty SuggestionBackgroundProperty =
             DependencyProperty.Register(
                 nameof(SuggestionBackground),
@@ -61,6 +85,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="SuggestionForeground"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty SuggestionForegroundProperty =
             DependencyProperty.Register(
                 nameof(SuggestionForeground),
@@ -68,6 +95,9 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="Prefixes"/> dependency property.
+        /// </summary>
         public static readonly DependencyProperty PrefixesProperty =
             DependencyProperty.Register(
                 nameof(Prefixes),
@@ -75,54 +105,81 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata("@", OnPrefixesChanged));
 
+        /// <summary>
+        /// Gets or sets the text that is displayed in the control until the value is changed by a user action or some other operation.
+        /// </summary>
         public string PlaceholderText
         {
             get => (string)GetValue(PlaceholderTextProperty);
             set => SetValue(PlaceholderTextProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the style of the underlying <see cref="RichEditBox"/>.
+        /// </summary>
         public Style RichEditBoxStyle
         {
             get => (Style)GetValue(RichEditBoxStyleProperty);
             set => SetValue(RichEditBoxStyleProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the content for the control's header.
+        /// </summary>
         public object Header
         {
             get => GetValue(HeaderProperty);
             set => SetValue(HeaderProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets content that is shown below the control. The content should provide guidance about the input expected by the control.
+        /// </summary>
         public object Description
         {
             get => GetValue(DescriptionProperty);
             set => SetValue(DescriptionProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value that indicates how text wrapping occurs if a line of text extends beyond the available width of the control.
+        /// </summary>
         public TextWrapping TextWrapping
         {
             get => (TextWrapping)GetValue(TextWrappingProperty);
             set => SetValue(TextWrappingProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value that specifies whether text is copied with all formats, or as plain text only.
+        /// </summary>
         public RichEditClipboardFormat ClipboardCopyFormat
         {
             get => (RichEditClipboardFormat)GetValue(ClipboardCopyFormatProperty);
             set => SetValue(ClipboardCopyFormatProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the default brush used to color the suggestion token background.
+        /// </summary>
         public SolidColorBrush SuggestionBackground
         {
             get => (SolidColorBrush)GetValue(SuggestionBackgroundProperty);
             set => SetValue(SuggestionBackgroundProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the default brush used to color the suggestion token foreground.
+        /// </summary>
         public SolidColorBrush SuggestionForeground
         {
             get => (SolidColorBrush)GetValue(SuggestionForegroundProperty);
             set => SetValue(SuggestionForegroundProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets prefix characters to start a query.
+        /// </summary>
         public string Prefixes
         {
             get => (string)GetValue(PrefixesProperty);
@@ -134,8 +191,14 @@ public string Prefixes
         /// </summary>
         protected object LockObj { get; }
 
+        /// <summary>
+        /// Gets an object that enables access to the text object model for the text contained in a <see cref="RichEditBox"/>.
+        /// </summary>
         public RichEditTextDocument TextDocument => _richEditBox?.TextDocument;
 
+        /// <summary>
+        /// Gets a collection of suggestion tokens that are present in the document.
+        /// </summary>
         public ReadOnlyObservableCollection<SuggestionInfo> Tokens { get; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index dd87d688355..3d311912f8b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -19,6 +19,9 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
     [TemplatePart(Name = PartRichEditBox, Type = typeof(RichEditBox))]
     [TemplatePart(Name = PartSuggestionsPopup, Type = typeof(Popup))]
     [TemplatePart(Name = PartSuggestionsList, Type = typeof(ListViewBase))]
@@ -56,6 +59,10 @@ public RichSuggestBox()
             RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
         }
 
+        /// <summary>
+        /// Clear unused tokens and undo/redo history. <see cref="RichSuggestBox"/> saves all of previously committed tokens
+        /// even when they are removed from the text. They have to be manually removed using this method.
+        /// </summary>
         public void ClearUndoRedoSuggestionHistory()
         {
             TextDocument.ClearUndoRedoHistory();
@@ -71,6 +78,7 @@ public void ClearUndoRedoSuggestionHistory()
             }
         }
 
+        /// <inheritdoc/>
         protected override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
index 1b10a12a9e5..3ab5f5a80c0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -7,18 +7,39 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// Provides data for the <see cref="RichSuggestBox.SuggestionChosen"/> event.
+    /// </summary>
     public class SuggestionChosenEventArgs : DeferredEventArgs
     {
+        /// <summary>
+        /// Gets the query used for this token.
+        /// </summary>
         public string Query { get; internal set; }
 
+        /// <summary>
+        /// Gets the prefix character used for this token.
+        /// </summary>
         public string Prefix { get; internal set; }
 
+        /// <summary>
+        /// Gets or sets the display text.
+        /// </summary>
         public string Text { get; set; }
 
+        /// <summary>
+        /// Gets the suggestion item associated with this token.
+        /// </summary>
         public object SelectedItem { get; internal set; }
 
+        /// <summary>
+        /// Gets token ID.
+        /// </summary>
         public Guid Id { get; internal set; }
 
+        /// <summary>
+        /// Gets the formatting construct to override this token formatting.
+        /// </summary>
         public SuggestionTokenFormat Format { get; internal set; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
index f0332dc7176..823c8def124 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
@@ -8,28 +8,59 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// SuggestionInfo describes a suggestion token in the document.
+    /// </summary>
     public class SuggestionInfo : INotifyPropertyChanged
     {
+        /// <inheritdoc/>
         public event PropertyChangedEventHandler PropertyChanged;
 
+        /// <summary>
+        /// Gets the <see cref="RichSuggestBox"/> instance that owns this token.
+        /// </summary>
         public RichSuggestBox Owner { get; }
 
+        /// <summary>
+        /// Gets the token ID.
+        /// </summary>
         public Guid Id { get; }
 
+        /// <summary>
+        /// Gets the text displayed in the document.
+        /// </summary>
         public string DisplayText { get; }
 
+        /// <summary>
+        /// Gets or sets the suggested item associated with this token.
+        /// </summary>
         public object Item { get; set; }
 
+        /// <summary>
+        /// Gets the start position of the text range.
+        /// </summary>
         public int RangeStart { get; private set; }
 
+        /// <summary>
+        /// Gets the end position of the text range.
+        /// </summary>
         public int RangeEnd { get; private set; }
 
+        /// <summary>
+        /// Gets the start position of the token in number of characters.
+        /// </summary>
         public int Position => _range?.GetIndex(TextRangeUnit.Character) - 1 ?? 0;
 
         internal bool Active { get; set; }
 
         private ITextRange _range;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SuggestionInfo"/> class.
+        /// </summary>
+        /// <param name="id">Token ID</param>
+        /// <param name="displayText">Text in the document</param>
+        /// <param name="owner"><see cref="RichSuggestBox"/> instance that owns this token</param>
         public SuggestionInfo(Guid id, string displayText, RichSuggestBox owner)
         {
             Id = id;
@@ -55,6 +86,7 @@ internal void UpdateTextRange(ITextRange range)
             }
         }
 
+        /// <inheritdoc/>
         public override string ToString()
         {
             return $"HYPERLINK \"{Id}\"{DisplayText}";
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
index ebb1b48f99c..588076f562f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
@@ -7,16 +7,34 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// SuggestionTokenFormat describes how a token should be formatted.
+    /// </summary>
     public class SuggestionTokenFormat
     {
+        /// <summary>
+        /// Gets or sets token foreground color.
+        /// </summary>
         public Color Foreground { get; set; }
 
+        /// <summary>
+        /// Gets or sets token background color.
+        /// </summary>
         public Color Background { get; set; }
 
+        /// <summary>
+        /// Gets or sets token italic style.
+        /// </summary>
         public FormatEffect Italic { get; set; }
 
+        /// <summary>
+        /// Gets or sets token bold style.
+        /// </summary>
         public FormatEffect Bold { get; set; }
 
+        /// <summary>
+        /// Gets or sets token underline style.
+        /// </summary>
         public UnderlineType Underline { get; set; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index c9f7a71d43c..60e358b2ff9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -6,10 +6,19 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
+    /// <summary>
+    /// Provide data for <see cref="RichSuggestBox.SuggestionsRequested"/> event.
+    /// </summary>
     public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
     {
+        /// <summary>
+        /// Gets or sets the prefix character used for the query.
+        /// </summary>
         public string Prefix { get; set; }
 
+        /// <summary>
+        /// Gets or sets the query for suggestions.
+        /// </summary>
         public string Query { get; set; }
     }
 }

From 60169ae95883f724413c6a5f1ed5a380437c6844 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 19 Jan 2021 22:37:03 -0800
Subject: [PATCH 028/200] fix indentation issues

---
 .../RichSuggestBox/RichSuggestBox.cs          | 48 ++++++++-----------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 3d311912f8b..ca8b9738e32 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -199,37 +199,31 @@ private void RichEditBoxKeyboardAccelerator_Invoked(KeyboardAccelerator sender,
             {
                 case VirtualKey.Up when itemsList.Count == 1:
                 case VirtualKey.Down when itemsList.Count == 1:
-                    {
-                        _suggestionsList.SelectedItem = itemsList[0];
-                        break;
-                    }
+                    _suggestionsList.SelectedItem = itemsList[0];
+                    break;
+
                 case VirtualKey.Up:
-                    {
-                        _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
-                        _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
-                        args.Handled = true;
-                        break;
-                    }
+                    _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
+                    _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                    args.Handled = true;
+                    break;
+
                 case VirtualKey.Down:
-                    {
-                        _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
-                        _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
-                        args.Handled = true;
-                        break;
-                    }
+                    _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
+                    _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                    args.Handled = true;
+                    break;
+
                 case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
-                    {
-                        ShowSuggestionsPopup(false);
-                        _ = OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
-                        args.Handled = true;
-                        break;
-                    }
+                    ShowSuggestionsPopup(false);
+                    _ = OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
+                    args.Handled = true;
+                    break;
+
                 case VirtualKey.Escape:
-                    {
-                        ShowSuggestionsPopup(false);
-                        args.Handled = true;
-                        break;
-                    }
+                    ShowSuggestionsPopup(false);
+                    args.Handled = true;
+                    break;
             }
         }
 

From 74c32190f31e8c404081baa10106a8df32568779 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 19 Jan 2021 23:30:24 -0800
Subject: [PATCH 029/200] more fixes

---
 .../RichSuggestBox/RichSuggestBox.cs                      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index ca8b9738e32..55d8a2850ba 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -31,6 +31,9 @@ public partial class RichSuggestBox : ItemsControl
         private const string PartSuggestionsPopup = "SuggestionsPopup";
         private const string PartSuggestionsList = "SuggestionsList";
 
+        private readonly Dictionary<string, SuggestionInfo> _tokens;
+        private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
+
         private Popup _suggestionPopup;
         private RichEditBox _richEditBox;
         private ListViewBase _suggestionsList;
@@ -41,8 +44,6 @@ public partial class RichSuggestBox : ItemsControl
         private bool _ignoreChange;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
-        private readonly Dictionary<string, SuggestionInfo> _tokens;
-        private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
@@ -416,12 +417,13 @@ private bool ValidateTokenFromRange(ITextRange range)
                 {
                     range.Link = string.Empty;
                 }
+
                 return false;
             }
 
             if (token.ToString() != range.Text)
             {
-                //range.Link = string.Empty;
+                range.Link = string.Empty;
                 range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
                 token.Active = false;
                 return false;

From 08122c3bed92d664402b125188ac718179a411b8 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 03:19:05 -0800
Subject: [PATCH 030/200] xaml formatting

---
 .../RichSuggestBox/RichSuggestBox.xaml        | 108 ++++++++++--------
 1 file changed, 58 insertions(+), 50 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index 5f3cb590dd6..44065225f1c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -1,34 +1,40 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
-    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
+                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+                    xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="DodgerBlue" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="#FF21303A" />
+            <SolidColorBrush x:Key="DefaultSuggestionForeground"
+                             Color="DodgerBlue" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground"
+                             Color="#FF21303A" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="{ThemeResource SystemColorButtonTextColor}" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="{ThemeResource SystemColorButtonFaceColor}" />
+            <SolidColorBrush x:Key="DefaultSuggestionForeground"
+                             Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground"
+                             Color="{ThemeResource SystemColorButtonFaceColor}" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground" Color="DarkSlateBlue" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground" Color="#e8f5fb" />
+            <SolidColorBrush x:Key="DefaultSuggestionForeground"
+                             Color="DarkSlateBlue" />
+            <SolidColorBrush x:Key="DefaultSuggestionBackground"
+                             Color="#e8f5fb" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
     <controls:PlainTextCommandBarFlyout x:Key="SuppressedTextCommandBarFlyout" />
 
-    <Style x:Key="DefaultRichEditBoxStyle" TargetType="RichEditBox" />
+    <Style x:Key="DefaultRichEditBoxStyle"
+           TargetType="RichEditBox" />
 
     <Style TargetType="controls:RichSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="VerticalContentAlignment" Value="Top"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="TextWrapping" Value="NoWrap" />
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
@@ -40,62 +46,64 @@
         <Setter Property="SuggestionForeground" Value="{ThemeResource DefaultSuggestionForeground}" />
         <Setter Property="SuggestionBackground" Value="{ThemeResource DefaultSuggestionBackground}" />
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
-        <contract6Present:Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
-        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <contract7Present:Setter Property="ContextFlyout" Value="{StaticResource SuppressedTextCommandBarFlyout}" />
+        <contract6Present:Setter Property="UseSystemFocusVisuals"
+                                 Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
+        <contract7Present:Setter Property="CornerRadius"
+                                 Value="{ThemeResource ControlCornerRadius}" />
+        <contract7Present:Setter Property="ContextFlyout"
+                                 Value="{StaticResource SuppressedTextCommandBarFlyout}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">
                     <Grid x:Name="LayoutRoot">
                         <RichEditBox x:Name="RichEditBox"
-                                     Style="{TemplateBinding RichEditBoxStyle}"
-                                     PlaceholderText="{TemplateBinding PlaceholderText}"
-                                     Header="{TemplateBinding Header}"
                                      Width="{TemplateBinding Width}"
+                                     Margin="0"
+                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                     contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                                      contract7Present:Description="{TemplateBinding Description}"
-                                     Foreground="{TemplateBinding Foreground}"
+                                     contract7Present:SelectionFlyout="{x:Null}"
                                      Background="{TemplateBinding Background}"
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                     FontSize="{TemplateBinding FontSize}"
-                                     FontFamily="{TemplateBinding FontFamily}"
-                                     FontWeight="{TemplateBinding FontWeight}"
-                                     FontStretch="{TemplateBinding FontStretch}"
-                                     TextWrapping="{TemplateBinding TextWrapping}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     ScrollViewer.BringIntoViewOnFocusChange="False"
                                      Canvas.ZIndex="0"
-                                     Margin="0"
-                                     DesiredCandidateWindowAlignment="BottomEdge"
-                                     DisabledFormattingAccelerators="All"
                                      ClipboardCopyFormat="{TemplateBinding ClipboardCopyFormat}"
                                      ContextFlyout="{TemplateBinding ContextFlyout}"
-                                     contract7Present:SelectionFlyout="{x:Null}"
-                                     UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}"
-                                     contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
+                                     DesiredCandidateWindowAlignment="BottomEdge"
+                                     DisabledFormattingAccelerators="All"
+                                     FontFamily="{TemplateBinding FontFamily}"
+                                     FontSize="{TemplateBinding FontSize}"
+                                     FontStretch="{TemplateBinding FontStretch}"
+                                     FontWeight="{TemplateBinding FontWeight}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     Header="{TemplateBinding Header}"
+                                     PlaceholderText="{TemplateBinding PlaceholderText}"
+                                     ScrollViewer.BringIntoViewOnFocusChange="False"
+                                     Style="{TemplateBinding RichEditBoxStyle}"
+                                     TextWrapping="{TemplateBinding TextWrapping}"
+                                     UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
 
                         <Popup x:Name="SuggestionsPopup"
                                contract8Present:ShouldConstrainToRootBounds="False">
                             <Border x:Name="SuggestionsContainer"
                                     Padding="{ThemeResource AutoSuggestListMargin}"
-                                    BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}"
-                                    BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
                                     Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
+                                    BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
+                                    BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}"
                                     CornerRadius="{ThemeResource OverlayCornerRadius}">
                                 <Border.RenderTransform>
                                     <contract7NotPresent:TranslateTransform x:Name="UpwardTransform" />
                                 </Border.RenderTransform>
-                                <ListView
-                                    x:Name="SuggestionsList"
-                                    DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
-                                    IsItemClickEnabled="True"
-                                    ItemsSource="{TemplateBinding ItemsSource}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                    ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
-                                    MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
-                                    Margin="{ThemeResource AutoSuggestListPadding}">
+                                <ListView x:Name="SuggestionsList"
+                                          MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
+                                          Margin="{ThemeResource AutoSuggestListPadding}"
+                                          DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                          IsItemClickEnabled="True"
+                                          ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                                          ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          ItemsSource="{TemplateBinding ItemsSource}">
                                     <ListView.ItemContainerTransitions>
                                         <contract7NotPresent:TransitionCollection />
                                     </ListView.ItemContainerTransitions>

From ce3726f73259a0b05b496b7489f8f3f8f74edc17 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 12:10:11 -0800
Subject: [PATCH 031/200] no conditional xaml due to bug
 https://github.com/microsoft/microsoft-ui-xaml/issues/2556

---
 .../RichSuggestBox/RichSuggestBox.xaml                 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index 44065225f1c..5dd78b712bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
                     xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
@@ -46,12 +45,9 @@
         <Setter Property="SuggestionForeground" Value="{ThemeResource DefaultSuggestionForeground}" />
         <Setter Property="SuggestionBackground" Value="{ThemeResource DefaultSuggestionBackground}" />
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
-        <contract6Present:Setter Property="UseSystemFocusVisuals"
-                                 Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
-        <contract7Present:Setter Property="CornerRadius"
-                                 Value="{ThemeResource ControlCornerRadius}" />
-        <contract7Present:Setter Property="ContextFlyout"
-                                 Value="{StaticResource SuppressedTextCommandBarFlyout}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="ContextFlyout" Value="{StaticResource SuppressedTextCommandBarFlyout}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">

From 91093cf56e82de7564b4d54f4a96cfb909b3811b Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 12:33:55 -0800
Subject: [PATCH 032/200] add sample page

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  13 ++
 .../RichSuggestBox/RichSuggestBoxCode.bind    |  27 ++++
 .../RichSuggestBox/RichSuggestBoxPage.xaml    |  19 +++
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 140 ++++++++++++++++++
 .../RichSuggestBox/RichSuggestBoxXaml.bind    |  61 ++++++++
 .../SuggestionTemplateSelector.cs             |  17 +++
 .../SamplePages/samples.json                  |  11 ++
 7 files changed, 288 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 9dddf4fb6b0..ba573e9e803 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -506,6 +506,10 @@
     <Compile Include="SamplePages\MetadataControl\MetadataControlPage.xaml.cs">
       <DependentUpon>MetadataControlPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\RichSuggestBox\RichSuggestBoxPage.xaml.cs">
+      <DependentUpon>RichSuggestBoxPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SamplePages\RichSuggestBox\SuggestionTemplateSelector.cs" />
     <Compile Include="SamplePages\TilesBrush\TilesBrushPage.xaml.cs">
       <DependentUpon>TilesBrushPage.xaml</DependentUpon>
     </Compile>
@@ -627,6 +631,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\KeyDownTriggerBehavior\KeyDownTriggerBehaviorXaml.bind" />
+    <Content Include="SamplePages\RichSuggestBox\RichSuggestBoxCode.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -986,6 +991,14 @@
     <Content Include="SamplePages\Primitives\SwitchPresenter.bind">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="SamplePages\RichSuggestBox\RichSuggestBoxXaml.bind">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Content>
+    <Page Include="SamplePages\RichSuggestBox\RichSuggestBoxPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
new file mode 100644
index 00000000000..4f815ff62a9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -0,0 +1,27 @@
+private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
+{
+	if (args.Prefix == "#")
+	{
+		args.Format.Background = Colors.DarkOrange;
+		args.Format.Foreground = Colors.OrangeRed;
+		args.Text = ((SampleDataType)args.SelectedItem).Text;
+	}
+	else
+	{
+		args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
+	}
+}
+
+private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+{
+	if (args.Prefix == "#")
+	{
+		sender.ItemsSource =
+		this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+	}
+	else
+	{
+		sender.ItemsSource =
+		this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+	}
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
new file mode 100644
index 00000000000..9d67768f0a2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
@@ -0,0 +1,19 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.RichSuggestBoxPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+    <Page.Resources>
+        <ResourceDictionary>
+            <local:SuggestionTemplateSelector x:Key="SuggestionTemplateSelector" />
+        </ResourceDictionary>
+    </Page.Resources>
+
+    <Grid Visibility="Collapsed">
+        <controls:RichSuggestBox />
+        <ListView />
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
new file mode 100644
index 00000000000..9d50fb7e427
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
+    {
+        private readonly List<SampleEmailDataType> _emailSamples = new List<SampleEmailDataType>()
+        {
+            new SampleEmailDataType() { FirstName = "Marcus", FamilyName = "Perryman" },
+            new SampleEmailDataType() { FirstName = "Michael", FamilyName = "Hawker" },
+            new SampleEmailDataType() { FirstName = "Matt", FamilyName = "Lacey" },
+            new SampleEmailDataType() { FirstName = "Alexandre", FamilyName = "Chohfi" },
+            new SampleEmailDataType() { FirstName = "Filip", FamilyName = "Wallberg" },
+            new SampleEmailDataType() { FirstName = "Shane", FamilyName = "Weaver" },
+            new SampleEmailDataType() { FirstName = "Vincent", FamilyName = "Gromfeld" },
+            new SampleEmailDataType() { FirstName = "Sergio", FamilyName = "Pedri" },
+            new SampleEmailDataType() { FirstName = "Alex", FamilyName = "Wilber" },
+            new SampleEmailDataType() { FirstName = "Allan", FamilyName = "Deyoung" },
+            new SampleEmailDataType() { FirstName = "Adele", FamilyName = "Vance" },
+            new SampleEmailDataType() { FirstName = "Grady", FamilyName = "Archie" },
+            new SampleEmailDataType() { FirstName = "Megan", FamilyName = "Bowen" },
+            new SampleEmailDataType() { FirstName = "Ben", FamilyName = "Walters" },
+            new SampleEmailDataType() { FirstName = "Debra", FamilyName = "Berger" },
+            new SampleEmailDataType() { FirstName = "Emily", FamilyName = "Braun" },
+            new SampleEmailDataType() { FirstName = "Christine", FamilyName = "Cline" },
+            new SampleEmailDataType() { FirstName = "Enrico", FamilyName = "Catteneo" },
+            new SampleEmailDataType() { FirstName = "Davit", FamilyName = "Badalyan" },
+            new SampleEmailDataType() { FirstName = "Diego", FamilyName = "Siciliani" },
+            new SampleEmailDataType() { FirstName = "Raul", FamilyName = "Razo" },
+            new SampleEmailDataType() { FirstName = "Miriam", FamilyName = "Graham" },
+            new SampleEmailDataType() { FirstName = "Lynne", FamilyName = "Robbins" },
+            new SampleEmailDataType() { FirstName = "Lydia", FamilyName = "Holloway" },
+            new SampleEmailDataType() { FirstName = "Nestor", FamilyName = "Wilke" },
+            new SampleEmailDataType() { FirstName = "Patti", FamilyName = "Fernandez" },
+            new SampleEmailDataType() { FirstName = "Pradeep", FamilyName = "Gupta" },
+            new SampleEmailDataType() { FirstName = "Joni", FamilyName = "Sherman" },
+            new SampleEmailDataType() { FirstName = "Isaiah", FamilyName = "Langer" },
+            new SampleEmailDataType() { FirstName = "Irvin", FamilyName = "Sayers" },
+        };
+
+        private readonly List<SampleDataType> _samples = new List<SampleDataType>()
+        {
+            new SampleDataType() { Text = "Account", Icon = Symbol.Account },
+            new SampleDataType() { Text = "Add Friend", Icon = Symbol.AddFriend },
+            new SampleDataType() { Text = "Attach", Icon = Symbol.Attach },
+            new SampleDataType() { Text = "Attach Camera", Icon = Symbol.AttachCamera },
+            new SampleDataType() { Text = "Audio", Icon = Symbol.Audio },
+            new SampleDataType() { Text = "Block Contact", Icon = Symbol.BlockContact },
+            new SampleDataType() { Text = "Calculator", Icon = Symbol.Calculator },
+            new SampleDataType() { Text = "Calendar", Icon = Symbol.Calendar },
+            new SampleDataType() { Text = "Camera", Icon = Symbol.Camera },
+            new SampleDataType() { Text = "Contact", Icon = Symbol.Contact },
+            new SampleDataType() { Text = "Favorite", Icon = Symbol.Favorite },
+            new SampleDataType() { Text = "Link", Icon = Symbol.Link },
+            new SampleDataType() { Text = "Mail", Icon = Symbol.Mail },
+            new SampleDataType() { Text = "Map", Icon = Symbol.Map },
+            new SampleDataType() { Text = "Phone", Icon = Symbol.Phone },
+            new SampleDataType() { Text = "Pin", Icon = Symbol.Pin },
+            new SampleDataType() { Text = "Rotate", Icon = Symbol.Rotate },
+            new SampleDataType() { Text = "Rotate Camera", Icon = Symbol.RotateCamera },
+            new SampleDataType() { Text = "Send", Icon = Symbol.Send },
+            new SampleDataType() { Text = "Tags", Icon = Symbol.Tag },
+            new SampleDataType() { Text = "UnFavorite", Icon = Symbol.UnFavorite },
+            new SampleDataType() { Text = "UnPin", Icon = Symbol.UnPin },
+            new SampleDataType() { Text = "Zoom", Icon = Symbol.Zoom },
+            new SampleDataType() { Text = "ZoomIn", Icon = Symbol.ZoomIn },
+            new SampleDataType() { Text = "ZoomOut", Icon = Symbol.ZoomOut },
+        };
+
+        private RichSuggestBox _rsb;
+
+        public RichSuggestBoxPage()
+        {
+            this.InitializeComponent();
+
+            Loaded += (sender, e) => { this.OnXamlRendered(this); };
+        }
+
+        public void OnXamlRendered(FrameworkElement control)
+        {
+            if (this._rsb != null)
+            {
+                this._rsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
+                this._rsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
+            }
+
+            if (control.FindChildByName("SuggestingBox") is RichSuggestBox rsb)
+            {
+                this._rsb = rsb;
+                this._rsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
+                this._rsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
+            }
+
+            if (control.FindChildByName("TokenListView") is ListView tls)
+            {
+                tls.ItemsSource = this._rsb?.Tokens;
+            }
+        }
+
+        private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
+        {
+            if (args.Prefix == "#")
+            {
+                args.Format.Background = Colors.DarkOrange;
+                args.Format.Foreground = Colors.OrangeRed;
+                args.Text = ((SampleDataType)args.SelectedItem).Text;
+            }
+            else
+            {
+                args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
+            }
+        }
+
+        private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+        {
+            if (args.Prefix == "#")
+            {
+                sender.ItemsSource =
+                    this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+            }
+            else
+            {
+                sender.ItemsSource =
+                    this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
new file mode 100644
index 00000000000..14ee01d4b23
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
@@ -0,0 +1,61 @@
+<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+    <Page.Resources>
+        <ResourceDictionary>
+            <DataTemplate x:Key="EmailTemplate">
+                <TextBlock Text="{Binding EmailAddress}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="DataTemplate">
+                <StackPanel Orientation="Horizontal">
+                    <SymbolIcon Symbol="{Binding Icon}" />
+                    <TextBlock Padding="4,0,0,0"
+                               Text="{Binding Text}" />
+                </StackPanel>
+            </DataTemplate>
+
+            <local:SuggestionTemplateSelector x:Key="SuggestionTemplateSelector"
+                                              Data="{StaticResource DataTemplate}"
+                                              Person="{StaticResource EmailTemplate}" />
+
+            <DataTemplate x:Key="TokenTemplate">
+                <StackPanel Margin="0,4,0,4"
+                            Orientation="Vertical">
+                    <TextBlock>
+                        Text: <Run Text="{Binding DisplayText}" /></TextBlock>
+                    <TextBlock>
+                        Position: <Run Text="{Binding Position}" /></TextBlock>
+                    <TextBlock>
+                        Id: <Run Text="{Binding Id}" /></TextBlock>
+                </StackPanel>
+            </DataTemplate>
+        </ResourceDictionary>
+    </Page.Resources>
+
+    <Grid Margin="40">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <controls:RichSuggestBox x:Name="SuggestingBox"
+                                 MaxHeight="400"
+                                 HorizontalAlignment="Stretch"
+                                 ClipboardCopyFormat="AllFormats"
+                                 Header="RichSuggestBox:"
+                                 ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
+                                 Prefixes="@#"
+                                 TextWrapping="Wrap" />
+
+        <ListView x:Name="TokenListView" 
+                  Grid.Row="1"
+                  Margin="0,16,0,0"
+                  HorizontalAlignment="Stretch"
+                  ItemTemplate="{StaticResource TokenTemplate}" />
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs
new file mode 100644
index 00000000000..1f3bf875bff
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs
@@ -0,0 +1,17 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    public class SuggestionTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate Person { get; set; }
+
+        public DataTemplate Data { get; set; }
+
+        protected override DataTemplate SelectTemplateCore(object item)
+        {
+            return item is SampleEmailDataType ? this.Person : this.Data;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 2447ae36db2..ffbee19f204 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -484,6 +484,17 @@
         "XamlCodeFile": "/SamplePages/Primitives/ConstrainedBox.bind",
         "Icon": "/SamplePages/Primitives/ConstrainedBox.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ConstrainedBox.md"
+      },
+      {
+        "Name": "RichSuggestBox",
+        "Type": "RichSuggestBoxPage",
+        "Subcategory": "Input",
+        "About": "A text input control that makes suggestions and keeps track of data token items in a rich document.",
+        "CodeUrl": "https://github.com/huynhsontung/WindowsCommunityToolkit/tree/RichSuggestBox/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox",
+        "CodeFile": "RichSuggestBoxCode.bind",
+        "XamlCodeFile": "RichSuggestBoxXaml.bind",
+        "Icon": "/SamplePages/TokenizingTextBox/TokenizingTextBox.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TokenizingTextBox.md"
       }
     ]
   },

From 99872b1effbefdc7832adfd629b015fe2416b2b2 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 13:05:28 -0800
Subject: [PATCH 033/200] add more template bindings

---
 .../RichSuggestBox.Properties.cs              | 43 ++++++++++++++++++-
 .../RichSuggestBox/RichSuggestBox.xaml        | 11 +++--
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index 59b499e9e4f..d28abfda809 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -6,6 +6,7 @@
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Media;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -73,7 +74,27 @@ public partial class RichSuggestBox
                 nameof(ClipboardCopyFormat),
                 typeof(RichEditClipboardFormat),
                 typeof(RichSuggestBox),
-                new PropertyMetadata(RichEditClipboardFormat.PlainText));
+                new PropertyMetadata(RichEditClipboardFormat.AllFormats));
+
+        /// <summary>
+        /// Identifies the <see cref="SelectionFlyout"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty SelectionFlyoutProperty =
+            DependencyProperty.Register(
+                nameof(SelectionFlyout),
+                typeof(FlyoutBase),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="DisabledFormattingAccelerators"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty DisabledFormattingAcceleratorsProperty =
+            DependencyProperty.Register(
+                nameof(DisabledFormattingAccelerators),
+                typeof(DisabledFormattingAccelerators),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(DisabledFormattingAccelerators.None));
 
         /// <summary>
         /// Identifies the <see cref="SuggestionBackground"/> dependency property.
@@ -103,7 +124,7 @@ public partial class RichSuggestBox
                 nameof(Prefixes),
                 typeof(string),
                 typeof(RichSuggestBox),
-                new PropertyMetadata("@", OnPrefixesChanged));
+                new PropertyMetadata(null, OnPrefixesChanged));
 
         /// <summary>
         /// Gets or sets the text that is displayed in the control until the value is changed by a user action or some other operation.
@@ -159,6 +180,24 @@ public RichEditClipboardFormat ClipboardCopyFormat
             set => SetValue(ClipboardCopyFormatProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the flyout that is shown when text is selected using mouse, touch, or pen; or null if no flyout is shown.
+        /// </summary>
+        public FlyoutBase SelectionFlyout
+        {
+            get => (FlyoutBase)GetValue(SelectionFlyoutProperty);
+            set => SetValue(SelectionFlyoutProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates which keyboard shortcuts for formatting are disabled.
+        /// </summary>
+        public DisabledFormattingAccelerators DisabledFormattingAccelerators
+        {
+            get => (DisabledFormattingAccelerators)GetValue(DisabledFormattingAcceleratorsProperty);
+            set => SetValue(DisabledFormattingAcceleratorsProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the default brush used to color the suggestion token background.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index 5dd78b712bd..ebf8856bca1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -25,7 +25,8 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <controls:PlainTextCommandBarFlyout x:Key="SuppressedTextCommandBarFlyout" />
+    <TextCommandBarFlyout x:Key="TextCommandBarContextFlyout" />
+    <TextCommandBarFlyout x:Key="TextCommandBarSelectionFlyout" />
 
     <Style x:Key="DefaultRichEditBoxStyle"
            TargetType="RichEditBox" />
@@ -47,7 +48,9 @@
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="ContextFlyout" Value="{StaticResource SuppressedTextCommandBarFlyout}" />
+        <Setter Property="ContextFlyout" Value="{StaticResource TextCommandBarContextFlyout}" />
+        <Setter Property="SelectionFlyout" Value="{StaticResource TextCommandBarSelectionFlyout}" />
+        <Setter Property="Prefixes" Value="@" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">
@@ -59,7 +62,7 @@
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                      contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                                      contract7Present:Description="{TemplateBinding Description}"
-                                     contract7Present:SelectionFlyout="{x:Null}"
+                                     contract7Present:SelectionFlyout="{TemplateBinding SelectionFlyout}"
                                      Background="{TemplateBinding Background}"
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
@@ -67,7 +70,7 @@
                                      ClipboardCopyFormat="{TemplateBinding ClipboardCopyFormat}"
                                      ContextFlyout="{TemplateBinding ContextFlyout}"
                                      DesiredCandidateWindowAlignment="BottomEdge"
-                                     DisabledFormattingAccelerators="All"
+                                     DisabledFormattingAccelerators="{TemplateBinding DisabledFormattingAccelerators}"
                                      FontFamily="{TemplateBinding FontFamily}"
                                      FontSize="{TemplateBinding FontSize}"
                                      FontStretch="{TemplateBinding FontStretch}"

From 5f7a8477cb64dbfff2a050d308d41360669405bf Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 13:18:13 -0800
Subject: [PATCH 034/200] update headers (again)

---
 .../SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs   | 6 +++++-
 .../RichSuggestBox/SuggestionTemplateSelector.cs            | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 9d50fb7e427..2e3dafb912f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.UI.Controls;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs
index 1f3bf875bff..863a9c62776 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/SuggestionTemplateSelector.cs
@@ -1,4 +1,8 @@
-using Windows.UI.Xaml;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages

From 3ba061e5d6e05732f6f3c1ed93a0266cb475e19e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 21 Jan 2021 13:21:01 -0800
Subject: [PATCH 035/200] no need for PlainTextCommandBarFlyout anymore

---
 .../PlainTextCommandBarFlyout.cs              | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
deleted file mode 100644
index 342514f5298..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/PlainTextCommandBarFlyout.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    internal class PlainTextCommandBarFlyout : TextCommandBarFlyout
-    {
-        public PlainTextCommandBarFlyout()
-        {
-            Opening += (sender, o) =>
-            {
-                PrimaryCommands.Clear();
-
-                // TODO: Limit Pasting to plain-text only
-            };
-        }
-    }
-}

From 0fda83b121ee49a020be30d7ec09fbed6e56d3b1 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 22 Jan 2021 15:27:51 -0800
Subject: [PATCH 036/200] prune duplicate properties and fix flyout placement

---
 .../RichSuggestBox/RichSuggestBoxXaml.bind    |   4 +-
 .../RichSuggestBox.Properties.cs              |  77 -------
 .../RichSuggestBox/RichSuggestBox.xaml        | 216 ++++++++++++++++--
 3 files changed, 204 insertions(+), 93 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
index 14ee01d4b23..655f8837f32 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
@@ -46,11 +46,9 @@
         <controls:RichSuggestBox x:Name="SuggestingBox"
                                  MaxHeight="400"
                                  HorizontalAlignment="Stretch"
-                                 ClipboardCopyFormat="AllFormats"
                                  Header="RichSuggestBox:"
                                  ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
-                                 Prefixes="@#"
-                                 TextWrapping="Wrap" />
+                                 Prefixes="@#" />
 
         <ListView x:Name="TokenListView" 
                   Grid.Row="1"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index d28abfda809..c59b462cc40 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -6,7 +6,6 @@
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Media;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -56,46 +55,6 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
-        /// <summary>
-        /// Identifies the <see cref="TextWrapping"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TextWrappingProperty =
-            DependencyProperty.Register(
-                nameof(TextWrapping),
-                typeof(TextWrapping),
-                typeof(RichSuggestBox),
-                new PropertyMetadata(TextWrapping.NoWrap));
-
-        /// <summary>
-        /// Identifies the <see cref="ClipboardCopyFormat"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ClipboardCopyFormatProperty =
-            DependencyProperty.Register(
-                nameof(ClipboardCopyFormat),
-                typeof(RichEditClipboardFormat),
-                typeof(RichSuggestBox),
-                new PropertyMetadata(RichEditClipboardFormat.AllFormats));
-
-        /// <summary>
-        /// Identifies the <see cref="SelectionFlyout"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty SelectionFlyoutProperty =
-            DependencyProperty.Register(
-                nameof(SelectionFlyout),
-                typeof(FlyoutBase),
-                typeof(RichSuggestBox),
-                new PropertyMetadata(null));
-
-        /// <summary>
-        /// Identifies the <see cref="DisabledFormattingAccelerators"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty DisabledFormattingAcceleratorsProperty =
-            DependencyProperty.Register(
-                nameof(DisabledFormattingAccelerators),
-                typeof(DisabledFormattingAccelerators),
-                typeof(RichSuggestBox),
-                new PropertyMetadata(DisabledFormattingAccelerators.None));
-
         /// <summary>
         /// Identifies the <see cref="SuggestionBackground"/> dependency property.
         /// </summary>
@@ -162,42 +121,6 @@ public object Description
             set => SetValue(DescriptionProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets a value that indicates how text wrapping occurs if a line of text extends beyond the available width of the control.
-        /// </summary>
-        public TextWrapping TextWrapping
-        {
-            get => (TextWrapping)GetValue(TextWrappingProperty);
-            set => SetValue(TextWrappingProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that specifies whether text is copied with all formats, or as plain text only.
-        /// </summary>
-        public RichEditClipboardFormat ClipboardCopyFormat
-        {
-            get => (RichEditClipboardFormat)GetValue(ClipboardCopyFormatProperty);
-            set => SetValue(ClipboardCopyFormatProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the flyout that is shown when text is selected using mouse, touch, or pen; or null if no flyout is shown.
-        /// </summary>
-        public FlyoutBase SelectionFlyout
-        {
-            get => (FlyoutBase)GetValue(SelectionFlyoutProperty);
-            set => SetValue(SelectionFlyoutProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value that indicates which keyboard shortcuts for formatting are disabled.
-        /// </summary>
-        public DisabledFormattingAccelerators DisabledFormattingAccelerators
-        {
-            get => (DisabledFormattingAccelerators)GetValue(DisabledFormattingAcceleratorsProperty);
-            set => SetValue(DisabledFormattingAcceleratorsProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets the default brush used to color the suggestion token background.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index ebf8856bca1..a3b19b41fe4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -25,18 +25,205 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <TextCommandBarFlyout x:Key="TextCommandBarContextFlyout" />
-    <TextCommandBarFlyout x:Key="TextCommandBarSelectionFlyout" />
+    <TextCommandBarFlyout x:Key="TextControlCommandBarContextFlyout"
+                          contract7Present:Placement="BottomEdgeAlignedLeft"
+                          contract7Present:ShowMode="Standard" />
+    <TextCommandBarFlyout x:Key="TextControlCommandBarSelectionFlyout"
+                          contract7Present:Placement="TopEdgeAlignedLeft"
+                          contract7Present:ShowMode="TransientWithDismissOnPointerMoveAway" />
 
+    <!--  Default RichEditBox style copied from WinUI 2021-01-22  -->
     <Style x:Key="DefaultRichEditBoxStyle"
-           TargetType="RichEditBox" />
+           TargetType="RichEditBox">
+        <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
+        <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
+        <Setter Property="ContentLinkForegroundColor" Value="{ThemeResource ContentLinkForegroundColor}" />
+        <Setter Property="ContentLinkBackgroundColor" Value="{ThemeResource ContentLinkBackgroundColor}" />
+        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
+        <Setter Property="ContextFlyout" Value="{StaticResource TextControlCommandBarContextFlyout}" />
+        <Setter Property="SelectionFlyout" Value="{StaticResource TextControlCommandBarSelectionFlyout}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RichEditBox">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.Row="0"
+                                          Margin="0,0,0,4"
+                                          VerticalAlignment="Top"
+                                          x:DeferLoadStrategy="Lazy"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                          FontWeight="Normal"
+                                          Foreground="{ThemeResource TextControlHeaderForeground}"
+                                          TextWrapping="Wrap"
+                                          Visibility="Collapsed" />
+                        <Border x:Name="BorderElement"
+                                Grid.Row="1"
+                                Grid.RowSpan="1"
+                                MinWidth="{ThemeResource TextControlThemeMinWidth}"
+                                MinHeight="{ThemeResource TextControlThemeMinHeight}"
+                                contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}" />
+                        <ScrollViewer x:Name="ContentElement"
+                                      Grid.Row="1"
+                                      Margin="{TemplateBinding BorderThickness}"
+                                      Padding="{TemplateBinding Padding}"
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                      IsTabStop="False"
+                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                      ZoomMode="Disabled" />
+                        <TextBlock x:Name="PlaceholderTextContentPresenter"
+                                   Grid.Row="1"
+                                   Margin="{TemplateBinding BorderThickness}"
+                                   Padding="{TemplateBinding Padding}"
+                                   Foreground="{ThemeResource TextControlPlaceholderForeground}"
+                                   IsHitTestVisible="False"
+                                   Text="{TemplateBinding PlaceholderText}"
+                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                   TextWrapping="{TemplateBinding TextWrapping}" />
+                        <contract7Present:ContentPresenter x:Name="DescriptionPresenter"
+                                                           Grid.Row="2"
+                                                           x:Load="False"
+                                                           AutomationProperties.AccessibilityView="Raw"
+                                                           Content="{TemplateBinding Description}"
+                                                           Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+
+                                <VisualState x:Name="Disabled">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBackgroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlPlaceholderForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Normal" />
+
+                                <VisualState x:Name="PointerOver">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlPlaceholderForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Focused">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlPlaceholderForegroundFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBackgroundFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBorderBrushFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
+                                                                       Storyboard.TargetProperty="BorderThickness">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource TextControlForegroundFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style TargetType="controls:RichSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="Prefixes" Value="@" />
+        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
         <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
@@ -48,29 +235,33 @@
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="ContextFlyout" Value="{StaticResource TextCommandBarContextFlyout}" />
-        <Setter Property="SelectionFlyout" Value="{StaticResource TextCommandBarSelectionFlyout}" />
-        <Setter Property="Prefixes" Value="@" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">
                     <Grid x:Name="LayoutRoot">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
                         <RichEditBox x:Name="RichEditBox"
-                                     Width="{TemplateBinding Width}"
                                      Margin="0"
+                                     Padding="{TemplateBinding Padding}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Stretch"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                      contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                                      contract7Present:Description="{TemplateBinding Description}"
-                                     contract7Present:SelectionFlyout="{TemplateBinding SelectionFlyout}"
                                      Background="{TemplateBinding Background}"
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
                                      Canvas.ZIndex="0"
-                                     ClipboardCopyFormat="{TemplateBinding ClipboardCopyFormat}"
-                                     ContextFlyout="{TemplateBinding ContextFlyout}"
                                      DesiredCandidateWindowAlignment="BottomEdge"
-                                     DisabledFormattingAccelerators="{TemplateBinding DisabledFormattingAccelerators}"
                                      FontFamily="{TemplateBinding FontFamily}"
                                      FontSize="{TemplateBinding FontSize}"
                                      FontStretch="{TemplateBinding FontStretch}"
@@ -80,7 +271,6 @@
                                      PlaceholderText="{TemplateBinding PlaceholderText}"
                                      ScrollViewer.BringIntoViewOnFocusChange="False"
                                      Style="{TemplateBinding RichEditBoxStyle}"
-                                     TextWrapping="{TemplateBinding TextWrapping}"
                                      UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
 
                         <Popup x:Name="SuggestionsPopup"

From 197e36e183acc55fb06938c63d6f236c2b0a37b7 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 25 Jan 2021 22:37:03 -0800
Subject: [PATCH 037/200] open suggestion up or down depends on available
 screen

---
 .../RichSuggestBox/RichSuggestBox.cs          | 80 +++++++++++++++++--
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 55d8a2850ba..50f2d3de461 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -3,15 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Deferred;
+using Windows.Foundation;
+using Windows.Graphics.Display;
 using Windows.System;
 using Windows.UI.Text;
+using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -42,6 +44,7 @@ public partial class RichSuggestBox : ItemsControl
         private string _currentQuery;
         private string _currentPrefix;
         private bool _ignoreChange;
+        private bool _popupOpenDown;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
 
@@ -95,9 +98,11 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.AddHandler(PointerPressedEvent, new PointerEventHandler(RichEditBoxPointerEventHandler), true);
             AddKeyboardAccelerators();
-            _suggestionsList.ItemClick += SuggestionsList_ItemClick;
 
+            _suggestionsList.ItemClick += SuggestionsList_ItemClick;
+            _suggestionsList.SizeChanged += SuggestionsList_SizeChanged;
             _suggestionsList.GotFocus += (sender, args) => _richEditBox.Focus(FocusState.Programmatic);
+
             LostFocus += (sender, args) => ShowSuggestionsPopup(false);
         }
 
@@ -125,6 +130,39 @@ private static string EnforcePrefixesRequirements(string value)
             return string.IsNullOrEmpty(possibles) ? "@" : possibles;
         }
 
+        private static bool IsElementOnScreen(UIElement element, double offsetX = 0, double offsetY = 0)
+        {
+            var toWindow = element.TransformToVisual(Window.Current.Content);
+            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            elementBounds = toWindow.TransformBounds(elementBounds);
+            elementBounds.X += windowBounds.X;
+            elementBounds.Y += windowBounds.Y;
+            var displayInfo = DisplayInformation.GetForCurrentView();
+            var scaleFactor = displayInfo.RawPixelsPerViewPixel;
+            var displayHeight = displayInfo.ScreenHeightInRawPixels;
+            return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
+        }
+
+        private static bool IsElementInsideWindow(UIElement element, double offsetX = 0, double offsetY = 0)
+        {
+            var toWindow = element.TransformToVisual(Window.Current.Content);
+            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            elementBounds = toWindow.TransformBounds(elementBounds);
+            elementBounds.Intersect(windowBounds);
+            return elementBounds.Height >= element.ActualSize.Y;
+        }
+
+        private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (this._suggestionPopup.IsOpen)
+            {
+                UpdatePopupPosition();
+            }
+        }
+
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
         {
             TextDocument.BeginUndoGroup();
@@ -256,14 +294,14 @@ private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
 
         private void RichEditBox_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            _suggestionPopup.VerticalOffset = e.NewSize.Height;
+            UpdatePopupPosition();
             _suggestionsList.MaxWidth = e.NewSize.Width;
         }
 
         private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
         {
             _suggestionChoice = 0;
-            ShowSuggestionsPopup(ItemsSource is IEnumerable);
+            ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
         }
 
         private async Task RequestForSuggestionsAsync()
@@ -436,13 +474,43 @@ private bool ValidateTokenFromRange(ITextRange range)
 
         private void ShowSuggestionsPopup(bool show)
         {
-            _suggestionPopup.IsOpen = show;
+            this._suggestionPopup.IsOpen = show;
             if (!show)
             {
-                _suggestionChoice = 0;
+                this._suggestionChoice = 0;
+                this._suggestionPopup.VerticalOffset = 0;
             }
         }
 
+        /// <summary>
+        /// Calculate whether to open the suggestion list up or down depends on how much screen space is available
+        /// </summary>
+        private void UpdatePopupPosition()
+        {
+            var downOffset = this._richEditBox.ActualHeight;
+            var upOffset = -this._suggestionsList.ActualHeight;
+            if (this._suggestionPopup.VerticalOffset == 0)
+            {
+                if (IsElementOnScreen(this._suggestionsList, offsetY: downOffset) &&
+                    (IsElementInsideWindow(this._suggestionsList, offsetY: downOffset) ||
+                     !IsElementInsideWindow(this._suggestionsList, offsetY: upOffset) ||
+                     !IsElementOnScreen(this._suggestionsList, offsetY: upOffset)))
+                {
+                    this._suggestionPopup.VerticalOffset = downOffset;
+                    this._popupOpenDown = true;
+                }
+                else
+                {
+                    this._suggestionPopup.VerticalOffset = upOffset;
+                    this._popupOpenDown = false;
+                }
+
+                return;
+            }
+
+            this._suggestionPopup.VerticalOffset = this._popupOpenDown ? downOffset : upOffset;
+        }
+
         private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
         {
             prefix = string.Empty;

From 4a0f38be0d7e4ae14c5dfe88b1d84f050edebb93 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 26 Jan 2021 17:18:43 -0800
Subject: [PATCH 038/200] add SuggestionPopupPlacement property

---
 .../RichSuggestBox.Properties.cs              | 19 ++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 67 ++++++++++++++++---
 .../SuggestionPopupPlacementMode.cs           | 28 ++++++++
 3 files changed, 104 insertions(+), 10 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index c59b462cc40..a6363fc4ad4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -55,6 +55,16 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
+        /// <summary>
+        /// Identifies the <see cref="SuggestionPopupPlacement"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty SuggestionPopupPlacementProperty =
+            DependencyProperty.Register(
+                nameof(SuggestionPopupPlacement),
+                typeof(SuggestionPopupPlacementMode),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(SuggestionPopupPlacementMode.Floating, OnSuggestionPopupPlacementChanged));
+
         /// <summary>
         /// Identifies the <see cref="SuggestionBackground"/> dependency property.
         /// </summary>
@@ -121,6 +131,15 @@ public object Description
             set => SetValue(DescriptionProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets suggestion popup placement to either Floating or Attached to the text box.
+        /// </summary>
+        public SuggestionPopupPlacementMode SuggestionPopupPlacement
+        {
+            get => (SuggestionPopupPlacementMode)this.GetValue(SuggestionPopupPlacementProperty);
+            set => SetValue(SuggestionPopupPlacementProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the default brush used to color the suggestion token background.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 50f2d3de461..0a660634cb9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -106,6 +106,12 @@ protected override void OnApplyTemplate()
             LostFocus += (sender, args) => ShowSuggestionsPopup(false);
         }
 
+        private static void OnSuggestionPopupPlacementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var view = (RichSuggestBox)d;
+            view.UpdatePopupWidth();
+        }
+
         private static void OnPrefixesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var view = (RichSuggestBox)d;
@@ -159,7 +165,7 @@ private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)
             {
-                UpdatePopupPosition();
+                this.UpdatePopupOffset();
             }
         }
 
@@ -294,8 +300,8 @@ private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
 
         private void RichEditBox_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            UpdatePopupPosition();
-            _suggestionsList.MaxWidth = e.NewSize.Width;
+            this.UpdatePopupWidth();
+            this.UpdatePopupOffset();
         }
 
         private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
@@ -479,16 +485,57 @@ private void ShowSuggestionsPopup(bool show)
             {
                 this._suggestionChoice = 0;
                 this._suggestionPopup.VerticalOffset = 0;
+                this._suggestionPopup.HorizontalOffset = 0;
+            }
+        }
+
+        private void UpdatePopupWidth()
+        {
+            if (this.SuggestionPopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                this._suggestionsList.MaxWidth = double.NaN;
+                this._suggestionsList.Width = this._richEditBox.ActualWidth;
+            }
+            else
+            {
+                this._suggestionsList.MaxWidth = this._richEditBox.ActualWidth;
+                this._suggestionsList.Width = double.NaN;
             }
         }
 
         /// <summary>
         /// Calculate whether to open the suggestion list up or down depends on how much screen space is available
         /// </summary>
-        private void UpdatePopupPosition()
+        private void UpdatePopupOffset()
         {
-            var downOffset = this._richEditBox.ActualHeight;
-            var upOffset = -this._suggestionsList.ActualHeight;
+            this._richEditBox.TextDocument.Selection.GetRect(PointOptions.None, out var selectionRect, out _);
+            Thickness padding = this._richEditBox.Padding;
+
+            // Update horizontal offset
+            if (SuggestionPopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                this._suggestionPopup.HorizontalOffset = 0;
+            }
+            else
+            {
+                double editBoxWidth = this._richEditBox.ActualWidth - padding.Left - padding.Right;
+                if (this._suggestionPopup.HorizontalOffset == 0 && editBoxWidth > 0)
+                {
+                    var normalizedX = selectionRect.X / editBoxWidth;
+                    this._suggestionPopup.HorizontalOffset =
+                        (this._richEditBox.ActualWidth - this._suggestionsList.ActualWidth) * normalizedX;
+                }
+            }
+
+            // Update vertical offset
+            double downOffset = this._richEditBox.ActualHeight;
+            double upOffset = -this._suggestionsList.ActualHeight;
+            if (SuggestionPopupPlacement == SuggestionPopupPlacementMode.Floating)
+            {
+                downOffset = selectionRect.Bottom + selectionRect.Height + padding.Top + padding.Bottom;
+                upOffset += selectionRect.Bottom + padding.Top;
+            }
+
             if (this._suggestionPopup.VerticalOffset == 0)
             {
                 if (IsElementOnScreen(this._suggestionsList, offsetY: downOffset) &&
@@ -504,11 +551,11 @@ private void UpdatePopupPosition()
                     this._suggestionPopup.VerticalOffset = upOffset;
                     this._popupOpenDown = false;
                 }
-
-                return;
             }
-
-            this._suggestionPopup.VerticalOffset = this._popupOpenDown ? downOffset : upOffset;
+            else
+            {
+                this._suggestionPopup.VerticalOffset = this._popupOpenDown ? downOffset : upOffset;
+            }
         }
 
         private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs
new file mode 100644
index 00000000000..b446b45b93d
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Placement modes for the suggestion popup in <see cref="RichSuggestBox"/>.
+    /// </summary>
+    public enum SuggestionPopupPlacementMode
+    {
+        /// <summary>
+        /// Suggestion popup floats above or below the typing caret.
+        /// </summary>
+        Floating,
+
+        /// <summary>
+        /// Suggestion popup is attached to either the top edge or the bottom edge of the text box.
+        /// </summary>
+        /// <remarks>
+        /// In this mode, popup width will be text box's width and the interior corners that connect the text box and the popup are square.
+        /// This is the same behavior as in <see cref="AutoSuggestBox"/>.
+        /// </remarks>
+        Attached
+    }
+}

From 71fcd9d8fc519a5db44fab21365b54a9266fbc42 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 26 Jan 2021 17:35:10 -0800
Subject: [PATCH 039/200] suggestion list scroll item into view on selection +
 use a single event handler for keyboard accelerators processing

---
 .../RichSuggestBox/RichSuggestBox.cs          | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 0a660634cb9..071e02be792 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -97,7 +97,7 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.AddHandler(PointerPressedEvent, new PointerEventHandler(RichEditBoxPointerEventHandler), true);
-            AddKeyboardAccelerators();
+            _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
 
             _suggestionsList.ItemClick += SuggestionsList_ItemClick;
             _suggestionsList.SizeChanged += SuggestionsList_SizeChanged;
@@ -213,25 +213,7 @@ private void RichEditBoxPointerEventHandler(object sender, PointerRoutedEventArg
             ShowSuggestionsPopup(false);
         }
 
-        private void AddKeyboardAccelerators()
-        {
-            var enterKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Enter };
-            var downKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Down };
-            var upKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Up };
-            var escapeKeyAccelerator = new KeyboardAccelerator { Key = VirtualKey.Escape };
-
-            enterKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
-            downKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
-            upKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
-            escapeKeyAccelerator.Invoked += RichEditBoxKeyboardAccelerator_Invoked;
-
-            _richEditBox.KeyboardAccelerators.Add(enterKeyAccelerator);
-            _richEditBox.KeyboardAccelerators.Add(downKeyAccelerator);
-            _richEditBox.KeyboardAccelerators.Add(upKeyAccelerator);
-            _richEditBox.KeyboardAccelerators.Add(escapeKeyAccelerator);
-        }
-
-        private void RichEditBoxKeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
+        private void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
         {
             var itemsList = _suggestionsList.Items;
             if (!_suggestionPopup.IsOpen || itemsList == null || itemsList.Count == 0)
@@ -239,23 +221,26 @@ private void RichEditBoxKeyboardAccelerator_Invoked(KeyboardAccelerator sender,
                 return;
             }
 
-            var key = args.KeyboardAccelerator.Key;
+            var key = args.Key;
             switch (key)
             {
                 case VirtualKey.Up when itemsList.Count == 1:
                 case VirtualKey.Down when itemsList.Count == 1:
                     _suggestionsList.SelectedItem = itemsList[0];
+                    args.Handled = true;
                     break;
 
                 case VirtualKey.Up:
                     _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
                     _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                    _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
                     args.Handled = true;
                     break;
 
                 case VirtualKey.Down:
                     _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
                     _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
+                    _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
                     args.Handled = true;
                     break;
 

From ec4602e6bca81e8f1df88a8bf8f1e4a4ce6abf8a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 26 Jan 2021 17:39:17 -0800
Subject: [PATCH 040/200] move static helper methods into a separate file

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 43 +++++++++++++++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 28 ------------
 2 files changed, 43 insertions(+), 28 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
new file mode 100644
index 00000000000..a3049a731be
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.Foundation;
+using Windows.Graphics.Display;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
+    public partial class RichSuggestBox
+    {
+        private static bool IsElementOnScreen(UIElement element, double offsetX = 0, double offsetY = 0)
+        {
+            var toWindow = element.TransformToVisual(Window.Current.Content);
+            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            elementBounds = toWindow.TransformBounds(elementBounds);
+            elementBounds.X += windowBounds.X;
+            elementBounds.Y += windowBounds.Y;
+            var displayInfo = DisplayInformation.GetForCurrentView();
+            var scaleFactor = displayInfo.RawPixelsPerViewPixel;
+            var displayHeight = displayInfo.ScreenHeightInRawPixels;
+            return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
+        }
+
+        private static bool IsElementInsideWindow(UIElement element, double offsetX = 0, double offsetY = 0)
+        {
+            var toWindow = element.TransformToVisual(Window.Current.Content);
+            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            elementBounds = toWindow.TransformBounds(elementBounds);
+            elementBounds.Intersect(windowBounds);
+            return elementBounds.Height >= element.ActualSize.Y;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 071e02be792..6c37a3a7be7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -9,11 +9,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Deferred;
-using Windows.Foundation;
-using Windows.Graphics.Display;
 using Windows.System;
 using Windows.UI.Text;
-using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -136,31 +133,6 @@ private static string EnforcePrefixesRequirements(string value)
             return string.IsNullOrEmpty(possibles) ? "@" : possibles;
         }
 
-        private static bool IsElementOnScreen(UIElement element, double offsetX = 0, double offsetY = 0)
-        {
-            var toWindow = element.TransformToVisual(Window.Current.Content);
-            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
-            elementBounds = toWindow.TransformBounds(elementBounds);
-            elementBounds.X += windowBounds.X;
-            elementBounds.Y += windowBounds.Y;
-            var displayInfo = DisplayInformation.GetForCurrentView();
-            var scaleFactor = displayInfo.RawPixelsPerViewPixel;
-            var displayHeight = displayInfo.ScreenHeightInRawPixels;
-            return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
-        }
-
-        private static bool IsElementInsideWindow(UIElement element, double offsetX = 0, double offsetY = 0)
-        {
-            var toWindow = element.TransformToVisual(Window.Current.Content);
-            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
-            windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
-            elementBounds = toWindow.TransformBounds(elementBounds);
-            elementBounds.Intersect(windowBounds);
-            return elementBounds.Height >= element.ActualSize.Y;
-        }
-
         private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)

From 5a7bc1cb32efa9cc6256eb6d2807b26bbbd8b8bc Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 26 Jan 2021 17:50:39 -0800
Subject: [PATCH 041/200] fix formatting bug on token delete

---
 .../RichSuggestBox/RichSuggestBox.cs                           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 6c37a3a7be7..8b9ba67d8b5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -424,7 +424,8 @@ private bool ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                range.Link = string.Empty;
+                // range.Link = string.Empty;   Do not manually set link to empty string here. Character format will not reset properly.
+                // Setting CharacterFormat to default format will also clear the Link property.
                 range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
                 token.Active = false;
                 return false;

From a4b911418e3f7f558c8572b495ad722929a5992f Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 26 Jan 2021 21:09:51 -0800
Subject: [PATCH 042/200] fix floating placement calculation errors + add its
 own header and description, suggestion placement is now correctly calculated

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 12 +++++
 .../RichSuggestBox.Properties.cs              | 29 +++++++++-
 .../RichSuggestBox/RichSuggestBox.cs          | 54 +++++++++++++------
 .../RichSuggestBox/RichSuggestBox.xaml        | 27 +++++++++-
 4 files changed, 104 insertions(+), 18 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
index a3049a731be..e25005f017f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Linq;
 using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI.ViewManagement;
@@ -39,5 +40,16 @@ private static bool IsElementInsideWindow(UIElement element, double offsetX = 0,
             elementBounds.Intersect(windowBounds);
             return elementBounds.Height >= element.ActualSize.Y;
         }
+
+        private static string EnforcePrefixesRequirements(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return "@";
+            }
+
+            var possibles = string.Concat(value.Where(char.IsPunctuation));
+            return string.IsNullOrEmpty(possibles) ? "@" : possibles;
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index a6363fc4ad4..918480ff52c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -43,6 +43,16 @@ public partial class RichSuggestBox
                 nameof(Header),
                 typeof(object),
                 typeof(RichSuggestBox),
+                new PropertyMetadata(null, OnHeaderChanged));
+
+        /// <summary>
+        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderTemplateProperty =
+            DependencyProperty.Register(
+                nameof(HeaderTemplate),
+                typeof(DataTemplate),
+                typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
         /// <summary>
@@ -53,7 +63,7 @@ public partial class RichSuggestBox
                 nameof(Description),
                 typeof(object),
                 typeof(RichSuggestBox),
-                new PropertyMetadata(null));
+                new PropertyMetadata(null, OnDescriptionChanged));
 
         /// <summary>
         /// Identifies the <see cref="SuggestionPopupPlacement"/> dependency property.
@@ -116,15 +126,32 @@ public Style RichEditBoxStyle
         /// <summary>
         /// Gets or sets the content for the control's header.
         /// </summary>
+        /// <remarks>
+        /// Suggestion popup relies on the actual size of the text control to calculate its placement on the screen.
+        /// It is recommended to set the header using this property instead of using <see cref="RichEditBox.Header"/>.
+        /// </remarks>
         public object Header
         {
             get => GetValue(HeaderProperty);
             set => SetValue(HeaderProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> used to display the content of the control's header.
+        /// </summary>
+        public DataTemplate HeaderTemplate
+        {
+            get => (DataTemplate)GetValue(HeaderTemplateProperty);
+            set => SetValue(HeaderTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets content that is shown below the control. The content should provide guidance about the input expected by the control.
         /// </summary>
+        /// <remarks>
+        /// Suggestion popup relies on the actual size of the text control to calculate its placement on the screen.
+        /// It is recommended to set the description using this property instead of using <see cref="RichEditBox.Description"/>.
+        /// </remarks>
         public object Description
         {
             get => GetValue(DescriptionProperty);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 8b9ba67d8b5..e1c2189ca7f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -24,11 +24,17 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplatePart(Name = PartRichEditBox, Type = typeof(RichEditBox))]
     [TemplatePart(Name = PartSuggestionsPopup, Type = typeof(Popup))]
     [TemplatePart(Name = PartSuggestionsList, Type = typeof(ListViewBase))]
+    [TemplatePart(Name = PartSuggestionsContainer, Type = typeof(Border))]
+    [TemplatePart(Name = PartHeaderContentPresenter, Type = typeof(ContentPresenter))]
+    [TemplatePart(Name = PartDescriptionPresenter, Type = typeof(ContentPresenter))]
     public partial class RichSuggestBox : ItemsControl
     {
         private const string PartRichEditBox = "RichEditBox";
         private const string PartSuggestionsPopup = "SuggestionsPopup";
         private const string PartSuggestionsList = "SuggestionsList";
+        private const string PartSuggestionsContainer = "SuggestionsContainer";
+        private const string PartHeaderContentPresenter = "HeaderContentPresenter";
+        private const string PartDescriptionPresenter = "DescriptionPresenter";
 
         private readonly Dictionary<string, SuggestionInfo> _tokens;
         private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
@@ -36,6 +42,7 @@ public partial class RichSuggestBox : ItemsControl
         private Popup _suggestionPopup;
         private RichEditBox _richEditBox;
         private ListViewBase _suggestionsList;
+        private Border _suggestionsContainer;
 
         private int _suggestionChoice;
         private string _currentQuery;
@@ -87,6 +94,9 @@ protected override void OnApplyTemplate()
             _suggestionPopup = (Popup)GetTemplateChild(PartSuggestionsPopup);
             _richEditBox = (RichEditBox)GetTemplateChild(PartRichEditBox);
             _suggestionsList = (ListViewBase)GetTemplateChild(PartSuggestionsList);
+            _suggestionsContainer = (Border)GetTemplateChild(PartSuggestionsContainer);
+            ConditionallyLoadElement(Header, PartHeaderContentPresenter);
+            ConditionallyLoadElement(Description, PartDescriptionPresenter);
 
             _richEditBox.SizeChanged += RichEditBox_SizeChanged;
             _richEditBox.TextChanging += RichEditBox_TextChanging;
@@ -103,6 +113,18 @@ protected override void OnApplyTemplate()
             LostFocus += (sender, args) => ShowSuggestionsPopup(false);
         }
 
+        private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var view = (RichSuggestBox)d;
+            view.ConditionallyLoadElement(e.NewValue, PartHeaderContentPresenter);
+        }
+
+        private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var view = (RichSuggestBox)d;
+            view.ConditionallyLoadElement(e.NewValue, PartDescriptionPresenter);
+        }
+
         private static void OnSuggestionPopupPlacementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var view = (RichSuggestBox)d;
@@ -122,17 +144,6 @@ private static void OnPrefixesChanged(DependencyObject d, DependencyPropertyChan
             }
         }
 
-        private static string EnforcePrefixesRequirements(string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                return "@";
-            }
-
-            var possibles = string.Concat(value.Where(char.IsPunctuation));
-            return string.IsNullOrEmpty(possibles) ? "@" : possibles;
-        }
-
         private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)
@@ -436,6 +447,14 @@ private bool ValidateTokenFromRange(ITextRange range)
             return true;
         }
 
+        private void ConditionallyLoadElement(object property, string elementName)
+        {
+            if (property != null && GetTemplateChild(elementName) is UIElement presenter)
+            {
+                presenter.Visibility = Visibility.Visible;
+            }
+        }
+
         private void ShowSuggestionsPopup(bool show)
         {
             this._suggestionPopup.IsOpen = show;
@@ -449,9 +468,14 @@ private void ShowSuggestionsPopup(bool show)
 
         private void UpdatePopupWidth()
         {
+            if (this._suggestionsList == null)
+            {
+                return;
+            }
+
             if (this.SuggestionPopupPlacement == SuggestionPopupPlacementMode.Attached)
             {
-                this._suggestionsList.MaxWidth = double.NaN;
+                this._suggestionsList.MaxWidth = double.PositiveInfinity;
                 this._suggestionsList.Width = this._richEditBox.ActualWidth;
             }
             else
@@ -487,11 +511,11 @@ private void UpdatePopupOffset()
 
             // Update vertical offset
             double downOffset = this._richEditBox.ActualHeight;
-            double upOffset = -this._suggestionsList.ActualHeight;
+            double upOffset = -this._suggestionsContainer.ActualHeight;
             if (SuggestionPopupPlacement == SuggestionPopupPlacementMode.Floating)
             {
-                downOffset = selectionRect.Bottom + selectionRect.Height + padding.Top + padding.Bottom;
-                upOffset += selectionRect.Bottom + padding.Top;
+                downOffset = selectionRect.Bottom + padding.Top + padding.Bottom;
+                upOffset += selectionRect.Top;
             }
 
             if (this._suggestionPopup.VerticalOffset == 0)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index a3b19b41fe4..a76130d8f1a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -245,10 +245,26 @@
                         </Grid.ColumnDefinitions>
 
                         <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                                          Grid.Row="0"
+                                          Grid.Column="0"
+                                          Margin="{ThemeResource TextBoxTopHeaderMargin}"
+                                          VerticalAlignment="Top"
+                                          x:Load="False"
+                                          Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                          FontWeight="Normal"
+                                          Foreground="{ThemeResource TextControlHeaderForeground}"
+                                          TextWrapping="Wrap"
+                                          Visibility="Collapsed" />
+
                         <RichEditBox x:Name="RichEditBox"
+                                     Grid.Row="1"
                                      Margin="0"
                                      Padding="{TemplateBinding Padding}"
                                      HorizontalAlignment="Stretch"
@@ -256,7 +272,6 @@
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                      contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-                                     contract7Present:Description="{TemplateBinding Description}"
                                      Background="{TemplateBinding Background}"
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
@@ -267,13 +282,21 @@
                                      FontStretch="{TemplateBinding FontStretch}"
                                      FontWeight="{TemplateBinding FontWeight}"
                                      Foreground="{TemplateBinding Foreground}"
-                                     Header="{TemplateBinding Header}"
                                      PlaceholderText="{TemplateBinding PlaceholderText}"
                                      ScrollViewer.BringIntoViewOnFocusChange="False"
                                      Style="{TemplateBinding RichEditBoxStyle}"
                                      UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
 
+                        <ContentPresenter x:Name="DescriptionPresenter"
+                                          Grid.Row="2"
+                                          Grid.Column="0"
+                                          x:Load="False"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          Content="{TemplateBinding Description}"
+                                          Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
+
                         <Popup x:Name="SuggestionsPopup"
+                               Grid.Row="1"
                                contract8Present:ShouldConstrainToRootBounds="False">
                             <Border x:Name="SuggestionsContainer"
                                     Padding="{ThemeResource AutoSuggestListMargin}"

From ccaf97a818759449b28927aa732220ae01a15573 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 29 Jan 2021 16:40:13 -0800
Subject: [PATCH 043/200] keep interior corners square in attached placement
 mode

---
 .../RichSuggestBox.Properties.cs              | 107 +++++++++++++++++-
 .../RichSuggestBox/RichSuggestBox.cs          |  49 +++++++-
 .../RichSuggestBox/RichSuggestBox.xaml        |   9 +-
 3 files changed, 153 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index 918480ff52c..9e3c5f9fd55 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -66,15 +66,65 @@ public partial class RichSuggestBox
                 new PropertyMetadata(null, OnDescriptionChanged));
 
         /// <summary>
-        /// Identifies the <see cref="SuggestionPopupPlacement"/> dependency property.
+        /// Identifies the <see cref="PopupPlacement"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty SuggestionPopupPlacementProperty =
+        public static readonly DependencyProperty PopupPlacementProperty =
             DependencyProperty.Register(
-                nameof(SuggestionPopupPlacement),
+                nameof(PopupPlacement),
                 typeof(SuggestionPopupPlacementMode),
                 typeof(RichSuggestBox),
                 new PropertyMetadata(SuggestionPopupPlacementMode.Floating, OnSuggestionPopupPlacementChanged));
 
+        /// <summary>
+        /// Identifies the <see cref="PopupCornerRadius"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty PopupCornerRadiusProperty =
+            DependencyProperty.Register(
+                nameof(PopupCornerRadius),
+                typeof(CornerRadius),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(default(CornerRadius)));
+
+        /// <summary>
+        /// Identifies the <see cref="PopupHeader"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty PopupHeaderProperty =
+            DependencyProperty.Register(
+                nameof(PopupHeader),
+                typeof(object),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="PopupHeaderTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty PopupHeaderTemplateProperty =
+            DependencyProperty.Register(
+                nameof(PopupHeaderTemplate),
+                typeof(DataTemplate),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="PopupFooter"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty PopupFooterProperty =
+            DependencyProperty.Register(
+                nameof(PopupFooter),
+                typeof(object),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
+        /// <summary>
+        /// Identifies the <see cref="PopupFooterTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty PopupFooterTemplateProperty =
+            DependencyProperty.Register(
+                nameof(PopupFooterTemplate),
+                typeof(DataTemplate),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(null));
+
         /// <summary>
         /// Identifies the <see cref="SuggestionBackground"/> dependency property.
         /// </summary>
@@ -161,10 +211,55 @@ public object Description
         /// <summary>
         /// Gets or sets suggestion popup placement to either Floating or Attached to the text box.
         /// </summary>
-        public SuggestionPopupPlacementMode SuggestionPopupPlacement
+        public SuggestionPopupPlacementMode PopupPlacement
+        {
+            get => (SuggestionPopupPlacementMode)GetValue(PopupPlacementProperty);
+            set => SetValue(PopupPlacementProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the radius for the corners of the popup control's border.
+        /// </summary>
+        public CornerRadius PopupCornerRadius
+        {
+            get => (CornerRadius)GetValue(PopupCornerRadiusProperty);
+            set => SetValue(PopupCornerRadiusProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the content for the suggestion popup control's header.
+        /// </summary>
+        public object PopupHeader
+        {
+            get => GetValue(PopupHeaderProperty);
+            set => SetValue(PopupHeaderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> used to display the content of the suggestion popup control's header.
+        /// </summary>
+        public DataTemplate PopupHeaderTemplate
+        {
+            get => (DataTemplate)GetValue(PopupHeaderTemplateProperty);
+            set => SetValue(PopupHeaderTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the content for the suggestion popup control's footer.
+        /// </summary>
+        public object PopupFooter
+        {
+            get => GetValue(PopupFooterProperty);
+            set => SetValue(PopupFooterProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataTemplate"/> used to display the content of the suggestion popup control's footer.
+        /// </summary>
+        public DataTemplate PopupFooterTemplate
         {
-            get => (SuggestionPopupPlacementMode)this.GetValue(SuggestionPopupPlacementProperty);
-            set => SetValue(SuggestionPopupPlacementProperty, value);
+            get => (DataTemplate)GetValue(PopupFooterTemplateProperty);
+            set => SetValue(PopupFooterTemplateProperty, value);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index e1c2189ca7f..51f9a95feea 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Deferred;
+using Windows.Foundation.Metadata;
 using Windows.System;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
@@ -65,6 +66,8 @@ public RichSuggestBox()
             DefaultStyleKey = typeof(RichSuggestBox);
 
             RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
+            RegisterPropertyChangedCallback(CornerRadiusProperty, OnCornerRadiusChanged);
+            RegisterPropertyChangedCallback(PopupCornerRadiusProperty, OnCornerRadiusChanged);
         }
 
         /// <summary>
@@ -144,6 +147,11 @@ private static void OnPrefixesChanged(DependencyObject d, DependencyPropertyChan
             }
         }
 
+        private void OnCornerRadiusChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            UpdateCornerRadii();
+        }
+
         private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)
@@ -463,6 +471,7 @@ private void ShowSuggestionsPopup(bool show)
                 this._suggestionChoice = 0;
                 this._suggestionPopup.VerticalOffset = 0;
                 this._suggestionPopup.HorizontalOffset = 0;
+                UpdateCornerRadii();
             }
         }
 
@@ -473,7 +482,7 @@ private void UpdatePopupWidth()
                 return;
             }
 
-            if (this.SuggestionPopupPlacement == SuggestionPopupPlacementMode.Attached)
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
             {
                 this._suggestionsList.MaxWidth = double.PositiveInfinity;
                 this._suggestionsList.Width = this._richEditBox.ActualWidth;
@@ -494,7 +503,7 @@ private void UpdatePopupOffset()
             Thickness padding = this._richEditBox.Padding;
 
             // Update horizontal offset
-            if (SuggestionPopupPlacement == SuggestionPopupPlacementMode.Attached)
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
             {
                 this._suggestionPopup.HorizontalOffset = 0;
             }
@@ -512,7 +521,7 @@ private void UpdatePopupOffset()
             // Update vertical offset
             double downOffset = this._richEditBox.ActualHeight;
             double upOffset = -this._suggestionsContainer.ActualHeight;
-            if (SuggestionPopupPlacement == SuggestionPopupPlacementMode.Floating)
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Floating)
             {
                 downOffset = selectionRect.Bottom + padding.Top + padding.Bottom;
                 upOffset += selectionRect.Top;
@@ -533,6 +542,8 @@ private void UpdatePopupOffset()
                     this._suggestionPopup.VerticalOffset = upOffset;
                     this._popupOpenDown = false;
                 }
+
+                UpdateCornerRadii();
             }
             else
             {
@@ -540,6 +551,38 @@ private void UpdatePopupOffset()
             }
         }
 
+        private void UpdateCornerRadii()
+        {
+            if (this._richEditBox == null || this._suggestionsContainer == null ||
+                !ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                return;
+            }
+
+            this._richEditBox.CornerRadius = CornerRadius;
+            this._suggestionsContainer.CornerRadius = PopupCornerRadius;
+
+            if (this._suggestionPopup.IsOpen && PopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                if (this._popupOpenDown)
+                {
+                    var cornerRadius = new CornerRadius(CornerRadius.TopLeft, CornerRadius.TopRight, 0, 0);
+                    this._richEditBox.CornerRadius = cornerRadius;
+                    var popupCornerRadius =
+                        new CornerRadius(0, 0, PopupCornerRadius.BottomRight, PopupCornerRadius.BottomLeft);
+                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
+                }
+                else
+                {
+                    var cornerRadius = new CornerRadius(0,0, CornerRadius.BottomRight, CornerRadius.BottomLeft);
+                    this._richEditBox.CornerRadius = cornerRadius;
+                    var popupCornerRadius =
+                        new CornerRadius(PopupCornerRadius.TopLeft, PopupCornerRadius.TopRight, 0, 0);
+                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
+                }
+            }
+        }
+
         private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
         {
             prefix = string.Empty;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index a76130d8f1a..8a938b6ca66 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -235,6 +235,7 @@
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="PopupCornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">
@@ -271,7 +272,6 @@
                                      VerticalAlignment="Stretch"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                                      Background="{TemplateBinding Background}"
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
@@ -302,8 +302,7 @@
                                     Padding="{ThemeResource AutoSuggestListMargin}"
                                     Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
                                     BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
-                                    BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}"
-                                    CornerRadius="{ThemeResource OverlayCornerRadius}">
+                                    BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}">
                                 <Border.RenderTransform>
                                     <contract7NotPresent:TranslateTransform x:Name="UpwardTransform" />
                                 </Border.RenderTransform>
@@ -311,6 +310,10 @@
                                           MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
                                           Margin="{ThemeResource AutoSuggestListPadding}"
                                           DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
+                                          Footer="{TemplateBinding PopupFooter}"
+                                          FooterTemplate="{TemplateBinding PopupFooterTemplate}"
+                                          Header="{TemplateBinding PopupHeader}"
+                                          HeaderTemplate="{TemplateBinding PopupHeaderTemplate}"
                                           IsItemClickEnabled="True"
                                           ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                                           ItemTemplate="{TemplateBinding ItemTemplate}"

From a49a27e6af4be36795e4208d647bc949c9b404f9 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 29 Jan 2021 19:02:33 -0800
Subject: [PATCH 044/200] fix lint issue

---
 .../RichSuggestBox/RichSuggestBox.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 51f9a95feea..cc26ca0ff93 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -574,7 +574,7 @@ private void UpdateCornerRadii()
                 }
                 else
                 {
-                    var cornerRadius = new CornerRadius(0,0, CornerRadius.BottomRight, CornerRadius.BottomLeft);
+                    var cornerRadius = new CornerRadius(0, 0, CornerRadius.BottomRight, CornerRadius.BottomLeft);
                     this._richEditBox.CornerRadius = cornerRadius;
                     var popupCornerRadius =
                         new CornerRadius(PopupCornerRadius.TopLeft, PopupCornerRadius.TopRight, 0, 0);

From b67ae42445fafb74ab385fce1d95230b51db30ac Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 5 Feb 2021 01:32:33 -0800
Subject: [PATCH 045/200] option to have plain text

---
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  7 ++-
 .../RichSuggestBox.Properties.cs              | 57 +++++++++++++++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 26 ++++++++-
 .../RichSuggestBox/RichSuggestBox.xaml        |  5 ++
 4 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
index 3351c3d81c5..3649b969627 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
@@ -27,6 +27,11 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
         /// </summary>
-        public event TypedEventHandler<RichEditBox, RoutedEventArgs> TextChanged;
+        public event TypedEventHandler<RichSuggestBox, RoutedEventArgs> TextChanged;
+
+        /// <summary>
+        /// Event raised when text is pasted into the control.
+        /// </summary>
+        public event TypedEventHandler<RichSuggestBox, TextControlPasteEventArgs> Paste;
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
index 9e3c5f9fd55..8bce873aa99 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -155,6 +155,36 @@ public partial class RichSuggestBox
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null, OnPrefixesChanged));
 
+        /// <summary>
+        /// Identifies the <see cref="ClipboardPasteFormat"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ClipboardPasteFormatProperty =
+            DependencyProperty.Register(
+                nameof(ClipboardPasteFormat),
+                typeof(RichEditClipboardFormat),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(RichEditClipboardFormat.AllFormats));
+
+        /// <summary>
+        /// Identifies the <see cref="ClipboardCopyFormat"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ClipboardCopyFormatProperty =
+            DependencyProperty.Register(
+                nameof(ClipboardCopyFormat),
+                typeof(RichEditClipboardFormat),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(RichEditClipboardFormat.AllFormats));
+
+        /// <summary>
+        /// Identifies the <see cref="DisabledFormattingAccelerators"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty DisabledFormattingAcceleratorsProperty =
+            DependencyProperty.Register(
+                nameof(DisabledFormattingAccelerators),
+                typeof(DisabledFormattingAccelerators),
+                typeof(RichSuggestBox),
+                new PropertyMetadata(DisabledFormattingAccelerators.None));
+
         /// <summary>
         /// Gets or sets the text that is displayed in the control until the value is changed by a user action or some other operation.
         /// </summary>
@@ -289,6 +319,33 @@ public string Prefixes
             set => SetValue(PrefixesProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value that specifies whether pasted text preserves all formats, or as plain text only.
+        /// </summary>
+        public RichEditClipboardFormat ClipboardPasteFormat
+        {
+            get => (RichEditClipboardFormat)GetValue(ClipboardPasteFormatProperty);
+            set => SetValue(ClipboardPasteFormatProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that specifies whether text is copied with all formats, or as plain text only.
+        /// </summary>
+        public RichEditClipboardFormat ClipboardCopyFormat
+        {
+            get => (RichEditClipboardFormat)GetValue(ClipboardCopyFormatProperty);
+            set => SetValue(ClipboardCopyFormatProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates which keyboard shortcuts for formatting are disabled.
+        /// </summary>
+        public DisabledFormattingAccelerators DisabledFormattingAccelerators
+        {
+            get => (DisabledFormattingAccelerators)GetValue(DisabledFormattingAcceleratorsProperty);
+            set => SetValue(DisabledFormattingAcceleratorsProperty, value);
+        }
+
         /// <summary>
         /// Gets object used for lock
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index cc26ca0ff93..37f4c0530ad 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Deferred;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation.Metadata;
 using Windows.System;
 using Windows.UI.Text;
@@ -106,6 +107,7 @@ protected override void OnApplyTemplate()
             _richEditBox.TextChanged += RichEditBox_TextChanged;
             _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
+            _richEditBox.Paste += RichEditBox_Paste;
             _richEditBox.AddHandler(PointerPressedEvent, new PointerEventHandler(RichEditBoxPointerEventHandler), true);
             _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
 
@@ -270,7 +272,7 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
 
         private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
         {
-            TextChanged?.Invoke((RichEditBox)sender, e);
+            TextChanged?.Invoke(this, e);
             UpdateVisibleTokenList();
         }
 
@@ -286,6 +288,28 @@ private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProp
             ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
         }
 
+        private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
+        {
+            Paste?.Invoke(this, e);
+
+            if (e.Handled || TextDocument == null)
+            {
+                return;
+            }
+
+            if (ClipboardPasteFormat == RichEditClipboardFormat.PlainText)
+            {
+                e.Handled = true;
+            }
+
+            var dataPackageView = Clipboard.GetContent();
+            if (dataPackageView.Contains(StandardDataFormats.Text))
+            {
+                var text = await dataPackageView.GetTextAsync();
+                TextDocument.Selection.SetText(TextSetOptions.None, text);
+            }
+        }
+
         private async Task RequestForSuggestionsAsync()
         {
             _suggestionRequestedTokenSource?.Cancel();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
index 8a938b6ca66..d9fa55f6054 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
@@ -236,6 +236,9 @@
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
         <Setter Property="PopupCornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+        <Setter Property="ClipboardCopyFormat" Value="AllFormats" />
+        <Setter Property="ClipboardPasteFormat" Value="AllFormats" />
+        <Setter Property="DisabledFormattingAccelerators" Value="None" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RichSuggestBox">
@@ -276,7 +279,9 @@
                                      BorderBrush="{TemplateBinding BorderBrush}"
                                      BorderThickness="{TemplateBinding BorderThickness}"
                                      Canvas.ZIndex="0"
+                                     ClipboardCopyFormat="{TemplateBinding ClipboardCopyFormat}"
                                      DesiredCandidateWindowAlignment="BottomEdge"
+                                     DisabledFormattingAccelerators="{TemplateBinding DisabledFormattingAccelerators}"
                                      FontFamily="{TemplateBinding FontFamily}"
                                      FontSize="{TemplateBinding FontSize}"
                                      FontStretch="{TemplateBinding FontStretch}"

From 53d9a3e4df39c6941a18db7632d4a8ce4e7c6f17 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 5 Feb 2021 01:59:58 -0800
Subject: [PATCH 046/200] fix double pasting

---
 .../RichSuggestBox/RichSuggestBox.cs                      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index 37f4c0530ad..f74059b1adb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -292,16 +292,12 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
         {
             Paste?.Invoke(this, e);
 
-            if (e.Handled || TextDocument == null)
+            if (e.Handled || TextDocument == null || ClipboardPasteFormat != RichEditClipboardFormat.PlainText)
             {
                 return;
             }
 
-            if (ClipboardPasteFormat == RichEditClipboardFormat.PlainText)
-            {
-                e.Handled = true;
-            }
-
+            e.Handled = true;
             var dataPackageView = Clipboard.GetContent();
             if (dataPackageView.Contains(StandardDataFormats.Text))
             {

From 275a87e4f8f60f6ad0eaced68262f42d861462e0 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 5 Feb 2021 02:00:21 -0800
Subject: [PATCH 047/200] add sample code

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 17 ++++++++++++--
 .../RichSuggestBox/RichSuggestBoxXaml.bind    | 23 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 2e3dafb912f..a02609837e0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -84,6 +84,7 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
         };
 
         private RichSuggestBox _rsb;
+        private RichSuggestBox _tsb;
 
         public RichSuggestBoxPage()
         {
@@ -107,9 +108,21 @@ public void OnXamlRendered(FrameworkElement control)
                 this._rsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
             }
 
-            if (control.FindChildByName("TokenListView") is ListView tls)
+            if (control.FindChildByName("PlainTextSuggestingBox") is RichSuggestBox tsb)
             {
-                tls.ItemsSource = this._rsb?.Tokens;
+                this._tsb = tsb;
+                this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
+                this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
+            }
+
+            if (control.FindChildByName("TokenListView1") is ListView tls1)
+            {
+                tls1.ItemsSource = this._rsb?.Tokens;
+            }
+
+            if (control.FindChildByName("TokenListView2") is ListView tls2)
+            {
+                tls2.ItemsSource = this._tsb?.Tokens;
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
index 655f8837f32..313b11054ac 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
@@ -40,20 +40,39 @@
     <Grid Margin="40">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="250" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="250" />
         </Grid.RowDefinitions>
 
         <controls:RichSuggestBox x:Name="SuggestingBox"
                                  MaxHeight="400"
                                  HorizontalAlignment="Stretch"
-                                 Header="RichSuggestBox:"
+                                 Header="Rich suggest box sample"
                                  ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
                                  Prefixes="@#" />
 
-        <ListView x:Name="TokenListView" 
+        <ListView x:Name="TokenListView1" 
                   Grid.Row="1"
                   Margin="0,16,0,0"
                   HorizontalAlignment="Stretch"
                   ItemTemplate="{StaticResource TokenTemplate}" />
+
+        <controls:RichSuggestBox x:Name="PlainTextSuggestingBox"
+                                 Grid.Row="2"
+                                 MaxHeight="400"
+                                 HorizontalAlignment="Stretch"
+                                 Header="Plain text only suggest box sample"
+                                 DisabledFormattingAccelerators="All"
+                                 ClipboardCopyFormat="PlainText"
+                                 ClipboardPasteFormat="PlainText"
+                                 ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
+                                 Prefixes="@#" />
+
+        <ListView x:Name="TokenListView2"
+                  Grid.Row="3"
+                  Margin="0,16,0,0"
+                  HorizontalAlignment="Stretch"
+                  ItemTemplate="{StaticResource TokenTemplate}" />
     </Grid>
 </Page>

From be6f4024b2f2d5a38ff37ef7a3ff5257ef61a3b6 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 5 Feb 2021 17:53:56 -0800
Subject: [PATCH 048/200] handle duplicate links + some refactoring

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 39 +++++++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 68 ++++++++-----------
 .../RichSuggestBox/SuggestionInfo.cs          |  9 +--
 3 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
index e25005f017f..d225e01f26c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Linq;
 using Windows.Foundation;
 using Windows.Graphics.Display;
+using Windows.UI.Text;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -51,5 +53,42 @@ private static string EnforcePrefixesRequirements(string value)
             var possibles = string.Concat(value.Where(char.IsPunctuation));
             return string.IsNullOrEmpty(possibles) ? "@" : possibles;
         }
+
+        private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
+        {
+            var range = document.GetRange(0, 0);
+            range.SetIndex(TextRangeUnit.Character, -1, false);
+
+            // Handle link at the very end of the document where GetIndex fails to detect
+            range.Expand(TextRangeUnit.Link);
+            if (!string.IsNullOrEmpty(range.Link))
+            {
+                action?.Invoke(range);
+            }
+
+            var nextIndex = range.GetIndex(TextRangeUnit.Link);
+            while (nextIndex != 0 && nextIndex != 1)
+            {
+                range.Move(TextRangeUnit.Link, -1);
+
+                var linkRange = range.GetClone();
+                linkRange.Expand(TextRangeUnit.Link);
+
+                // Adjacent links have the same index. Manually check each link with Collapse and Expand.
+                var previousText = linkRange.Text;
+                var hasAdjacentToken = true;
+                while (hasAdjacentToken)
+                {
+                    action?.Invoke(linkRange);
+
+                    linkRange.Collapse(false);
+                    linkRange.Expand(TextRangeUnit.Link);
+                    hasAdjacentToken = !string.IsNullOrEmpty(linkRange.Text) && linkRange.Text != previousText;
+                    previousText = linkRange.Text;
+                }
+
+                nextIndex = range.GetIndex(TextRangeUnit.Link);
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index f74059b1adb..b22d0f94a53 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -303,6 +303,7 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             {
                 var text = await dataPackageView.GetTextAsync();
                 TextDocument.Selection.SetText(TextSetOptions.None, text);
+                TextDocument.Selection.Collapse(false);
             }
         }
 
@@ -376,13 +377,13 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
                 var displayText = prefix + text;
                 var tokenRange = CommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
 
-                var token = new SuggestionInfo(id, displayText, this) { Active = true, Item = selectedItem };
+                var token = new SuggestionInfo(id, displayText) { Active = true, Item = selectedItem };
                 token.UpdateTextRange(tokenRange);
                 _tokens.Add(tokenRange.Link, token);
             }
         }
 
-        private ITextRange CommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format)
+        private ITextRange CommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format, bool addTrailingSpace = true)
         {
             _ignoreChange = true;
             TextDocument.BeginUndoGroup();
@@ -398,10 +399,13 @@ private ITextRange CommitSuggestionIntoDocument(ITextRange range, string display
 
             var returnRange = TextDocument.GetRange(range.StartPosition, range.EndPosition);
 
-            range.Collapse(false);
-            range.SetText(TextSetOptions.Unhide, " ");
-            range.Collapse(false);
-            TextDocument.Selection.SetRange(range.EndPosition, range.EndPosition);
+            if (addTrailingSpace)
+            {
+                range.Collapse(false);
+                range.SetText(TextSetOptions.Unhide, " ");
+                range.Collapse(false);
+                TextDocument.Selection.SetRange(range.EndPosition, range.EndPosition);
+            }
 
             TextDocument.EndUndoGroup();
             _ignoreChange = false;
@@ -415,39 +419,10 @@ private void ValidateTokensInDocument()
                 token.Active = false;
             }
 
-            var range = TextDocument.GetRange(0, 0);
-            range.SetIndex(TextRangeUnit.Character, -1, false);
-
-            // Handle link at the very end of the document where GetIndex fails to detect
-            range.Expand(TextRangeUnit.Link);
-            ValidateTokenFromRange(range);
-
-            var nextIndex = range.GetIndex(TextRangeUnit.Link);
-            while (nextIndex != 0 && nextIndex != 1)
-            {
-                range.Move(TextRangeUnit.Link, -1);
-
-                var validateRange = range.GetClone();
-                validateRange.Expand(TextRangeUnit.Link);
-
-                // Adjacent links have the same index. Manually check each link with Collapse and Expand.
-                var previousText = validateRange.Text;
-                var hasAdjacentToken = true;
-                while (hasAdjacentToken)
-                {
-                    ValidateTokenFromRange(validateRange);
-                    validateRange.Collapse(false);
-                    validateRange.Expand(TextRangeUnit.Link);
-
-                    hasAdjacentToken = validateRange.Text != previousText;
-                    previousText = validateRange.Text;
-                }
-
-                nextIndex = range.GetIndex(TextRangeUnit.Link);
-            }
+            ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
         }
 
-        private bool ValidateTokenFromRange(ITextRange range)
+        private void ValidateTokenFromRange(ITextRange range)
         {
             if (range.Length == 0 || string.IsNullOrEmpty(range.Link) ||
                 !_tokens.TryGetValue(range.Link, out var token))
@@ -458,7 +433,21 @@ private bool ValidateTokenFromRange(ITextRange range)
                     range.Link = string.Empty;
                 }
 
-                return false;
+                return;
+            }
+
+            // Check for duplicate tokens. This can happen if the user copies and pastes the token multiple times.
+            if (token.Active && token.RangeStart != range.StartPosition && token.RangeEnd != range.EndPosition)
+            {
+                lock (LockObj)
+                {
+                    var guid = Guid.NewGuid();
+                    range = CommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateSuggestionTokenFormat(), false);
+                    token = new SuggestionInfo(guid, token.DisplayText) { Active = true, Item = token.Item };
+                    token.UpdateTextRange(range);
+                    _tokens.Add(range.Link, token);
+                    return;
+                }
             }
 
             if (token.ToString() != range.Text)
@@ -467,12 +456,11 @@ private bool ValidateTokenFromRange(ITextRange range)
                 // Setting CharacterFormat to default format will also clear the Link property.
                 range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
                 token.Active = false;
-                return false;
+                return;
             }
 
             token.UpdateTextRange(range);
             token.Active = true;
-            return true;
         }
 
         private void ConditionallyLoadElement(object property, string elementName)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
index 823c8def124..e7503141133 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
@@ -16,11 +16,6 @@ public class SuggestionInfo : INotifyPropertyChanged
         /// <inheritdoc/>
         public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>
-        /// Gets the <see cref="RichSuggestBox"/> instance that owns this token.
-        /// </summary>
-        public RichSuggestBox Owner { get; }
-
         /// <summary>
         /// Gets the token ID.
         /// </summary>
@@ -60,12 +55,10 @@ public class SuggestionInfo : INotifyPropertyChanged
         /// </summary>
         /// <param name="id">Token ID</param>
         /// <param name="displayText">Text in the document</param>
-        /// <param name="owner"><see cref="RichSuggestBox"/> instance that owns this token</param>
-        public SuggestionInfo(Guid id, string displayText, RichSuggestBox owner)
+        public SuggestionInfo(Guid id, string displayText)
         {
             Id = id;
             DisplayText = displayText;
-            Owner = owner;
         }
 
         internal void UpdateTextRange(ITextRange range)

From a4fd2393f76060f1375acf38cf1c531947b93cc0 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 5 Feb 2021 19:09:48 -0800
Subject: [PATCH 049/200] fix some bugs when pasting

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs              | 6 +++---
 .../RichSuggestBox/RichSuggestBox.cs                      | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
index d225e01f26c..156681d2ecb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -75,7 +75,7 @@ private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRa
                 linkRange.Expand(TextRangeUnit.Link);
 
                 // Adjacent links have the same index. Manually check each link with Collapse and Expand.
-                var previousText = linkRange.Text;
+                var previousStart = linkRange.StartPosition;
                 var hasAdjacentToken = true;
                 while (hasAdjacentToken)
                 {
@@ -83,8 +83,8 @@ private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRa
 
                     linkRange.Collapse(false);
                     linkRange.Expand(TextRangeUnit.Link);
-                    hasAdjacentToken = !string.IsNullOrEmpty(linkRange.Text) && linkRange.Text != previousText;
-                    previousText = linkRange.Text;
+                    hasAdjacentToken = !string.IsNullOrEmpty(linkRange.Link) && linkRange.StartPosition != previousStart;
+                    previousStart = linkRange.StartPosition;
                 }
 
                 nextIndex = range.GetIndex(TextRangeUnit.Link);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
index b22d0f94a53..d903b04a8e8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
@@ -388,7 +388,13 @@ private ITextRange CommitSuggestionIntoDocument(ITextRange range, string display
             _ignoreChange = true;
             TextDocument.BeginUndoGroup();
 
-            range.SetText(TextSetOptions.Unhide, displayText);
+            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
+            range.GetText(TextGetOptions.NoHidden, out var existingText);
+            if (existingText != displayText)
+            {
+                range.SetText(TextSetOptions.Unhide, displayText);
+            }
+
             range.Link = $"\"{id}\"";
 
             range.CharacterFormat.BackgroundColor = format.Background;

From 67583c06d9e6351b8ed1f45140fc558b56b1c226 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 30 Apr 2021 23:47:06 -0700
Subject: [PATCH 050/200] move to Microsoft.Toolkit.Uwp.UI.Controls.Input

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs          | 10 +++++-----
 .../RichSuggestBox/RichSuggestBox.Events.cs            |  0
 .../RichSuggestBox/RichSuggestBox.Helpers.cs           |  0
 .../RichSuggestBox/RichSuggestBox.Properties.cs        |  0
 .../RichSuggestBox/RichSuggestBox.cs                   |  0
 .../RichSuggestBox/RichSuggestBox.xaml                 |  0
 .../RichSuggestBox/SuggestionChosenEventArgs.cs        |  2 +-
 .../RichSuggestBox/SuggestionInfo.cs                   |  0
 .../RichSuggestBox/SuggestionPopupPlacementMode.cs     |  0
 .../RichSuggestBox/SuggestionTokenFormat.cs            |  0
 .../RichSuggestBox/SuggestionsRequestedEventArgs.cs    |  2 +-
 .../Themes/Generic.xaml                                |  1 +
 12 files changed, 8 insertions(+), 7 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Helpers.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionChosenEventArgs.cs (97%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionInfo.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionPopupPlacementMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionTokenFormat.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionsRequestedEventArgs.cs (95%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index a02609837e0..252dcee1146 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -5,11 +5,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -101,26 +101,26 @@ public void OnXamlRendered(FrameworkElement control)
                 this._rsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
             }
 
-            if (control.FindChildByName("SuggestingBox") is RichSuggestBox rsb)
+            if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
             {
                 this._rsb = rsb;
                 this._rsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._rsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
             }
 
-            if (control.FindChildByName("PlainTextSuggestingBox") is RichSuggestBox tsb)
+            if (control.FindChild("PlainTextSuggestingBox") is RichSuggestBox tsb)
             {
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
             }
 
-            if (control.FindChildByName("TokenListView1") is ListView tls1)
+            if (control.FindChild("TokenListView1") is ListView tls1)
             {
                 tls1.ItemsSource = this._rsb?.Tokens;
             }
 
-            if (control.FindChildByName("TokenListView2") is ListView tls2)
+            if (control.FindChild("TokenListView2") is ListView tls2)
             {
                 tls2.ItemsSource = this._tsb?.Tokens;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
similarity index 97%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
index 3ab5f5a80c0..16c1c033a83 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Uwp.Deferred;
+using Microsoft.Toolkit.Deferred;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionPopupPlacementMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionPopupPlacementMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index 60e358b2ff9..eee5ccfbb45 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.Deferred;
+using Microsoft.Toolkit.Deferred;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
index 85a16de6c5c..761bf93fb6c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
@@ -8,5 +8,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file

From 418a6469a06277792b81ceae913bcdfe77f39067 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 1 May 2021 00:37:01 -0700
Subject: [PATCH 051/200] unregister events before registering

---
 .../RichSuggestBox/RichSuggestBox.cs          | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index d903b04a8e8..7a38fff40b0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -53,6 +53,7 @@ public partial class RichSuggestBox : ItemsControl
         private bool _popupOpenDown;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
+        private PointerEventHandler _pointerEventHandler;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
@@ -61,6 +62,7 @@ public RichSuggestBox()
         {
             _tokens = new Dictionary<string, SuggestionInfo>();
             _visibleTokens = new ObservableCollection<SuggestionInfo>();
+            _pointerEventHandler = new PointerEventHandler(RichEditBoxPointerEventHandler);
             Tokens = new ReadOnlyObservableCollection<SuggestionInfo>(_visibleTokens);
             LockObj = new object();
 
@@ -69,6 +71,7 @@ public RichSuggestBox()
             RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
             RegisterPropertyChangedCallback(CornerRadiusProperty, OnCornerRadiusChanged);
             RegisterPropertyChangedCallback(PopupCornerRadiusProperty, OnCornerRadiusChanged);
+            LostFocus += (sender, args) => ShowSuggestionsPopup(false);
         }
 
         /// <summary>
@@ -102,20 +105,31 @@ protected override void OnApplyTemplate()
             ConditionallyLoadElement(Header, PartHeaderContentPresenter);
             ConditionallyLoadElement(Description, PartDescriptionPresenter);
 
+            _richEditBox.SizeChanged -= RichEditBox_SizeChanged;
+            _richEditBox.TextChanging -= RichEditBox_TextChanging;
+            _richEditBox.TextChanged -= RichEditBox_TextChanged;
+            _richEditBox.SelectionChanging -= RichEditBox_SelectionChanging;
+            _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
+            _richEditBox.Paste -= RichEditBox_Paste;
+            _richEditBox.RemoveHandler(PointerPressedEvent, _pointerEventHandler);
+            _richEditBox.ProcessKeyboardAccelerators -= RichEditBox_ProcessKeyboardAccelerators;
+
             _richEditBox.SizeChanged += RichEditBox_SizeChanged;
             _richEditBox.TextChanging += RichEditBox_TextChanging;
             _richEditBox.TextChanged += RichEditBox_TextChanged;
             _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.Paste += RichEditBox_Paste;
-            _richEditBox.AddHandler(PointerPressedEvent, new PointerEventHandler(RichEditBoxPointerEventHandler), true);
+            _richEditBox.AddHandler(PointerPressedEvent, _pointerEventHandler, true);
             _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
 
+            _suggestionsList.ItemClick -= SuggestionsList_ItemClick;
+            _suggestionsList.SizeChanged -= SuggestionsList_SizeChanged;
+            _suggestionsList.GotFocus -= SuggestionList_GotFocus;
+
             _suggestionsList.ItemClick += SuggestionsList_ItemClick;
             _suggestionsList.SizeChanged += SuggestionsList_SizeChanged;
-            _suggestionsList.GotFocus += (sender, args) => _richEditBox.Focus(FocusState.Programmatic);
-
-            LostFocus += (sender, args) => ShowSuggestionsPopup(false);
+            _suggestionsList.GotFocus += SuggestionList_GotFocus;
         }
 
         private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -162,6 +176,14 @@ private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
             }
         }
 
+        private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
+        {
+            if (_richEditBox != null)
+            {
+                _richEditBox.Focus(FocusState.Programmatic);
+            }
+        }
+
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
         {
             TextDocument.BeginUndoGroup();
@@ -479,6 +501,11 @@ private void ConditionallyLoadElement(object property, string elementName)
 
         private void ShowSuggestionsPopup(bool show)
         {
+            if (_suggestionPopup == null)
+            {
+                return;
+            }
+
             this._suggestionPopup.IsOpen = show;
             if (!show)
             {

From 8e2a7ac17abc8f570c83b6798f3d437ed5c93c5e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 1 May 2021 00:42:09 -0700
Subject: [PATCH 052/200] remove copy of DefaultRichEditBoxStyle we can now
 reference directly from WinUI

---
 .../RichSuggestBox/RichSuggestBox.xaml        | 185 ------------------
 1 file changed, 185 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index d9fa55f6054..7e29a9861e0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -32,191 +32,6 @@
                           contract7Present:Placement="TopEdgeAlignedLeft"
                           contract7Present:ShowMode="TransientWithDismissOnPointerMoveAway" />
 
-    <!--  Default RichEditBox style copied from WinUI 2021-01-22  -->
-    <Style x:Key="DefaultRichEditBoxStyle"
-           TargetType="RichEditBox">
-        <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
-        <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
-        <Setter Property="ContentLinkForegroundColor" Value="{ThemeResource ContentLinkForegroundColor}" />
-        <Setter Property="ContentLinkBackgroundColor" Value="{ThemeResource ContentLinkBackgroundColor}" />
-        <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="TextWrapping" Value="Wrap" />
-        <Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
-        <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
-        <Setter Property="ContextFlyout" Value="{StaticResource TextControlCommandBarContextFlyout}" />
-        <Setter Property="SelectionFlyout" Value="{StaticResource TextControlCommandBarSelectionFlyout}" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RichEditBox">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <ContentPresenter x:Name="HeaderContentPresenter"
-                                          Grid.Row="0"
-                                          Margin="0,0,0,4"
-                                          VerticalAlignment="Top"
-                                          x:DeferLoadStrategy="Lazy"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          FontWeight="Normal"
-                                          Foreground="{ThemeResource TextControlHeaderForeground}"
-                                          TextWrapping="Wrap"
-                                          Visibility="Collapsed" />
-                        <Border x:Name="BorderElement"
-                                Grid.Row="1"
-                                Grid.RowSpan="1"
-                                MinWidth="{ThemeResource TextControlThemeMinWidth}"
-                                MinHeight="{ThemeResource TextControlThemeMinHeight}"
-                                contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
-                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}" />
-                        <ScrollViewer x:Name="ContentElement"
-                                      Grid.Row="1"
-                                      Margin="{TemplateBinding BorderThickness}"
-                                      Padding="{TemplateBinding Padding}"
-                                      AutomationProperties.AccessibilityView="Raw"
-                                      HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                      HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                      IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                      IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
-                                      IsTabStop="False"
-                                      IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
-                                      VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                      VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                      ZoomMode="Disabled" />
-                        <TextBlock x:Name="PlaceholderTextContentPresenter"
-                                   Grid.Row="1"
-                                   Margin="{TemplateBinding BorderThickness}"
-                                   Padding="{TemplateBinding Padding}"
-                                   Foreground="{ThemeResource TextControlPlaceholderForeground}"
-                                   IsHitTestVisible="False"
-                                   Text="{TemplateBinding PlaceholderText}"
-                                   TextAlignment="{TemplateBinding TextAlignment}"
-                                   TextWrapping="{TemplateBinding TextWrapping}" />
-                        <contract7Present:ContentPresenter x:Name="DescriptionPresenter"
-                                                           Grid.Row="2"
-                                                           x:Load="False"
-                                                           AutomationProperties.AccessibilityView="Raw"
-                                                           Content="{TemplateBinding Description}"
-                                                           Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-
-                                <VisualState x:Name="Disabled">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBackgroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBorderBrushDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlPlaceholderForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Normal" />
-
-                                <VisualState x:Name="PointerOver">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlPlaceholderForegroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlForegroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Focused">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlPlaceholderForegroundFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBackgroundFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBorderBrushFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement"
-                                                                       Storyboard.TargetProperty="BorderThickness">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource TextControlForegroundFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style TargetType="controls:RichSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="VerticalContentAlignment" Value="Top" />

From 79d1755c3fe783a2b7319699bbfc90e2a583d921 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 16 May 2021 13:56:40 -0700
Subject: [PATCH 053/200] handle removing token at position 0 special case

---
 .../RichSuggestBox/RichSuggestBox.cs          | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 7a38fff40b0..66ec55b17c0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -51,6 +51,7 @@ public partial class RichSuggestBox : ItemsControl
         private string _currentPrefix;
         private bool _ignoreChange;
         private bool _popupOpenDown;
+        private bool _tokenAtStart;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
         private PointerEventHandler _pointerEventHandler;
@@ -220,6 +221,13 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
 
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
+            var selection = TextDocument.Selection.GetClone();
+            _tokenAtStart = false;
+            if (selection.StartPosition == 0 && _tokens.ContainsKey(selection.Link))
+            {
+                _tokenAtStart = true;
+            }
+
             await RequestForSuggestionsAsync();
         }
 
@@ -280,7 +288,7 @@ private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e
 
         private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangingEventArgs args)
         {
-            if (_ignoreChange)
+            if (_ignoreChange || !args.IsContentChanging)
             {
                 return;
             }
@@ -448,6 +456,17 @@ private void ValidateTokensInDocument()
             }
 
             ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
+
+            // Handle the special case where editing a token at the start of the document
+            // does not completely reset the character format.
+            if (_tokenAtStart)
+            {
+                var range = TextDocument.Selection.GetClone();
+                range.SetRange(0, range.EndPosition);
+                range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+                TextDocument.Selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+                _tokenAtStart = false;
+            }
         }
 
         private void ValidateTokenFromRange(ITextRange range)

From 1d3cfc8bcd00b02119e73fa71f0df292894c437e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 17 May 2021 23:05:57 -0700
Subject: [PATCH 054/200] handle rare case where link not updating

---
 .../RichSuggestBox/RichSuggestBox.cs          | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 66ec55b17c0..c4dd7caf1d9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -405,15 +405,16 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
             lock (LockObj)
             {
                 var displayText = prefix + text;
-                var tokenRange = CommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
-
-                var token = new SuggestionInfo(id, displayText) { Active = true, Item = selectedItem };
-                token.UpdateTextRange(tokenRange);
-                _tokens.Add(tokenRange.Link, token);
+                if (TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format))
+                {
+                    var token = new SuggestionInfo(id, displayText) { Active = true, Item = selectedItem };
+                    token.UpdateTextRange(range);
+                    _tokens.TryAdd(range.Link, token);
+                }
             }
         }
 
-        private ITextRange CommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format, bool addTrailingSpace = true)
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format, bool addTrailingSpace = true)
         {
             _ignoreChange = true;
             TextDocument.BeginUndoGroup();
@@ -427,25 +428,31 @@ private ITextRange CommitSuggestionIntoDocument(ITextRange range, string display
 
             range.Link = $"\"{id}\"";
 
+            // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
+            if (range.Link != $"\"{id}\"")
+            {
+                return false;
+            }
+
             range.CharacterFormat.BackgroundColor = format.Background;
             range.CharacterFormat.ForegroundColor = format.Foreground;
             range.CharacterFormat.Bold = format.Bold;
             range.CharacterFormat.Italic = format.Italic;
             range.CharacterFormat.Underline = format.Underline;
 
-            var returnRange = TextDocument.GetRange(range.StartPosition, range.EndPosition);
+            var clone = range.GetClone();
 
             if (addTrailingSpace)
             {
-                range.Collapse(false);
-                range.SetText(TextSetOptions.Unhide, " ");
-                range.Collapse(false);
-                TextDocument.Selection.SetRange(range.EndPosition, range.EndPosition);
+                clone.Collapse(false);
+                clone.SetText(TextSetOptions.Unhide, " ");
+                clone.Collapse(false);
+                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
             }
 
             TextDocument.EndUndoGroup();
             _ignoreChange = false;
-            return returnRange;
+            return true;
         }
 
         private void ValidateTokensInDocument()
@@ -489,10 +496,13 @@ private void ValidateTokenFromRange(ITextRange range)
                 lock (LockObj)
                 {
                     var guid = Guid.NewGuid();
-                    range = CommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateSuggestionTokenFormat(), false);
-                    token = new SuggestionInfo(guid, token.DisplayText) { Active = true, Item = token.Item };
-                    token.UpdateTextRange(range);
-                    _tokens.Add(range.Link, token);
+                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateSuggestionTokenFormat(), false))
+                    {
+                        token = new SuggestionInfo(guid, token.DisplayText) { Active = true, Item = token.Item };
+                        token.UpdateTextRange(range);
+                        _tokens.Add(range.Link, token);
+                    }
+
                     return;
                 }
             }

From 723824b93fd18add96022e35ef2e26fad03e7266 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 17 May 2021 23:08:09 -0700
Subject: [PATCH 055/200] add Ctrl + Tab to commit cannot handle just Tab due
 to conflict with accessibility

---
 .../RichSuggestBox/RichSuggestBox.cs                             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index c4dd7caf1d9..677bb4d64e0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -267,6 +267,7 @@ private void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, ProcessKe
                     args.Handled = true;
                     break;
 
+                case VirtualKey.Tab when _suggestionsList.SelectedItem != null:
                 case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
                     ShowSuggestionsPopup(false);
                     _ = OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);

From 08b48e353385a518720fa423614bbeda79dc58b3 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 17 May 2021 23:17:10 -0700
Subject: [PATCH 056/200] allow empty prefixes

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs                    | 2 +-
 .../RichSuggestBox/RichSuggestBox.Properties.cs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 156681d2ecb..c74117dae74 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -47,7 +47,7 @@ private static string EnforcePrefixesRequirements(string value)
         {
             if (string.IsNullOrEmpty(value))
             {
-                return "@";
+                return string.Empty;
             }
 
             var possibles = string.Concat(value.Where(char.IsPunctuation));
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index 8bce873aa99..b7fbf0010cc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -153,7 +153,7 @@ public partial class RichSuggestBox
                 nameof(Prefixes),
                 typeof(string),
                 typeof(RichSuggestBox),
-                new PropertyMetadata(null, OnPrefixesChanged));
+                new PropertyMetadata("@", OnPrefixesChanged));
 
         /// <summary>
         /// Identifies the <see cref="ClipboardPasteFormat"/> dependency property.

From 557657b5e3829988bc3fdf9d3c470e895e4a30fb Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 18 May 2021 00:50:28 -0700
Subject: [PATCH 057/200] add more formatting options

---
 .../RichSuggestBox/RichSuggestBox.cs          | 27 +++---
 .../RichSuggestBox/SuggestionTokenFormat.cs   | 83 ++++++++++++++++++-
 2 files changed, 97 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 677bb4d64e0..a24e64a038b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -439,7 +439,18 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
             range.CharacterFormat.ForegroundColor = format.Foreground;
             range.CharacterFormat.Bold = format.Bold;
             range.CharacterFormat.Italic = format.Italic;
-            range.CharacterFormat.Underline = format.Underline;
+            range.CharacterFormat.FontStretch = format.FontStretch;
+            range.CharacterFormat.FontStyle = format.FontStyle;
+            range.CharacterFormat.Name = format.FontName;
+            range.CharacterFormat.Kerning = format.Kerning;
+            range.CharacterFormat.Strikethrough = format.Strikethrough;
+            range.CharacterFormat.Size = format.FontSize;
+            range.CharacterFormat.Outline = format.Outline;
+            range.CharacterFormat.Weight = format.Weight;
+            range.CharacterFormat.Spacing = format.Spacing;
+            range.CharacterFormat.Subscript = format.Subscript;
+            range.CharacterFormat.Superscript = format.Superscript;
+            range.CharacterFormat.Position = format.Position;
 
             var clone = range.GetClone();
 
@@ -719,24 +730,18 @@ private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out s
         private SuggestionTokenFormat CreateSuggestionTokenFormat()
         {
             var defaultFormat = TextDocument.GetDefaultCharacterFormat();
+            var suggestionFormat = new SuggestionTokenFormat(defaultFormat);
             if (SuggestionBackground != null)
             {
-                defaultFormat.BackgroundColor = SuggestionBackground.Color;
+                suggestionFormat.Background = SuggestionBackground.Color;
             }
 
             if (SuggestionForeground != null)
             {
-                defaultFormat.ForegroundColor = SuggestionForeground.Color;
+                suggestionFormat.Foreground = SuggestionForeground.Color;
             }
 
-            return new SuggestionTokenFormat
-            {
-                Foreground = defaultFormat.ForegroundColor,
-                Background = defaultFormat.BackgroundColor,
-                Italic = defaultFormat.Italic,
-                Bold = defaultFormat.Bold,
-                Underline = defaultFormat.Underline
-            };
+            return suggestionFormat;
         }
 
         private void ApplyDefaultFormatToRange(ITextRange range)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
index 588076f562f..59f8ff335e7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
@@ -33,8 +33,87 @@ public class SuggestionTokenFormat
         public FormatEffect Bold { get; set; }
 
         /// <summary>
-        /// Gets or sets token underline style.
+        /// Gets or sets the degree to which the font is stretched, compared to the normal aspect ratio of the font.
         /// </summary>
-        public UnderlineType Underline { get; set; }
+        public FontStretch FontStretch { get; set; }
+
+        /// <summary>
+        /// Gets or sets the style of the font face, such as normal or italic.
+        /// </summary>
+        public FontStyle FontStyle { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether characters are displayed with a horizontal line through the center.
+        /// </summary>
+        public FormatEffect Strikethrough { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether characters are displayed as outlined characters.
+        /// </summary>
+        public FormatEffect Outline { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether characters are displayed as subscript.
+        /// </summary>
+        public FormatEffect Subscript { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether characters are displayed as superscript.
+        /// </summary>
+        public FormatEffect Superscript { get; set; }
+
+        /// <summary>
+        /// Gets or sets the font name.
+        /// </summary>
+        public string FontName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum font size at which kerning occurs.
+        /// </summary>
+        public float Kerning { get; set; }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public float FontSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the font weight of the characters.
+        /// </summary>
+        public int Weight { get; set; }
+
+        /// <summary>
+        /// Gets or sets the amount of horizontal spacing between characters.
+        /// </summary>
+        public float Spacing { get; set; }
+
+        /// <summary>
+        /// Gets or sets the character offset relative to the baseline.
+        /// </summary>
+        public float Position { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SuggestionTokenFormat"/> class.
+        /// </summary>
+        /// <param name="source">Source formatting to initialize from.</param>
+        public SuggestionTokenFormat(ITextCharacterFormat source)
+        {
+            Foreground = source.ForegroundColor;
+            Background = source.BackgroundColor;
+            Italic = source.Italic;
+            Bold = source.Bold;
+            FontStretch = source.FontStretch;
+            FontStyle = source.FontStyle;
+            Strikethrough = source.Strikethrough;
+            Outline = source.Outline;
+            Subscript = source.Subscript;
+            Superscript = source.Superscript;
+            FontName = source.Name;
+            Kerning = source.Kerning;
+            FontSize = source.Size;
+            Weight = source.Weight;
+            Spacing = source.Spacing;
+            Position = source.Position;
+        }
     }
 }

From eab2cc8f67bb862d777b84a50ede82c021adf89d Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 18 May 2021 01:05:30 -0700
Subject: [PATCH 058/200] forgot to set _ignoreChange

---
 .../RichSuggestBox/RichSuggestBox.cs          | 86 ++++++++++---------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index a24e64a038b..5fc33503fa0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -417,54 +417,60 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
 
         private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format, bool addTrailingSpace = true)
         {
-            _ignoreChange = true;
-            TextDocument.BeginUndoGroup();
-
-            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
-            range.GetText(TextGetOptions.NoHidden, out var existingText);
-            if (existingText != displayText)
+            try
             {
-                range.SetText(TextSetOptions.Unhide, displayText);
-            }
+                _ignoreChange = true;
+                TextDocument.BeginUndoGroup();
 
-            range.Link = $"\"{id}\"";
+                // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
+                range.GetText(TextGetOptions.NoHidden, out var existingText);
+                if (existingText != displayText)
+                {
+                    range.SetText(TextSetOptions.Unhide, displayText);
+                }
 
-            // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
-            if (range.Link != $"\"{id}\"")
-            {
-                return false;
-            }
+                range.Link = $"\"{id}\"";
 
-            range.CharacterFormat.BackgroundColor = format.Background;
-            range.CharacterFormat.ForegroundColor = format.Foreground;
-            range.CharacterFormat.Bold = format.Bold;
-            range.CharacterFormat.Italic = format.Italic;
-            range.CharacterFormat.FontStretch = format.FontStretch;
-            range.CharacterFormat.FontStyle = format.FontStyle;
-            range.CharacterFormat.Name = format.FontName;
-            range.CharacterFormat.Kerning = format.Kerning;
-            range.CharacterFormat.Strikethrough = format.Strikethrough;
-            range.CharacterFormat.Size = format.FontSize;
-            range.CharacterFormat.Outline = format.Outline;
-            range.CharacterFormat.Weight = format.Weight;
-            range.CharacterFormat.Spacing = format.Spacing;
-            range.CharacterFormat.Subscript = format.Subscript;
-            range.CharacterFormat.Superscript = format.Superscript;
-            range.CharacterFormat.Position = format.Position;
+                // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
+                if (range.Link != $"\"{id}\"")
+                {
+                    return false;
+                }
 
-            var clone = range.GetClone();
+                range.CharacterFormat.BackgroundColor = format.Background;
+                range.CharacterFormat.ForegroundColor = format.Foreground;
+                range.CharacterFormat.Bold = format.Bold;
+                range.CharacterFormat.Italic = format.Italic;
+                range.CharacterFormat.FontStretch = format.FontStretch;
+                range.CharacterFormat.FontStyle = format.FontStyle;
+                range.CharacterFormat.Name = format.FontName;
+                range.CharacterFormat.Kerning = format.Kerning;
+                range.CharacterFormat.Strikethrough = format.Strikethrough;
+                range.CharacterFormat.Size = format.FontSize;
+                range.CharacterFormat.Outline = format.Outline;
+                range.CharacterFormat.Weight = format.Weight;
+                range.CharacterFormat.Spacing = format.Spacing;
+                range.CharacterFormat.Subscript = format.Subscript;
+                range.CharacterFormat.Superscript = format.Superscript;
+                range.CharacterFormat.Position = format.Position;
+
+                var clone = range.GetClone();
+
+                if (addTrailingSpace)
+                {
+                    clone.Collapse(false);
+                    clone.SetText(TextSetOptions.Unhide, " ");
+                    clone.Collapse(false);
+                    TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
+                }
 
-            if (addTrailingSpace)
+                TextDocument.EndUndoGroup();
+                return true;
+            }
+            finally
             {
-                clone.Collapse(false);
-                clone.SetText(TextSetOptions.Unhide, " ");
-                clone.Collapse(false);
-                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
+                _ignoreChange = false;
             }
-
-            TextDocument.EndUndoGroup();
-            _ignoreChange = false;
-            return true;
         }
 
         private void ValidateTokensInDocument()

From 03a40edf65f10bed218c4e9e38b067b898bad35c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 18 May 2021 01:07:45 -0700
Subject: [PATCH 059/200] remove redundant ApplyDefaultFormatToRange

---
 .../RichSuggestBox/RichSuggestBox.cs                 | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 5fc33503fa0..cab4ddcf586 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -214,7 +214,7 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 range.MoveStart(TextRangeUnit.Link, -1);
                 if (selection.StartPosition != range.StartPosition || selection.StartPosition == 0)
                 {
-                    ApplyDefaultFormatToRange(selection);
+                    selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
                 }
             }
         }
@@ -750,16 +750,6 @@ private SuggestionTokenFormat CreateSuggestionTokenFormat()
             return suggestionFormat;
         }
 
-        private void ApplyDefaultFormatToRange(ITextRange range)
-        {
-            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
-            range.CharacterFormat.BackgroundColor = defaultFormat.BackgroundColor;
-            range.CharacterFormat.ForegroundColor = defaultFormat.ForegroundColor;
-            range.CharacterFormat.Bold = defaultFormat.Bold;
-            range.CharacterFormat.Italic = defaultFormat.Italic;
-            range.CharacterFormat.Underline = defaultFormat.Underline;
-        }
-
         private void UpdateVisibleTokenList()
         {
             lock (LockObj)

From 91c8cfc438400bf412341ce92cf6066111873166 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 18 May 2021 23:15:00 -0700
Subject: [PATCH 060/200] fix suggestion refresh unnecessarily when text
 composition changes

---
 .../RichSuggestBox/RichSuggestBox.cs          | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index cab4ddcf586..7fa891d636a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -52,6 +52,7 @@ public partial class RichSuggestBox : ItemsControl
         private bool _ignoreChange;
         private bool _popupOpenDown;
         private bool _tokenAtStart;
+        private bool _textCompositionActive;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
         private PointerEventHandler _pointerEventHandler;
@@ -109,6 +110,9 @@ protected override void OnApplyTemplate()
             _richEditBox.SizeChanged -= RichEditBox_SizeChanged;
             _richEditBox.TextChanging -= RichEditBox_TextChanging;
             _richEditBox.TextChanged -= RichEditBox_TextChanged;
+            _richEditBox.TextCompositionStarted -= RichEditBox_TextCompositionStarted;
+            _richEditBox.TextCompositionChanged -= RichEditBox_TextCompositionChanged;
+            _richEditBox.TextCompositionEnded -= RichEditBox_TextCompositionEnded;
             _richEditBox.SelectionChanging -= RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
             _richEditBox.Paste -= RichEditBox_Paste;
@@ -118,6 +122,9 @@ protected override void OnApplyTemplate()
             _richEditBox.SizeChanged += RichEditBox_SizeChanged;
             _richEditBox.TextChanging += RichEditBox_TextChanging;
             _richEditBox.TextChanged += RichEditBox_TextChanged;
+            _richEditBox.TextCompositionStarted += RichEditBox_TextCompositionStarted;
+            _richEditBox.TextCompositionChanged += RichEditBox_TextCompositionChanged;
+            _richEditBox.TextCompositionEnded += RichEditBox_TextCompositionEnded;
             _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.Paste += RichEditBox_Paste;
@@ -228,7 +235,16 @@ private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e
                 _tokenAtStart = true;
             }
 
-            await RequestForSuggestionsAsync();
+            // During text composition changing (e.g. user typing with an IME),
+            // SelectionChanged event is fired multiple times with each keystroke.
+            // To reduce the number of suggestion requests, the request is made
+            // in TextCompositionChanged handler instead.
+            if (_textCompositionActive)
+            {
+                return;
+            }
+
+            await RequestSuggestionsAsync();
         }
 
         private void RichEditBoxPointerEventHandler(object sender, PointerRoutedEventArgs e)
@@ -307,6 +323,22 @@ private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
             UpdateVisibleTokenList();
         }
 
+        private void RichEditBox_TextCompositionStarted(RichEditBox sender, TextCompositionStartedEventArgs args)
+        {
+            _textCompositionActive = true;
+        }
+
+        private async void RichEditBox_TextCompositionChanged(RichEditBox sender, TextCompositionChangedEventArgs args)
+        {
+            var range = TextDocument.GetRange(args.StartIndex == 0 ? 0 : args.StartIndex - 1, args.StartIndex + args.Length);
+            await RequestSuggestionsAsync(range);
+        }
+
+        private void RichEditBox_TextCompositionEnded(RichEditBox sender, TextCompositionEndedEventArgs args)
+        {
+            _textCompositionActive = false;
+        }
+
         private void RichEditBox_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             this.UpdatePopupWidth();
@@ -338,12 +370,23 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             }
         }
 
-        private async Task RequestForSuggestionsAsync()
+        private async Task RequestSuggestionsAsync(ITextRange range = null)
         {
+            string prefix;
+            string query;
+            var queryFound = range == null
+                ? TryExtractQueryFromSelection(out prefix, out query, out range)
+                : TryExtractQueryFromRange(range, out prefix, out query);
+
+            if (queryFound && prefix == _currentPrefix && query == _currentQuery &&
+                range.EndPosition == _currentRange?.EndPosition && _suggestionPopup.IsOpen)
+            {
+                return;
+            }
+
             _suggestionRequestedTokenSource?.Cancel();
 
-            if (TryExtractQueryFromSelection(out var prefix, out var query, out var range) &&
-                SuggestionsRequested != null)
+            if (queryFound && SuggestionsRequested != null)
             {
                 _suggestionRequestedTokenSource = new CancellationTokenSource();
                 _currentPrefix = prefix;

From a38d1e54edb4f14d3855d4506b39e3f2cf71f15a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 18 May 2021 23:24:07 -0700
Subject: [PATCH 061/200] remove unused TextControlCommandBarFlyouts

---
 .../RichSuggestBox/RichSuggestBox.xaml                     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index 7e29a9861e0..d9f7dca1b2a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -25,13 +25,6 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <TextCommandBarFlyout x:Key="TextControlCommandBarContextFlyout"
-                          contract7Present:Placement="BottomEdgeAlignedLeft"
-                          contract7Present:ShowMode="Standard" />
-    <TextCommandBarFlyout x:Key="TextControlCommandBarSelectionFlyout"
-                          contract7Present:Placement="TopEdgeAlignedLeft"
-                          contract7Present:ShowMode="TransientWithDismissOnPointerMoveAway" />
-
     <Style TargetType="controls:RichSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="VerticalContentAlignment" Value="Top" />

From 4983b0edacc4f9fd2d4380daa5cbf7e413943409 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 1 Jun 2021 16:47:13 -0700
Subject: [PATCH 062/200] refactor

---
 .../RichSuggestBox/RichSuggestBox.cs                   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 7fa891d636a..652c5e53e39 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -40,6 +40,7 @@ public partial class RichSuggestBox : ItemsControl
 
         private readonly Dictionary<string, SuggestionInfo> _tokens;
         private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
+        private readonly PointerEventHandler _pointerEventHandler;
 
         private Popup _suggestionPopup;
         private RichEditBox _richEditBox;
@@ -55,7 +56,6 @@ public partial class RichSuggestBox : ItemsControl
         private bool _textCompositionActive;
         private ITextRange _currentRange;
         private CancellationTokenSource _suggestionRequestedTokenSource;
-        private PointerEventHandler _pointerEventHandler;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
@@ -64,7 +64,7 @@ public RichSuggestBox()
         {
             _tokens = new Dictionary<string, SuggestionInfo>();
             _visibleTokens = new ObservableCollection<SuggestionInfo>();
-            _pointerEventHandler = new PointerEventHandler(RichEditBoxPointerEventHandler);
+            _pointerEventHandler = RichEditBoxPointerEventHandler;
             Tokens = new ReadOnlyObservableCollection<SuggestionInfo>(_visibleTokens);
             LockObj = new object();
 
@@ -229,11 +229,7 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
             var selection = TextDocument.Selection.GetClone();
-            _tokenAtStart = false;
-            if (selection.StartPosition == 0 && _tokens.ContainsKey(selection.Link))
-            {
-                _tokenAtStart = true;
-            }
+            _tokenAtStart = selection.StartPosition == 0 && _tokens.ContainsKey(selection.Link);
 
             // During text composition changing (e.g. user typing with an IME),
             // SelectionChanged event is fired multiple times with each keystroke.

From 5be33ce81590cb384c49d116af644a1c1300f41e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 1 Jun 2021 17:14:03 -0700
Subject: [PATCH 063/200] add key to default RichSuggestBox style

---
 .../RichSuggestBox/RichSuggestBox.xaml                     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index d9f7dca1b2a..f539a20a489 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -25,7 +25,12 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Style TargetType="controls:RichSuggestBox">
+    <!--  Default style for RichSuggestBox  -->
+    <Style BasedOn="{StaticResource DefaultRichSuggestBoxStyle}"
+           TargetType="controls:RichSuggestBox" />
+
+    <Style x:Key="DefaultRichSuggestBoxStyle"
+           TargetType="controls:RichSuggestBox">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />

From 68a17e20ee3192ced39f8b75cd0b1a371495bd00 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 26 Jun 2021 10:56:50 -0700
Subject: [PATCH 064/200] no enforcing non-empty prefix

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs              | 8 +-------
 .../RichSuggestBox/RichSuggestBox.Properties.cs           | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index c74117dae74..04f0fbb6507 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -45,13 +45,7 @@ private static bool IsElementInsideWindow(UIElement element, double offsetX = 0,
 
         private static string EnforcePrefixesRequirements(string value)
         {
-            if (string.IsNullOrEmpty(value))
-            {
-                return string.Empty;
-            }
-
-            var possibles = string.Concat(value.Where(char.IsPunctuation));
-            return string.IsNullOrEmpty(possibles) ? "@" : possibles;
+            return string.IsNullOrEmpty(value) ? string.Empty : string.Concat(value.Where(char.IsPunctuation));
         }
 
         private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index b7fbf0010cc..c13886da2fa 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -153,7 +153,7 @@ public partial class RichSuggestBox
                 nameof(Prefixes),
                 typeof(string),
                 typeof(RichSuggestBox),
-                new PropertyMetadata("@", OnPrefixesChanged));
+                new PropertyMetadata(string.Empty, OnPrefixesChanged));
 
         /// <summary>
         /// Identifies the <see cref="ClipboardPasteFormat"/> dependency property.

From fda6c408c097675edd00fe2791a6a7f923d23af8 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 5 Jul 2021 00:23:15 -0700
Subject: [PATCH 065/200] add tab key to select token + fix properly invalidate
 tokens

---
 .../RichSuggestBox/RichSuggestBox.cs          | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 652c5e53e39..1a63b6d8477 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -73,7 +73,7 @@ public RichSuggestBox()
             RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
             RegisterPropertyChangedCallback(CornerRadiusProperty, OnCornerRadiusChanged);
             RegisterPropertyChangedCallback(PopupCornerRadiusProperty, OnCornerRadiusChanged);
-            LostFocus += (sender, args) => ShowSuggestionsPopup(false);
+            LostFocus += OnLostFocus;
         }
 
         /// <summary>
@@ -116,6 +116,7 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanging -= RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
             _richEditBox.Paste -= RichEditBox_Paste;
+            _richEditBox.PreviewKeyDown -= RichEditBox_PreviewKeyDown;
             _richEditBox.RemoveHandler(PointerPressedEvent, _pointerEventHandler);
             _richEditBox.ProcessKeyboardAccelerators -= RichEditBox_ProcessKeyboardAccelerators;
 
@@ -128,6 +129,7 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.Paste += RichEditBox_Paste;
+            _richEditBox.PreviewKeyDown += RichEditBox_PreviewKeyDown;
             _richEditBox.AddHandler(PointerPressedEvent, _pointerEventHandler, true);
             _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
 
@@ -176,6 +178,11 @@ private void OnCornerRadiusChanged(DependencyObject sender, DependencyProperty d
             UpdateCornerRadii();
         }
 
+        private void OnLostFocus(object sender, RoutedEventArgs e)
+        {
+            ShowSuggestionsPopup(false);
+        }
+
         private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)
@@ -248,7 +255,7 @@ private void RichEditBoxPointerEventHandler(object sender, PointerRoutedEventArg
             ShowSuggestionsPopup(false);
         }
 
-        private void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
+        private async void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
         {
             var itemsList = _suggestionsList.Items;
             if (!_suggestionPopup.IsOpen || itemsList == null || itemsList.Count == 0)
@@ -261,38 +268,45 @@ private void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, ProcessKe
             {
                 case VirtualKey.Up when itemsList.Count == 1:
                 case VirtualKey.Down when itemsList.Count == 1:
-                    _suggestionsList.SelectedItem = itemsList[0];
                     args.Handled = true;
+                    _suggestionsList.SelectedItem = itemsList[0];
                     break;
 
                 case VirtualKey.Up:
+                    args.Handled = true;
                     _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
                     _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
                     _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
-                    args.Handled = true;
                     break;
 
                 case VirtualKey.Down:
+                    args.Handled = true;
                     _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
                     _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
                     _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
-                    args.Handled = true;
                     break;
 
-                case VirtualKey.Tab when _suggestionsList.SelectedItem != null:
                 case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
-                    ShowSuggestionsPopup(false);
-                    _ = OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
                     args.Handled = true;
+                    await OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
                     break;
 
                 case VirtualKey.Escape:
-                    ShowSuggestionsPopup(false);
                     args.Handled = true;
+                    ShowSuggestionsPopup(false);
                     break;
             }
         }
 
+        private async void RichEditBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key == VirtualKey.Tab && _suggestionsList.SelectedItem != null)
+            {
+                e.Handled = true;
+                await OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
+            }
+        }
+
         private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e)
         {
             var selectedItem = e.ClickedItem;
@@ -566,8 +580,8 @@ private void ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                // range.Link = string.Empty;   Do not manually set link to empty string here. Character format will not reset properly.
-                // Setting CharacterFormat to default format will also clear the Link property.
+                // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
+                range.Link = string.Empty;
                 range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
                 token.Active = false;
                 return;
@@ -678,6 +692,11 @@ private void UpdatePopupOffset()
             }
         }
 
+        /// <summary>
+        /// Set corner radii so that inner corners, where suggestion list and text box connect, are square.
+        /// This only applies when <see cref="PopupPlacement"/> is set to <see cref="SuggestionPopupPlacementMode.Attached"/>.
+        /// </summary>
+        /// https://docs.microsoft.com/en-us/windows/apps/design/style/rounded-corner#when-not-to-round
         private void UpdateCornerRadii()
         {
             if (this._richEditBox == null || this._suggestionsContainer == null ||

From 7876aa9c7890ad818d5ca3d97cfb2e970e7a2914 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 6 Jul 2021 01:10:47 -0700
Subject: [PATCH 066/200] add TokenSelected event + some renaming

---
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  5 ++
 .../RichSuggestBox.Properties.cs              |  2 +-
 .../RichSuggestBox/RichSuggestBox.cs          | 48 ++++++++++++++-----
 ...{SuggestionInfo.cs => RichSuggestToken.cs} |  8 ++--
 ...kenFormat.cs => RichSuggestTokenFormat.cs} |  8 ++--
 .../RichSuggestTokenSelectedEventArgs.cs      | 31 ++++++++++++
 .../SuggestionChosenEventArgs.cs              |  2 +-
 7 files changed, 82 insertions(+), 22 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{SuggestionInfo.cs => RichSuggestToken.cs} (90%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{SuggestionTokenFormat.cs => RichSuggestTokenFormat.cs} (93%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 3649b969627..e9f1c836876 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -24,6 +24,11 @@ public partial class RichSuggestBox
         /// </summary>
         public event TypedEventHandler<RichSuggestBox, SuggestionChosenEventArgs> SuggestionChosen;
 
+        /// <summary>
+        /// Event raised when a token is fully highlighted.
+        /// </summary>
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenSelectedEventArgs> TokenSelected;
+
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index c13886da2fa..27048fc0515 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -359,6 +359,6 @@ public DisabledFormattingAccelerators DisabledFormattingAccelerators
         /// <summary>
         /// Gets a collection of suggestion tokens that are present in the document.
         /// </summary>
-        public ReadOnlyObservableCollection<SuggestionInfo> Tokens { get; }
+        public ReadOnlyObservableCollection<RichSuggestToken> Tokens { get; }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 1a63b6d8477..d256f9a5551 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.Deferred;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation;
 using Windows.Foundation.Metadata;
 using Windows.System;
 using Windows.UI.Text;
@@ -38,8 +39,8 @@ public partial class RichSuggestBox : ItemsControl
         private const string PartHeaderContentPresenter = "HeaderContentPresenter";
         private const string PartDescriptionPresenter = "DescriptionPresenter";
 
-        private readonly Dictionary<string, SuggestionInfo> _tokens;
-        private readonly ObservableCollection<SuggestionInfo> _visibleTokens;
+        private readonly Dictionary<string, RichSuggestToken> _tokens;
+        private readonly ObservableCollection<RichSuggestToken> _visibleTokens;
         private readonly PointerEventHandler _pointerEventHandler;
 
         private Popup _suggestionPopup;
@@ -62,10 +63,10 @@ public partial class RichSuggestBox : ItemsControl
         /// </summary>
         public RichSuggestBox()
         {
-            _tokens = new Dictionary<string, SuggestionInfo>();
-            _visibleTokens = new ObservableCollection<SuggestionInfo>();
+            _tokens = new Dictionary<string, RichSuggestToken>();
+            _visibleTokens = new ObservableCollection<RichSuggestToken>();
             _pointerEventHandler = RichEditBoxPointerEventHandler;
-            Tokens = new ReadOnlyObservableCollection<SuggestionInfo>(_visibleTokens);
+            Tokens = new ReadOnlyObservableCollection<RichSuggestToken>(_visibleTokens);
             LockObj = new object();
 
             DefaultStyleKey = typeof(RichSuggestBox);
@@ -220,6 +221,7 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
             {
                 // Prevent user from manually editing the link
                 selection.SetRange(range.StartPosition, range.EndPosition);
+                InvokeTokenSelected(selection);
             }
             else if (selection.StartPosition == range.StartPosition)
             {
@@ -380,6 +382,18 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             }
         }
 
+        private void InvokeTokenSelected(ITextSelection selection)
+        {
+            var id = selection.Link;
+            if (string.IsNullOrEmpty(id) || !_tokens.TryGetValue(id, out var token))
+            {
+                return;
+            }
+
+            var tokenRect = GetTokenRect(selection);
+            TokenSelected?.Invoke(this, new RichSuggestTokenSelectedEventArgs(token, tokenRect));
+        }
+
         private async Task RequestSuggestionsAsync(ITextRange range = null)
         {
             string prefix;
@@ -441,7 +455,7 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
                 Prefix = prefix,
                 Query = query,
                 SelectedItem = selectedItem,
-                Format = CreateSuggestionTokenFormat()
+                Format = this.CreateTokenFormat()
             };
             var textBefore = range.Text;
             await SuggestionChosen.InvokeAsync(this, eventArgs);
@@ -461,14 +475,14 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
                 var displayText = prefix + text;
                 if (TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format))
                 {
-                    var token = new SuggestionInfo(id, displayText) { Active = true, Item = selectedItem };
+                    var token = new RichSuggestToken(id, displayText) { Active = true, Item = selectedItem };
                     token.UpdateTextRange(range);
                     _tokens.TryAdd(range.Link, token);
                 }
             }
         }
 
-        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, SuggestionTokenFormat format, bool addTrailingSpace = true)
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
         {
             try
             {
@@ -567,9 +581,9 @@ private void ValidateTokenFromRange(ITextRange range)
                 lock (LockObj)
                 {
                     var guid = Guid.NewGuid();
-                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateSuggestionTokenFormat(), false))
+                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, this.CreateTokenFormat(), false))
                     {
-                        token = new SuggestionInfo(guid, token.DisplayText) { Active = true, Item = token.Item };
+                        token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
                         token.UpdateTextRange(range);
                         _tokens.Add(range.Link, token);
                     }
@@ -791,10 +805,10 @@ private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out s
             return false;
         }
 
-        private SuggestionTokenFormat CreateSuggestionTokenFormat()
+        private RichSuggestTokenFormat CreateTokenFormat()
         {
             var defaultFormat = TextDocument.GetDefaultCharacterFormat();
-            var suggestionFormat = new SuggestionTokenFormat(defaultFormat);
+            var suggestionFormat = new RichSuggestTokenFormat(defaultFormat);
             if (SuggestionBackground != null)
             {
                 suggestionFormat.Background = SuggestionBackground.Color;
@@ -808,6 +822,16 @@ private SuggestionTokenFormat CreateSuggestionTokenFormat()
             return suggestionFormat;
         }
 
+        private Rect GetTokenRect(ITextRange tokenRange)
+        {
+            var padding = _richEditBox.Padding;
+            tokenRange.GetRect(PointOptions.None, out var rect, out _);
+            rect.X += padding.Left;
+            rect.Y += padding.Top;
+            var transform = _richEditBox.TransformToVisual(this);
+            return transform.TransformBounds(rect);
+        }
+
         private void UpdateVisibleTokenList()
         {
             lock (LockObj)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
index e7503141133..6f723c7d1a4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
@@ -9,9 +9,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// SuggestionInfo describes a suggestion token in the document.
+    /// RichSuggestToken describes a suggestion token in the document.
     /// </summary>
-    public class SuggestionInfo : INotifyPropertyChanged
+    public class RichSuggestToken : INotifyPropertyChanged
     {
         /// <inheritdoc/>
         public event PropertyChangedEventHandler PropertyChanged;
@@ -51,11 +51,11 @@ public class SuggestionInfo : INotifyPropertyChanged
         private ITextRange _range;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SuggestionInfo"/> class.
+        /// Initializes a new instance of the <see cref="RichSuggestToken"/> class.
         /// </summary>
         /// <param name="id">Token ID</param>
         /// <param name="displayText">Text in the document</param>
-        public SuggestionInfo(Guid id, string displayText)
+        public RichSuggestToken(Guid id, string displayText)
         {
             Id = id;
             DisplayText = displayText;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs
index 59f8ff335e7..67db6bd07e8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs
@@ -8,9 +8,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// SuggestionTokenFormat describes how a token should be formatted.
+    /// RichSuggestTokenFormat describes how a token should be formatted.
     /// </summary>
-    public class SuggestionTokenFormat
+    public class RichSuggestTokenFormat
     {
         /// <summary>
         /// Gets or sets token foreground color.
@@ -93,10 +93,10 @@ public class SuggestionTokenFormat
         public float Position { get; set; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SuggestionTokenFormat"/> class.
+        /// Initializes a new instance of the <see cref="RichSuggestTokenFormat"/> class.
         /// </summary>
         /// <param name="source">Source formatting to initialize from.</param>
-        public SuggestionTokenFormat(ITextCharacterFormat source)
+        public RichSuggestTokenFormat(ITextCharacterFormat source)
         {
             Foreground = source.ForegroundColor;
             Background = source.BackgroundColor;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
new file mode 100644
index 00000000000..738bf7e746c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.Foundation;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Provides data for <see cref="RichSuggestBox.TokenSelected"/> event.
+    /// </summary>
+    public class RichSuggestTokenSelectedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the selected token.
+        /// </summary>
+        public RichSuggestToken Token { get; }
+
+        /// <summary>
+        /// Gets the position and size of the selected rectangle measured from the top left of the <see cref="RichSuggestBox"/> control.
+        /// </summary>
+        public Rect Rect { get; }
+
+        internal RichSuggestTokenSelectedEventArgs(RichSuggestToken token, Rect rect)
+        {
+            Token = token;
+            Rect = rect;
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
index 16c1c033a83..21e4aeca931 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -40,6 +40,6 @@ public class SuggestionChosenEventArgs : DeferredEventArgs
         /// <summary>
         /// Gets the formatting construct to override this token formatting.
         /// </summary>
-        public SuggestionTokenFormat Format { get; internal set; }
+        public RichSuggestTokenFormat Format { get; internal set; }
     }
 }

From a3faee9b390dd905785e61a6b626ffc01bee0e8c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 8 Jul 2021 01:48:29 -0700
Subject: [PATCH 067/200] expose SelectionChanged event + bug fixes

---
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  5 +
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 20 ++++
 .../RichSuggestBox/RichSuggestBox.cs          | 99 +++++++++++--------
 .../RichSuggestBox/RichSuggestToken.cs        |  2 +-
 4 files changed, 83 insertions(+), 43 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index e9f1c836876..6b2c665f500 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -34,6 +34,11 @@ public partial class RichSuggestBox
         /// </summary>
         public event TypedEventHandler<RichSuggestBox, RoutedEventArgs> TextChanged;
 
+        /// <summary>
+        /// Event raised when the text selection has changed.
+        /// </summary>
+        public event TypedEventHandler<RichSuggestBox, RoutedEventArgs> SelectionChanged;
+
         /// <summary>
         /// Event raised when text is pasted into the control.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 04f0fbb6507..f1c54ce26b6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -48,6 +48,26 @@ private static string EnforcePrefixesRequirements(string value)
             return string.IsNullOrEmpty(value) ? string.Empty : string.Concat(value.Where(char.IsPunctuation));
         }
 
+        private static void ApplyTokenFormat(ITextCharacterFormat target, RichSuggestTokenFormat format)
+        {
+            target.BackgroundColor = format.Background;
+            target.ForegroundColor = format.Foreground;
+            target.Bold = format.Bold;
+            target.Italic = format.Italic;
+            target.FontStretch = format.FontStretch;
+            target.FontStyle = format.FontStyle;
+            target.Name = format.FontName;
+            target.Kerning = format.Kerning;
+            target.Strikethrough = format.Strikethrough;
+            target.Size = format.FontSize;
+            target.Outline = format.Outline;
+            target.Weight = format.Weight;
+            target.Spacing = format.Spacing;
+            target.Subscript = format.Subscript;
+            target.Superscript = format.Superscript;
+            target.Position = format.Position;
+        }
+
         private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
         {
             var range = document.GetRange(0, 0);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index d256f9a5551..95858da90fd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -217,9 +217,14 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 return;
             }
 
+            if (selection.StartPosition == 0 && this._tokens.ContainsKey(selection.GetClone().Link))
+            {
+                selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+            }
+
             if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
             {
-                // Prevent user from manually editing the link
+                // Snap selection to token on click
                 selection.SetRange(range.StartPosition, range.EndPosition);
                 InvokeTokenSelected(selection);
             }
@@ -237,8 +242,11 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
 
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
-            var selection = TextDocument.Selection.GetClone();
-            _tokenAtStart = selection.StartPosition == 0 && _tokens.ContainsKey(selection.Link);
+            SelectionChanged?.Invoke(this, e);
+            var selection = TextDocument.Selection;
+            _tokenAtStart = selection.StartPosition == 0 &&
+                            selection.Type == SelectionType.Normal &&
+                            _tokens.ContainsKey(selection.GetClone().Link);
 
             // During text composition changing (e.g. user typing with an IME),
             // SelectionChanged event is fired multiple times with each keystroke.
@@ -324,6 +332,7 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
 
             _ignoreChange = true;
             ValidateTokensInDocument();
+            ResetFormatAfterTokenRemoveAtStart();
             TextDocument.EndUndoGroup();
             TextDocument.BeginUndoGroup();
             _ignoreChange = false;
@@ -384,8 +393,9 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
 
         private void InvokeTokenSelected(ITextSelection selection)
         {
-            var id = selection.Link;
-            if (string.IsNullOrEmpty(id) || !_tokens.TryGetValue(id, out var token))
+            var id = selection.GetClone().Link;
+            if (string.IsNullOrEmpty(id) || !_tokens.TryGetValue(id, out var token) ||
+                token.RangeEnd != selection.EndPosition)
             {
                 return;
             }
@@ -436,7 +446,7 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
 
         private async Task OnSuggestionSelectedAsync(object selectedItem)
         {
-            var range = _currentRange;
+            var range = _currentRange?.GetClone();
             var id = Guid.NewGuid();
             var prefix = _currentPrefix;
             var query = _currentQuery;
@@ -501,30 +511,15 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
                 // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
                 if (range.Link != $"\"{id}\"")
                 {
+                    range.Link = string.Empty;
                     return false;
                 }
 
-                range.CharacterFormat.BackgroundColor = format.Background;
-                range.CharacterFormat.ForegroundColor = format.Foreground;
-                range.CharacterFormat.Bold = format.Bold;
-                range.CharacterFormat.Italic = format.Italic;
-                range.CharacterFormat.FontStretch = format.FontStretch;
-                range.CharacterFormat.FontStyle = format.FontStyle;
-                range.CharacterFormat.Name = format.FontName;
-                range.CharacterFormat.Kerning = format.Kerning;
-                range.CharacterFormat.Strikethrough = format.Strikethrough;
-                range.CharacterFormat.Size = format.FontSize;
-                range.CharacterFormat.Outline = format.Outline;
-                range.CharacterFormat.Weight = format.Weight;
-                range.CharacterFormat.Spacing = format.Spacing;
-                range.CharacterFormat.Subscript = format.Subscript;
-                range.CharacterFormat.Superscript = format.Superscript;
-                range.CharacterFormat.Position = format.Position;
-
-                var clone = range.GetClone();
+                ApplyTokenFormat(range.CharacterFormat, format);
 
                 if (addTrailingSpace)
                 {
+                    var clone = range.GetClone();
                     clone.Collapse(false);
                     clone.SetText(TextSetOptions.Unhide, " ");
                     clone.Collapse(false);
@@ -548,28 +543,18 @@ private void ValidateTokensInDocument()
             }
 
             ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
-
-            // Handle the special case where editing a token at the start of the document
-            // does not completely reset the character format.
-            if (_tokenAtStart)
-            {
-                var range = TextDocument.Selection.GetClone();
-                range.SetRange(0, range.EndPosition);
-                range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
-                TextDocument.Selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
-                _tokenAtStart = false;
-            }
         }
 
         private void ValidateTokenFromRange(ITextRange range)
         {
-            if (range.Length == 0 || string.IsNullOrEmpty(range.Link) ||
-                !_tokens.TryGetValue(range.Link, out var token))
+            var clone = range.GetClone();
+            if (clone.Length == 0 || string.IsNullOrEmpty(clone.Link) ||
+                !_tokens.TryGetValue(clone.Link, out var token))
             {
                 // Handle case where range.Link is empty but it still recognized and rendered as a link
-                if (range.CharacterFormat.LinkType == LinkType.FriendlyLinkName)
+                if (clone.CharacterFormat.LinkType == LinkType.FriendlyLinkName)
                 {
-                    range.Link = string.Empty;
+                    clone.Link = string.Empty;
                 }
 
                 return;
@@ -594,9 +579,7 @@ private void ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
-                range.Link = string.Empty;
-                range.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+                this.ResetFormat(range);
                 token.Active = false;
                 return;
             }
@@ -605,6 +588,38 @@ private void ValidateTokenFromRange(ITextRange range)
             token.Active = true;
         }
 
+        /// <summary>
+        /// Handle the special case where editing a token at the start of the document does not completely reset the character format.
+        /// </summary>
+        private void ResetFormatAfterTokenRemoveAtStart()
+        {
+            if (_tokenAtStart)
+            {
+                var range = TextDocument.Selection.GetClone();
+                range.SetRange(0, range.EndPosition);
+                this.ResetFormat(range);
+                _tokenAtStart = false;
+            }
+        }
+
+        private void ResetFormat(ITextRange range)
+        {
+            // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
+            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
+            var selection = TextDocument.Selection;
+            if (!string.IsNullOrEmpty(range.Link))
+            {
+                range.Link = string.Empty;
+            }
+
+            range.CharacterFormat = defaultFormat;
+
+            if (selection.Type == SelectionType.InsertionPoint && selection.EndPosition == range.EndPosition)
+            {
+                selection.CharacterFormat = defaultFormat;
+            }
+        }
+
         private void ConditionallyLoadElement(object property, string elementName)
         {
             if (property != null && GetTemplateChild(elementName) is UIElement presenter)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
index 6f723c7d1a4..f7d2016e67f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
@@ -65,7 +65,7 @@ internal void UpdateTextRange(ITextRange range)
         {
             if (_range == null)
             {
-                _range = range;
+                _range = range.GetClone();
                 RangeStart = _range.StartPosition;
                 RangeEnd = _range.EndPosition;
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));

From 13747b105f293e20ed4c51855a49051a82b4144d Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 8 Jul 2021 17:43:00 -0700
Subject: [PATCH 068/200] token background: transparent; foreground:
 HyperlinkButtonForeground

---
 .../RichSuggestBox.Properties.cs              | 24 +++++++++---------
 .../RichSuggestBox/RichSuggestBox.cs          |  8 +++---
 .../RichSuggestBox/RichSuggestBox.xaml        | 25 ++-----------------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index 27048fc0515..4872ed0c4c8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -126,21 +126,21 @@ public partial class RichSuggestBox
                 new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="SuggestionBackground"/> dependency property.
+        /// Identifies the <see cref="TokenBackground"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty SuggestionBackgroundProperty =
+        public static readonly DependencyProperty TokenBackgroundProperty =
             DependencyProperty.Register(
-                nameof(SuggestionBackground),
+                nameof(TokenBackground),
                 typeof(SolidColorBrush),
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="SuggestionForeground"/> dependency property.
+        /// Identifies the <see cref="TokenForeground"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty SuggestionForegroundProperty =
+        public static readonly DependencyProperty TokenForegroundProperty =
             DependencyProperty.Register(
-                nameof(SuggestionForeground),
+                nameof(TokenForeground),
                 typeof(SolidColorBrush),
                 typeof(RichSuggestBox),
                 new PropertyMetadata(null));
@@ -295,19 +295,19 @@ public DataTemplate PopupFooterTemplate
         /// <summary>
         /// Gets or sets the default brush used to color the suggestion token background.
         /// </summary>
-        public SolidColorBrush SuggestionBackground
+        public SolidColorBrush TokenBackground
         {
-            get => (SolidColorBrush)GetValue(SuggestionBackgroundProperty);
-            set => SetValue(SuggestionBackgroundProperty, value);
+            get => (SolidColorBrush)GetValue(TokenBackgroundProperty);
+            set => SetValue(TokenBackgroundProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the default brush used to color the suggestion token foreground.
         /// </summary>
-        public SolidColorBrush SuggestionForeground
+        public SolidColorBrush TokenForeground
         {
-            get => (SolidColorBrush)GetValue(SuggestionForegroundProperty);
-            set => SetValue(SuggestionForegroundProperty, value);
+            get => (SolidColorBrush)GetValue(TokenForegroundProperty);
+            set => SetValue(TokenForegroundProperty, value);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 95858da90fd..787117a1202 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -824,14 +824,14 @@ private RichSuggestTokenFormat CreateTokenFormat()
         {
             var defaultFormat = TextDocument.GetDefaultCharacterFormat();
             var suggestionFormat = new RichSuggestTokenFormat(defaultFormat);
-            if (SuggestionBackground != null)
+            if (this.TokenBackground != null)
             {
-                suggestionFormat.Background = SuggestionBackground.Color;
+                suggestionFormat.Background = this.TokenBackground.Color;
             }
 
-            if (SuggestionForeground != null)
+            if (this.TokenForeground != null)
             {
-                suggestionFormat.Foreground = SuggestionForeground.Color;
+                suggestionFormat.Foreground = this.TokenForeground.Color;
             }
 
             return suggestionFormat;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index f539a20a489..103c97bf3b1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -4,27 +4,6 @@
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground"
-                             Color="DodgerBlue" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground"
-                             Color="#FF21303A" />
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground"
-                             Color="{ThemeResource SystemColorButtonTextColor}" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground"
-                             Color="{ThemeResource SystemColorButtonFaceColor}" />
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Light">
-            <SolidColorBrush x:Key="DefaultSuggestionForeground"
-                             Color="DarkSlateBlue" />
-            <SolidColorBrush x:Key="DefaultSuggestionBackground"
-                             Color="#e8f5fb" />
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
     <!--  Default style for RichSuggestBox  -->
     <Style BasedOn="{StaticResource DefaultRichSuggestBoxStyle}"
            TargetType="controls:RichSuggestBox" />
@@ -43,8 +22,8 @@
         <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="SuggestionForeground" Value="{ThemeResource DefaultSuggestionForeground}" />
-        <Setter Property="SuggestionBackground" Value="{ThemeResource DefaultSuggestionBackground}" />
+        <Setter Property="TokenForeground" Value="{ThemeResource HyperlinkButtonForeground}" />
+        <Setter Property="TokenBackground" Value="Transparent" />
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />

From 2387ba3f53542f7ebca9e95394008bc41d0784c9 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 8 Jul 2021 20:34:28 -0700
Subject: [PATCH 069/200] add more features to RichSuggestBox sample

---
 .../RichSuggestBox/RichSuggestBoxCode.bind    | 71 +++++++++++++------
 .../RichSuggestBox/RichSuggestBoxPage.xaml    |  1 +
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 45 ++++++++++++
 .../RichSuggestBox/RichSuggestBoxXaml.bind    | 37 +++++++---
 4 files changed, 123 insertions(+), 31 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
index 4f815ff62a9..7f19184b3fd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -1,27 +1,54 @@
-private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
+private async void SuggestingBox_OnPointerReleased(object sender, PointerRoutedEventArgs e)
 {
-	if (args.Prefix == "#")
-	{
-		args.Format.Background = Colors.DarkOrange;
-		args.Format.Foreground = Colors.OrangeRed;
-		args.Text = ((SampleDataType)args.SelectedItem).Text;
-	}
-	else
-	{
-		args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
-	}
+  await Task.Delay(10);
+  this._showFlyout?.Invoke();
+  this._showFlyout = null;
 }
 
-private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+private void SuggestingBox_OnTokenSelected(RichSuggestBox sender, RichSuggestTokenSelectedEventArgs args)
+{
+  this._showFlyout = () =>
+  {
+    var x = (args.Rect.Width / 2) + args.Rect.X;
+    var y = (args.Rect.Height / 2) + args.Rect.Y;
+    var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+    if (flyout.Content is ContentPresenter cp)
+    {
+      cp.Content = args.Token.Item;
+      flyout.ShowAt(sender, new FlyoutShowOptions
+      {
+        Position = new Point(x, y),
+        ExclusionRect = args.Rect,
+        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+      });
+    }
+  };
+}
+
+private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
 {
-	if (args.Prefix == "#")
-	{
-		sender.ItemsSource =
-		this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
-	}
-	else
-	{
-		sender.ItemsSource =
-		this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
-	}
+  if (args.Prefix == "#")
+  {
+    args.Format.Background = Colors.DarkOrange;
+    args.Format.Foreground = Colors.OrangeRed;
+    args.Text = ((SampleDataType)args.SelectedItem).Text;
+  }
+  else
+  {
+    args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
+  }
 }
+
+private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+{
+  if (args.Prefix == "#")
+  {
+    sender.ItemsSource =
+      this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+  }
+  else
+  {
+    sender.ItemsSource =
+      this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+  }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
index 9d67768f0a2..a57d44b9576 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml
@@ -9,6 +9,7 @@
     <Page.Resources>
         <ResourceDictionary>
             <local:SuggestionTemplateSelector x:Key="SuggestionTemplateSelector" />
+            <local:NameToColorConverter x:Key="NameToColorConverter" />
         </ResourceDictionary>
     </Page.Resources>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 252dcee1146..005bc1c5cb8 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -5,11 +5,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
+using Windows.Foundation;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Input;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -52,6 +56,7 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
             new SampleEmailDataType() { FirstName = "Joni", FamilyName = "Sherman" },
             new SampleEmailDataType() { FirstName = "Isaiah", FamilyName = "Langer" },
             new SampleEmailDataType() { FirstName = "Irvin", FamilyName = "Sayers" },
+            new SampleEmailDataType() { FirstName = "Tung", FamilyName = "Huynh" },
         };
 
         private readonly List<SampleDataType> _samples = new List<SampleDataType>()
@@ -85,10 +90,13 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
 
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
+        private Action _showFlyout;
+        private PointerEventHandler _pointerReleasedHandler;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
+            this._pointerReleasedHandler = this.SuggestingBox_OnPointerReleased;
 
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
@@ -101,6 +109,14 @@ public void OnXamlRendered(FrameworkElement control)
                 this._rsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
             }
 
+            if (this._tsb != null)
+            {
+                this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
+                this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
+                this._tsb.TokenSelected -= SuggestingBox_OnTokenSelected;
+                this._tsb.RemoveHandler(PointerReleasedEvent, this._pointerReleasedHandler);
+            }
+
             if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
             {
                 this._rsb = rsb;
@@ -113,6 +129,8 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
+                this._tsb.TokenSelected += SuggestingBox_OnTokenSelected;
+                this._tsb.AddHandler(PointerReleasedEvent, this._pointerReleasedHandler, true);
             }
 
             if (control.FindChild("TokenListView1") is ListView tls1)
@@ -126,6 +144,33 @@ public void OnXamlRendered(FrameworkElement control)
             }
         }
 
+        private async void SuggestingBox_OnPointerReleased(object sender, PointerRoutedEventArgs e)
+        {
+            await Task.Delay(10);
+            this._showFlyout?.Invoke();
+            this._showFlyout = null;
+        }
+
+        private void SuggestingBox_OnTokenSelected(RichSuggestBox sender, RichSuggestTokenSelectedEventArgs args)
+        {
+            this._showFlyout = () =>
+            {
+                var x = (args.Rect.Width / 2) + args.Rect.X;
+                var y = (args.Rect.Height / 2) + args.Rect.Y;
+                var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+                if (flyout.Content is ContentPresenter cp)
+                {
+                    cp.Content = args.Token.Item;
+                    flyout.ShowAt(sender, new FlyoutShowOptions
+                    {
+                        Position = new Point(x, y),
+                        ExclusionRect = args.Rect,
+                        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+                    });
+                }
+            };
+        }
+
         private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
         {
             if (args.Prefix == "#")
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
index 313b11054ac..e061d59f6e3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
@@ -7,8 +7,20 @@
       mc:Ignorable="d">
     <Page.Resources>
         <ResourceDictionary>
+            <local:NameToColorConverter x:Key="NameToColorConverter"/>
+
             <DataTemplate x:Key="EmailTemplate">
-                <TextBlock Text="{Binding EmailAddress}" />
+                <StackPanel Orientation="Horizontal">
+                    <Border CornerRadius="9999" Background="{Binding DisplayName, Converter={StaticResource NameToColorConverter}}"
+                            Width="20" Height="20">
+                        <TextBlock Text="{Binding Initials}" Foreground="White"
+                                   FontSize="10"
+                                   FontWeight="Semibold"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"/>
+                    </Border>
+                    <TextBlock Text="{Binding DisplayName}" Padding="4,0,0,0"/>
+                </StackPanel>
             </DataTemplate>
 
             <DataTemplate x:Key="DataTemplate">
@@ -34,25 +46,30 @@
                         Id: <Run Text="{Binding Id}" /></TextBlock>
                 </StackPanel>
             </DataTemplate>
+
+            <Flyout x:Key="TokenSelectedFlyout">
+                <ContentPresenter x:Name="FlyoutPresenter"
+                                  ContentTemplate="{StaticResource EmailTemplate}" />
+            </Flyout>
         </ResourceDictionary>
     </Page.Resources>
 
     <Grid Margin="40">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="250" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="250" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <controls:RichSuggestBox x:Name="SuggestingBox"
                                  MaxHeight="400"
                                  HorizontalAlignment="Stretch"
-                                 Header="Rich suggest box sample"
+                                 Header="Suggest box that supports multiple prefixes"
                                  ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
                                  Prefixes="@#" />
 
-        <ListView x:Name="TokenListView1" 
+        <ListView x:Name="TokenListView1"
                   Grid.Row="1"
                   Margin="0,16,0,0"
                   HorizontalAlignment="Stretch"
@@ -60,14 +77,16 @@
 
         <controls:RichSuggestBox x:Name="PlainTextSuggestingBox"
                                  Grid.Row="2"
+                                 Grid.Column="0"
                                  MaxHeight="400"
                                  HorizontalAlignment="Stretch"
-                                 Header="Plain text only suggest box sample"
-                                 DisabledFormattingAccelerators="All"
                                  ClipboardCopyFormat="PlainText"
                                  ClipboardPasteFormat="PlainText"
-                                 ItemTemplateSelector="{StaticResource SuggestionTemplateSelector}"
-                                 Prefixes="@#" />
+                                 DisabledFormattingAccelerators="All"
+                                 Header="Plain text suggest box with on token selected flyout"
+                                 ItemTemplate="{StaticResource EmailTemplate}"
+                                 Prefixes="@"
+                                 FlyoutBase.AttachedFlyout="{StaticResource TokenSelectedFlyout}" />
 
         <ListView x:Name="TokenListView2"
                   Grid.Row="3"

From 2ac3e4f41e3af93d32bae0bfe78ab85c899e6054 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 12 Jul 2021 14:37:21 -0700
Subject: [PATCH 070/200] added TokenHovered event and some refactoring

---
 .../RichSuggestBox/RichSuggestBox.Events.cs   |   5 +
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  |  18 +++
 .../RichSuggestBox/RichSuggestBox.cs          | 148 +++++++++++++-----
 .../RichSuggestBox/RichSuggestToken.cs        |  17 +-
 .../RichSuggestTokenHoveredEventArgs.cs       |  19 +++
 .../RichSuggestTokenSelectedEventArgs.cs      |  18 +--
 6 files changed, 167 insertions(+), 58 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 6b2c665f500..1c3eed90b66 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -29,6 +29,11 @@ public partial class RichSuggestBox
         /// </summary>
         public event TypedEventHandler<RichSuggestBox, RichSuggestTokenSelectedEventArgs> TokenSelected;
 
+        /// <summary>
+        /// Event raised when a pointer is hovering over a token.
+        /// </summary>
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenHoveredEventArgs> TokenHovered;
+
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index f1c54ce26b6..c5c9cef5db7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq;
+using System.Threading;
 using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI.Text;
@@ -104,5 +105,22 @@ private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRa
                 nextIndex = range.GetIndex(TextRangeUnit.Link);
             }
         }
+
+        private static void CancelIfNotDisposed(CancellationTokenSource cancellationSource)
+        {
+            if (cancellationSource == null || cancellationSource.IsCancellationRequested)
+            {
+                return;
+            }
+
+            try
+            {
+                cancellationSource.Cancel();
+            }
+            catch (ObjectDisposedException)
+            {
+                // pass
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 787117a1202..2a37b2abfa3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -13,6 +13,7 @@
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
 using Windows.System;
+using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -41,7 +42,6 @@ public partial class RichSuggestBox : ItemsControl
 
         private readonly Dictionary<string, RichSuggestToken> _tokens;
         private readonly ObservableCollection<RichSuggestToken> _visibleTokens;
-        private readonly PointerEventHandler _pointerEventHandler;
 
         private Popup _suggestionPopup;
         private RichEditBox _richEditBox;
@@ -56,7 +56,8 @@ public partial class RichSuggestBox : ItemsControl
         private bool _tokenAtStart;
         private bool _textCompositionActive;
         private ITextRange _currentRange;
-        private CancellationTokenSource _suggestionRequestedTokenSource;
+        private RichSuggestToken _hoveringToken;
+        private CancellationTokenSource _suggestionRequestedCancellationSource;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
@@ -65,7 +66,6 @@ public RichSuggestBox()
         {
             _tokens = new Dictionary<string, RichSuggestToken>();
             _visibleTokens = new ObservableCollection<RichSuggestToken>();
-            _pointerEventHandler = RichEditBoxPointerEventHandler;
             Tokens = new ReadOnlyObservableCollection<RichSuggestToken>(_visibleTokens);
             LockObj = new object();
 
@@ -77,6 +77,16 @@ public RichSuggestBox()
             LostFocus += OnLostFocus;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RichSuggestBox"/> class for unit tests.
+        /// </summary>
+        /// <param name="richEditBox"><see cref="RichEditBox"/> instance to be used for <see cref="TextDocument"/>.</param>
+        internal RichSuggestBox(RichEditBox richEditBox)
+            : this()
+        {
+            _richEditBox = richEditBox;
+        }
+
         /// <summary>
         /// Clear unused tokens and undo/redo history. <see cref="RichSuggestBox"/> saves all of previously committed tokens
         /// even when they are removed from the text. They have to be manually removed using this method.
@@ -84,22 +94,40 @@ public RichSuggestBox()
         public void ClearUndoRedoSuggestionHistory()
         {
             TextDocument.ClearUndoRedoHistory();
-            if (_tokens.Count == 0)
+            lock (LockObj)
             {
-                return;
-            }
+                if (_tokens.Count == 0)
+                {
+                    return;
+                }
 
-            var keysToDelete = _tokens.Where(pair => !pair.Value.Active).Select(pair => pair.Key).ToArray();
-            foreach (var key in keysToDelete)
-            {
-                _tokens.Remove(key);
+                var keysToDelete = _tokens.Where(pair => !pair.Value.Active).Select(pair => pair.Key).ToArray();
+                foreach (var key in keysToDelete)
+                {
+                    _tokens.Remove(key);
+                }
             }
         }
 
+        /// <summary>
+        /// Try getting the token associated with a text range.
+        /// </summary>
+        /// <param name="range">The range of the token to get.</param>
+        /// <param name="token">When this method returns, contains the token associated with the specified range; otherwise, it is null.</param>
+        /// <returns>true if there is a token associated with the text range; otherwise false.</returns>
+        public bool TryGetTokenFromRange(ITextRange range, out RichSuggestToken token)
+        {
+            token = null;
+            range = range.GetClone();
+            return range != null && !string.IsNullOrEmpty(range.Link) && _tokens.TryGetValue(range.Link, out token);
+        }
+
         /// <inheritdoc/>
         protected override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
+            PointerEventHandler pointerPressedHandler = RichEditBox_OnPointerPressed;
+            PointerEventHandler pointerMovedHandler = RichEditBox_OnPointerMoved;
 
             _suggestionPopup = (Popup)GetTemplateChild(PartSuggestionsPopup);
             _richEditBox = (RichEditBox)GetTemplateChild(PartRichEditBox);
@@ -118,7 +146,9 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
             _richEditBox.Paste -= RichEditBox_Paste;
             _richEditBox.PreviewKeyDown -= RichEditBox_PreviewKeyDown;
-            _richEditBox.RemoveHandler(PointerPressedEvent, _pointerEventHandler);
+            _richEditBox.PointerExited -= RichEditBox_OnPointerExited;
+            _richEditBox.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
+            _richEditBox.RemoveHandler(PointerPressedEvent, pointerPressedHandler);
             _richEditBox.ProcessKeyboardAccelerators -= RichEditBox_ProcessKeyboardAccelerators;
 
             _richEditBox.SizeChanged += RichEditBox_SizeChanged;
@@ -131,7 +161,9 @@ protected override void OnApplyTemplate()
             _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
             _richEditBox.Paste += RichEditBox_Paste;
             _richEditBox.PreviewKeyDown += RichEditBox_PreviewKeyDown;
-            _richEditBox.AddHandler(PointerPressedEvent, _pointerEventHandler, true);
+            _richEditBox.PointerExited += RichEditBox_OnPointerExited;
+            _richEditBox.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
+            _richEditBox.AddHandler(PointerPressedEvent, pointerPressedHandler, true);
             _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
 
             _suggestionsList.ItemClick -= SuggestionsList_ItemClick;
@@ -200,6 +232,17 @@ private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
             }
         }
 
+        private void RichEditBox_OnPointerExited(object sender, PointerRoutedEventArgs e)
+        {
+            this._hoveringToken = null;
+        }
+
+        private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
+        {
+            var pointer = e.GetCurrentPoint((UIElement)sender);
+            InvokeTokenHovered(pointer.Position, e.GetCurrentPoint(this));
+        }
+
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
         {
             TextDocument.BeginUndoGroup();
@@ -260,7 +303,7 @@ private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e
             await RequestSuggestionsAsync();
         }
 
-        private void RichEditBoxPointerEventHandler(object sender, PointerRoutedEventArgs e)
+        private void RichEditBox_OnPointerPressed(object sender, PointerRoutedEventArgs e)
         {
             ShowSuggestionsPopup(false);
         }
@@ -279,21 +322,19 @@ private async void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, Pro
                 case VirtualKey.Up when itemsList.Count == 1:
                 case VirtualKey.Down when itemsList.Count == 1:
                     args.Handled = true;
-                    _suggestionsList.SelectedItem = itemsList[0];
+                    UpdateSuggestionsListSelectedItem(1);
                     break;
 
                 case VirtualKey.Up:
                     args.Handled = true;
                     _suggestionChoice = _suggestionChoice <= 0 ? itemsList.Count : _suggestionChoice - 1;
-                    _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
-                    _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
+                    UpdateSuggestionsListSelectedItem(this._suggestionChoice);
                     break;
 
                 case VirtualKey.Down:
                     args.Handled = true;
                     _suggestionChoice = _suggestionChoice >= itemsList.Count ? 0 : _suggestionChoice + 1;
-                    _suggestionsList.SelectedItem = _suggestionChoice == 0 ? null : itemsList[_suggestionChoice - 1];
-                    _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
+                    UpdateSuggestionsListSelectedItem(this._suggestionChoice);
                     break;
 
                 case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
@@ -393,15 +434,40 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
 
         private void InvokeTokenSelected(ITextSelection selection)
         {
-            var id = selection.GetClone().Link;
-            if (string.IsNullOrEmpty(id) || !_tokens.TryGetValue(id, out var token) ||
-                token.RangeEnd != selection.EndPosition)
+            if (!TryGetTokenFromRange(selection, out var token) || token.RangeEnd != selection.EndPosition)
             {
                 return;
             }
 
             var tokenRect = GetTokenRect(selection);
-            TokenSelected?.Invoke(this, new RichSuggestTokenSelectedEventArgs(token, tokenRect));
+            TokenSelected?.Invoke(this, new RichSuggestTokenSelectedEventArgs
+            {
+                Token = token,
+                Rect = tokenRect,
+                Range = selection.GetClone()
+            });
+        }
+
+        private void InvokeTokenHovered(Point pointerPosition, PointerPoint passingPointerPoint)
+        {
+            var padding = _richEditBox.Padding;
+            pointerPosition.X -= padding.Left;
+            pointerPosition.Y -= padding.Top;
+            var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
+            RichSuggestToken token = null;
+            if (range.Expand(TextRangeUnit.Link) > 0 && TryGetTokenFromRange(range, out token) &&
+                token != _hoveringToken)
+            {
+                TokenHovered?.Invoke(this, new RichSuggestTokenHoveredEventArgs
+                {
+                    Token = token,
+                    Rect = GetTokenRect(range),
+                    Range = range,
+                    CurrentPoint = passingPointerPoint
+                });
+            }
+
+            _hoveringToken = token;
         }
 
         private async Task RequestSuggestionsAsync(ITextRange range = null)
@@ -418,22 +484,24 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                 return;
             }
 
-            _suggestionRequestedTokenSource?.Cancel();
+            CancelIfNotDisposed(this._suggestionRequestedCancellationSource);
+            this._suggestionRequestedCancellationSource = null;
 
             if (queryFound && SuggestionsRequested != null)
             {
-                _suggestionRequestedTokenSource = new CancellationTokenSource();
+                using var tokenSource = new CancellationTokenSource();
+                _suggestionRequestedCancellationSource = tokenSource;
                 _currentPrefix = prefix;
                 _currentQuery = query;
                 _currentRange = range;
 
-                var cancellationToken = _suggestionRequestedTokenSource.Token;
+                var cancellationToken = tokenSource.Token;
                 var eventArgs = new SuggestionsRequestedEventArgs { Query = query, Prefix = prefix };
                 try
                 {
-                    await SuggestionsRequested.InvokeAsync(this, eventArgs, cancellationToken);
+                    await SuggestionsRequested?.InvokeAsync(this, eventArgs, cancellationToken);
                 }
-                catch (TaskCanceledException)
+                catch (OperationCanceledException)
                 {
                     eventArgs.Cancel = true;
                 }
@@ -492,7 +560,7 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
             }
         }
 
-        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
+        internal bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
         {
             try
             {
@@ -547,16 +615,8 @@ private void ValidateTokensInDocument()
 
         private void ValidateTokenFromRange(ITextRange range)
         {
-            var clone = range.GetClone();
-            if (clone.Length == 0 || string.IsNullOrEmpty(clone.Link) ||
-                !_tokens.TryGetValue(clone.Link, out var token))
+            if (range.Length == 0 || !TryGetTokenFromRange(range, out var token))
             {
-                // Handle case where range.Link is empty but it still recognized and rendered as a link
-                if (clone.CharacterFormat.LinkType == LinkType.FriendlyLinkName)
-                {
-                    clone.Link = string.Empty;
-                }
-
                 return;
             }
 
@@ -628,6 +688,18 @@ private void ConditionallyLoadElement(object property, string elementName)
             }
         }
 
+        private void UpdateSuggestionsListSelectedItem(int choice)
+        {
+            var itemsList = _suggestionsList.Items;
+            if (itemsList == null)
+            {
+                return;
+            }
+
+            _suggestionsList.SelectedItem = choice == 0 ? null : itemsList[choice - 1];
+            _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
+        }
+
         private void ShowSuggestionsPopup(bool show)
         {
             if (_suggestionPopup == null)
@@ -840,7 +912,7 @@ private RichSuggestTokenFormat CreateTokenFormat()
         private Rect GetTokenRect(ITextRange tokenRange)
         {
             var padding = _richEditBox.Padding;
-            tokenRange.GetRect(PointOptions.None, out var rect, out _);
+            tokenRange.GetRect(PointOptions.ClientCoordinates, out var rect, out var hit);
             rect.X += padding.Left;
             rect.Y += padding.Top;
             var transform = _richEditBox.TransformToVisual(this);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
index f7d2016e67f..f322285fee4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
@@ -63,18 +63,13 @@ public RichSuggestToken(Guid id, string displayText)
 
         internal void UpdateTextRange(ITextRange range)
         {
-            if (_range == null)
-            {
-                _range = range.GetClone();
-                RangeStart = _range.StartPosition;
-                RangeEnd = _range.EndPosition;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
-            }
-            else if (RangeStart != range.StartPosition || RangeEnd != range.EndPosition)
+            bool invoke = _range == null || RangeStart != range.StartPosition || RangeEnd != range.EndPosition;
+            _range = range.GetClone();
+            RangeStart = _range.StartPosition;
+            RangeEnd = _range.EndPosition;
+
+            if (invoke)
             {
-                _range.SetRange(range.StartPosition, range.EndPosition);
-                RangeStart = _range.StartPosition;
-                RangeEnd = _range.EndPosition;
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs
new file mode 100644
index 00000000000..c01cb7d75c9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Input;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Provides data for <see cref="RichSuggestBox.TokenHovered"/> event.
+    /// </summary>
+    public class RichSuggestTokenHoveredEventArgs : RichSuggestTokenSelectedEventArgs
+    {
+        /// <summary>
+        /// Gets or sets a <see cref="PointerPoint"/> object with position relative to the <see cref="RichSuggestBox"/> instance.
+        /// </summary>
+        public PointerPoint CurrentPoint { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
index 738bf7e746c..16606206083 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
@@ -4,6 +4,7 @@
 
 using System;
 using Windows.Foundation;
+using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -13,19 +14,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public class RichSuggestTokenSelectedEventArgs : EventArgs
     {
         /// <summary>
-        /// Gets the selected token.
+        /// Gets or sets the selected token.
         /// </summary>
-        public RichSuggestToken Token { get; }
+        public RichSuggestToken Token { get; set; }
 
         /// <summary>
-        /// Gets the position and size of the selected rectangle measured from the top left of the <see cref="RichSuggestBox"/> control.
+        /// Gets or sets the position and size of the selected rectangle measured from the top left of the <see cref="RichSuggestBox"/> control.
         /// </summary>
-        public Rect Rect { get; }
+        public Rect Rect { get; set; }
 
-        internal RichSuggestTokenSelectedEventArgs(RichSuggestToken token, Rect rect)
-        {
-            Token = token;
-            Rect = rect;
-        }
+        /// <summary>
+        /// Gets or sets the range associated with the token.
+        /// </summary>
+        public ITextRange Range { get; set; }
     }
 }

From b150736401b24c7ca081a6f8766bdd942ee35a27 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 12 Jul 2021 14:39:32 -0700
Subject: [PATCH 071/200] update sample to use TokenHovered

---
 .../RichSuggestBox/RichSuggestBoxCode.bind    | 34 +++++--------
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 50 +++++++------------
 2 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
index 7f19184b3fd..6d96f5801dd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -1,28 +1,18 @@
-private async void SuggestingBox_OnPointerReleased(object sender, PointerRoutedEventArgs e)
+private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenHoveredEventArgs args)
 {
-  await Task.Delay(10);
-  this._showFlyout?.Invoke();
-  this._showFlyout = null;
-}
-
-private void SuggestingBox_OnTokenSelected(RichSuggestBox sender, RichSuggestTokenSelectedEventArgs args)
-{
-  this._showFlyout = () =>
+  await Task.Delay(1);
+  var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+  if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+    (!flyout.IsOpen || cp.Content != args.Token.Item))
   {
-    var x = (args.Rect.Width / 2) + args.Rect.X;
-    var y = (args.Rect.Height / 2) + args.Rect.Y;
-    var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-    if (flyout.Content is ContentPresenter cp)
+    cp.Content = args.Token.Item;
+    flyout.ShowAt(sender, new FlyoutShowOptions
     {
-      cp.Content = args.Token.Item;
-      flyout.ShowAt(sender, new FlyoutShowOptions
-      {
-        Position = new Point(x, y),
-        ExclusionRect = args.Rect,
-        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
-      });
-    }
-  };
+      Position = args.CurrentPoint.Position,
+      ExclusionRect = args.Rect,
+      ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+    });
+  }
 }
 
 private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 005bc1c5cb8..481b3dcafcc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -8,12 +8,12 @@
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.Foundation;
+using Windows.System;
 using Windows.UI;
+using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -90,14 +90,12 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
 
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
-        private Action _showFlyout;
-        private PointerEventHandler _pointerReleasedHandler;
+        private DispatcherQueueTimer _hoveringTimer;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
-            this._pointerReleasedHandler = this.SuggestingBox_OnPointerReleased;
-
+            this._hoveringTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
 
@@ -113,8 +111,7 @@ public void OnXamlRendered(FrameworkElement control)
             {
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenSelected -= SuggestingBox_OnTokenSelected;
-                this._tsb.RemoveHandler(PointerReleasedEvent, this._pointerReleasedHandler);
+                this._tsb.TokenHovered -= SuggestingBox_OnTokenHovered;
             }
 
             if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
@@ -129,8 +126,7 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenSelected += SuggestingBox_OnTokenSelected;
-                this._tsb.AddHandler(PointerReleasedEvent, this._pointerReleasedHandler, true);
+                this._tsb.TokenHovered += this.SuggestingBox_OnTokenHovered;
             }
 
             if (control.FindChild("TokenListView1") is ListView tls1)
@@ -144,31 +140,21 @@ public void OnXamlRendered(FrameworkElement control)
             }
         }
 
-        private async void SuggestingBox_OnPointerReleased(object sender, PointerRoutedEventArgs e)
+        private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenHoveredEventArgs args)
         {
-            await Task.Delay(10);
-            this._showFlyout?.Invoke();
-            this._showFlyout = null;
-        }
-
-        private void SuggestingBox_OnTokenSelected(RichSuggestBox sender, RichSuggestTokenSelectedEventArgs args)
-        {
-            this._showFlyout = () =>
+            await Task.Delay(1);
+            var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+            if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+                (!flyout.IsOpen || cp.Content != args.Token.Item))
             {
-                var x = (args.Rect.Width / 2) + args.Rect.X;
-                var y = (args.Rect.Height / 2) + args.Rect.Y;
-                var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-                if (flyout.Content is ContentPresenter cp)
+                cp.Content = args.Token.Item;
+                flyout.ShowAt(sender, new FlyoutShowOptions
                 {
-                    cp.Content = args.Token.Item;
-                    flyout.ShowAt(sender, new FlyoutShowOptions
-                    {
-                        Position = new Point(x, y),
-                        ExclusionRect = args.Rect,
-                        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
-                    });
-                }
-            };
+                    Position = args.CurrentPoint.Position,
+                    ExclusionRect = args.Rect,
+                    ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+                });
+            }
         }
 
         private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)

From 9d66f1a4e14ebc99b22f94f23f24de8540128a87 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 13 Jul 2021 10:24:29 -0700
Subject: [PATCH 072/200] better way to handle on hovered position

---
 .../RichSuggestBox/RichSuggestBoxCode.bind    | 11 +++++++---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 21 +++++++++++++------
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  4 ++--
 .../RichSuggestBox/RichSuggestBox.cs          | 10 ++++-----
 .../RichSuggestBox/RichSuggestBox.xaml        |  5 +++++
 ...ntArgs.cs => RichSuggestTokenEventArgs.cs} |  2 +-
 .../RichSuggestTokenHoveredEventArgs.cs       | 19 -----------------
 7 files changed, 35 insertions(+), 37 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{RichSuggestTokenSelectedEventArgs.cs => RichSuggestTokenEventArgs.cs} (93%)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
index 6d96f5801dd..70a6453bdfe 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -1,6 +1,11 @@
-private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenHoveredEventArgs args)
+private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
 {
-  await Task.Delay(1);
+  this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
+}
+
+private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
+{
+  await Task.Delay(200);
   var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
   if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
     (!flyout.IsOpen || cp.Content != args.Token.Item))
@@ -8,7 +13,7 @@
     cp.Content = args.Token.Item;
     flyout.ShowAt(sender, new FlyoutShowOptions
     {
-      Position = args.CurrentPoint.Position,
+      Position = this._pointerPoint.Position,
       ExclusionRect = args.Rect,
       ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
     });
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 481b3dcafcc..c91c32560d0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -8,12 +8,13 @@
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.System;
 using Windows.UI;
+using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Input;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -90,17 +91,18 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
 
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
-        private DispatcherQueueTimer _hoveringTimer;
+        private PointerPoint _pointerPoint;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
-            this._hoveringTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
 
         public void OnXamlRendered(FrameworkElement control)
         {
+            PointerEventHandler pointerMovedHandler = SuggestingBox_OnPointerMoved;
+
             if (this._rsb != null)
             {
                 this._rsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
@@ -112,6 +114,7 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
                 this._tsb.TokenHovered -= SuggestingBox_OnTokenHovered;
+                this._tsb.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
             }
 
             if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
@@ -127,6 +130,7 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
                 this._tsb.TokenHovered += this.SuggestingBox_OnTokenHovered;
+                this._tsb.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
             }
 
             if (control.FindChild("TokenListView1") is ListView tls1)
@@ -140,9 +144,14 @@ public void OnXamlRendered(FrameworkElement control)
             }
         }
 
-        private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenHoveredEventArgs args)
+        private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
+        {
+            this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
+        }
+
+        private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
         {
-            await Task.Delay(1);
+            await Task.Delay(200);
             var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
             if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
                 (!flyout.IsOpen || cp.Content != args.Token.Item))
@@ -150,7 +159,7 @@ private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSugge
                 cp.Content = args.Token.Item;
                 flyout.ShowAt(sender, new FlyoutShowOptions
                 {
-                    Position = args.CurrentPoint.Position,
+                    Position = this._pointerPoint.Position,
                     ExclusionRect = args.Rect,
                     ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
                 });
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 1c3eed90b66..0b7b9a6959e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -27,12 +27,12 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when a token is fully highlighted.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenSelectedEventArgs> TokenSelected;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenSelected;
 
         /// <summary>
         /// Event raised when a pointer is hovering over a token.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenHoveredEventArgs> TokenHovered;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenHovered;
 
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 2a37b2abfa3..74823147c05 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -13,7 +13,6 @@
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
 using Windows.System;
-using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -240,7 +239,7 @@ private void RichEditBox_OnPointerExited(object sender, PointerRoutedEventArgs e
         private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var pointer = e.GetCurrentPoint((UIElement)sender);
-            InvokeTokenHovered(pointer.Position, e.GetCurrentPoint(this));
+            InvokeTokenHovered(pointer.Position);
         }
 
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
@@ -440,7 +439,7 @@ private void InvokeTokenSelected(ITextSelection selection)
             }
 
             var tokenRect = GetTokenRect(selection);
-            TokenSelected?.Invoke(this, new RichSuggestTokenSelectedEventArgs
+            TokenSelected?.Invoke(this, new RichSuggestTokenEventArgs
             {
                 Token = token,
                 Rect = tokenRect,
@@ -448,7 +447,7 @@ private void InvokeTokenSelected(ITextSelection selection)
             });
         }
 
-        private void InvokeTokenHovered(Point pointerPosition, PointerPoint passingPointerPoint)
+        private void InvokeTokenHovered(Point pointerPosition)
         {
             var padding = _richEditBox.Padding;
             pointerPosition.X -= padding.Left;
@@ -458,12 +457,11 @@ private void InvokeTokenHovered(Point pointerPosition, PointerPoint passingPoint
             if (range.Expand(TextRangeUnit.Link) > 0 && TryGetTokenFromRange(range, out token) &&
                 token != _hoveringToken)
             {
-                TokenHovered?.Invoke(this, new RichSuggestTokenHoveredEventArgs
+                TokenHovered?.Invoke(this, new RichSuggestTokenEventArgs
                 {
                     Token = token,
                     Rect = GetTokenRect(range),
                     Range = range,
-                    CurrentPoint = passingPointerPoint
                 });
             }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index 103c97bf3b1..f63a0c476e1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -4,6 +4,11 @@
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+    <ResourceDictionary.MergedDictionaries>
+        <!--  WinUI dependency for testing  -->
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+    </ResourceDictionary.MergedDictionaries>
+
     <!--  Default style for RichSuggestBox  -->
     <Style BasedOn="{StaticResource DefaultRichSuggestBoxStyle}"
            TargetType="controls:RichSuggestBox" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
index 16606206083..3291b5288ed 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Provides data for <see cref="RichSuggestBox.TokenSelected"/> event.
     /// </summary>
-    public class RichSuggestTokenSelectedEventArgs : EventArgs
+    public class RichSuggestTokenEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the selected token.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs
deleted file mode 100644
index c01cb7d75c9..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveredEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Input;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Provides data for <see cref="RichSuggestBox.TokenHovered"/> event.
-    /// </summary>
-    public class RichSuggestTokenHoveredEventArgs : RichSuggestTokenSelectedEventArgs
-    {
-        /// <summary>
-        /// Gets or sets a <see cref="PointerPoint"/> object with position relative to the <see cref="RichSuggestBox"/> instance.
-        /// </summary>
-        public PointerPoint CurrentPoint { get; set; }
-    }
-}

From 7c7c29069807506b35cb00a21a37bc9c72470a8a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 14 Jul 2021 00:23:25 -0700
Subject: [PATCH 073/200] take into account scrollviewer offsets when
 calculating positions

---
 .../RichSuggestBox/RichSuggestBoxCode.bind    | 26 +++++-----
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 31 ++++++-----
 .../RichSuggestBox.Properties.cs              | 10 ++++
 .../RichSuggestBox/RichSuggestBox.cs          | 51 ++++++++++---------
 4 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
index 70a6453bdfe..20c1154519f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -3,21 +3,23 @@
   this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
 }
 
-private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
+private void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
 {
-  await Task.Delay(200);
-  var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-  if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
-    (!flyout.IsOpen || cp.Content != args.Token.Item))
+  this._hoveringTimer.Debounce(() =>
   {
-    cp.Content = args.Token.Item;
-    flyout.ShowAt(sender, new FlyoutShowOptions
+    var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+    if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+      (!flyout.IsOpen || cp.Content != args.Token.Item))
     {
-      Position = this._pointerPoint.Position,
-      ExclusionRect = args.Rect,
-      ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
-    });
-  }
+      cp.Content = args.Token.Item;
+      flyout.ShowAt(sender, new FlyoutShowOptions
+      {
+        Position = this._pointerPoint.Position,
+        ExclusionRect = args.Rect,
+        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+      });
+    }
+  }, TimeSpan.FromMilliseconds(200));
 }
 
 private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index c91c32560d0..585eac73a89 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
+using Windows.System;
 using Windows.UI;
 using Windows.UI.Input;
 using Windows.UI.Text;
@@ -91,11 +91,13 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
 
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
+        private DispatcherQueueTimer _hoveringTimer;
         private PointerPoint _pointerPoint;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
+            this._hoveringTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
 
@@ -149,21 +151,24 @@ private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs
             this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
         }
 
-        private async void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
+        private void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
         {
-            await Task.Delay(200);
-            var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-            if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
-                (!flyout.IsOpen || cp.Content != args.Token.Item))
+            this._hoveringTimer.Debounce(
+                () =>
             {
-                cp.Content = args.Token.Item;
-                flyout.ShowAt(sender, new FlyoutShowOptions
+                var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+                if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+                    (!flyout.IsOpen || cp.Content != args.Token.Item))
                 {
-                    Position = this._pointerPoint.Position,
-                    ExclusionRect = args.Rect,
-                    ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
-                });
-            }
+                    cp.Content = args.Token.Item;
+                    flyout.ShowAt(sender, new FlyoutShowOptions
+                    {
+                        Position = this._pointerPoint.Position,
+                        ExclusionRect = args.Rect,
+                        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+                    });
+                }
+            }, TimeSpan.FromMilliseconds(200));
         }
 
         private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index 4872ed0c4c8..ffb075f5e1c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -356,6 +356,16 @@ public DisabledFormattingAccelerators DisabledFormattingAccelerators
         /// </summary>
         public RichEditTextDocument TextDocument => _richEditBox?.TextDocument;
 
+        /// <summary>
+        /// Gets the distance the content has been scrolled horizontally from the underlying <see cref="ScrollViewer"/>.
+        /// </summary>
+        public double HorizontalOffset => this._scrollViewer?.HorizontalOffset ?? 0;
+
+        /// <summary>
+        /// Gets the distance the content has been scrolled vertically from the underlying <see cref="ScrollViewer"/>.
+        /// </summary>
+        public double VerticalOffset => this._scrollViewer?.VerticalOffset ?? 0;
+
         /// <summary>
         /// Gets a collection of suggestion tokens that are present in the document.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 74823147c05..59af6a1c03b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -44,6 +44,7 @@ public partial class RichSuggestBox : ItemsControl
 
         private Popup _suggestionPopup;
         private RichEditBox _richEditBox;
+        private ScrollViewer _scrollViewer;
         private ListViewBase _suggestionsList;
         private Border _suggestionsContainer;
 
@@ -74,16 +75,7 @@ public RichSuggestBox()
             RegisterPropertyChangedCallback(CornerRadiusProperty, OnCornerRadiusChanged);
             RegisterPropertyChangedCallback(PopupCornerRadiusProperty, OnCornerRadiusChanged);
             LostFocus += OnLostFocus;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RichSuggestBox"/> class for unit tests.
-        /// </summary>
-        /// <param name="richEditBox"><see cref="RichEditBox"/> instance to be used for <see cref="TextDocument"/>.</param>
-        internal RichSuggestBox(RichEditBox richEditBox)
-            : this()
-        {
-            _richEditBox = richEditBox;
+            Loaded += OnLoaded;
         }
 
         /// <summary>
@@ -210,6 +202,11 @@ private void OnCornerRadiusChanged(DependencyObject sender, DependencyProperty d
             UpdateCornerRadii();
         }
 
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            _scrollViewer = _richEditBox?.FindDescendant<ScrollViewer>();
+        }
+
         private void OnLostFocus(object sender, RoutedEventArgs e)
         {
             ShowSuggestionsPopup(false);
@@ -338,7 +335,7 @@ private async void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, Pro
 
                 case VirtualKey.Enter when _suggestionsList.SelectedItem != null:
                     args.Handled = true;
-                    await OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
+                    await CommitSuggestionAsync(_suggestionsList.SelectedItem);
                     break;
 
                 case VirtualKey.Escape:
@@ -353,14 +350,14 @@ private async void RichEditBox_PreviewKeyDown(object sender, KeyRoutedEventArgs
             if (e.Key == VirtualKey.Tab && _suggestionsList.SelectedItem != null)
             {
                 e.Handled = true;
-                await OnSuggestionSelectedAsync(_suggestionsList.SelectedItem);
+                await CommitSuggestionAsync(_suggestionsList.SelectedItem);
             }
         }
 
         private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e)
         {
             var selectedItem = e.ClickedItem;
-            await OnSuggestionSelectedAsync(selectedItem);
+            await CommitSuggestionAsync(selectedItem);
         }
 
         private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangingEventArgs args)
@@ -450,8 +447,8 @@ private void InvokeTokenSelected(ITextSelection selection)
         private void InvokeTokenHovered(Point pointerPosition)
         {
             var padding = _richEditBox.Padding;
-            pointerPosition.X -= padding.Left;
-            pointerPosition.Y -= padding.Top;
+            pointerPosition.X += HorizontalOffset - padding.Left;
+            pointerPosition.Y += VerticalOffset - padding.Top;
             var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
             RichSuggestToken token = null;
             if (range.Expand(TextRangeUnit.Link) > 0 && TryGetTokenFromRange(range, out token) &&
@@ -510,7 +507,7 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
             }
         }
 
-        private async Task OnSuggestionSelectedAsync(object selectedItem)
+        internal async Task CommitSuggestionAsync(object selectedItem)
         {
             var range = _currentRange?.GetClone();
             var id = Guid.NewGuid();
@@ -519,22 +516,27 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
 
             // range has length of 0 at the end of the commit.
             // Checking length == 0 to avoid committing twice.
-            if (SuggestionChosen == null || prefix == null || query == null || range == null ||
-                range.Length == 0)
+            if (prefix == null || query == null || range == null || range.Length == 0)
             {
                 return;
             }
 
+            var textBefore = range.Text;
             var eventArgs = new SuggestionChosenEventArgs
             {
                 Id = id,
                 Prefix = prefix,
                 Query = query,
                 SelectedItem = selectedItem,
+                Text = query,
                 Format = this.CreateTokenFormat()
             };
-            var textBefore = range.Text;
-            await SuggestionChosen.InvokeAsync(this, eventArgs);
+
+            if (SuggestionChosen != null)
+            {
+                await SuggestionChosen.InvokeAsync(this, eventArgs);
+            }
+
             var text = eventArgs.Text;
 
             // Since this operation is async, the document may have changed at this point.
@@ -558,7 +560,7 @@ private async Task OnSuggestionSelectedAsync(object selectedItem)
             }
         }
 
-        internal bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
         {
             try
             {
@@ -711,6 +713,7 @@ private void ShowSuggestionsPopup(bool show)
                 this._suggestionChoice = 0;
                 this._suggestionPopup.VerticalOffset = 0;
                 this._suggestionPopup.HorizontalOffset = 0;
+                this._suggestionsList.ScrollIntoView(this._suggestionsList.Items?.FirstOrDefault());
                 UpdateCornerRadii();
             }
         }
@@ -741,6 +744,8 @@ private void UpdatePopupOffset()
         {
             this._richEditBox.TextDocument.Selection.GetRect(PointOptions.None, out var selectionRect, out _);
             Thickness padding = this._richEditBox.Padding;
+            selectionRect.X -= HorizontalOffset;
+            selectionRect.Y -= VerticalOffset;
 
             // Update horizontal offset
             if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
@@ -911,8 +916,8 @@ private Rect GetTokenRect(ITextRange tokenRange)
         {
             var padding = _richEditBox.Padding;
             tokenRange.GetRect(PointOptions.ClientCoordinates, out var rect, out var hit);
-            rect.X += padding.Left;
-            rect.Y += padding.Top;
+            rect.X += padding.Left - HorizontalOffset;
+            rect.Y += padding.Top - VerticalOffset;
             var transform = _richEditBox.TransformToVisual(this);
             return transform.TransformBounds(rect);
         }

From 6e4fb90e5910c670873853352930757ed9f472c2 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 16 Jul 2021 01:22:15 -0700
Subject: [PATCH 074/200] rework undo group handling

---
 .../RichSuggestBox/RichSuggestBox.cs          | 69 ++++++++-----------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 59af6a1c03b..76a66dc6b09 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -256,11 +256,6 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 return;
             }
 
-            if (selection.StartPosition == 0 && this._tokens.ContainsKey(selection.GetClone().Link))
-            {
-                selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
-            }
-
             if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
             {
                 // Snap selection to token on click
@@ -274,7 +269,7 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 range.MoveStart(TextRangeUnit.Link, -1);
                 if (selection.StartPosition != range.StartPosition || selection.StartPosition == 0)
                 {
-                    selection.CharacterFormat = TextDocument.GetDefaultCharacterFormat();
+                    ResetFormat(selection);
                 }
             }
         }
@@ -551,7 +546,14 @@ internal async Task CommitSuggestionAsync(object selectedItem)
             lock (LockObj)
             {
                 var displayText = prefix + text;
-                if (TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format))
+
+                _ignoreChange = true;
+                TextDocument.BeginUndoGroup();
+                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
+                TextDocument.EndUndoGroup();
+                _ignoreChange = false;
+
+                if (committed)
                 {
                     var token = new RichSuggestToken(id, displayText) { Active = true, Item = selectedItem };
                     token.UpdateTextRange(range);
@@ -562,45 +564,34 @@ internal async Task CommitSuggestionAsync(object selectedItem)
 
         private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
         {
-            try
+            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
+            range.GetText(TextGetOptions.NoHidden, out var existingText);
+            if (existingText != displayText)
             {
-                _ignoreChange = true;
-                TextDocument.BeginUndoGroup();
-
-                // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
-                range.GetText(TextGetOptions.NoHidden, out var existingText);
-                if (existingText != displayText)
-                {
-                    range.SetText(TextSetOptions.Unhide, displayText);
-                }
-
-                range.Link = $"\"{id}\"";
+                range.SetText(TextSetOptions.None, displayText);
+            }
 
-                // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
-                if (range.Link != $"\"{id}\"")
-                {
-                    range.Link = string.Empty;
-                    return false;
-                }
+            range.Link = $"\"{id}\"";
 
-                ApplyTokenFormat(range.CharacterFormat, format);
+            // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
+            if (range.Link != $"\"{id}\"")
+            {
+                range.Link = string.Empty;
+                return false;
+            }
 
-                if (addTrailingSpace)
-                {
-                    var clone = range.GetClone();
-                    clone.Collapse(false);
-                    clone.SetText(TextSetOptions.Unhide, " ");
-                    clone.Collapse(false);
-                    TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
-                }
+            ApplyTokenFormat(range.CharacterFormat, format);
 
-                TextDocument.EndUndoGroup();
-                return true;
-            }
-            finally
+            if (addTrailingSpace)
             {
-                _ignoreChange = false;
+                var clone = range.GetClone();
+                clone.Collapse(false);
+                clone.SetText(TextSetOptions.Unhide, " ");
+                clone.Collapse(false);
+                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
             }
+
+            return true;
         }
 
         private void ValidateTokensInDocument()

From 76e7c8858e86e5aa4bca1575d152f13996e24008 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 16 Jul 2021 19:06:38 -0700
Subject: [PATCH 075/200] fix some bugs when there is a token at the start of
 the document

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 21 ++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 75 +++++++++++--------
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index c5c9cef5db7..42cca667378 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -69,6 +69,27 @@ private static void ApplyTokenFormat(ITextCharacterFormat target, RichSuggestTok
             target.Position = format.Position;
         }
 
+        private static void ApplyFormat(ITextRange dest, ITextCharacterFormat format)
+        {
+            var target = dest.CharacterFormat;
+            target.BackgroundColor = format.BackgroundColor;
+            target.ForegroundColor = format.ForegroundColor;
+            target.Bold = format.Bold;
+            target.Italic = format.Italic;
+            target.FontStretch = format.FontStretch;
+            target.FontStyle = format.FontStyle;
+            target.Name = format.Name;
+            target.Kerning = format.Kerning;
+            target.Strikethrough = format.Strikethrough;
+            target.Size = format.Size;
+            target.Outline = format.Outline;
+            target.Weight = format.Weight;
+            target.Spacing = format.Spacing;
+            target.Subscript = format.Subscript;
+            target.Superscript = format.Superscript;
+            target.Position = format.Position;
+        }
+
         private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
         {
             var range = document.GetRange(0, 0);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 76a66dc6b09..57462961301 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -244,7 +244,8 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
             TextDocument.BeginUndoGroup();
 
             var selection = TextDocument.Selection;
-            if (selection.Type != SelectionType.InsertionPoint)
+
+            if (selection.Type != SelectionType.InsertionPoint && selection.Type != SelectionType.Normal)
             {
                 return;
             }
@@ -256,31 +257,41 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 return;
             }
 
-            if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
-            {
-                // Snap selection to token on click
-                selection.SetRange(range.StartPosition, range.EndPosition);
-                InvokeTokenSelected(selection);
-            }
-            else if (selection.StartPosition == range.StartPosition)
+            switch (selection.Type)
             {
-                // Reset formatting if selection is sandwiched between 2 adjacent links
-                // or if the link is at the beginning of the document
-                range.MoveStart(TextRangeUnit.Link, -1);
-                if (selection.StartPosition != range.StartPosition || selection.StartPosition == 0)
-                {
-                    ResetFormat(selection);
-                }
+                case SelectionType.InsertionPoint:
+                    if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
+                    {
+                        // Snap selection to token on click
+                        selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
+                    }
+                    else if (selection.StartPosition == range.StartPosition)
+                    {
+                        // Reset formatting if selection is sandwiched between 2 adjacent links
+                        range.MoveStart(TextRangeUnit.Link, -1);
+                        if (selection.StartPosition != range.StartPosition)
+                        {
+                            ResetFormat(selection);
+                        }
+                    }
+
+                    break;
+                case SelectionType.Normal:
+                    if ((range.StartPosition <= selection.StartPosition && selection.EndPosition < range.EndPosition) ||
+                        (range.StartPosition < selection.StartPosition && selection.EndPosition <= range.EndPosition))
+                    {
+                        selection.Expand(TextRangeUnit.Link);
+                    }
+
+                    break;
             }
         }
 
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
             SelectionChanged?.Invoke(this, e);
-            var selection = TextDocument.Selection;
-            _tokenAtStart = selection.StartPosition == 0 &&
-                            selection.Type == SelectionType.Normal &&
-                            _tokens.ContainsKey(selection.GetClone().Link);
+            CheckTokenAtStart();
 
             // During text composition changing (e.g. user typing with an IME),
             // SelectionChanged event is fired multiple times with each keystroke.
@@ -363,8 +374,8 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
             }
 
             _ignoreChange = true;
-            ValidateTokensInDocument();
             ResetFormatAfterTokenRemoveAtStart();
+            ValidateTokensInDocument();
             TextDocument.EndUndoGroup();
             TextDocument.BeginUndoGroup();
             _ignoreChange = false;
@@ -460,6 +471,14 @@ private void InvokeTokenHovered(Point pointerPosition)
             _hoveringToken = token;
         }
 
+        private void CheckTokenAtStart()
+        {
+            var selection = TextDocument.Selection;
+            var range = selection.GetClone();
+            range.Expand(TextRangeUnit.Link);
+            _tokenAtStart = _tokens.ContainsKey(range.Link) && (selection.StartPosition == 0 || selection.EndPosition == 0);
+        }
+
         private async Task RequestSuggestionsAsync(ITextRange range = null)
         {
             string prefix;
@@ -648,27 +667,23 @@ private void ResetFormatAfterTokenRemoveAtStart()
             {
                 var range = TextDocument.Selection.GetClone();
                 range.SetRange(0, range.EndPosition);
-                this.ResetFormat(range);
+                ResetFormat(range);
+                ResetFormat(TextDocument.Selection);
                 _tokenAtStart = false;
             }
         }
 
         private void ResetFormat(ITextRange range)
         {
-            // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
             var defaultFormat = TextDocument.GetDefaultCharacterFormat();
-            var selection = TextDocument.Selection;
-            if (!string.IsNullOrEmpty(range.Link))
+
+            // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
+            if (!string.IsNullOrEmpty(range.GetClone().Link))
             {
                 range.Link = string.Empty;
             }
 
-            range.CharacterFormat = defaultFormat;
-
-            if (selection.Type == SelectionType.InsertionPoint && selection.EndPosition == range.EndPosition)
-            {
-                selection.CharacterFormat = defaultFormat;
-            }
+            ApplyFormat(range, defaultFormat);
         }
 
         private void ConditionallyLoadElement(object property, string elementName)

From becfc100365d22ae388a50038b32de3872549979 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 16 Jul 2021 19:43:13 -0700
Subject: [PATCH 076/200] miss 1 InvokeTokenSelected invocation

---
 .../RichSuggestBox/RichSuggestBox.cs                            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 57462961301..f275a965f83 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -277,11 +277,13 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                     }
 
                     break;
+
                 case SelectionType.Normal:
                     if ((range.StartPosition <= selection.StartPosition && selection.EndPosition < range.EndPosition) ||
                         (range.StartPosition < selection.StartPosition && selection.EndPosition <= range.EndPosition))
                     {
                         selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
                     }
 
                     break;

From 6e2d6f264aff478d846adb76a67c3c49837619ad Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 18 Jul 2021 11:45:03 -0700
Subject: [PATCH 077/200] add synchronization for token dict

---
 .../RichSuggestBox/RichSuggestBox.cs          | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index f275a965f83..5d3385c8675 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -110,7 +110,15 @@ public bool TryGetTokenFromRange(ITextRange range, out RichSuggestToken token)
         {
             token = null;
             range = range.GetClone();
-            return range != null && !string.IsNullOrEmpty(range.Link) && _tokens.TryGetValue(range.Link, out token);
+            if (range != null && !string.IsNullOrEmpty(range.Link))
+            {
+                lock (LockObj)
+                {
+                    return _tokens.TryGetValue(range.Link, out token);
+                }
+            }
+
+            return false;
         }
 
         /// <inheritdoc/>
@@ -252,9 +260,12 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
 
             var range = selection.GetClone();
             range.Expand(TextRangeUnit.Link);
-            if (!_tokens.ContainsKey(range.Link))
+            lock (LockObj)
             {
-                return;
+                if (!_tokens.ContainsKey(range.Link))
+                {
+                    return;
+                }
             }
 
             switch (selection.Type)
@@ -279,9 +290,12 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                     break;
 
                 case SelectionType.Normal:
+                    // We do not want user to partially select a token since pasting to a partial token can break
+                    // the token tracking system, which can result in unwanted character formatting issues.
                     if ((range.StartPosition <= selection.StartPosition && selection.EndPosition < range.EndPosition) ||
                         (range.StartPosition < selection.StartPosition && selection.EndPosition <= range.EndPosition))
                     {
+                        // TODO: Figure out how to expand selection without breaking selection flow (with Shift select or pointer sweep select)
                         selection.Expand(TextRangeUnit.Link);
                         InvokeTokenSelected(selection);
                     }
@@ -478,7 +492,10 @@ private void CheckTokenAtStart()
             var selection = TextDocument.Selection;
             var range = selection.GetClone();
             range.Expand(TextRangeUnit.Link);
-            _tokenAtStart = _tokens.ContainsKey(range.Link) && (selection.StartPosition == 0 || selection.EndPosition == 0);
+            lock (LockObj)
+            {
+                _tokenAtStart = _tokens.ContainsKey(range.Link) && (selection.StartPosition == 0 || selection.EndPosition == 0);
+            }
         }
 
         private async Task RequestSuggestionsAsync(ITextRange range = null)
@@ -617,9 +634,12 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
 
         private void ValidateTokensInDocument()
         {
-            foreach (var (_, token) in _tokens)
+            lock (LockObj)
             {
-                token.Active = false;
+                foreach (var (_, token) in _tokens)
+                {
+                    token.Active = false;
+                }
             }
 
             ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);

From b36c28332aa93a78358770aa4c690c747db9cfa9 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 18 Jul 2021 20:37:12 -0700
Subject: [PATCH 078/200] pass ITextCharacterFormat to user instead of using
 custom RichSuggestTokenFormat

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs |   6 +-
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  |  41 ------
 .../RichSuggestBox/RichSuggestBox.cs          |  49 ++++----
 .../RichSuggestBox/RichSuggestTokenFormat.cs  | 119 ------------------
 .../SuggestionChosenEventArgs.cs              |   3 +-
 5 files changed, 31 insertions(+), 187 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 585eac73a89..ca9e2e6adaf 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -175,8 +175,10 @@ private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionC
         {
             if (args.Prefix == "#")
             {
-                args.Format.Background = Colors.DarkOrange;
-                args.Format.Foreground = Colors.OrangeRed;
+                args.Format.BackgroundColor = Colors.DarkOrange;
+                args.Format.ForegroundColor = Colors.OrangeRed;
+                args.Format.Bold = FormatEffect.On;
+                args.Format.Italic = FormatEffect.On;
                 args.Text = ((SampleDataType)args.SelectedItem).Text;
             }
             else
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 42cca667378..9c528d27321 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -49,47 +49,6 @@ private static string EnforcePrefixesRequirements(string value)
             return string.IsNullOrEmpty(value) ? string.Empty : string.Concat(value.Where(char.IsPunctuation));
         }
 
-        private static void ApplyTokenFormat(ITextCharacterFormat target, RichSuggestTokenFormat format)
-        {
-            target.BackgroundColor = format.Background;
-            target.ForegroundColor = format.Foreground;
-            target.Bold = format.Bold;
-            target.Italic = format.Italic;
-            target.FontStretch = format.FontStretch;
-            target.FontStyle = format.FontStyle;
-            target.Name = format.FontName;
-            target.Kerning = format.Kerning;
-            target.Strikethrough = format.Strikethrough;
-            target.Size = format.FontSize;
-            target.Outline = format.Outline;
-            target.Weight = format.Weight;
-            target.Spacing = format.Spacing;
-            target.Subscript = format.Subscript;
-            target.Superscript = format.Superscript;
-            target.Position = format.Position;
-        }
-
-        private static void ApplyFormat(ITextRange dest, ITextCharacterFormat format)
-        {
-            var target = dest.CharacterFormat;
-            target.BackgroundColor = format.BackgroundColor;
-            target.ForegroundColor = format.ForegroundColor;
-            target.Bold = format.Bold;
-            target.Italic = format.Italic;
-            target.FontStretch = format.FontStretch;
-            target.FontStyle = format.FontStyle;
-            target.Name = format.Name;
-            target.Kerning = format.Kerning;
-            target.Strikethrough = format.Strikethrough;
-            target.Size = format.Size;
-            target.Outline = format.Outline;
-            target.Weight = format.Weight;
-            target.Spacing = format.Spacing;
-            target.Subscript = format.Subscript;
-            target.Superscript = format.Superscript;
-            target.Position = format.Position;
-        }
-
         private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
         {
             var range = document.GetRange(0, 0);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 5d3385c8675..e5554fef8ed 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -515,23 +515,26 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
             CancelIfNotDisposed(this._suggestionRequestedCancellationSource);
             this._suggestionRequestedCancellationSource = null;
 
-            if (queryFound && SuggestionsRequested != null)
+            if (queryFound)
             {
-                using var tokenSource = new CancellationTokenSource();
-                _suggestionRequestedCancellationSource = tokenSource;
                 _currentPrefix = prefix;
                 _currentQuery = query;
                 _currentRange = range;
 
-                var cancellationToken = tokenSource.Token;
-                var eventArgs = new SuggestionsRequestedEventArgs { Query = query, Prefix = prefix };
-                try
+                if (SuggestionsRequested != null)
                 {
-                    await SuggestionsRequested?.InvokeAsync(this, eventArgs, cancellationToken);
-                }
-                catch (OperationCanceledException)
-                {
-                    eventArgs.Cancel = true;
+                    using var tokenSource = new CancellationTokenSource();
+                    _suggestionRequestedCancellationSource = tokenSource;
+                    var cancellationToken = tokenSource.Token;
+                    var eventArgs = new SuggestionsRequestedEventArgs { Query = query, Prefix = prefix };
+                    try
+                    {
+                        await SuggestionsRequested.InvokeAsync(this, eventArgs, cancellationToken);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        eventArgs.Cancel = true;
+                    }
                 }
             }
             else
@@ -562,7 +565,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 Query = query,
                 SelectedItem = selectedItem,
                 Text = query,
-                Format = this.CreateTokenFormat()
+                Format = CreateTokenFormat(range)
             };
 
             if (SuggestionChosen != null)
@@ -600,7 +603,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
             }
         }
 
-        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, RichSuggestTokenFormat format, bool addTrailingSpace = true)
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, ITextCharacterFormat format, bool addTrailingSpace = true)
         {
             // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
             range.GetText(TextGetOptions.NoHidden, out var existingText);
@@ -609,17 +612,16 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
                 range.SetText(TextSetOptions.None, displayText);
             }
 
+            range.CharacterFormat.SetClone(format);
             range.Link = $"\"{id}\"";
 
             // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
             if (range.Link != $"\"{id}\"")
             {
-                range.Link = string.Empty;
+                ResetFormat(range);
                 return false;
             }
 
-            ApplyTokenFormat(range.CharacterFormat, format);
-
             if (addTrailingSpace)
             {
                 var clone = range.GetClone();
@@ -658,7 +660,7 @@ private void ValidateTokenFromRange(ITextRange range)
                 lock (LockObj)
                 {
                     var guid = Guid.NewGuid();
-                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, this.CreateTokenFormat(), false))
+                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
                     {
                         token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
                         token.UpdateTextRange(range);
@@ -705,7 +707,7 @@ private void ResetFormat(ITextRange range)
                 range.Link = string.Empty;
             }
 
-            ApplyFormat(range, defaultFormat);
+            range.CharacterFormat.SetClone(defaultFormat);
         }
 
         private void ConditionallyLoadElement(object property, string elementName)
@@ -923,21 +925,20 @@ private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out s
             return false;
         }
 
-        private RichSuggestTokenFormat CreateTokenFormat()
+        private ITextCharacterFormat CreateTokenFormat(ITextRange range)
         {
-            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
-            var suggestionFormat = new RichSuggestTokenFormat(defaultFormat);
+            var format = range.CharacterFormat.GetClone();
             if (this.TokenBackground != null)
             {
-                suggestionFormat.Background = this.TokenBackground.Color;
+                format.BackgroundColor = this.TokenBackground.Color;
             }
 
             if (this.TokenForeground != null)
             {
-                suggestionFormat.Foreground = this.TokenForeground.Color;
+                format.ForegroundColor = this.TokenForeground.Color;
             }
 
-            return suggestionFormat;
+            return format;
         }
 
         private Rect GetTokenRect(ITextRange tokenRange)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs
deleted file mode 100644
index 67db6bd07e8..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenFormat.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI;
-using Windows.UI.Text;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// RichSuggestTokenFormat describes how a token should be formatted.
-    /// </summary>
-    public class RichSuggestTokenFormat
-    {
-        /// <summary>
-        /// Gets or sets token foreground color.
-        /// </summary>
-        public Color Foreground { get; set; }
-
-        /// <summary>
-        /// Gets or sets token background color.
-        /// </summary>
-        public Color Background { get; set; }
-
-        /// <summary>
-        /// Gets or sets token italic style.
-        /// </summary>
-        public FormatEffect Italic { get; set; }
-
-        /// <summary>
-        /// Gets or sets token bold style.
-        /// </summary>
-        public FormatEffect Bold { get; set; }
-
-        /// <summary>
-        /// Gets or sets the degree to which the font is stretched, compared to the normal aspect ratio of the font.
-        /// </summary>
-        public FontStretch FontStretch { get; set; }
-
-        /// <summary>
-        /// Gets or sets the style of the font face, such as normal or italic.
-        /// </summary>
-        public FontStyle FontStyle { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether characters are displayed with a horizontal line through the center.
-        /// </summary>
-        public FormatEffect Strikethrough { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether characters are displayed as outlined characters.
-        /// </summary>
-        public FormatEffect Outline { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether characters are displayed as subscript.
-        /// </summary>
-        public FormatEffect Subscript { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether characters are displayed as superscript.
-        /// </summary>
-        public FormatEffect Superscript { get; set; }
-
-        /// <summary>
-        /// Gets or sets the font name.
-        /// </summary>
-        public string FontName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the minimum font size at which kerning occurs.
-        /// </summary>
-        public float Kerning { get; set; }
-
-        /// <summary>
-        /// Gets or sets the font size.
-        /// </summary>
-        public float FontSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the font weight of the characters.
-        /// </summary>
-        public int Weight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the amount of horizontal spacing between characters.
-        /// </summary>
-        public float Spacing { get; set; }
-
-        /// <summary>
-        /// Gets or sets the character offset relative to the baseline.
-        /// </summary>
-        public float Position { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RichSuggestTokenFormat"/> class.
-        /// </summary>
-        /// <param name="source">Source formatting to initialize from.</param>
-        public RichSuggestTokenFormat(ITextCharacterFormat source)
-        {
-            Foreground = source.ForegroundColor;
-            Background = source.BackgroundColor;
-            Italic = source.Italic;
-            Bold = source.Bold;
-            FontStretch = source.FontStretch;
-            FontStyle = source.FontStyle;
-            Strikethrough = source.Strikethrough;
-            Outline = source.Outline;
-            Subscript = source.Subscript;
-            Superscript = source.Superscript;
-            FontName = source.Name;
-            Kerning = source.Kerning;
-            FontSize = source.Size;
-            Weight = source.Weight;
-            Spacing = source.Spacing;
-            Position = source.Position;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
index 21e4aeca931..44d44836c75 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -4,6 +4,7 @@
 
 using System;
 using Microsoft.Toolkit.Deferred;
+using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -40,6 +41,6 @@ public class SuggestionChosenEventArgs : DeferredEventArgs
         /// <summary>
         /// Gets the formatting construct to override this token formatting.
         /// </summary>
-        public RichSuggestTokenFormat Format { get; internal set; }
+        public ITextCharacterFormat Format { get; internal set; }
     }
 }

From 70e7a417c228b6bb4a2504c8964b460a42a7297e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 19 Jul 2021 01:20:53 -0700
Subject: [PATCH 079/200] reset formatting on text change that contains a token
 at range start

---
 .../RichSuggestBox/RichSuggestBox.cs          | 138 ++++++++++++------
 1 file changed, 90 insertions(+), 48 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index e5554fef8ed..89b6d144ff6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -49,11 +49,11 @@ public partial class RichSuggestBox : ItemsControl
         private Border _suggestionsContainer;
 
         private int _suggestionChoice;
+        private int _resetStartPosition;
         private string _currentQuery;
         private string _currentPrefix;
         private bool _ignoreChange;
         private bool _popupOpenDown;
-        private bool _tokenAtStart;
         private bool _textCompositionActive;
         private ITextRange _currentRange;
         private RichSuggestToken _hoveringToken;
@@ -64,6 +64,7 @@ public partial class RichSuggestBox : ItemsControl
         /// </summary>
         public RichSuggestBox()
         {
+            _resetStartPosition = -1;
             _tokens = new Dictionary<string, RichSuggestToken>();
             _visibleTokens = new ObservableCollection<RichSuggestToken>();
             Tokens = new ReadOnlyObservableCollection<RichSuggestToken>(_visibleTokens);
@@ -268,46 +269,25 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 }
             }
 
-            switch (selection.Type)
+            if (selection.Type == SelectionType.InsertionPoint && selection.StartPosition == range.StartPosition)
             {
-                case SelectionType.InsertionPoint:
-                    if (range.StartPosition < selection.StartPosition && selection.EndPosition < range.EndPosition)
-                    {
-                        // Snap selection to token on click
-                        selection.Expand(TextRangeUnit.Link);
-                        InvokeTokenSelected(selection);
-                    }
-                    else if (selection.StartPosition == range.StartPosition)
-                    {
-                        // Reset formatting if selection is sandwiched between 2 adjacent links
-                        range.MoveStart(TextRangeUnit.Link, -1);
-                        if (selection.StartPosition != range.StartPosition)
-                        {
-                            ResetFormat(selection);
-                        }
-                    }
-
-                    break;
-
-                case SelectionType.Normal:
-                    // We do not want user to partially select a token since pasting to a partial token can break
-                    // the token tracking system, which can result in unwanted character formatting issues.
-                    if ((range.StartPosition <= selection.StartPosition && selection.EndPosition < range.EndPosition) ||
-                        (range.StartPosition < selection.StartPosition && selection.EndPosition <= range.EndPosition))
-                    {
-                        // TODO: Figure out how to expand selection without breaking selection flow (with Shift select or pointer sweep select)
-                        selection.Expand(TextRangeUnit.Link);
-                        InvokeTokenSelected(selection);
-                    }
-
-                    break;
+                // Reset formatting if selection is sandwiched between 2 adjacent links
+                range.MoveStart(TextRangeUnit.Link, -1);
+                if (selection.StartPosition != range.StartPosition)
+                {
+                    ResetFormat(selection);
+                }
+            }
+            else
+            {
+                ExpandSelectionOnPartialTokenSelect(selection, range);
             }
         }
 
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
             SelectionChanged?.Invoke(this, e);
-            CheckTokenAtStart();
+            SetFormatResetPosition();
 
             // During text composition changing (e.g. user typing with an IME),
             // SelectionChanged event is fired multiple times with each keystroke.
@@ -390,7 +370,7 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
             }
 
             _ignoreChange = true;
-            ResetFormatAfterTokenRemoveAtStart();
+            ResetFormatOnTextChanged();
             ValidateTokensInDocument();
             TextDocument.EndUndoGroup();
             TextDocument.BeginUndoGroup();
@@ -450,15 +430,44 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             }
         }
 
+        private void ExpandSelectionOnPartialTokenSelect(ITextSelection selection, ITextRange tokenRange)
+        {
+            switch (selection.Type)
+            {
+                case SelectionType.InsertionPoint:
+                    // Snap selection to token on click
+                    if (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition < tokenRange.EndPosition)
+                    {
+                        selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
+                    }
+
+                    break;
+
+                case SelectionType.Normal:
+                    // We do not want user to partially select a token since pasting to a partial token can break
+                    // the token tracking system, which can result in unwanted character formatting issues.
+                    if ((tokenRange.StartPosition <= selection.StartPosition && selection.EndPosition < tokenRange.EndPosition) ||
+                        (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition <= tokenRange.EndPosition))
+                    {
+                        // TODO: Figure out how to expand selection without breaking selection flow (with Shift select or pointer sweep select)
+                        selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
+                    }
+
+                    break;
+            }
+        }
+
         private void InvokeTokenSelected(ITextSelection selection)
         {
-            if (!TryGetTokenFromRange(selection, out var token) || token.RangeEnd != selection.EndPosition)
+            if (TokenSelected == null || !TryGetTokenFromRange(selection, out var token) || token.RangeEnd != selection.EndPosition)
             {
                 return;
             }
 
             var tokenRect = GetTokenRect(selection);
-            TokenSelected?.Invoke(this, new RichSuggestTokenEventArgs
+            TokenSelected.Invoke(this, new RichSuggestTokenEventArgs
             {
                 Token = token,
                 Rect = tokenRect,
@@ -468,6 +477,11 @@ private void InvokeTokenSelected(ITextSelection selection)
 
         private void InvokeTokenHovered(Point pointerPosition)
         {
+            if (TokenHovered == null)
+            {
+                return;
+            }
+
             var padding = _richEditBox.Padding;
             pointerPosition.X += HorizontalOffset - padding.Left;
             pointerPosition.Y += VerticalOffset - padding.Top;
@@ -476,7 +490,7 @@ private void InvokeTokenHovered(Point pointerPosition)
             if (range.Expand(TextRangeUnit.Link) > 0 && TryGetTokenFromRange(range, out token) &&
                 token != _hoveringToken)
             {
-                TokenHovered?.Invoke(this, new RichSuggestTokenEventArgs
+                TokenHovered.Invoke(this, new RichSuggestTokenEventArgs
                 {
                     Token = token,
                     Rect = GetTokenRect(range),
@@ -487,15 +501,38 @@ private void InvokeTokenHovered(Point pointerPosition)
             _hoveringToken = token;
         }
 
-        private void CheckTokenAtStart()
+        private void SetFormatResetPosition()
         {
+            _resetStartPosition = -1;
             var selection = TextDocument.Selection;
             var range = selection.GetClone();
             range.Expand(TextRangeUnit.Link);
+            bool isToken;
             lock (LockObj)
             {
-                _tokenAtStart = _tokens.ContainsKey(range.Link) && (selection.StartPosition == 0 || selection.EndPosition == 0);
+                isToken = _tokens.ContainsKey(range.Link);
             }
+
+            if (!isToken)
+            {
+                return;
+            }
+
+            if (selection.StartPosition == 0 || selection.EndPosition == 0)
+            {
+                _resetStartPosition = 0;
+            }
+
+            if (selection.Type == SelectionType.Normal)
+            {
+                var startPosition = range.StartPosition;
+                range.MoveStart(TextRangeUnit.Link, -1);
+                if (range.StartPosition != startPosition)
+                {
+                    _resetStartPosition = startPosition;
+                }
+            }
+
         }
 
         private async Task RequestSuggestionsAsync(ITextRange range = null)
@@ -673,7 +710,8 @@ private void ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                this.ResetFormat(range);
+                ResetFormat(range);
+                ResetFormat(TextDocument.Selection);
                 token.Active = false;
                 return;
             }
@@ -683,17 +721,21 @@ private void ValidateTokenFromRange(ITextRange range)
         }
 
         /// <summary>
-        /// Handle the special case where editing a token at the start of the document does not completely reset the character format.
+        /// Reset character format after editing text that contains a token.
+        /// In some special cases, changing the text of a range that contains a token at the start
+        /// can result in the character format of the token gets applied to the changed text.
         /// </summary>
-        private void ResetFormatAfterTokenRemoveAtStart()
+        private void ResetFormatOnTextChanged()
         {
-            if (_tokenAtStart)
+            var selection = TextDocument.Selection;
+
+            if (_resetStartPosition >= 0 && selection.EndPosition > _resetStartPosition)
             {
-                var range = TextDocument.Selection.GetClone();
-                range.SetRange(0, range.EndPosition);
+                var range = selection.GetClone();
+                range.SetRange(_resetStartPosition, range.EndPosition);
                 ResetFormat(range);
-                ResetFormat(TextDocument.Selection);
-                _tokenAtStart = false;
+                ResetFormat(selection);
+                _resetStartPosition = -1;
             }
         }
 

From 02f1076564432ba3c48dc0502c70f82e1742ec6c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 19 Jul 2021 20:42:47 -0700
Subject: [PATCH 080/200] minor tweaks

---
 .../RichSuggestBox/RichSuggestBox.cs          | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 89b6d144ff6..43ce2a6d130 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -250,8 +250,6 @@ private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
 
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
         {
-            TextDocument.BeginUndoGroup();
-
             var selection = TextDocument.Selection;
 
             if (selection.Type != SelectionType.InsertionPoint && selection.Type != SelectionType.Normal)
@@ -507,15 +505,12 @@ private void SetFormatResetPosition()
             var selection = TextDocument.Selection;
             var range = selection.GetClone();
             range.Expand(TextRangeUnit.Link);
-            bool isToken;
             lock (LockObj)
             {
-                isToken = _tokens.ContainsKey(range.Link);
-            }
-
-            if (!isToken)
-            {
-                return;
+                if (!_tokens.ContainsKey(range.Link))
+                {
+                    return;
+                }
             }
 
             if (selection.StartPosition == 0 || selection.EndPosition == 0)
@@ -626,9 +621,9 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 var displayText = prefix + text;
 
                 _ignoreChange = true;
-                TextDocument.BeginUndoGroup();
                 var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
                 TextDocument.EndUndoGroup();
+                TextDocument.BeginUndoGroup();
                 _ignoreChange = false;
 
                 if (committed)
@@ -646,13 +641,13 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
             range.GetText(TextGetOptions.NoHidden, out var existingText);
             if (existingText != displayText)
             {
-                range.SetText(TextSetOptions.None, displayText);
+                range.SetText(TextSetOptions.Unhide, displayText);
             }
 
             range.CharacterFormat.SetClone(format);
             range.Link = $"\"{id}\"";
 
-            // In some rare case, setting Link can fail. Only observed when the token is at the start of the document.
+            // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
             if (range.Link != $"\"{id}\"")
             {
                 ResetFormat(range);

From 6686e7424f00a5b16d2eb0b769b0ad1a03797f6b Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 19 Jul 2021 20:43:00 -0700
Subject: [PATCH 081/200] add tests

---
 .../UI/Controls/Test_RichSuggestBox.cs        | 254 ++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   1 +
 2 files changed, 255 insertions(+)
 create mode 100644 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
new file mode 100644
index 00000000000..d5e6c93bb5a
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -0,0 +1,254 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.UI.Text;
+using Microsoft.Toolkit.Uwp;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.UI.Controls
+{
+    [TestClass]
+    [TestCategory(nameof(Test_RichSuggestBox))]
+    public class Test_RichSuggestBox : VisualUITestBase
+    {
+        [TestMethod]
+        [DataRow("@Token1", "@Token2", "@Token3")]
+        [DataRow("@Token1", "@Token2", "#Token3")]
+        [DataRow("#Token1", "@Token2", "@Token3")]
+        public async Task Test_RichSuggestBox_AddTokens(string tokenText1, string tokenText2, string tokenText3)
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox() { Prefixes = "@#" };
+                await SetTestContentAsync(rsb);
+                var document = rsb.TextDocument;
+
+                // Adding token 1
+                await TestAddTokenAsync(rsb, tokenText1);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Token count is not 1 after committing 1 token.");
+
+                var token1 = rsb.Tokens.Last();
+
+                AssertToken(rsb, token1, tokenText1);
+                var expectedStory = $"{token1} \r";
+                document.GetText(TextGetOptions.None, out var actualStory);
+                Assert.AreEqual(expectedStory, actualStory);
+
+                // Adding token 2 with space between previous token
+                await TestAddTokenAsync(rsb, tokenText2);
+
+                Assert.AreEqual(2, rsb.Tokens.Count, "Token count is not 2 after committing 2 token.");
+
+                var token2 = rsb.Tokens.Last();
+
+                AssertToken(rsb, token2, tokenText2);
+                expectedStory = $"{token1} {token2} \r";
+                document.GetText(TextGetOptions.None, out actualStory);
+                Assert.AreEqual(expectedStory, actualStory);
+
+                // Adding token 3 without space between previous token
+                rsb.TextDocument.Selection.Delete(TextRangeUnit.Character, -1);
+                await TestAddTokenAsync(rsb, tokenText3);
+
+                Assert.AreEqual(3, rsb.Tokens.Count, "Token count is not 3 after committing 3 token.");
+
+                var token3 = rsb.Tokens.Last();
+
+                AssertToken(rsb, token3, tokenText3);
+                expectedStory = $"{token1} {token2}{token3} \r";
+                document.GetText(TextGetOptions.None, out actualStory);
+                Assert.AreEqual(expectedStory, actualStory);
+
+                document.Selection.Delete(TextRangeUnit.Character, -1);
+                Assert.AreEqual(3, rsb.Tokens.Count, "Token at the end of the document is not recognized.");
+            });
+        }
+
+        [TestMethod]
+        public async Task Test_RichSuggestBox_CustomizeToken()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox() { Prefixes = "@" };
+                await SetTestContentAsync(rsb);
+                var inputText = "@Placeholder";
+                var expectedText = "@Token";
+
+                rsb.SuggestionChosen += (rsb, e) =>
+                {
+                    e.Text = expectedText.Substring(1);
+                    var format = e.Format;
+                    format.BackgroundColor = Windows.UI.Colors.Beige;
+                    format.ForegroundColor = Windows.UI.Colors.Azure;
+                    format.Bold = FormatEffect.On;
+                    format.Italic = FormatEffect.On;
+                    format.Size = 9;
+                };
+
+                await AddTokenAsync(rsb, inputText);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Token count is not 1 after committing 1 token.");
+
+                var token = rsb.Tokens[0];
+                var range = rsb.TextDocument.GetRange(token.RangeStart, token.RangeEnd);
+                Assert.AreEqual(expectedText, token.DisplayText, "Unexpected token text.");
+                Assert.AreEqual(range.Text, token.ToString());
+                Assert.AreEqual(Windows.UI.Colors.Beige, range.CharacterFormat.BackgroundColor, "Unexpected background color.");
+                Assert.AreEqual(Windows.UI.Colors.Azure, range.CharacterFormat.ForegroundColor, "Unexpected foreground color.");
+                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Bold, "Range is expected to be bold.");
+                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Italic, "Range is expected to be italic.");
+                Assert.AreEqual(9, range.CharacterFormat.Size, "Unexpected font size.");
+            });
+        }
+
+        [TestMethod]
+        [DataRow("@Token1", "@Token2")]
+        [DataRow("@Token1", "#Token2")]
+        [DataRow("#Token1", "@Token2")]
+        public async Task Test_RichSuggestBox_DeleteTokens(string token1, string token2)
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox() { Prefixes = "@#" };
+                await SetTestContentAsync(rsb);
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+
+                await AddTokenAsync(rsb, token1);
+                await AddTokenAsync(rsb, token2);
+
+                Assert.AreEqual(2, rsb.Tokens.Count, "Unexpected token count after adding.");
+
+                // Delete token as a whole
+                selection.Delete(TextRangeUnit.Character, -1);
+                selection.Delete(TextRangeUnit.Link, -1);
+                await Task.Delay(10);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Unexpected token count after deleting token 2");
+
+                // Partially delete a token
+                selection.Delete(TextRangeUnit.Character, -2);
+                await Task.Delay(10);
+
+                Assert.AreEqual(0, rsb.Tokens.Count, "Unexpected token count after deleting token 1");
+            });
+        }
+
+        [TestMethod]
+        public async Task Test_RichSuggestBox_ReplaceToken()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox() { Prefixes = "@" };
+                await SetTestContentAsync(rsb);
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+
+                await AddTokenAsync(rsb, "@Before");
+                var tokenBefore = rsb.Tokens[0];
+                AssertToken(rsb, tokenBefore, "@Before");
+
+                selection.Delete(TextRangeUnit.Character, -2);
+                await Task.Delay(10);
+
+                await AddTokenAsync(rsb, "@After");
+                var tokenAfter = rsb.Tokens[0];
+                AssertToken(rsb, tokenAfter, "@After");
+
+                Assert.AreNotSame(tokenBefore, tokenAfter, "Token before and token after are the same.");
+                Assert.AreNotEqual(tokenBefore.Id, tokenAfter.Id, "Token ID before and token ID after are the same.");
+            });
+        }
+
+        [TestMethod]
+        public async Task Test_RichSuggestBox_FormatReset()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox() { Prefixes = "@" };
+                rsb.TokenBackground = new Windows.UI.Xaml.Media.SolidColorBrush(Windows.UI.Colors.Azure);
+                await SetTestContentAsync(rsb);
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+                var defaultFormat = document.GetDefaultCharacterFormat();
+
+                await AddTokenAsync(rsb, "@Token1");
+                selection.Delete(TextRangeUnit.Character, -1);
+                var middlePosition = selection.StartPosition;
+                await AddTokenAsync(rsb, "@Token2");
+                selection.Delete(TextRangeUnit.Character, -1);
+
+                await Task.Delay(10);
+                selection.SetText(TextSetOptions.Unhide, "text");
+                Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color after a token.");
+
+                selection.SetRange(middlePosition, middlePosition);
+                await Task.Delay(10);
+                selection.SetText(TextSetOptions.Unhide, "text");
+                Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color when sandwiched between 2 tokens.");
+
+                selection.SetRange(0, 0);
+                await Task.Delay(10);
+                selection.SetText(TextSetOptions.Unhide, "text");
+                Assert.AreEqual(defaultFormat.BackgroundColor, selection.CharacterFormat.BackgroundColor, "Raw text have background color when insert at beginning of the document.");
+            });
+        }
+
+        private static void AssertToken(RichSuggestBox rsb, RichSuggestToken token, string displayText)
+        {
+            var document = rsb.TextDocument;
+            var tokenRange = document.GetRange(token.RangeStart, token.RangeEnd);
+            Assert.AreSame(displayText, token.Item, $"Token item has unknown object {token.Item}.");
+            Assert.AreEqual(token.ToString(), tokenRange.Text);
+            Assert.AreEqual($"\"{token.Id}\"", tokenRange.Link, "Unexpected link value.");
+            Assert.AreEqual(LinkType.FriendlyLinkAddress, tokenRange.CharacterFormat.LinkType, "Unexpected link type.");
+        }
+
+        private static async Task TestAddTokenAsync(RichSuggestBox rsb, string tokenText)
+        {
+            bool suggestionsRequestedCalled = false;
+            bool suggestionChosenCalled = false;
+
+            void SuggestionsRequestedHandler(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+            {
+                suggestionsRequestedCalled = true;
+                Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionsRequested)}.");
+                Assert.AreEqual(tokenText.Substring(1), args.Query, $"Unexpected query in {nameof(RichSuggestBox.SuggestionsRequested)}.");
+            }
+
+            void SuggestionChosenHandler(RichSuggestBox sender, SuggestionChosenEventArgs args)
+            {
+                suggestionChosenCalled = true;
+                Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreEqual(tokenText.Substring(1), args.Query, $"Unexpected query in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreEqual(args.Query, args.Text, $"Unexpected display text in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreSame(tokenText, args.SelectedItem, $"Selected item has unknown object {args.SelectedItem} in {nameof(RichSuggestBox.SuggestionChosen)}.");
+            }
+
+            rsb.SuggestionsRequested += SuggestionsRequestedHandler;
+            rsb.SuggestionChosen += SuggestionChosenHandler;
+
+            await AddTokenAsync(rsb, tokenText);
+
+            rsb.SuggestionsRequested -= SuggestionsRequestedHandler;
+            rsb.SuggestionChosen -= SuggestionChosenHandler;
+
+            Assert.IsTrue(suggestionsRequestedCalled, "SuggestionsRequested was not invoked.");
+            Assert.IsTrue(suggestionChosenCalled, "SuggestionChosen was not invoked.");
+        }
+
+        private static async Task AddTokenAsync(RichSuggestBox rsb, string tokenText)
+        {
+            var selection = rsb.TextDocument.Selection;
+            selection.TypeText(tokenText);
+            await Task.Delay(10);   // Wait for SelectionChanged to be invoked
+            await rsb.CommitSuggestionAsync(tokenText);
+            await Task.Delay(10);   // Wait for TextChanged to be invoked
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 734228e69b1..459232f8405 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -234,6 +234,7 @@
     <Compile Include="UI\Controls\Test_ConstrainedBox.Combined.cs" />
     <Compile Include="UI\Controls\Test_ImageEx.cs" />
     <Compile Include="UI\Controls\Test_RadialGauge.cs" />
+    <Compile Include="UI\Controls\Test_RichSuggestBox.cs" />
     <Compile Include="UI\Controls\Test_TextToolbar_Localization.cs" />
     <Compile Include="UI\Controls\Test_InfiniteCanvas_Regression.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_AutomationPeer.cs" />

From 8f10e3bf8e90203c8b72d99559c00b49fb32e7d5 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 20 Jul 2021 00:02:30 -0700
Subject: [PATCH 082/200] pad token with Zero-Width-Spaces to avoid character
 format "bleed"

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 19 +++++
 .../RichSuggestBox/RichSuggestBox.cs          | 71 +------------------
 .../RichSuggestBox/RichSuggestToken.cs        |  2 +-
 3 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 9c528d27321..8cb9f0987dd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -49,6 +49,25 @@ private static string EnforcePrefixesRequirements(string value)
             return string.IsNullOrEmpty(value) ? string.Empty : string.Concat(value.Where(char.IsPunctuation));
         }
 
+        /// <summary>
+        /// Pad range with Zero-Width-Spaces.
+        /// </summary>
+        /// <param name="range">Range to pad.</param>
+        /// <param name="format">Character format to apply to the padding.</param>
+        private static void PadRange(ITextRange range, ITextCharacterFormat format)
+        {
+            var startPosition = range.StartPosition;
+            var endPosition = range.EndPosition + 1;
+            var clone = range.GetClone();
+            clone.Collapse(true);
+            clone.SetText(TextSetOptions.Unhide, "\u200B");
+            clone.CharacterFormat.SetClone(format);
+            clone.SetRange(endPosition, endPosition);
+            clone.SetText(TextSetOptions.Unhide, "\u200B");
+            clone.CharacterFormat.SetClone(format);
+            range.SetRange(startPosition, endPosition + 1);
+        }
+
         private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRange> action)
         {
             var range = document.GetRange(0, 0);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 43ce2a6d130..14fedddf43a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -49,7 +49,6 @@ public partial class RichSuggestBox : ItemsControl
         private Border _suggestionsContainer;
 
         private int _suggestionChoice;
-        private int _resetStartPosition;
         private string _currentQuery;
         private string _currentPrefix;
         private bool _ignoreChange;
@@ -64,7 +63,6 @@ public partial class RichSuggestBox : ItemsControl
         /// </summary>
         public RichSuggestBox()
         {
-            _resetStartPosition = -1;
             _tokens = new Dictionary<string, RichSuggestToken>();
             _visibleTokens = new ObservableCollection<RichSuggestToken>();
             Tokens = new ReadOnlyObservableCollection<RichSuggestToken>(_visibleTokens);
@@ -267,25 +265,12 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
                 }
             }
 
-            if (selection.Type == SelectionType.InsertionPoint && selection.StartPosition == range.StartPosition)
-            {
-                // Reset formatting if selection is sandwiched between 2 adjacent links
-                range.MoveStart(TextRangeUnit.Link, -1);
-                if (selection.StartPosition != range.StartPosition)
-                {
-                    ResetFormat(selection);
-                }
-            }
-            else
-            {
-                ExpandSelectionOnPartialTokenSelect(selection, range);
-            }
+            ExpandSelectionOnPartialTokenSelect(selection, range);
         }
 
         private async void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
         {
             SelectionChanged?.Invoke(this, e);
-            SetFormatResetPosition();
 
             // During text composition changing (e.g. user typing with an IME),
             // SelectionChanged event is fired multiple times with each keystroke.
@@ -368,7 +353,6 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
             }
 
             _ignoreChange = true;
-            ResetFormatOnTextChanged();
             ValidateTokensInDocument();
             TextDocument.EndUndoGroup();
             TextDocument.BeginUndoGroup();
@@ -499,37 +483,6 @@ private void InvokeTokenHovered(Point pointerPosition)
             _hoveringToken = token;
         }
 
-        private void SetFormatResetPosition()
-        {
-            _resetStartPosition = -1;
-            var selection = TextDocument.Selection;
-            var range = selection.GetClone();
-            range.Expand(TextRangeUnit.Link);
-            lock (LockObj)
-            {
-                if (!_tokens.ContainsKey(range.Link))
-                {
-                    return;
-                }
-            }
-
-            if (selection.StartPosition == 0 || selection.EndPosition == 0)
-            {
-                _resetStartPosition = 0;
-            }
-
-            if (selection.Type == SelectionType.Normal)
-            {
-                var startPosition = range.StartPosition;
-                range.MoveStart(TextRangeUnit.Link, -1);
-                if (range.StartPosition != startPosition)
-                {
-                    _resetStartPosition = startPosition;
-                }
-            }
-
-        }
-
         private async Task RequestSuggestionsAsync(ITextRange range = null)
         {
             string prefix;
@@ -644,7 +597,9 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
                 range.SetText(TextSetOptions.Unhide, displayText);
             }
 
+            var formatBefore = range.CharacterFormat.GetClone();
             range.CharacterFormat.SetClone(format);
+            PadRange(range, formatBefore);
             range.Link = $"\"{id}\"";
 
             // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
@@ -706,7 +661,6 @@ private void ValidateTokenFromRange(ITextRange range)
             if (token.ToString() != range.Text)
             {
                 ResetFormat(range);
-                ResetFormat(TextDocument.Selection);
                 token.Active = false;
                 return;
             }
@@ -715,25 +669,6 @@ private void ValidateTokenFromRange(ITextRange range)
             token.Active = true;
         }
 
-        /// <summary>
-        /// Reset character format after editing text that contains a token.
-        /// In some special cases, changing the text of a range that contains a token at the start
-        /// can result in the character format of the token gets applied to the changed text.
-        /// </summary>
-        private void ResetFormatOnTextChanged()
-        {
-            var selection = TextDocument.Selection;
-
-            if (_resetStartPosition >= 0 && selection.EndPosition > _resetStartPosition)
-            {
-                var range = selection.GetClone();
-                range.SetRange(_resetStartPosition, range.EndPosition);
-                ResetFormat(range);
-                ResetFormat(selection);
-                _resetStartPosition = -1;
-            }
-        }
-
         private void ResetFormat(ITextRange range)
         {
             var defaultFormat = TextDocument.GetDefaultCharacterFormat();
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
index f322285fee4..95748ea52d9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
@@ -77,7 +77,7 @@ internal void UpdateTextRange(ITextRange range)
         /// <inheritdoc/>
         public override string ToString()
         {
-            return $"HYPERLINK \"{Id}\"{DisplayText}";
+            return $"HYPERLINK \"{Id}\"\u200B{DisplayText}\u200B";
         }
     }
 }

From 6e53a50ba9dc95bdc911d68b314189fac372fcc1 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 20 Jul 2021 00:26:57 -0700
Subject: [PATCH 083/200] update test for padding

---
 .../UI/Controls/Test_RichSuggestBox.cs        | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index d5e6c93bb5a..e3bc28c5a8a 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -94,15 +94,29 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 Assert.AreEqual(1, rsb.Tokens.Count, "Token count is not 1 after committing 1 token.");
 
+                var defaultFormat = rsb.TextDocument.GetDefaultCharacterFormat();
                 var token = rsb.Tokens[0];
                 var range = rsb.TextDocument.GetRange(token.RangeStart, token.RangeEnd);
                 Assert.AreEqual(expectedText, token.DisplayText, "Unexpected token text.");
                 Assert.AreEqual(range.Text, token.ToString());
-                Assert.AreEqual(Windows.UI.Colors.Beige, range.CharacterFormat.BackgroundColor, "Unexpected background color.");
-                Assert.AreEqual(Windows.UI.Colors.Azure, range.CharacterFormat.ForegroundColor, "Unexpected foreground color.");
-                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Bold, "Range is expected to be bold.");
-                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Italic, "Range is expected to be italic.");
-                Assert.AreEqual(9, range.CharacterFormat.Size, "Unexpected font size.");
+
+                var prePad = range.GetClone();
+                prePad.SetRange(range.StartPosition, range.StartPosition + 1);
+                Assert.AreEqual(defaultFormat.BackgroundColor, prePad.CharacterFormat.BackgroundColor, "Unexpected background color for pre padding.");
+                Assert.AreEqual(defaultFormat.ForegroundColor, prePad.CharacterFormat.ForegroundColor, "Unexpected foreground color for pre padding.");
+
+                var postPad = range.GetClone();
+                postPad.SetRange(range.EndPosition - 1, range.EndPosition);
+                Assert.AreEqual(defaultFormat.BackgroundColor, postPad.CharacterFormat.BackgroundColor, "Unexpected background color for post padding.");
+                Assert.AreEqual(defaultFormat.ForegroundColor, postPad.CharacterFormat.ForegroundColor, "Unexpected foreground color for post padding.");
+
+                var hiddenText = $"HYPERLINK \"{token.Id}\"\u200B";
+                range.SetRange(range.StartPosition + hiddenText.Length, range.EndPosition - 1);
+                Assert.AreEqual(Windows.UI.Colors.Beige, range.CharacterFormat.BackgroundColor, "Unexpected token background color.");
+                Assert.AreEqual(Windows.UI.Colors.Azure, range.CharacterFormat.ForegroundColor, "Unexpected token foreground color.");
+                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Bold, "Token is expected to be bold.");
+                Assert.AreEqual(FormatEffect.On, range.CharacterFormat.Italic, "Token is expected to be italic.");
+                Assert.AreEqual(9, range.CharacterFormat.Size, "Unexpected token font size.");
             });
         }
 

From 17e33995d96ec15dbb9aa48ccca47bfabe0d5b9c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 20 Jul 2021 01:57:16 -0700
Subject: [PATCH 084/200] try to fix test App not running on CI

---
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index e3bc28c5a8a..4d68eb5cdb4 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -12,9 +12,9 @@
 namespace UnitTests.UI.Controls
 {
     [TestClass]
-    [TestCategory(nameof(Test_RichSuggestBox))]
     public class Test_RichSuggestBox : VisualUITestBase
     {
+        [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         [DataRow("@Token1", "@Token2", "@Token3")]
         [DataRow("@Token1", "@Token2", "#Token3")]
@@ -69,6 +69,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_CustomizeToken()
         {
@@ -120,6 +121,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         [DataRow("@Token1", "@Token2")]
         [DataRow("@Token1", "#Token2")]
@@ -153,6 +155,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_ReplaceToken()
         {
@@ -179,6 +182,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_FormatReset()
         {

From fd99d9d9717c42ab18ec2d552ae87812260a106c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 20 Jul 2021 16:31:43 -0700
Subject: [PATCH 085/200] delete text instead of resetting their character
 format

---
 .../RichSuggestBox/RichSuggestBox.cs            | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 14fedddf43a..ab56d30b2df 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -605,7 +605,7 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
             // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
             if (range.Link != $"\"{id}\"")
             {
-                ResetFormat(range);
+                range.Delete(TextRangeUnit.Story, -1);
                 return false;
             }
 
@@ -660,7 +660,7 @@ private void ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                ResetFormat(range);
+                range.Delete(TextRangeUnit.Story, -1);
                 token.Active = false;
                 return;
             }
@@ -669,19 +669,6 @@ private void ValidateTokenFromRange(ITextRange range)
             token.Active = true;
         }
 
-        private void ResetFormat(ITextRange range)
-        {
-            var defaultFormat = TextDocument.GetDefaultCharacterFormat();
-
-            // Need to reset both Link and CharacterFormat or the token id will still persist in the RTF text.
-            if (!string.IsNullOrEmpty(range.GetClone().Link))
-            {
-                range.Link = string.Empty;
-            }
-
-            range.CharacterFormat.SetClone(defaultFormat);
-        }
-
         private void ConditionallyLoadElement(object property, string elementName)
         {
             if (property != null && GetTemplateChild(elementName) is UIElement presenter)

From d6e64c1d88d6e614720e8e410197667e7f629deb Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 26 Jul 2021 20:15:11 -0700
Subject: [PATCH 086/200] add winui dependency in test app

---
 .../RichSuggestBox/RichSuggestBox.xaml                        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index f63a0c476e1..3dc3f50ae43 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -4,10 +4,6 @@
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
-    <ResourceDictionary.MergedDictionaries>
-        <!--  WinUI dependency for testing  -->
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-    </ResourceDictionary.MergedDictionaries>
 
     <!--  Default style for RichSuggestBox  -->
     <Style BasedOn="{StaticResource DefaultRichSuggestBoxStyle}"

From 169c716d0eec7dbd11e92be7f7452e855cef5115 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 26 Jul 2021 20:16:06 -0700
Subject: [PATCH 087/200] update token list before triggering TextChanged

---
 .../RichSuggestBox/RichSuggestBox.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index ab56d30b2df..4d40a5bdf3b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -361,8 +361,8 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
 
         private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
         {
-            TextChanged?.Invoke(this, e);
             UpdateVisibleTokenList();
+            TextChanged?.Invoke(this, e);
         }
 
         private void RichEditBox_TextCompositionStarted(RichEditBox sender, TextCompositionStartedEventArgs args)

From b13fc0891d777b0534f6ec49d8a661055a8f22f7 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 30 Jul 2021 16:52:27 -0700
Subject: [PATCH 088/200] use content link foreground to avoid incompatible
 colors

---
 .../RichSuggestBox/RichSuggestBox.xaml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index 3dc3f50ae43..232ad489a65 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
@@ -23,7 +23,7 @@
         <Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="TokenForeground" Value="{ThemeResource HyperlinkButtonForeground}" />
+        <Setter Property="TokenForeground" Value="{ThemeResource ContentLinkForegroundColor}" />
         <Setter Property="TokenBackground" Value="Transparent" />
         <Setter Property="RichEditBoxStyle" Value="{StaticResource DefaultRichEditBoxStyle}" />
         <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />

From 2e7d978b90652494f8a316cccc80e2d8d092408c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 5 Aug 2021 13:57:34 -0700
Subject: [PATCH 089/200] update TestAdapter and TestFramework

---
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs | 2 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 4d68eb5cdb4..877d48192a8 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -9,7 +9,7 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_RichSuggestBox : VisualUITestBase
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 459232f8405..fcbc41cf708 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -132,10 +132,10 @@
       <Version>2.6.1</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.1.2</Version>
+      <Version>2.2.5</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>2.1.2</Version>
+      <Version>2.2.5</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Newtonsoft.Json">

From 2ab8096eb3cc56579f1b6e9a7bbd5d6648a92a99 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 5 Aug 2021 22:18:52 -0700
Subject: [PATCH 090/200] temporarily remove tests

---
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 877d48192a8..d4c42840e4a 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -15,7 +15,6 @@ namespace UnitTests.UWP.UI.Controls
     public class Test_RichSuggestBox : VisualUITestBase
     {
         [TestCategory(nameof(RichSuggestBox))]
-        [TestMethod]
         [DataRow("@Token1", "@Token2", "@Token3")]
         [DataRow("@Token1", "@Token2", "#Token3")]
         [DataRow("#Token1", "@Token2", "@Token3")]
@@ -70,7 +69,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
         }
 
         [TestCategory(nameof(RichSuggestBox))]
-        [TestMethod]
         public async Task Test_RichSuggestBox_CustomizeToken()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>
@@ -122,7 +120,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
         }
 
         [TestCategory(nameof(RichSuggestBox))]
-        [TestMethod]
         [DataRow("@Token1", "@Token2")]
         [DataRow("@Token1", "#Token2")]
         [DataRow("#Token1", "@Token2")]
@@ -156,7 +153,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
         }
 
         [TestCategory(nameof(RichSuggestBox))]
-        [TestMethod]
         public async Task Test_RichSuggestBox_ReplaceToken()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>
@@ -183,7 +179,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
         }
 
         [TestCategory(nameof(RichSuggestBox))]
-        [TestMethod]
         public async Task Test_RichSuggestBox_FormatReset()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>

From 56104c1e040ec533a0e94c04430824d486cf8025 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 6 Aug 2021 02:14:19 -0700
Subject: [PATCH 091/200] TokenHovering event repeatedly fire on pointer moved
 clean up and polish

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs |  38 ++---
 .../RichSuggestBox/RichSuggestBox.Events.cs   |   2 +-
 .../RichSuggestBox/RichSuggestBox.cs          | 135 +++++++++---------
 .../RichSuggestBox/RichSuggestBox.xaml        |  11 +-
 .../RichSuggestTokenEventArgs.cs              |   6 -
 5 files changed, 87 insertions(+), 105 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index ca9e2e6adaf..1e366ed94ae 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -16,8 +16,6 @@
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
 
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     /// <summary>
@@ -91,13 +89,14 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
 
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
-        private DispatcherQueueTimer _hoveringTimer;
+        private DispatcherQueue _dispatcherQueue;
         private PointerPoint _pointerPoint;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
-            this._hoveringTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
+            DispatcherQueue.GetForCurrentThread().CreateTimer();
+            this._dispatcherQueue = DispatcherQueue.GetForCurrentThread();
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
 
@@ -115,7 +114,7 @@ public void OnXamlRendered(FrameworkElement control)
             {
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenHovered -= SuggestingBox_OnTokenHovered;
+                this._tsb.TokenHovering -= this.SuggestingBox_OnTokenHovering;
                 this._tsb.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
             }
 
@@ -131,7 +130,7 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenHovered += this.SuggestingBox_OnTokenHovered;
+                this._tsb.TokenHovering += this.SuggestingBox_OnTokenHovering;
                 this._tsb.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
             }
 
@@ -151,24 +150,25 @@ private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs
             this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
         }
 
-        private void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
+        private void SuggestingBox_OnTokenHovering(RichSuggestBox sender, RichSuggestTokenEventArgs args)
         {
-            this._hoveringTimer.Debounce(
-                () =>
+            var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+            var pointerPosition = this._pointerPoint.Position;
+
+            if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+                (!flyout.IsOpen || cp.Content != args.Token.Item))
             {
-                var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-                if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
-                    (!flyout.IsOpen || cp.Content != args.Token.Item))
+                this._dispatcherQueue.TryEnqueue(() =>
                 {
                     cp.Content = args.Token.Item;
                     flyout.ShowAt(sender, new FlyoutShowOptions
-                    {
-                        Position = this._pointerPoint.Position,
-                        ExclusionRect = args.Rect,
-                        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
-                    });
-                }
-            }, TimeSpan.FromMilliseconds(200));
+                        {
+                            Position = pointerPosition,
+                            ExclusionRect = sender.GetRectFromRange(args.Range),
+                            ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway,
+                        });
+                });
+            }
         }
 
         private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 0b7b9a6959e..a4de8a87633 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -32,7 +32,7 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when a pointer is hovering over a token.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenHovered;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenHovering;
 
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 4d40a5bdf3b..62d11886236 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -55,7 +55,6 @@ public partial class RichSuggestBox : ItemsControl
         private bool _popupOpenDown;
         private bool _textCompositionActive;
         private ITextRange _currentRange;
-        private RichSuggestToken _hoveringToken;
         private CancellationTokenSource _suggestionRequestedCancellationSource;
 
         /// <summary>
@@ -120,6 +119,22 @@ public bool TryGetTokenFromRange(ITextRange range, out RichSuggestToken token)
             return false;
         }
 
+        /// <summary>
+        /// Retrieves the bounding rectangle that encompasses the text range
+        /// with position measured from the top left of the <see cref="RichSuggestBox"/> control.
+        /// </summary>
+        /// <param name="range">Text range to retrieve the bounding box from.</param>
+        /// <returns>The bounding rectangle.</returns>
+        public Rect GetRectFromRange(ITextRange range)
+        {
+            var padding = _richEditBox.Padding;
+            range.GetRect(PointOptions.None, out var rect, out var hit);
+            rect.X += padding.Left - HorizontalOffset;
+            rect.Y += padding.Top - VerticalOffset;
+            var transform = _richEditBox.TransformToVisual(this);
+            return transform.TransformBounds(rect);
+        }
+
         /// <inheritdoc/>
         protected override void OnApplyTemplate()
         {
@@ -134,43 +149,47 @@ protected override void OnApplyTemplate()
             ConditionallyLoadElement(Header, PartHeaderContentPresenter);
             ConditionallyLoadElement(Description, PartDescriptionPresenter);
 
-            _richEditBox.SizeChanged -= RichEditBox_SizeChanged;
-            _richEditBox.TextChanging -= RichEditBox_TextChanging;
-            _richEditBox.TextChanged -= RichEditBox_TextChanged;
-            _richEditBox.TextCompositionStarted -= RichEditBox_TextCompositionStarted;
-            _richEditBox.TextCompositionChanged -= RichEditBox_TextCompositionChanged;
-            _richEditBox.TextCompositionEnded -= RichEditBox_TextCompositionEnded;
-            _richEditBox.SelectionChanging -= RichEditBox_SelectionChanging;
-            _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
-            _richEditBox.Paste -= RichEditBox_Paste;
-            _richEditBox.PreviewKeyDown -= RichEditBox_PreviewKeyDown;
-            _richEditBox.PointerExited -= RichEditBox_OnPointerExited;
-            _richEditBox.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
-            _richEditBox.RemoveHandler(PointerPressedEvent, pointerPressedHandler);
-            _richEditBox.ProcessKeyboardAccelerators -= RichEditBox_ProcessKeyboardAccelerators;
-
-            _richEditBox.SizeChanged += RichEditBox_SizeChanged;
-            _richEditBox.TextChanging += RichEditBox_TextChanging;
-            _richEditBox.TextChanged += RichEditBox_TextChanged;
-            _richEditBox.TextCompositionStarted += RichEditBox_TextCompositionStarted;
-            _richEditBox.TextCompositionChanged += RichEditBox_TextCompositionChanged;
-            _richEditBox.TextCompositionEnded += RichEditBox_TextCompositionEnded;
-            _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
-            _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
-            _richEditBox.Paste += RichEditBox_Paste;
-            _richEditBox.PreviewKeyDown += RichEditBox_PreviewKeyDown;
-            _richEditBox.PointerExited += RichEditBox_OnPointerExited;
-            _richEditBox.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
-            _richEditBox.AddHandler(PointerPressedEvent, pointerPressedHandler, true);
-            _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
-
-            _suggestionsList.ItemClick -= SuggestionsList_ItemClick;
-            _suggestionsList.SizeChanged -= SuggestionsList_SizeChanged;
-            _suggestionsList.GotFocus -= SuggestionList_GotFocus;
-
-            _suggestionsList.ItemClick += SuggestionsList_ItemClick;
-            _suggestionsList.SizeChanged += SuggestionsList_SizeChanged;
-            _suggestionsList.GotFocus += SuggestionList_GotFocus;
+            if (_richEditBox != null)
+            {
+                _richEditBox.SizeChanged -= RichEditBox_SizeChanged;
+                _richEditBox.TextChanging -= RichEditBox_TextChanging;
+                _richEditBox.TextChanged -= RichEditBox_TextChanged;
+                _richEditBox.TextCompositionStarted -= RichEditBox_TextCompositionStarted;
+                _richEditBox.TextCompositionChanged -= RichEditBox_TextCompositionChanged;
+                _richEditBox.TextCompositionEnded -= RichEditBox_TextCompositionEnded;
+                _richEditBox.SelectionChanging -= RichEditBox_SelectionChanging;
+                _richEditBox.SelectionChanged -= RichEditBox_SelectionChanged;
+                _richEditBox.Paste -= RichEditBox_Paste;
+                _richEditBox.PreviewKeyDown -= RichEditBox_PreviewKeyDown;
+                _richEditBox.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
+                _richEditBox.RemoveHandler(PointerPressedEvent, pointerPressedHandler);
+                _richEditBox.ProcessKeyboardAccelerators -= RichEditBox_ProcessKeyboardAccelerators;
+
+                _richEditBox.SizeChanged += RichEditBox_SizeChanged;
+                _richEditBox.TextChanging += RichEditBox_TextChanging;
+                _richEditBox.TextChanged += RichEditBox_TextChanged;
+                _richEditBox.TextCompositionStarted += RichEditBox_TextCompositionStarted;
+                _richEditBox.TextCompositionChanged += RichEditBox_TextCompositionChanged;
+                _richEditBox.TextCompositionEnded += RichEditBox_TextCompositionEnded;
+                _richEditBox.SelectionChanging += RichEditBox_SelectionChanging;
+                _richEditBox.SelectionChanged += RichEditBox_SelectionChanged;
+                _richEditBox.Paste += RichEditBox_Paste;
+                _richEditBox.PreviewKeyDown += RichEditBox_PreviewKeyDown;
+                _richEditBox.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
+                _richEditBox.AddHandler(PointerPressedEvent, pointerPressedHandler, true);
+                _richEditBox.ProcessKeyboardAccelerators += RichEditBox_ProcessKeyboardAccelerators;
+            }
+
+            if (_suggestionsList != null)
+            {
+                _suggestionsList.ItemClick -= SuggestionsList_ItemClick;
+                _suggestionsList.SizeChanged -= SuggestionsList_SizeChanged;
+                _suggestionsList.GotFocus -= SuggestionList_GotFocus;
+
+                _suggestionsList.ItemClick += SuggestionsList_ItemClick;
+                _suggestionsList.SizeChanged += SuggestionsList_SizeChanged;
+                _suggestionsList.GotFocus += SuggestionList_GotFocus;
+            }
         }
 
         private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -235,15 +254,10 @@ private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RichEditBox_OnPointerExited(object sender, PointerRoutedEventArgs e)
-        {
-            this._hoveringToken = null;
-        }
-
         private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var pointer = e.GetCurrentPoint((UIElement)sender);
-            InvokeTokenHovered(pointer.Position);
+            this.InvokeTokenHovering(pointer.Position);
         }
 
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
@@ -448,18 +462,16 @@ private void InvokeTokenSelected(ITextSelection selection)
                 return;
             }
 
-            var tokenRect = GetTokenRect(selection);
             TokenSelected.Invoke(this, new RichSuggestTokenEventArgs
             {
                 Token = token,
-                Rect = tokenRect,
                 Range = selection.GetClone()
             });
         }
 
-        private void InvokeTokenHovered(Point pointerPosition)
+        private void InvokeTokenHovering(Point pointerPosition)
         {
-            if (TokenHovered == null)
+            if (this.TokenHovering == null)
             {
                 return;
             }
@@ -468,19 +480,14 @@ private void InvokeTokenHovered(Point pointerPosition)
             pointerPosition.X += HorizontalOffset - padding.Left;
             pointerPosition.Y += VerticalOffset - padding.Top;
             var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
-            RichSuggestToken token = null;
-            if (range.Expand(TextRangeUnit.Link) > 0 && TryGetTokenFromRange(range, out token) &&
-                token != _hoveringToken)
+            var linkRange = range.GetClone();
+            range.Expand(TextRangeUnit.Word);
+            range.GetRect(PointOptions.None, out var rect, out _);
+            if (rect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
+                TryGetTokenFromRange(linkRange, out var token))
             {
-                TokenHovered.Invoke(this, new RichSuggestTokenEventArgs
-                {
-                    Token = token,
-                    Rect = GetTokenRect(range),
-                    Range = range,
-                });
+                this.TokenHovering.Invoke(this, new RichSuggestTokenEventArgs { Token = token, Range = linkRange });
             }
-
-            _hoveringToken = token;
         }
 
         private async Task RequestSuggestionsAsync(ITextRange range = null)
@@ -900,16 +907,6 @@ private ITextCharacterFormat CreateTokenFormat(ITextRange range)
             return format;
         }
 
-        private Rect GetTokenRect(ITextRange tokenRange)
-        {
-            var padding = _richEditBox.Padding;
-            tokenRange.GetRect(PointOptions.ClientCoordinates, out var rect, out var hit);
-            rect.X += padding.Left - HorizontalOffset;
-            rect.Y += padding.Top - VerticalOffset;
-            var transform = _richEditBox.TransformToVisual(this);
-            return transform.TransformBounds(rect);
-        }
-
         private void UpdateVisibleTokenList()
         {
             lock (LockObj)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
index 232ad489a65..aeeb2e851b8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-                    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
                     xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
@@ -101,9 +99,6 @@
                                     Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
                                     BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
                                     BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}">
-                                <Border.RenderTransform>
-                                    <contract7NotPresent:TranslateTransform x:Name="UpwardTransform" />
-                                </Border.RenderTransform>
                                 <ListView x:Name="SuggestionsList"
                                           MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
                                           Margin="{ThemeResource AutoSuggestListPadding}"
@@ -116,11 +111,7 @@
                                           ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
                                           ItemTemplate="{TemplateBinding ItemTemplate}"
                                           ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                          ItemsSource="{TemplateBinding ItemsSource}">
-                                    <ListView.ItemContainerTransitions>
-                                        <contract7NotPresent:TransitionCollection />
-                                    </ListView.ItemContainerTransitions>
-                                </ListView>
+                                          ItemsSource="{TemplateBinding ItemsSource}" />
                             </Border>
                         </Popup>
                     </Grid>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
index 3291b5288ed..dc23d21f3d5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Windows.Foundation;
 using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -18,11 +17,6 @@ public class RichSuggestTokenEventArgs : EventArgs
         /// </summary>
         public RichSuggestToken Token { get; set; }
 
-        /// <summary>
-        /// Gets or sets the position and size of the selected rectangle measured from the top left of the <see cref="RichSuggestBox"/> control.
-        /// </summary>
-        public Rect Rect { get; set; }
-
         /// <summary>
         /// Gets or sets the range associated with the token.
         /// </summary>

From b25cdd5bb6ef449d47e1b1cd0a5f446b5d38996c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 6 Aug 2021 02:22:25 -0700
Subject: [PATCH 092/200] use ignore attribute instead

---
 .../UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index d4c42840e4a..e6a3c4b52d4 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -14,7 +14,9 @@ namespace UnitTests.UWP.UI.Controls
     [TestClass]
     public class Test_RichSuggestBox : VisualUITestBase
     {
+        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
         [DataRow("@Token1", "@Token2", "@Token3")]
         [DataRow("@Token1", "@Token2", "#Token3")]
         [DataRow("#Token1", "@Token2", "@Token3")]
@@ -68,7 +70,9 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
         public async Task Test_RichSuggestBox_CustomizeToken()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>
@@ -119,7 +123,9 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
         [DataRow("@Token1", "@Token2")]
         [DataRow("@Token1", "#Token2")]
         [DataRow("#Token1", "@Token2")]
@@ -152,7 +158,9 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
         public async Task Test_RichSuggestBox_ReplaceToken()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>
@@ -178,7 +186,9 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
+        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
         public async Task Test_RichSuggestBox_FormatReset()
         {
             await App.DispatcherQueue.EnqueueAsync(async () =>

From be29388b224f237bfb8f6394ced019b18bb9c056 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 7 Aug 2021 00:25:24 -0700
Subject: [PATCH 093/200] refine hit test for TokenHovering

---
 .../RichSuggestBox/RichSuggestBox.cs                      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 62d11886236..f8632106989 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -481,9 +481,11 @@ private void InvokeTokenHovering(Point pointerPosition)
             pointerPosition.Y += VerticalOffset - padding.Top;
             var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
             var linkRange = range.GetClone();
-            range.Expand(TextRangeUnit.Word);
-            range.GetRect(PointOptions.None, out var rect, out _);
-            if (rect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
+            range.Expand(TextRangeUnit.Character);
+            range.GetRect(PointOptions.None, out var hitTestRect, out _);
+            hitTestRect.X -= hitTestRect.Width;
+            hitTestRect.Width *= 2;
+            if (hitTestRect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
                 TryGetTokenFromRange(linkRange, out var token))
             {
                 this.TokenHovering.Invoke(this, new RichSuggestTokenEventArgs { Token = token, Range = linkRange });

From 1c1c370aaf09f7d7a627b3f0621e245fd4939d29 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 7 Aug 2021 13:22:37 -0700
Subject: [PATCH 094/200] TokenHoveringEventArgs to include a PointerPoint
 object

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 16 ++--------
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  4 +--
 .../RichSuggestBox/RichSuggestBox.cs          | 27 +++++++++-------
 .../RichSuggestTokenHoveringEventArgs.cs      | 31 +++++++++++++++++++
 ...s => RichSuggestTokenSelectedEventArgs.cs} |  2 +-
 5 files changed, 52 insertions(+), 28 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{RichSuggestTokenEventArgs.cs => RichSuggestTokenSelectedEventArgs.cs} (91%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 1e366ed94ae..52d29507bdc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -9,12 +9,10 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.System;
 using Windows.UI;
-using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -90,19 +88,16 @@ public sealed partial class RichSuggestBoxPage : Page, IXamlRenderListener
         private RichSuggestBox _rsb;
         private RichSuggestBox _tsb;
         private DispatcherQueue _dispatcherQueue;
-        private PointerPoint _pointerPoint;
 
         public RichSuggestBoxPage()
         {
             this.InitializeComponent();
-            DispatcherQueue.GetForCurrentThread().CreateTimer();
             this._dispatcherQueue = DispatcherQueue.GetForCurrentThread();
             Loaded += (sender, e) => { this.OnXamlRendered(this); };
         }
 
         public void OnXamlRendered(FrameworkElement control)
         {
-            PointerEventHandler pointerMovedHandler = SuggestingBox_OnPointerMoved;
 
             if (this._rsb != null)
             {
@@ -115,7 +110,6 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
                 this._tsb.TokenHovering -= this.SuggestingBox_OnTokenHovering;
-                this._tsb.RemoveHandler(PointerMovedEvent, pointerMovedHandler);
             }
 
             if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
@@ -131,7 +125,6 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
                 this._tsb.TokenHovering += this.SuggestingBox_OnTokenHovering;
-                this._tsb.AddHandler(PointerMovedEvent, pointerMovedHandler, true);
             }
 
             if (control.FindChild("TokenListView1") is ListView tls1)
@@ -145,15 +138,10 @@ public void OnXamlRendered(FrameworkElement control)
             }
         }
 
-        private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
-        {
-            this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
-        }
-
-        private void SuggestingBox_OnTokenHovering(RichSuggestBox sender, RichSuggestTokenEventArgs args)
+        private void SuggestingBox_OnTokenHovering(RichSuggestBox sender, RichSuggestTokenHoveringEventArgs args)
         {
             var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-            var pointerPosition = this._pointerPoint.Position;
+            var pointerPosition = args.CurrentPoint.Position;
 
             if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
                 (!flyout.IsOpen || cp.Content != args.Token.Item))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index a4de8a87633..75605a2ad24 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -27,12 +27,12 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when a token is fully highlighted.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenSelected;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenSelectedEventArgs> TokenSelected;
 
         /// <summary>
         /// Event raised when a pointer is hovering over a token.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenEventArgs> TokenHovering;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenHoveringEventArgs> TokenHovering;
 
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index f8632106989..7d642182f4c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -13,6 +13,7 @@
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
 using Windows.System;
+using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -256,8 +257,11 @@ private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
 
         private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
         {
-            var pointer = e.GetCurrentPoint((UIElement)sender);
-            this.InvokeTokenHovering(pointer.Position);
+            var pointer = e.GetCurrentPoint(this);
+            if (TokenHovering != null)
+            {
+                this.InvokeTokenHovering(pointer);
+            }
         }
 
         private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelectionChangingEventArgs args)
@@ -421,7 +425,7 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             if (dataPackageView.Contains(StandardDataFormats.Text))
             {
                 var text = await dataPackageView.GetTextAsync();
-                TextDocument.Selection.SetText(TextSetOptions.None, text);
+                TextDocument.Selection.SetText(TextSetOptions.Unhide, text);
                 TextDocument.Selection.Collapse(false);
             }
         }
@@ -462,20 +466,16 @@ private void InvokeTokenSelected(ITextSelection selection)
                 return;
             }
 
-            TokenSelected.Invoke(this, new RichSuggestTokenEventArgs
+            TokenSelected.Invoke(this, new RichSuggestTokenSelectedEventArgs
             {
                 Token = token,
                 Range = selection.GetClone()
             });
         }
 
-        private void InvokeTokenHovering(Point pointerPosition)
+        private void InvokeTokenHovering(PointerPoint pointer)
         {
-            if (this.TokenHovering == null)
-            {
-                return;
-            }
-
+            var pointerPosition = TransformToVisual(_richEditBox).TransformPoint(pointer.Position);
             var padding = _richEditBox.Padding;
             pointerPosition.X += HorizontalOffset - padding.Left;
             pointerPosition.Y += VerticalOffset - padding.Top;
@@ -488,7 +488,12 @@ private void InvokeTokenHovering(Point pointerPosition)
             if (hitTestRect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
                 TryGetTokenFromRange(linkRange, out var token))
             {
-                this.TokenHovering.Invoke(this, new RichSuggestTokenEventArgs { Token = token, Range = linkRange });
+                this.TokenHovering.Invoke(this, new RichSuggestTokenHoveringEventArgs
+                {
+                    Token = token,
+                    Range = linkRange,
+                    CurrentPoint = pointer
+                });
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs
new file mode 100644
index 00000000000..cd0ccefb039
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.UI.Input;
+using Windows.UI.Text;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Provides data for <see cref="RichSuggestBox.TokenHovering"/> event.
+    /// </summary>
+    public class RichSuggestTokenHoveringEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the selected token.
+        /// </summary>
+        public RichSuggestToken Token { get; set; }
+
+        /// <summary>
+        /// Gets or sets the range associated with the token.
+        /// </summary>
+        public ITextRange Range { get; set; }
+
+        /// <summary>
+        /// Gets or sets a PointerPoint object relative to the <see cref="RichSuggestBox"/> control.
+        /// </summary>
+        public PointerPoint CurrentPoint { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
similarity index 91%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
index dc23d21f3d5..9711eb617af 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenSelectedEventArgs.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Provides data for <see cref="RichSuggestBox.TokenSelected"/> event.
     /// </summary>
-    public class RichSuggestTokenEventArgs : EventArgs
+    public class RichSuggestTokenSelectedEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the selected token.

From e40e461986fea63791afebaf71adb8bdb02f493b Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 15 Aug 2021 12:58:24 -0700
Subject: [PATCH 095/200] add richsuggestbox UI test

---
 UITests/UITests.App/App.xaml                  |  7 +-
 UITests/UITests.App/UITests.App.csproj        |  5 +-
 .../Controls/RichSuggestBoxTest.cs            | 71 +++++++++++++++++++
 .../Controls/RichSuggestBoxTestPage.xaml      | 32 +++++++++
 .../Controls/RichSuggestBoxTestPage.xaml.cs   | 34 +++++++++
 5 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
 create mode 100644 UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
 create mode 100644 UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs

diff --git a/UITests/UITests.App/App.xaml b/UITests/UITests.App/App.xaml
index e923b2739ef..ba6c10cd397 100644
--- a/UITests/UITests.App/App.xaml
+++ b/UITests/UITests.App/App.xaml
@@ -1,4 +1,9 @@
 <Application x:Class="UITests.App.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:UITests.App" />
+             xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+             xmlns:local="using:UITests.App">
+    <Application.Resources>
+        <controls:XamlControlsResources />
+    </Application.Resources>
+</Application>
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index d0eb10b9c05..a502e95f063 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -168,6 +168,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.6.1</Version>
+    </PackageReference>
     <PackageReference Include="MUXAppTestHelpers">
       <Version>0.0.4</Version>
     </PackageReference>
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
new file mode 100644
index 00000000000..0d5f5059e62
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
@@ -0,0 +1,71 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Windows.Apps.Test.Foundation;
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
+#if USING_TAEF
+using WEX.Logging.Interop;
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
+
+namespace UITests.Tests
+{
+    [TestClass]
+    public class RichSuggestBoxTest : UITestBase
+    {
+        [ClassInitialize]
+        [TestProperty("RunAs", "User")]
+        [TestProperty("Classification", "ScenarioTestSuite")]
+        [TestProperty("Platform", "Any")]
+        public static void ClassInitialize(TestContext testContext)
+        {
+            TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+        }
+
+        [TestMethod]
+        [TestPage("RichSuggestBoxTestPage")]
+        public void RichSuggestBox_DefaultTest()
+        {
+            var richSuggestBox = FindElement.ByName("richSuggestBox");
+            var richEditBox = new TextBlock(FindElement.ByClassName("RichEditBox"));
+            var tokenCounter = new TextBlock(FindElement.ById("tokenCounter"));
+            var tokenListView = FindElement.ById("tokenListView");
+
+            Verify.AreEqual(string.Empty, richEditBox.GetText());
+
+            richEditBox.SendKeys("Hello@Test1");
+
+            var suggestListView = richSuggestBox.Descendants.Find(UICondition.CreateFromClassName("ListView"));
+            Verify.IsNotNull(suggestListView);
+            Verify.AreEqual(3, suggestListView.Children.Count);
+            InputHelper.LeftClick(suggestListView.Children[0]);
+
+            var tokenInfo1 = tokenListView.Children[0];
+            var text = "Hello\u200b@Test1Token1\u200b ";
+            var actualText = richEditBox.GetText(false);
+            Verify.AreEqual(text, actualText);
+            Verify.AreEqual("1", tokenCounter.GetText());
+            Verify.AreEqual("Test1Token1", tokenInfo1.Children[0].GetText());
+            Verify.AreEqual("5", tokenInfo1.Children[1].GetText());
+
+            richEditBox.SendKeys("@Test2");
+            Verify.AreEqual(3, suggestListView.Children.Count);
+            InputHelper.LeftClick(suggestListView.Children[1]);
+
+            var tokenInfo2 = tokenListView.Children[1];
+            text = "Hello\u200b@Test1Token1\u200b \u200b@Test2Token2\u200b ";
+            actualText = richEditBox.GetText(false);
+            Verify.AreEqual(text, actualText);
+            Verify.AreEqual("2", tokenCounter.GetText());
+            Verify.AreEqual("Test2Token2", tokenInfo2.Children[0].GetText());
+            Verify.AreEqual("68", tokenInfo2.Children[1].GetText());
+        }
+    }
+}
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
new file mode 100644
index 00000000000..1d3ee851229
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
@@ -0,0 +1,32 @@
+<Page x:Class="UITests.App.Pages.RichSuggestBoxTestPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+        <controls:RichSuggestBox x:Name="richSuggestBox"
+                                 Width="300"
+                                 AutomationProperties.Name="richSuggestBox"
+                                 SuggestionChosen="RichSuggestBox_OnSuggestionsChosen"
+                                 SuggestionsRequested="RichSuggestBox_OnSuggestionsRequested" />
+
+        <TextBlock x:Name="tokenCounter"
+                   Text="{x:Bind richSuggestBox.Tokens.Count, Mode=OneWay}" />
+
+        <ListView x:Name="tokenListView"
+                  ItemsSource="{x:Bind richSuggestBox.Tokens}">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="controls:RichSuggestToken">
+                    <StackPanel>
+                        <TextBlock Text="{x:Bind Item}" />
+                        <TextBlock Text="{x:Bind Position}" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </StackPanel>
+</Page>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
new file mode 100644
index 00000000000..c62a244dcbe
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using Windows.UI.Xaml.Controls;
+
+namespace UITests.App.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class RichSuggestBoxTestPage : Page
+    {
+        private static readonly List<string> _suggestions = new List<string> { "Token1", "Token2", "Token3" };
+
+        public RichSuggestBoxTestPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void RichSuggestBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+        {
+            sender.ItemsSource = _suggestions.Select(x => args.Query + x);
+        }
+
+        private void RichSuggestBox_OnSuggestionsChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
+        {
+            args.Text = (string)args.SelectedItem;
+        }
+    }
+}
\ No newline at end of file

From 22cae500bb7b8d8ea1c3fa39f88fcff282902e89 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 15 Aug 2021 13:36:37 -0700
Subject: [PATCH 096/200] test token text separate from item

---
 .../UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs    | 4 ++--
 .../Controls/RichSuggestBoxTestPage.xaml.cs                | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
index 0d5f5059e62..122cf6ad275 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
@@ -52,7 +52,7 @@ public void RichSuggestBox_DefaultTest()
             var actualText = richEditBox.GetText(false);
             Verify.AreEqual(text, actualText);
             Verify.AreEqual("1", tokenCounter.GetText());
-            Verify.AreEqual("Test1Token1", tokenInfo1.Children[0].GetText());
+            Verify.AreEqual("Token1", tokenInfo1.Children[0].GetText());
             Verify.AreEqual("5", tokenInfo1.Children[1].GetText());
 
             richEditBox.SendKeys("@Test2");
@@ -64,7 +64,7 @@ public void RichSuggestBox_DefaultTest()
             actualText = richEditBox.GetText(false);
             Verify.AreEqual(text, actualText);
             Verify.AreEqual("2", tokenCounter.GetText());
-            Verify.AreEqual("Test2Token2", tokenInfo2.Children[0].GetText());
+            Verify.AreEqual("Token2", tokenInfo2.Children[0].GetText());
             Verify.AreEqual("68", tokenInfo2.Children[1].GetText());
         }
     }
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
index c62a244dcbe..e8087294cf1 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Controls;
 
@@ -14,7 +13,7 @@ namespace UITests.App.Pages
     /// </summary>
     public sealed partial class RichSuggestBoxTestPage : Page
     {
-        private static readonly List<string> _suggestions = new List<string> { "Token1", "Token2", "Token3" };
+        private static readonly List<string> _suggestions = new() { "Token1", "Token2", "Token3" };
 
         public RichSuggestBoxTestPage()
         {
@@ -23,12 +22,12 @@ public RichSuggestBoxTestPage()
 
         private void RichSuggestBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
         {
-            sender.ItemsSource = _suggestions.Select(x => args.Query + x);
+            sender.ItemsSource = _suggestions;
         }
 
         private void RichSuggestBox_OnSuggestionsChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
         {
-            args.Text = (string)args.SelectedItem;
+            args.Text = args.Query + (string)args.SelectedItem;
         }
     }
 }
\ No newline at end of file

From 1b2e483276e274f42c044e1d1c398c3ab46c6cb3 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 15 Aug 2021 14:53:48 -0700
Subject: [PATCH 097/200] test observale position

---
 UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs | 6 ++++++
 .../Controls/RichSuggestBoxTestPage.xaml                    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
index 122cf6ad275..e29fe4f63a4 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs
@@ -6,6 +6,7 @@
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+using Microsoft.Windows.Apps.Test.Automation;
 
 #if USING_TAEF
 using WEX.Logging.Interop;
@@ -66,6 +67,11 @@ public void RichSuggestBox_DefaultTest()
             Verify.AreEqual("2", tokenCounter.GetText());
             Verify.AreEqual("Token2", tokenInfo2.Children[0].GetText());
             Verify.AreEqual("68", tokenInfo2.Children[1].GetText());
+
+            KeyboardHelper.PressKey(Key.Home);
+            richEditBox.SendKeys(" ");
+            Verify.AreEqual("6", tokenInfo1.Children[1].GetText());
+            Verify.AreEqual("69", tokenInfo2.Children[1].GetText());
         }
     }
 }
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
index 1d3ee851229..6567cb83ef8 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
@@ -23,7 +23,7 @@
                 <DataTemplate x:DataType="controls:RichSuggestToken">
                     <StackPanel>
                         <TextBlock Text="{x:Bind Item}" />
-                        <TextBlock Text="{x:Bind Position}" />
+                        <TextBlock Text="{x:Bind Position, Mode=OneWay}" />
                     </StackPanel>
                 </DataTemplate>
             </ListView.ItemTemplate>

From 1f3dcc7aa92214e98f3ea19e307b4685c42a8b83 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 16 Aug 2021 14:05:11 -0700
Subject: [PATCH 098/200] dont use UIElement.ActualSize

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 8cb9f0987dd..156ced8ba3e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -19,11 +19,11 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class RichSuggestBox
     {
-        private static bool IsElementOnScreen(UIElement element, double offsetX = 0, double offsetY = 0)
+        private static bool IsElementOnScreen(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
             var toWindow = element.TransformToVisual(Window.Current.Content);
             var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
             elementBounds = toWindow.TransformBounds(elementBounds);
             elementBounds.X += windowBounds.X;
             elementBounds.Y += windowBounds.Y;
@@ -33,15 +33,15 @@ private static bool IsElementOnScreen(UIElement element, double offsetX = 0, dou
             return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
         }
 
-        private static bool IsElementInsideWindow(UIElement element, double offsetX = 0, double offsetY = 0)
+        private static bool IsElementInsideWindow(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
             var toWindow = element.TransformToVisual(Window.Current.Content);
             var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
             windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualSize.X, element.ActualSize.Y);
+            var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
             elementBounds = toWindow.TransformBounds(elementBounds);
             elementBounds.Intersect(windowBounds);
-            return elementBounds.Height >= element.ActualSize.Y;
+            return elementBounds.Height >= element.ActualHeight;
         }
 
         private static string EnforcePrefixesRequirements(string value)

From b39d0ba920bfc788b3bcadb8036918bb5b0ae74e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 16 Aug 2021 14:17:01 -0700
Subject: [PATCH 099/200] modify size of suggestionsContainer instead of the
 actual listview

---
 .../RichSuggestBox/RichSuggestBox.cs          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 7d642182f4c..e78315d715a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -723,20 +723,20 @@ private void ShowSuggestionsPopup(bool show)
 
         private void UpdatePopupWidth()
         {
-            if (this._suggestionsList == null)
+            if (this._suggestionsContainer == null)
             {
                 return;
             }
 
             if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
             {
-                this._suggestionsList.MaxWidth = double.PositiveInfinity;
-                this._suggestionsList.Width = this._richEditBox.ActualWidth;
+                this._suggestionsContainer.MaxWidth = double.PositiveInfinity;
+                this._suggestionsContainer.Width = this._richEditBox.ActualWidth;
             }
             else
             {
-                this._suggestionsList.MaxWidth = this._richEditBox.ActualWidth;
-                this._suggestionsList.Width = double.NaN;
+                this._suggestionsContainer.MaxWidth = this._richEditBox.ActualWidth;
+                this._suggestionsContainer.Width = double.NaN;
             }
         }
 
@@ -745,6 +745,11 @@ private void UpdatePopupWidth()
         /// </summary>
         private void UpdatePopupOffset()
         {
+            if (this._suggestionsContainer == null || this._suggestionPopup == null || this._richEditBox == null)
+            {
+                return;
+            }
+
             this._richEditBox.TextDocument.Selection.GetRect(PointOptions.None, out var selectionRect, out _);
             Thickness padding = this._richEditBox.Padding;
             selectionRect.X -= HorizontalOffset;
@@ -762,7 +767,7 @@ private void UpdatePopupOffset()
                 {
                     var normalizedX = selectionRect.X / editBoxWidth;
                     this._suggestionPopup.HorizontalOffset =
-                        (this._richEditBox.ActualWidth - this._suggestionsList.ActualWidth) * normalizedX;
+                        (this._richEditBox.ActualWidth - this._suggestionsContainer.ActualWidth) * normalizedX;
                 }
             }
 
@@ -777,10 +782,10 @@ private void UpdatePopupOffset()
 
             if (this._suggestionPopup.VerticalOffset == 0)
             {
-                if (IsElementOnScreen(this._suggestionsList, offsetY: downOffset) &&
-                    (IsElementInsideWindow(this._suggestionsList, offsetY: downOffset) ||
-                     !IsElementInsideWindow(this._suggestionsList, offsetY: upOffset) ||
-                     !IsElementOnScreen(this._suggestionsList, offsetY: upOffset)))
+                if (IsElementOnScreen(this._suggestionsContainer, offsetY: downOffset) &&
+                    (IsElementInsideWindow(this._suggestionsContainer, offsetY: downOffset) ||
+                     !IsElementInsideWindow(this._suggestionsContainer, offsetY: upOffset) ||
+                     !IsElementOnScreen(this._suggestionsContainer, offsetY: upOffset)))
                 {
                     this._suggestionPopup.VerticalOffset = downOffset;
                     this._popupOpenDown = true;

From db0599a33a92c70b0db86ced50d1877e908f3d06 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 16 Aug 2021 15:03:29 -0700
Subject: [PATCH 100/200] retry adding unit tests

---
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index e6a3c4b52d4..877d48192a8 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -14,7 +14,6 @@ namespace UnitTests.UWP.UI.Controls
     [TestClass]
     public class Test_RichSuggestBox : VisualUITestBase
     {
-        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         [DataRow("@Token1", "@Token2", "@Token3")]
@@ -70,7 +69,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
-        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_CustomizeToken()
@@ -123,7 +121,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
-        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         [DataRow("@Token1", "@Token2")]
@@ -158,7 +155,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
-        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_ReplaceToken()
@@ -186,7 +182,6 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
-        [Ignore("Ignore due to CI problem")]
         [TestCategory(nameof(RichSuggestBox))]
         [TestMethod]
         public async Task Test_RichSuggestBox_FormatReset()

From 36f46bed7fb7469807c4359479e5cd76f735248e Mon Sep 17 00:00:00 2001
From: Daniel <dpaulino@users.noreply.github.com>
Date: Mon, 16 Aug 2021 15:14:27 -0700
Subject: [PATCH 101/200] Added license text

---
 .../UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
index 7ccfad59f26..a42cd47a65e 100644
--- a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
+++ b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI.Triggers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

From c4f6009ae948087f5fb9ecc64d502af5701435ad Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Tue, 17 Aug 2021 16:41:50 -0700
Subject: [PATCH 102/200] ClearReferenceInfo

---
 .../Expressions/CompositionExtensions.cs           |  2 ++
 .../Expressions/ExpressionNodes/ExpressionNode.cs  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
index 16f0525b369..78251ecc1c0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
@@ -176,6 +176,7 @@ public static void StartAnimation(this CompositionObject compObject, string prop
         /// <param name="easing">The easing function to use when interpolating between frames.</param>
         public static void InsertExpressionKeyFrame(this KeyFrameAnimation keyframeAnimation, float normalizedProgressKey, ExpressionNode expressionNode, CompositionEasingFunction easing = null)
         {
+            expressionNode.ClearReferenceInfo();
             keyframeAnimation.InsertExpressionKeyFrame(normalizedProgressKey, expressionNode.ToExpressionString(), easing);
 
             expressionNode.SetAllParameters(keyframeAnimation);
@@ -252,6 +253,7 @@ private static ExpressionAnimation CreateExpressionAnimationFromNode(Compositor
             // Only create a new animation if this node hasn't already generated one before, so we don't have to re-parse the expression string.
             if (expressionNode.ExpressionAnimation == null)
             {
+                expressionNode.ClearReferenceInfo();
                 expressionNode.ExpressionAnimation = compositor.CreateExpressionAnimation(expressionNode.ToExpressionString());
             }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
index e02d4500201..9c0c9d4dc6b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
@@ -260,6 +260,20 @@ internal string ToExpressionString()
             return ToExpressionStringInternal();
         }
 
+        /// <summary>
+        /// Clears the reference information.
+        /// </summary>
+        /// <exception cref="System.Exception">Reference and paramName can't both be null</exception>
+        internal void ClearReferenceInfo()
+        {
+            _objRefList = null;
+            ParamName = null;
+            foreach (var child in Children)
+            {
+               child.ClearReferenceInfo();
+            }
+        }
+
         /// <summary>
         /// Ensures the reference information.
         /// </summary>

From f458d517effcb80e090818763a393401351b481c Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Tue, 17 Aug 2021 22:03:53 -0700
Subject: [PATCH 103/200] Added unit tests

---
 .../UI/Triggers/Test_ControlSizeTrigger.cs    | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
index a42cd47a65e..2e0d501032b 100644
--- a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
+++ b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
@@ -37,6 +37,74 @@ await App.DispatcherQueue.EnqueueAsync(() =>
             });
         }
 
+        [DataTestMethod]
+        [DataRow(400, 400, true)]
+        [DataRow(400, 399, false)]
+        public async Task ControlSizeMinHeightTriggerTest(double width, double height, bool expectedResult)
+        {
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                Grid grid = CreateGrid(width, height);
+                var trigger = new ControlSizeTrigger();
+
+                trigger.TargetElement = grid;
+                trigger.MinHeight = 400;
+
+                Assert.AreEqual(expectedResult, trigger.IsActive);
+            });
+        }
+
+        [DataTestMethod]
+        [DataRow(399, 400, false)]
+        [DataRow(400, 400, true)]
+        public async Task ControlSizeMinWidthTriggerTest(double width, double height, bool expectedResult)
+        {
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                Grid grid = CreateGrid(width, height);
+                var trigger = new ControlSizeTrigger();
+
+                trigger.TargetElement = grid;
+                trigger.MinWidth = 400;
+
+                Assert.AreEqual(expectedResult, trigger.IsActive);
+            });
+        }
+
+        [DataTestMethod]
+        [DataRow(450, 450, false)]
+        [DataRow(450, 449, true)]
+        public async Task ControlSizeMaxHeightTriggerTest(double width, double height, bool expectedResult)
+        {
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                Grid grid = CreateGrid(width, height);
+                var trigger = new ControlSizeTrigger();
+
+                trigger.TargetElement = grid;
+                trigger.MaxHeight = 450;
+
+                Assert.AreEqual(expectedResult, trigger.IsActive);
+            });
+        }
+
+        [DataTestMethod]
+        [DataRow(450, 450, false)]
+        [DataRow(449, 450, true)]
+        public async Task ControlSizeMaxWidthTriggerTest(double width, double height, bool expectedResult)
+        {
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                Grid grid = CreateGrid(width, height);
+                var trigger = new ControlSizeTrigger();
+
+                trigger.TargetElement = grid;
+                trigger.MaxWidth = 450;
+
+                Assert.AreEqual(expectedResult, trigger.IsActive);
+            });
+        }
+
         private Grid CreateGrid(double width, double height)
         {
             var grid = new Grid()

From bc95b9a9e3e5959facceec8171fd9ecdef5ec55e Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 17 Aug 2021 22:39:14 -0700
Subject: [PATCH 104/200] fix Tab key trap

---
 .../RichSuggestBox/RichSuggestBox.cs                           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index e78315d715a..b9c2d787c4c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -350,7 +350,7 @@ private async void RichEditBox_ProcessKeyboardAccelerators(UIElement sender, Pro
 
         private async void RichEditBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
         {
-            if (e.Key == VirtualKey.Tab && _suggestionsList.SelectedItem != null)
+            if (e.Key == VirtualKey.Tab && _suggestionPopup.IsOpen && _suggestionsList.SelectedItem != null)
             {
                 e.Handled = true;
                 await CommitSuggestionAsync(_suggestionsList.SelectedItem);
@@ -716,6 +716,7 @@ private void ShowSuggestionsPopup(bool show)
                 this._suggestionChoice = 0;
                 this._suggestionPopup.VerticalOffset = 0;
                 this._suggestionPopup.HorizontalOffset = 0;
+                this._suggestionsList.SelectedItem = null;
                 this._suggestionsList.ScrollIntoView(this._suggestionsList.Items?.FirstOrDefault());
                 UpdateCornerRadii();
             }

From 0428550457a05cb681e009ce0519bfb65190215c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Tue, 17 Aug 2021 23:00:01 -0700
Subject: [PATCH 105/200] TokenHovering -> TokenPointerOver

---
 .../SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs | 6 +++---
 .../RichSuggestBox/RichSuggestBox.Events.cs               | 2 +-
 .../RichSuggestBox/RichSuggestBox.cs                      | 8 ++++----
 ...entArgs.cs => RichSuggestTokenPointerOverEventArgs.cs} | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{RichSuggestTokenHoveringEventArgs.cs => RichSuggestTokenPointerOverEventArgs.cs} (85%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 52d29507bdc..c7d100aac85 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -109,7 +109,7 @@ public void OnXamlRendered(FrameworkElement control)
             {
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenHovering -= this.SuggestingBox_OnTokenHovering;
+                this._tsb.TokenPointerOver -= this.SuggestingBox_OnTokenPointerOver;
             }
 
             if (control.FindChild("SuggestingBox") is RichSuggestBox rsb)
@@ -124,7 +124,7 @@ public void OnXamlRendered(FrameworkElement control)
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
                 this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
-                this._tsb.TokenHovering += this.SuggestingBox_OnTokenHovering;
+                this._tsb.TokenPointerOver += this.SuggestingBox_OnTokenPointerOver;
             }
 
             if (control.FindChild("TokenListView1") is ListView tls1)
@@ -138,7 +138,7 @@ public void OnXamlRendered(FrameworkElement control)
             }
         }
 
-        private void SuggestingBox_OnTokenHovering(RichSuggestBox sender, RichSuggestTokenHoveringEventArgs args)
+        private void SuggestingBox_OnTokenPointerOver(RichSuggestBox sender, RichSuggestTokenPointerOverEventArgs args)
         {
             var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
             var pointerPosition = args.CurrentPoint.Position;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 75605a2ad24..67d5124ece9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -32,7 +32,7 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when a pointer is hovering over a token.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenHoveringEventArgs> TokenHovering;
+        public event TypedEventHandler<RichSuggestBox, RichSuggestTokenPointerOverEventArgs> TokenPointerOver;
 
         /// <summary>
         /// Event raised when text is changed, either by user or by internal formatting.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index b9c2d787c4c..da892344c2f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -258,9 +258,9 @@ private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
         private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var pointer = e.GetCurrentPoint(this);
-            if (TokenHovering != null)
+            if (this.TokenPointerOver != null)
             {
-                this.InvokeTokenHovering(pointer);
+                this.InvokeTokenPointerOver(pointer);
             }
         }
 
@@ -473,7 +473,7 @@ private void InvokeTokenSelected(ITextSelection selection)
             });
         }
 
-        private void InvokeTokenHovering(PointerPoint pointer)
+        private void InvokeTokenPointerOver(PointerPoint pointer)
         {
             var pointerPosition = TransformToVisual(_richEditBox).TransformPoint(pointer.Position);
             var padding = _richEditBox.Padding;
@@ -488,7 +488,7 @@ private void InvokeTokenHovering(PointerPoint pointer)
             if (hitTestRect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
                 TryGetTokenFromRange(linkRange, out var token))
             {
-                this.TokenHovering.Invoke(this, new RichSuggestTokenHoveringEventArgs
+                this.TokenPointerOver.Invoke(this, new RichSuggestTokenPointerOverEventArgs
                 {
                     Token = token,
                     Range = linkRange,
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenPointerOverEventArgs.cs
similarity index 85%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenPointerOverEventArgs.cs
index cd0ccefb039..d784abe839c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenHoveringEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestTokenPointerOverEventArgs.cs
@@ -9,9 +9,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Provides data for <see cref="RichSuggestBox.TokenHovering"/> event.
+    /// Provides data for <see cref="RichSuggestBox.TokenPointerOver"/> event.
     /// </summary>
-    public class RichSuggestTokenHoveringEventArgs : EventArgs
+    public class RichSuggestTokenPointerOverEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the selected token.

From 91957204685fdbe7ee69d4c923c7c676451d06f1 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 00:22:35 -0700
Subject: [PATCH 106/200] SuggestionsRequestedEventArgs should inherit
 DeferredEventArgs instead

---
 .../RichSuggestBox/RichSuggestBox.cs                            | 2 +-
 .../RichSuggestBox/SuggestionsRequestedEventArgs.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index da892344c2f..a5444c894a4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -532,7 +532,7 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     }
                     catch (OperationCanceledException)
                     {
-                        eventArgs.Cancel = true;
+                        // pass
                     }
                 }
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index eee5ccfbb45..dec011ff84e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Provide data for <see cref="RichSuggestBox.SuggestionsRequested"/> event.
     /// </summary>
-    public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
+    public class SuggestionsRequestedEventArgs : DeferredEventArgs
     {
         /// <summary>
         /// Gets or sets the prefix character used for the query.

From a2b38809f0541a905cb593c70b6b4c55939065c9 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 20:46:34 -0700
Subject: [PATCH 107/200] rework SuggestionsRequested to support
 AdvancedCollectionView

---
 .../RichSuggestBox/RichSuggestBox.cs          | 35 +++++++++----------
 .../RichSuggestBox/RichSuggestQuery.cs        | 16 +++++++++
 .../SuggestionsRequestedEventArgs.cs          |  2 +-
 3 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index a5444c894a4..b0e23f5f3f1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -50,12 +50,10 @@ public partial class RichSuggestBox : ItemsControl
         private Border _suggestionsContainer;
 
         private int _suggestionChoice;
-        private string _currentQuery;
-        private string _currentPrefix;
         private bool _ignoreChange;
         private bool _popupOpenDown;
         private bool _textCompositionActive;
-        private ITextRange _currentRange;
+        private RichSuggestQuery _currentQuery;
         private CancellationTokenSource _suggestionRequestedCancellationSource;
 
         /// <summary>
@@ -70,7 +68,6 @@ public RichSuggestBox()
 
             DefaultStyleKey = typeof(RichSuggestBox);
 
-            RegisterPropertyChangedCallback(ItemsSourceProperty, ItemsSource_PropertyChanged);
             RegisterPropertyChangedCallback(CornerRadiusProperty, OnCornerRadiusChanged);
             RegisterPropertyChangedCallback(PopupCornerRadiusProperty, OnCornerRadiusChanged);
             LostFocus += OnLostFocus;
@@ -405,12 +402,6 @@ private void RichEditBox_SizeChanged(object sender, SizeChangedEventArgs e)
             this.UpdatePopupOffset();
         }
 
-        private void ItemsSource_PropertyChanged(DependencyObject sender, DependencyProperty dp)
-        {
-            _suggestionChoice = 0;
-            ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
-        }
-
         private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
         {
             Paste?.Invoke(this, e);
@@ -501,12 +492,13 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
         {
             string prefix;
             string query;
+            var currentQuery = _currentQuery;
             var queryFound = range == null
                 ? TryExtractQueryFromSelection(out prefix, out query, out range)
                 : TryExtractQueryFromRange(range, out prefix, out query);
 
-            if (queryFound && prefix == _currentPrefix && query == _currentQuery &&
-                range.EndPosition == _currentRange?.EndPosition && _suggestionPopup.IsOpen)
+            if (queryFound && prefix == currentQuery?.Prefix && query == currentQuery?.QueryText &&
+                range.EndPosition == currentQuery?.Range.EndPosition && _suggestionPopup.IsOpen)
             {
                 return;
             }
@@ -516,9 +508,7 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
 
             if (queryFound)
             {
-                _currentPrefix = prefix;
-                _currentQuery = query;
-                _currentRange = range;
+                _currentQuery = new RichSuggestQuery { Prefix = prefix, QueryText = query, Range = range };
 
                 if (SuggestionsRequested != null)
                 {
@@ -532,7 +522,13 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     }
                     catch (OperationCanceledException)
                     {
-                        // pass
+                        return;
+                    }
+
+                    if (!eventArgs.Cancel)
+                    {
+                        _suggestionChoice = 0;
+                        ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
                     }
                 }
             }
@@ -544,10 +540,11 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
 
         internal async Task CommitSuggestionAsync(object selectedItem)
         {
-            var range = _currentRange?.GetClone();
+            var currentQuery = _currentQuery;
+            var range = currentQuery?.Range.GetClone();
             var id = Guid.NewGuid();
-            var prefix = _currentPrefix;
-            var query = _currentQuery;
+            var prefix = currentQuery?.Prefix;
+            var query = currentQuery?.QueryText;
 
             // range has length of 0 at the end of the commit.
             // Checking length == 0 to avoid committing twice.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
new file mode 100644
index 00000000000..e88fb7747a0
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
@@ -0,0 +1,16 @@
+using Windows.UI.Text;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// A structure for <see cref="RichSuggestBox"/> to keep track of the current query internally.
+    /// </summary>
+    internal class RichSuggestQuery
+    {
+        public string Prefix { get; set; }
+
+        public string QueryText { get; set; }
+
+        public ITextRange Range { get; set; }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index dec011ff84e..eee5ccfbb45 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// <summary>
     /// Provide data for <see cref="RichSuggestBox.SuggestionsRequested"/> event.
     /// </summary>
-    public class SuggestionsRequestedEventArgs : DeferredEventArgs
+    public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
     {
         /// <summary>
         /// Gets or sets the prefix character used for the query.

From d091e6a919cdcad10cc3794fb4215707ef01fc6a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 21:35:05 -0700
Subject: [PATCH 108/200] protected LockObj -> private _tokensLock

---
 .../RichSuggestBox/RichSuggestBox.Properties.cs |  5 -----
 .../RichSuggestBox/RichSuggestBox.cs            | 17 +++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index ffb075f5e1c..e0f6ec17ad3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -346,11 +346,6 @@ public DisabledFormattingAccelerators DisabledFormattingAccelerators
             set => SetValue(DisabledFormattingAcceleratorsProperty, value);
         }
 
-        /// <summary>
-        /// Gets object used for lock
-        /// </summary>
-        protected object LockObj { get; }
-
         /// <summary>
         /// Gets an object that enables access to the text object model for the text contained in a <see cref="RichEditBox"/>.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index b0e23f5f3f1..1a6fe323883 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -40,6 +40,7 @@ public partial class RichSuggestBox : ItemsControl
         private const string PartHeaderContentPresenter = "HeaderContentPresenter";
         private const string PartDescriptionPresenter = "DescriptionPresenter";
 
+        private readonly object _tokensLock;
         private readonly Dictionary<string, RichSuggestToken> _tokens;
         private readonly ObservableCollection<RichSuggestToken> _visibleTokens;
 
@@ -61,10 +62,10 @@ public partial class RichSuggestBox : ItemsControl
         /// </summary>
         public RichSuggestBox()
         {
+            _tokensLock = new object();
             _tokens = new Dictionary<string, RichSuggestToken>();
             _visibleTokens = new ObservableCollection<RichSuggestToken>();
             Tokens = new ReadOnlyObservableCollection<RichSuggestToken>(_visibleTokens);
-            LockObj = new object();
 
             DefaultStyleKey = typeof(RichSuggestBox);
 
@@ -81,7 +82,7 @@ public RichSuggestBox()
         public void ClearUndoRedoSuggestionHistory()
         {
             TextDocument.ClearUndoRedoHistory();
-            lock (LockObj)
+            lock (_tokensLock)
             {
                 if (_tokens.Count == 0)
                 {
@@ -108,7 +109,7 @@ public bool TryGetTokenFromRange(ITextRange range, out RichSuggestToken token)
             range = range.GetClone();
             if (range != null && !string.IsNullOrEmpty(range.Link))
             {
-                lock (LockObj)
+                lock (_tokensLock)
                 {
                     return _tokens.TryGetValue(range.Link, out token);
                 }
@@ -272,7 +273,7 @@ private void RichEditBox_SelectionChanging(RichEditBox sender, RichEditBoxSelect
 
             var range = selection.GetClone();
             range.Expand(TextRangeUnit.Link);
-            lock (LockObj)
+            lock (_tokensLock)
             {
                 if (!_tokens.ContainsKey(range.Link))
                 {
@@ -580,7 +581,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 return;
             }
 
-            lock (LockObj)
+            lock (_tokensLock)
             {
                 var displayText = prefix + text;
 
@@ -634,7 +635,7 @@ private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayTex
 
         private void ValidateTokensInDocument()
         {
-            lock (LockObj)
+            lock (_tokensLock)
             {
                 foreach (var (_, token) in _tokens)
                 {
@@ -655,7 +656,7 @@ private void ValidateTokenFromRange(ITextRange range)
             // Check for duplicate tokens. This can happen if the user copies and pastes the token multiple times.
             if (token.Active && token.RangeStart != range.StartPosition && token.RangeEnd != range.EndPosition)
             {
-                lock (LockObj)
+                lock (_tokensLock)
                 {
                     var guid = Guid.NewGuid();
                     if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
@@ -919,7 +920,7 @@ private ITextCharacterFormat CreateTokenFormat(ITextRange range)
 
         private void UpdateVisibleTokenList()
         {
-            lock (LockObj)
+            lock (_tokensLock)
             {
                 var toBeRemoved = _visibleTokens.Where(x => !x.Active).ToArray();
 

From 9d4809c4c265234f847ef278f57e755e84cb5e26 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 22:17:08 -0700
Subject: [PATCH 109/200] trigger RichSuggestToken PropertyChanged individually

---
 .../RichSuggestBox/RichSuggestToken.cs         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
index 95748ea52d9..1cd40a22d4a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestToken.cs
@@ -63,14 +63,26 @@ public RichSuggestToken(Guid id, string displayText)
 
         internal void UpdateTextRange(ITextRange range)
         {
-            bool invoke = _range == null || RangeStart != range.StartPosition || RangeEnd != range.EndPosition;
+            bool rangeStartChanged = RangeStart != range.StartPosition;
+            bool rangeEndChanged = RangeEnd != range.EndPosition;
+            bool positionChanged = _range == null || rangeStartChanged;
             _range = range.GetClone();
             RangeStart = _range.StartPosition;
             RangeEnd = _range.EndPosition;
 
-            if (invoke)
+            if (rangeStartChanged)
             {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RangeStart)));
+            }
+
+            if (rangeEndChanged)
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RangeEnd)));
+            }
+
+            if (positionChanged)
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Position)));
             }
         }
 

From 58a3cde0d08dad0693a3e610cda58b23bb240647 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 22:37:26 -0700
Subject: [PATCH 110/200] rename Query -> QueryText everywhere

---
 .../SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs   | 4 ++--
 .../RichSuggestBox/RichSuggestBox.cs                        | 4 ++--
 .../RichSuggestBox/SuggestionChosenEventArgs.cs             | 2 +-
 .../RichSuggestBox/SuggestionsRequestedEventArgs.cs         | 2 +-
 .../Controls/RichSuggestBoxTestPage.xaml.cs                 | 2 +-
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs  | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index c7d100aac85..56807e12829 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -180,12 +180,12 @@ private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, Suggest
             if (args.Prefix == "#")
             {
                 sender.ItemsSource =
-                    this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+                    this._samples.Where(x => x.Text.Contains(args.QueryText, StringComparison.OrdinalIgnoreCase));
             }
             else
             {
                 sender.ItemsSource =
-                    this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+                    this._emailSamples.Where(x => x.DisplayName.Contains(args.QueryText, StringComparison.OrdinalIgnoreCase));
             }
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 1a6fe323883..64476ec374e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -516,7 +516,7 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     using var tokenSource = new CancellationTokenSource();
                     _suggestionRequestedCancellationSource = tokenSource;
                     var cancellationToken = tokenSource.Token;
-                    var eventArgs = new SuggestionsRequestedEventArgs { Query = query, Prefix = prefix };
+                    var eventArgs = new SuggestionsRequestedEventArgs { QueryText = query, Prefix = prefix };
                     try
                     {
                         await SuggestionsRequested.InvokeAsync(this, eventArgs, cancellationToken);
@@ -559,7 +559,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
             {
                 Id = id,
                 Prefix = prefix,
-                Query = query,
+                QueryText = query,
                 SelectedItem = selectedItem,
                 Text = query,
                 Format = CreateTokenFormat(range)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
index 44d44836c75..a045764deae 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -16,7 +16,7 @@ public class SuggestionChosenEventArgs : DeferredEventArgs
         /// <summary>
         /// Gets the query used for this token.
         /// </summary>
-        public string Query { get; internal set; }
+        public string QueryText { get; internal set; }
 
         /// <summary>
         /// Gets the prefix character used for this token.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
index eee5ccfbb45..63e9c2ce07b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
@@ -19,6 +19,6 @@ public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
         /// <summary>
         /// Gets or sets the query for suggestions.
         /// </summary>
-        public string Query { get; set; }
+        public string QueryText { get; set; }
     }
 }
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
index e8087294cf1..a8af62a986d 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
@@ -27,7 +27,7 @@ private void RichSuggestBox_OnSuggestionsRequested(RichSuggestBox sender, Sugges
 
         private void RichSuggestBox_OnSuggestionsChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
         {
-            args.Text = args.Query + (string)args.SelectedItem;
+            args.Text = args.QueryText + (string)args.SelectedItem;
         }
     }
 }
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 877d48192a8..cb82ad53641 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -236,15 +236,15 @@ void SuggestionsRequestedHandler(RichSuggestBox sender, SuggestionsRequestedEven
             {
                 suggestionsRequestedCalled = true;
                 Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionsRequested)}.");
-                Assert.AreEqual(tokenText.Substring(1), args.Query, $"Unexpected query in {nameof(RichSuggestBox.SuggestionsRequested)}.");
+                Assert.AreEqual(tokenText.Substring(1), args.QueryText, $"Unexpected query in {nameof(RichSuggestBox.SuggestionsRequested)}.");
             }
 
             void SuggestionChosenHandler(RichSuggestBox sender, SuggestionChosenEventArgs args)
             {
                 suggestionChosenCalled = true;
                 Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionChosen)}.");
-                Assert.AreEqual(tokenText.Substring(1), args.Query, $"Unexpected query in {nameof(RichSuggestBox.SuggestionChosen)}.");
-                Assert.AreEqual(args.Query, args.Text, $"Unexpected display text in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreEqual(tokenText.Substring(1), args.QueryText, $"Unexpected query in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreEqual(args.QueryText, args.Text, $"Unexpected display text in {nameof(RichSuggestBox.SuggestionChosen)}.");
                 Assert.AreSame(tokenText, args.SelectedItem, $"Selected item has unknown object {args.SelectedItem} in {nameof(RichSuggestBox.SuggestionChosen)}.");
             }
 

From c363f627c2907c6bd9b41de1ec1964aa847d8d91 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 18 Aug 2021 22:57:24 -0700
Subject: [PATCH 111/200] improve clarity for SuggestionChosenEventArgs

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs            | 4 ++--
 .../RichSuggestBox/RichSuggestBox.cs                     | 9 +++++----
 .../RichSuggestBox/SuggestionChosenEventArgs.cs          | 6 +++---
 .../Controls/RichSuggestBoxTestPage.xaml.cs              | 2 +-
 .../UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs     | 4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index 56807e12829..fa5ed7f93e3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -167,11 +167,11 @@ private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionC
                 args.Format.ForegroundColor = Colors.OrangeRed;
                 args.Format.Bold = FormatEffect.On;
                 args.Format.Italic = FormatEffect.On;
-                args.Text = ((SampleDataType)args.SelectedItem).Text;
+                args.DisplayText = ((SampleDataType)args.SelectedItem).Text;
             }
             else
             {
-                args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
+                args.DisplayText = ((SampleEmailDataType)args.SelectedItem).DisplayName;
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 64476ec374e..9575825fee8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -555,14 +555,15 @@ internal async Task CommitSuggestionAsync(object selectedItem)
             }
 
             var textBefore = range.Text;
+            var format = CreateTokenFormat(range);
             var eventArgs = new SuggestionChosenEventArgs
             {
                 Id = id,
                 Prefix = prefix,
                 QueryText = query,
                 SelectedItem = selectedItem,
-                Text = query,
-                Format = CreateTokenFormat(range)
+                DisplayText = query,
+                Format = format
             };
 
             if (SuggestionChosen != null)
@@ -570,7 +571,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 await SuggestionChosen.InvokeAsync(this, eventArgs);
             }
 
-            var text = eventArgs.Text;
+            var text = eventArgs.DisplayText;
 
             // Since this operation is async, the document may have changed at this point.
             // Double check if the range still has the expected query.
@@ -586,7 +587,7 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 var displayText = prefix + text;
 
                 _ignoreChange = true;
-                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format);
+                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format ?? format);
                 TextDocument.EndUndoGroup();
                 TextDocument.BeginUndoGroup();
                 _ignoreChange = false;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
index a045764deae..b465e3ed5de 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs
@@ -26,7 +26,7 @@ public class SuggestionChosenEventArgs : DeferredEventArgs
         /// <summary>
         /// Gets or sets the display text.
         /// </summary>
-        public string Text { get; set; }
+        public string DisplayText { get; set; }
 
         /// <summary>
         /// Gets the suggestion item associated with this token.
@@ -39,8 +39,8 @@ public class SuggestionChosenEventArgs : DeferredEventArgs
         public Guid Id { get; internal set; }
 
         /// <summary>
-        /// Gets the formatting construct to override this token formatting.
+        /// Gets or sets the <see cref="ITextCharacterFormat"/> object used to format the display text for this token.
         /// </summary>
-        public ITextCharacterFormat Format { get; internal set; }
+        public ITextCharacterFormat Format { get; set; }
     }
 }
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
index a8af62a986d..0b52908b0c0 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
@@ -27,7 +27,7 @@ private void RichSuggestBox_OnSuggestionsRequested(RichSuggestBox sender, Sugges
 
         private void RichSuggestBox_OnSuggestionsChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
         {
-            args.Text = args.QueryText + (string)args.SelectedItem;
+            args.DisplayText = args.QueryText + (string)args.SelectedItem;
         }
     }
 }
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index cb82ad53641..6d59fa13942 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -82,7 +82,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 rsb.SuggestionChosen += (rsb, e) =>
                 {
-                    e.Text = expectedText.Substring(1);
+                    e.DisplayText = expectedText.Substring(1);
                     var format = e.Format;
                     format.BackgroundColor = Windows.UI.Colors.Beige;
                     format.ForegroundColor = Windows.UI.Colors.Azure;
@@ -244,7 +244,7 @@ void SuggestionChosenHandler(RichSuggestBox sender, SuggestionChosenEventArgs ar
                 suggestionChosenCalled = true;
                 Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionChosen)}.");
                 Assert.AreEqual(tokenText.Substring(1), args.QueryText, $"Unexpected query in {nameof(RichSuggestBox.SuggestionChosen)}.");
-                Assert.AreEqual(args.QueryText, args.Text, $"Unexpected display text in {nameof(RichSuggestBox.SuggestionChosen)}.");
+                Assert.AreEqual(args.QueryText, args.DisplayText, $"Unexpected display text in {nameof(RichSuggestBox.SuggestionChosen)}.");
                 Assert.AreSame(tokenText, args.SelectedItem, $"Selected item has unknown object {args.SelectedItem} in {nameof(RichSuggestBox.SuggestionChosen)}.");
             }
 

From 2ffd1ff288efced5b14628b280eaaa9c5877d0d0 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 19 Aug 2021 01:24:54 -0700
Subject: [PATCH 112/200] add header for RichSuggestQuery.cs

---
 .../RichSuggestBox/RichSuggestQuery.cs                        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
index e88fb7747a0..cbda2eb3c4e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls

From 357d2ba7efd94707f198067f3c69ba61f2f843c9 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Thu, 19 Aug 2021 09:50:27 -0700
Subject: [PATCH 113/200] Wire up Unload event

---
 .../FrameworkElementExtensions.RelativeAncestor.cs    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index 8dbdf9dd251..2dc95954d67 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -64,10 +64,13 @@ private static void AncestorType_PropertyChanged(DependencyObject obj, Dependenc
             if (obj is FrameworkElement fe)
             {
                 fe.Loaded -= FrameworkElement_Loaded;
+                fe.Unloaded -= FrameworkElement_Unloaded;
 
                 if (args.NewValue != null)
                 {
                     fe.Loaded += FrameworkElement_Loaded;
+                    fe.Unloaded += FrameworkElement_Unloaded;
+
                     if (fe.Parent != null)
                     {
                         FrameworkElement_Loaded(fe, null);
@@ -83,5 +86,13 @@ private static void FrameworkElement_Loaded(object sender, RoutedEventArgs e)
                 SetAncestor(fe, fe.FindAscendant(GetAncestorType(fe)));
             }
         }
+
+        private static void FrameworkElement_Unloaded(object sender, RoutedEventArgs e)
+        {
+            if(sender is FrameworkElement fe)
+            {
+                SetAncestor(fe, null);
+            }
+        }
     }
 }
\ No newline at end of file

From 6787487436149f39e7b831613f97fe494936e856 Mon Sep 17 00:00:00 2001
From: Shane Weaver <shweaver@microsoft.com>
Date: Thu, 19 Aug 2021 13:17:06 -0700
Subject: [PATCH 114/200] Removing "this." instances

---
 ...pplicationDataStorageHelper.CacheFolder.cs | 10 +--
 .../ApplicationDataStorageHelper.cs           | 62 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
index 40a51057bcc..2bb537b5b52 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
@@ -29,7 +29,7 @@ public partial class ApplicationDataStorageHelper
         /// <returns>Waiting task until completion with the object in the file.</returns>
         public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         {
-            return ReadFileAsync<T>(this.CacheFolder, filePath, @default);
+            return ReadFileAsync<T>(CacheFolder, filePath, @default);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>A list of file types and names in the target folder.</returns>
         public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadCacheFolderAsync(string folderPath)
         {
-            return ReadFolderAsync(this.CacheFolder, folderPath);
+            return ReadFolderAsync(CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFileAsync<T>(string filePath, T value)
         {
-            return CreateFileAsync<T>(this.CacheFolder, filePath, value);
+            return CreateFileAsync<T>(CacheFolder, filePath, value);
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ public Task CreateCacheFileAsync<T>(string filePath, T value)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFolderAsync(string folderPath)
         {
-            return CreateFolderAsync(this.CacheFolder, folderPath);
+            return CreateFolderAsync(CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public Task<bool> TryDeleteCacheItemAsync(string itemPath)
         /// <returns>Waiting task until completion.</returns>
         public Task<bool> TryRenameCacheItemAsync(string itemPath, string newName)
         {
-            return TryRenameItemAsync(this.CacheFolder, itemPath, newName);
+            return TryRenameItemAsync(CacheFolder, itemPath, newName);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
index 7140dcfbd23..7f2da09f7df 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -27,19 +27,19 @@ public partial class ApplicationDataStorageHelper : IFileStorageHelper, ISetting
         /// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>
         public ApplicationDataStorageHelper(ApplicationData appData, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
         {
-            this.AppData = appData ?? throw new ArgumentNullException(nameof(appData));
-            this.Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();
+            AppData = appData ?? throw new ArgumentNullException(nameof(appData));
+            Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();
         }
 
         /// <summary>
         /// Gets the settings container.
         /// </summary>
-        public ApplicationDataContainer Settings => this.AppData.LocalSettings;
+        public ApplicationDataContainer Settings => AppData.LocalSettings;
 
         /// <summary>
         ///  Gets the storage folder.
         /// </summary>
-        public StorageFolder Folder => this.AppData.LocalFolder;
+        public StorageFolder Folder => AppData.LocalFolder;
 
         /// <summary>
         /// Gets the storage host.
@@ -81,7 +81,7 @@ public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user
         /// <returns>True if a value exists.</returns>
         public bool KeyExists(string key)
         {
-            return this.Settings.Values.ContainsKey(key);
+            return Settings.Values.ContainsKey(key);
         }
 
         /// <summary>
@@ -93,9 +93,9 @@ public bool KeyExists(string key)
         /// <returns>The TValue object.</returns>
         public T? Read<T>(string key, T? @default = default)
         {
-            if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
+            if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
             {
-                return this.Serializer.Deserialize<T>(valueString);
+                return Serializer.Deserialize<T>(valueString);
             }
 
             return @default;
@@ -104,9 +104,9 @@ public bool KeyExists(string key)
         /// <inheritdoc />
         public bool TryRead<T>(string key, out T? value)
         {
-            if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
+            if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
             {
-                value = this.Serializer.Deserialize<T>(valueString);
+                value = Serializer.Deserialize<T>(valueString);
                 return true;
             }
 
@@ -117,19 +117,19 @@ public bool TryRead<T>(string key, out T? value)
         /// <inheritdoc />
         public void Save<T>(string key, T value)
         {
-            this.Settings.Values[key] = this.Serializer.Serialize(value);
+            Settings.Values[key] = Serializer.Serialize(value);
         }
 
         /// <inheritdoc />
         public bool TryDelete(string key)
         {
-            return this.Settings.Values.Remove(key);
+            return Settings.Values.Remove(key);
         }
 
         /// <inheritdoc />
         public void Clear()
         {
-            this.Settings.Values.Clear();
+            Settings.Values.Clear();
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public void Clear()
         /// <returns>True if a value exists.</returns>
         public bool KeyExists(string compositeKey, string key)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 return composite.ContainsKey(key);
             }
@@ -158,12 +158,12 @@ public bool KeyExists(string compositeKey, string key)
         /// <returns>The T object.</returns>
         public bool TryRead<T>(string compositeKey, string key, out T? value)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 string compositeValue = (string)composite[key];
                 if (compositeValue != null)
                 {
-                    value = this.Serializer.Deserialize<T>(compositeValue);
+                    value = Serializer.Deserialize<T>(compositeValue);
                     return true;
                 }
             }
@@ -182,11 +182,11 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)
         /// <returns>The T object.</returns>
         public T? Read<T>(string compositeKey, string key, T? @default = default)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 if (composite.TryGetValue(key, out object valueObj) && valueObj is string value)
                 {
-                    return this.Serializer.Deserialize<T>(value);
+                    return Serializer.Deserialize<T>(value);
                 }
             }
 
@@ -203,17 +203,17 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)
         /// <param name="values">Objects to save.</param>
         public void Save<T>(string compositeKey, IDictionary<string, T> values)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 foreach (KeyValuePair<string, T> setting in values)
                 {
                     if (composite.ContainsKey(setting.Key))
                     {
-                        composite[setting.Key] = this.Serializer.Serialize(setting.Value);
+                        composite[setting.Key] = Serializer.Serialize(setting.Value);
                     }
                     else
                     {
-                        composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));
+                        composite.Add(setting.Key, Serializer.Serialize(setting.Value));
                     }
                 }
             }
@@ -222,10 +222,10 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)
                 composite = new ApplicationDataCompositeValue();
                 foreach (KeyValuePair<string, T> setting in values)
                 {
-                    composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));
+                    composite.Add(setting.Key, Serializer.Serialize(setting.Value));
                 }
 
-                this.Settings.Values[compositeKey] = composite;
+                Settings.Values[compositeKey] = composite;
             }
         }
 
@@ -237,7 +237,7 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)
         /// <returns>A boolean indicator of success.</returns>
         public bool TryDelete(string compositeKey, string key)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 return composite.Remove(key);
             }
@@ -248,43 +248,43 @@ public bool TryDelete(string compositeKey, string key)
         /// <inheritdoc />
         public Task<T?> ReadFileAsync<T>(string filePath, T? @default = default)
         {
-            return this.ReadFileAsync<T>(this.Folder, filePath, @default);
+            return ReadFileAsync<T>(Folder, filePath, @default);
         }
 
         /// <inheritdoc />
         public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadFolderAsync(string folderPath)
         {
-            return this.ReadFolderAsync(this.Folder, folderPath);
+            return ReadFolderAsync(Folder, folderPath);
         }
 
         /// <inheritdoc />
         public Task CreateFileAsync<T>(string filePath, T value)
         {
-            return this.CreateFileAsync<T>(this.Folder, filePath, value);
+            return CreateFileAsync<T>(Folder, filePath, value);
         }
 
         /// <inheritdoc />
         public Task CreateFolderAsync(string folderPath)
         {
-            return this.CreateFolderAsync(this.Folder, folderPath);
+            return CreateFolderAsync(Folder, folderPath);
         }
 
         /// <inheritdoc />
         public Task<bool> TryDeleteItemAsync(string itemPath)
         {
-            return TryDeleteItemAsync(this.Folder, itemPath);
+            return TryDeleteItemAsync(Folder, itemPath);
         }
 
         /// <inheritdoc />
         public Task<bool> TryRenameItemAsync(string itemPath, string newName)
         {
-            return TryRenameItemAsync(this.Folder, itemPath, newName);
+            return TryRenameItemAsync(Folder, itemPath, newName);
         }
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
         {
             string value = await StorageFileHelper.ReadTextFromFileAsync(folder, NormalizePath(filePath));
-            return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;
+            return (value != null) ? Serializer.Deserialize<T>(value) : @default;
         }
 
         private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)
@@ -304,7 +304,7 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
+            return await StorageFileHelper.WriteTextToFileAsync(folder, Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
         }
 
         private async Task CreateFolderAsync(StorageFolder folder, string folderPath)

From 1ba3228ae447674771119e20834719404fb47adb Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 19 Aug 2021 14:07:14 -0700
Subject: [PATCH 115/200] add Clear() and AddTokens() methods these 2 methods
 support loading data into the control programmatically

---
 .../RichSuggestBox/RichSuggestBox.cs          | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 9575825fee8..16f38bbda73 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -97,6 +97,36 @@ public void ClearUndoRedoSuggestionHistory()
             }
         }
 
+        /// <summary>
+        /// Clear the document and token list. This will also clear the undo/redo history.
+        /// </summary>
+        public void Clear()
+        {
+            lock (_tokensLock)
+            {
+                _tokens.Clear();
+                _visibleTokens.Clear();
+                TextDocument.Selection.Expand(TextRangeUnit.Story);
+                TextDocument.Selection.Delete(TextRangeUnit.Story, 0);
+                TextDocument.ClearUndoRedoHistory();
+            }
+        }
+
+        /// <summary>
+        /// Add tokens to be tracked against the document. Duplicate tokens will not be updated.
+        /// </summary>
+        /// <param name="tokens">The collection of tokens to be tracked.</param>
+        public void AddTokens(IEnumerable<RichSuggestToken> tokens)
+        {
+            lock (_tokensLock)
+            {
+                foreach (var token in tokens)
+                {
+                    _tokens.TryAdd($"\"{token.Id}\"", token);
+                }
+            }
+        }
+
         /// <summary>
         /// Try getting the token associated with a text range.
         /// </summary>
@@ -673,7 +703,7 @@ private void ValidateTokenFromRange(ITextRange range)
 
             if (token.ToString() != range.Text)
             {
-                range.Delete(TextRangeUnit.Story, -1);
+                range.Delete(TextRangeUnit.Story, 0);
                 token.Active = false;
                 return;
             }
@@ -923,7 +953,7 @@ private void UpdateVisibleTokenList()
         {
             lock (_tokensLock)
             {
-                var toBeRemoved = _visibleTokens.Where(x => !x.Active).ToArray();
+                var toBeRemoved = _visibleTokens.Where(x => !x.Active || !_tokens.ContainsKey($"\"{x.Id}\"")).ToArray();
 
                 foreach (var elem in toBeRemoved)
                 {

From 17b9b32f6075ac5adc95fecc5f6a91b93e60f754 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 19 Aug 2021 17:34:20 -0700
Subject: [PATCH 116/200] reafactor out _suggestionRequestedCancellationSource

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 17 ---------------
 .../RichSuggestBox/RichSuggestBox.cs          | 21 +++++++++++++------
 .../RichSuggestBox/RichSuggestQuery.cs        |  3 +++
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 156ced8ba3e..3f01fe4383a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -104,22 +104,5 @@ private static void ForEachLinkInDocument(ITextDocument document, Action<ITextRa
                 nextIndex = range.GetIndex(TextRangeUnit.Link);
             }
         }
-
-        private static void CancelIfNotDisposed(CancellationTokenSource cancellationSource)
-        {
-            if (cancellationSource == null || cancellationSource.IsCancellationRequested)
-            {
-                return;
-            }
-
-            try
-            {
-                cancellationSource.Cancel();
-            }
-            catch (ObjectDisposedException)
-            {
-                // pass
-            }
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 16f38bbda73..8c40aaf6982 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -55,7 +55,6 @@ public partial class RichSuggestBox : ItemsControl
         private bool _popupOpenDown;
         private bool _textCompositionActive;
         private RichSuggestQuery _currentQuery;
-        private CancellationTokenSource _suggestionRequestedCancellationSource;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RichSuggestBox"/> class.
@@ -534,17 +533,25 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                 return;
             }
 
-            CancelIfNotDisposed(this._suggestionRequestedCancellationSource);
-            this._suggestionRequestedCancellationSource = null;
+            var previousTokenSource = currentQuery?.CancellationTokenSource;
+            if (!(previousTokenSource?.IsCancellationRequested ?? true))
+            {
+                previousTokenSource.Cancel();
+            }
 
             if (queryFound)
             {
-                _currentQuery = new RichSuggestQuery { Prefix = prefix, QueryText = query, Range = range };
+                using var tokenSource = new CancellationTokenSource();
+                _currentQuery = new RichSuggestQuery
+                {
+                    Prefix = prefix,
+                    QueryText = query,
+                    Range = range,
+                    CancellationTokenSource = tokenSource
+                };
 
                 if (SuggestionsRequested != null)
                 {
-                    using var tokenSource = new CancellationTokenSource();
-                    _suggestionRequestedCancellationSource = tokenSource;
                     var cancellationToken = tokenSource.Token;
                     var eventArgs = new SuggestionsRequestedEventArgs { QueryText = query, Prefix = prefix };
                     try
@@ -562,6 +569,8 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                         ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
                     }
                 }
+
+                tokenSource.Cancel();
             }
             else
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
index cbda2eb3c4e..892fd2753ed 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestQuery.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Threading;
 using Windows.UI.Text;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -16,5 +17,7 @@ internal class RichSuggestQuery
         public string QueryText { get; set; }
 
         public ITextRange Range { get; set; }
+
+        public CancellationTokenSource CancellationTokenSource { get; set; }
     }
 }

From f772542ee8a88d9198d7af29e0f54be6c2789ea0 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 19 Aug 2021 17:55:14 -0700
Subject: [PATCH 117/200] add Load() method

---
 .../RichSuggestBox/RichSuggestBox.cs                 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 8c40aaf6982..a5ec529f59d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -126,6 +126,18 @@ public void AddTokens(IEnumerable<RichSuggestToken> tokens)
             }
         }
 
+        /// <summary>
+        /// Populate the <see cref="RichSuggestBox"/> with an existing Rich Text Format (RTF) document and a collection of tokens.
+        /// </summary>
+        /// <param name="rtf">The Rich Text Format (RTF) text to be imported.</param>
+        /// <param name="tokens">The collection of tokens embedded in the document.</param>
+        public void Load(string rtf, IEnumerable<RichSuggestToken> tokens)
+        {
+            Clear();
+            AddTokens(tokens);
+            TextDocument.SetText(TextSetOptions.FormatRtf, rtf);
+        }
+
         /// <summary>
         /// Try getting the token associated with a text range.
         /// </summary>

From cddc5a6f6ec827ff2f65d961228ffa94628cca88 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 20 Aug 2021 01:02:38 -0700
Subject: [PATCH 118/200] add tests for Load and Clear

---
 .../UI/Controls/Test_RichSuggestBox.cs        | 106 ++++++++++++++++--
 1 file changed, 99 insertions(+), 7 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 6d59fa13942..12e569ff1f7 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.UI.Text;
@@ -34,7 +35,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 var token1 = rsb.Tokens.Last();
 
-                AssertToken(rsb, token1, tokenText1);
+                AssertToken(rsb, token1);
                 var expectedStory = $"{token1} \r";
                 document.GetText(TextGetOptions.None, out var actualStory);
                 Assert.AreEqual(expectedStory, actualStory);
@@ -46,7 +47,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 var token2 = rsb.Tokens.Last();
 
-                AssertToken(rsb, token2, tokenText2);
+                AssertToken(rsb, token2);
                 expectedStory = $"{token1} {token2} \r";
                 document.GetText(TextGetOptions.None, out actualStory);
                 Assert.AreEqual(expectedStory, actualStory);
@@ -59,7 +60,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 var token3 = rsb.Tokens.Last();
 
-                AssertToken(rsb, token3, tokenText3);
+                AssertToken(rsb, token3);
                 expectedStory = $"{token1} {token2}{token3} \r";
                 document.GetText(TextGetOptions.None, out actualStory);
                 Assert.AreEqual(expectedStory, actualStory);
@@ -168,14 +169,14 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
 
                 await AddTokenAsync(rsb, "@Before");
                 var tokenBefore = rsb.Tokens[0];
-                AssertToken(rsb, tokenBefore, "@Before");
+                AssertToken(rsb, tokenBefore);
 
                 selection.Delete(TextRangeUnit.Character, -2);
                 await Task.Delay(10);
 
                 await AddTokenAsync(rsb, "@After");
                 var tokenAfter = rsb.Tokens[0];
-                AssertToken(rsb, tokenAfter, "@After");
+                AssertToken(rsb, tokenAfter);
 
                 Assert.AreNotSame(tokenBefore, tokenAfter, "Token before and token after are the same.");
                 Assert.AreNotEqual(tokenBefore.Id, tokenAfter.Id, "Token ID before and token ID after are the same.");
@@ -217,11 +218,102 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
             });
         }
 
-        private static void AssertToken(RichSuggestBox rsb, RichSuggestToken token, string displayText)
+        [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
+        public async Task Test_RichSuggestBox_Clear()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox();
+                await SetTestContentAsync(rsb);
+
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+                selection.TypeText("before ");
+                await AddTokenAsync(rsb, "@Token");
+                selection.TypeText("after");
+                document.GetText(TextGetOptions.NoHidden, out var text);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Unexpected tokens count before clear.");
+                Assert.IsTrue(document.CanUndo(), "Document cannot undo before clear.");
+                Assert.AreEqual("before \u200B@Token\u200B after", text);
+
+                rsb.Clear();
+                document.GetText(TextGetOptions.NoHidden, out text);
+
+                Assert.AreEqual(0, rsb.Tokens.Count, "Unexpected tokens count after clear.");
+                Assert.IsFalse(document.CanUndo(), "Document can undo after clear.");
+                Assert.AreEqual(string.Empty, text);
+            });
+        }
+
+        [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
+        public async Task Test_RichSuggestBox_ClearUndoRedoHistory()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox();
+                await SetTestContentAsync(rsb);
+
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+                selection.TypeText("before ");
+                await AddTokenAsync(rsb, "@Token");
+                selection.TypeText("after");
+                document.GetText(TextGetOptions.NoHidden, out var text);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Unexpected tokens count before clear.");
+                Assert.IsTrue(document.CanUndo(), "Document cannot undo before clear.");
+                Assert.AreEqual("before \u200B@Token\u200B after", text);
+
+                rsb.ClearUndoRedoSuggestionHistory();
+                document.GetText(TextGetOptions.NoHidden, out text);
+
+                Assert.AreEqual(1, rsb.Tokens.Count, "Unexpected tokens count after clear.");
+                Assert.IsFalse(document.CanUndo(), "Document can undo after clear.");
+                Assert.AreEqual("before \u200B@Token\u200B after", text);
+            });
+        }
+
+        [TestCategory(nameof(RichSuggestBox))]
+        [TestMethod]
+        public async Task Test_RichSuggestBox_Load()
+        {
+            const string rtf = @"{\rtf1\fbidis\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}{\f1\fnil Segoe UI;}}
+{\colortbl ;\red255\green255\blue255;\red0\green0\blue255;\red41\green150\blue204;}
+{\*\generator Riched20 10.0.19041}\viewkind4\uc1 
+\pard\tx720\cf1\f0\fs21\lang4105 Hello {{\field{\*\fldinst{HYPERLINK ""c3b58ee9-df54-4686-b295-f203a5d8809a""}}{\fldrslt{\ul\cf2\u8203?\cf3\highlight1 @Michael Hawker\cf1\highlight0\u8203?}}}}\f1\fs21  \f0 from {{\field{\*\fldinst{HYPERLINK ""1c6a71c3-f81f-4a27-8f17-50d64acd5b61""}}{\fldrslt{\ul\cf2\u8203?\cf3\highlight1 @Tung Huynh\cf1\highlight0\u8203?}}}}\f1\fs21\par
+}
+";
+            var token1 = new RichSuggestToken(Guid.Parse("c3b58ee9-df54-4686-b295-f203a5d8809a"), "@Michael Hawker");
+            var token2 = new RichSuggestToken(Guid.Parse("1c6a71c3-f81f-4a27-8f17-50d64acd5b61"), "@Tung Huynh");
+
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var rsb = new RichSuggestBox();
+                await SetTestContentAsync(rsb);
+
+                var document = rsb.TextDocument;
+                var selection = document.Selection;
+                selection.TypeText("before ");
+                await AddTokenAsync(rsb, "@Token");
+                selection.TypeText("after");
+
+                rsb.Load(rtf, new[] { token1, token2 });
+                await Task.Delay(10);
+                document.GetText(TextGetOptions.NoHidden, out var text);
+
+                Assert.AreEqual("Hello \u200b@Michael Hawker\u200b from \u200b@Tung Huynh\u200b\r", text, "Unexpected document text.");
+                AssertToken(rsb, token1);
+                AssertToken(rsb, token2);
+            });
+        }
+
+        private static void AssertToken(RichSuggestBox rsb, RichSuggestToken token)
         {
             var document = rsb.TextDocument;
             var tokenRange = document.GetRange(token.RangeStart, token.RangeEnd);
-            Assert.AreSame(displayText, token.Item, $"Token item has unknown object {token.Item}.");
             Assert.AreEqual(token.ToString(), tokenRange.Text);
             Assert.AreEqual($"\"{token.Id}\"", tokenRange.Link, "Unexpected link value.");
             Assert.AreEqual(LinkType.FriendlyLinkAddress, tokenRange.CharacterFormat.LinkType, "Unexpected link type.");

From 70c9ef0a816bb2b34e208d968a05a544048d253c Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 20 Aug 2021 16:15:07 -0700
Subject: [PATCH 119/200] minor fix for the Load test case

---
 UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 12e569ff1f7..91827f46bad 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -304,6 +304,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
                 await Task.Delay(10);
                 document.GetText(TextGetOptions.NoHidden, out var text);
 
+                Assert.AreEqual(2, rsb.Tokens.Count, "Unexpected tokens count after load.");
                 Assert.AreEqual("Hello \u200b@Michael Hawker\u200b from \u200b@Tung Huynh\u200b\r", text, "Unexpected document text.");
                 AssertToken(rsb, token1);
                 AssertToken(rsb, token2);

From 3587c409918b7c106229613089fd92cad325e98d Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 20 Aug 2021 16:24:30 -0700
Subject: [PATCH 120/200] SuggestionsRequested -> SuggestionRequested

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 20 +++++++++----------
 .../RichSuggestBox/RichSuggestBox.Events.cs   |  2 +-
 .../RichSuggestBox/RichSuggestBox.cs          |  6 +++---
 ...rgs.cs => SuggestionRequestedEventArgs.cs} |  4 ++--
 .../Controls/RichSuggestBoxTestPage.xaml      |  4 ++--
 .../Controls/RichSuggestBoxTestPage.xaml.cs   |  4 ++--
 .../UI/Controls/Test_RichSuggestBox.cs        | 14 ++++++-------
 7 files changed, 27 insertions(+), 27 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/{SuggestionsRequestedEventArgs.cs => SuggestionRequestedEventArgs.cs} (80%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index fa5ed7f93e3..f7a662d2a3f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -102,13 +102,13 @@ public void OnXamlRendered(FrameworkElement control)
             if (this._rsb != null)
             {
                 this._rsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
-                this._rsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
+                this._rsb.SuggestionRequested -= this.SuggestingBox_OnSuggestionRequested;
             }
 
             if (this._tsb != null)
             {
                 this._tsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
-                this._tsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested;
+                this._tsb.SuggestionRequested -= this.SuggestingBox_OnSuggestionRequested;
                 this._tsb.TokenPointerOver -= this.SuggestingBox_OnTokenPointerOver;
             }
 
@@ -116,14 +116,14 @@ public void OnXamlRendered(FrameworkElement control)
             {
                 this._rsb = rsb;
                 this._rsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
-                this._rsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
+                this._rsb.SuggestionRequested += this.SuggestingBox_OnSuggestionRequested;
             }
 
             if (control.FindChild("PlainTextSuggestingBox") is RichSuggestBox tsb)
             {
                 this._tsb = tsb;
                 this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen;
-                this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested;
+                this._tsb.SuggestionRequested += this.SuggestingBox_OnSuggestionRequested;
                 this._tsb.TokenPointerOver += this.SuggestingBox_OnTokenPointerOver;
             }
 
@@ -150,11 +150,11 @@ private void SuggestingBox_OnTokenPointerOver(RichSuggestBox sender, RichSuggest
                 {
                     cp.Content = args.Token.Item;
                     flyout.ShowAt(sender, new FlyoutShowOptions
-                        {
-                            Position = pointerPosition,
-                            ExclusionRect = sender.GetRectFromRange(args.Range),
-                            ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway,
-                        });
+                    {
+                        Position = pointerPosition,
+                        ExclusionRect = sender.GetRectFromRange(args.Range),
+                        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway,
+                    });
                 });
             }
         }
@@ -175,7 +175,7 @@ private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionC
             }
         }
 
-        private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+        private void SuggestingBox_OnSuggestionRequested(RichSuggestBox sender, SuggestionRequestedEventArgs args)
         {
             if (args.Prefix == "#")
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
index 67d5124ece9..c57bfd7b680 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs
@@ -16,7 +16,7 @@ public partial class RichSuggestBox
         /// <summary>
         /// Event raised when the control needs to show suggestions.
         /// </summary>
-        public event TypedEventHandler<RichSuggestBox, SuggestionsRequestedEventArgs> SuggestionsRequested;
+        public event TypedEventHandler<RichSuggestBox, SuggestionRequestedEventArgs> SuggestionRequested;
 
         /// <summary>
         /// Event raised when user click on a suggestion.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index a5ec529f59d..b93fc9df513 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -562,13 +562,13 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     CancellationTokenSource = tokenSource
                 };
 
-                if (SuggestionsRequested != null)
+                if (SuggestionRequested != null)
                 {
                     var cancellationToken = tokenSource.Token;
-                    var eventArgs = new SuggestionsRequestedEventArgs { QueryText = query, Prefix = prefix };
+                    var eventArgs = new SuggestionRequestedEventArgs { QueryText = query, Prefix = prefix };
                     try
                     {
-                        await SuggestionsRequested.InvokeAsync(this, eventArgs, cancellationToken);
+                        await SuggestionRequested.InvokeAsync(this, eventArgs, cancellationToken);
                     }
                     catch (OperationCanceledException)
                     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionRequestedEventArgs.cs
similarity index 80%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionRequestedEventArgs.cs
index 63e9c2ce07b..21c8655bb0f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionRequestedEventArgs.cs
@@ -7,9 +7,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Provide data for <see cref="RichSuggestBox.SuggestionsRequested"/> event.
+    /// Provide data for <see cref="RichSuggestBox.SuggestionRequested"/> event.
     /// </summary>
-    public class SuggestionsRequestedEventArgs : DeferredCancelEventArgs
+    public class SuggestionRequestedEventArgs : DeferredCancelEventArgs
     {
         /// <summary>
         /// Gets or sets the prefix character used for the query.
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
index 6567cb83ef8..72250ea9e16 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml
@@ -11,8 +11,8 @@
         <controls:RichSuggestBox x:Name="richSuggestBox"
                                  Width="300"
                                  AutomationProperties.Name="richSuggestBox"
-                                 SuggestionChosen="RichSuggestBox_OnSuggestionsChosen"
-                                 SuggestionsRequested="RichSuggestBox_OnSuggestionsRequested" />
+                                 SuggestionChosen="RichSuggestBox_OnSuggestionChosen"
+                                 SuggestionRequested="RichSuggestBox_OnSuggestionRequested" />
 
         <TextBlock x:Name="tokenCounter"
                    Text="{x:Bind richSuggestBox.Tokens.Count, Mode=OneWay}" />
diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
index 0b52908b0c0..cfe45370b64 100644
--- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
+++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTestPage.xaml.cs
@@ -20,12 +20,12 @@ public RichSuggestBoxTestPage()
             this.InitializeComponent();
         }
 
-        private void RichSuggestBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+        private void RichSuggestBox_OnSuggestionRequested(RichSuggestBox sender, SuggestionRequestedEventArgs args)
         {
             sender.ItemsSource = _suggestions;
         }
 
-        private void RichSuggestBox_OnSuggestionsChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
+        private void RichSuggestBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
         {
             args.DisplayText = args.QueryText + (string)args.SelectedItem;
         }
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
index 91827f46bad..ea6af4c911d 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RichSuggestBox.cs
@@ -325,11 +325,11 @@ private static async Task TestAddTokenAsync(RichSuggestBox rsb, string tokenText
             bool suggestionsRequestedCalled = false;
             bool suggestionChosenCalled = false;
 
-            void SuggestionsRequestedHandler(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+            void SuggestionsRequestedHandler(RichSuggestBox sender, SuggestionRequestedEventArgs args)
             {
                 suggestionsRequestedCalled = true;
-                Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionsRequested)}.");
-                Assert.AreEqual(tokenText.Substring(1), args.QueryText, $"Unexpected query in {nameof(RichSuggestBox.SuggestionsRequested)}.");
+                Assert.AreEqual(tokenText[0].ToString(), args.Prefix, $"Unexpected prefix in {nameof(RichSuggestBox.SuggestionRequested)}.");
+                Assert.AreEqual(tokenText.Substring(1), args.QueryText, $"Unexpected query in {nameof(RichSuggestBox.SuggestionRequested)}.");
             }
 
             void SuggestionChosenHandler(RichSuggestBox sender, SuggestionChosenEventArgs args)
@@ -341,16 +341,16 @@ void SuggestionChosenHandler(RichSuggestBox sender, SuggestionChosenEventArgs ar
                 Assert.AreSame(tokenText, args.SelectedItem, $"Selected item has unknown object {args.SelectedItem} in {nameof(RichSuggestBox.SuggestionChosen)}.");
             }
 
-            rsb.SuggestionsRequested += SuggestionsRequestedHandler;
+            rsb.SuggestionRequested += SuggestionsRequestedHandler;
             rsb.SuggestionChosen += SuggestionChosenHandler;
 
             await AddTokenAsync(rsb, tokenText);
 
-            rsb.SuggestionsRequested -= SuggestionsRequestedHandler;
+            rsb.SuggestionRequested -= SuggestionsRequestedHandler;
             rsb.SuggestionChosen -= SuggestionChosenHandler;
 
-            Assert.IsTrue(suggestionsRequestedCalled, "SuggestionsRequested was not invoked.");
-            Assert.IsTrue(suggestionChosenCalled, "SuggestionChosen was not invoked.");
+            Assert.IsTrue(suggestionsRequestedCalled, $"{nameof(RichSuggestBox.SuggestionRequested)} was not invoked.");
+            Assert.IsTrue(suggestionChosenCalled, $"{nameof(RichSuggestBox.SuggestionChosen)} was not invoked.");
         }
 
         private static async Task AddTokenAsync(RichSuggestBox rsb, string tokenText)

From 73e5f15b9db602917c8dc0bb383d6f4ac5d7f593 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Fri, 20 Aug 2021 17:38:28 -0700
Subject: [PATCH 121/200] update sample code bind

---
 .../RichSuggestBox/RichSuggestBoxCode.bind    | 43 +++++++++----------
 .../RichSuggestBox/RichSuggestBoxXaml.bind    |  4 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
index 20c1154519f..0c4e59518fa 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxCode.bind
@@ -1,51 +1,50 @@
-private void SuggestingBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
+private void SuggestingBox_OnTokenPointerOver(RichSuggestBox sender, RichSuggestTokenPointerOverEventArgs args)
 {
-  this._pointerPoint = e.GetCurrentPoint((UIElement)sender);
-}
+  var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
+  var pointerPosition = args.CurrentPoint.Position;
 
-private void SuggestingBox_OnTokenHovered(RichSuggestBox sender, RichSuggestTokenEventArgs args)
-{
-  this._hoveringTimer.Debounce(() =>
+  if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
+    (!flyout.IsOpen || cp.Content != args.Token.Item))
   {
-    var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(sender);
-    if (flyout?.Content is ContentPresenter cp && sender.TextDocument.Selection.Type != SelectionType.Normal &&
-      (!flyout.IsOpen || cp.Content != args.Token.Item))
+    this._dispatcherQueue.TryEnqueue(() =>
     {
       cp.Content = args.Token.Item;
       flyout.ShowAt(sender, new FlyoutShowOptions
       {
-        Position = this._pointerPoint.Position,
-        ExclusionRect = args.Rect,
-        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+        Position = pointerPosition,
+        ExclusionRect = sender.GetRectFromRange(args.Range),
+        ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway,
       });
-    }
-  }, TimeSpan.FromMilliseconds(200));
+    });
+  }
 }
 
 private void SuggestingBox_OnSuggestionChosen(RichSuggestBox sender, SuggestionChosenEventArgs args)
 {
   if (args.Prefix == "#")
   {
-    args.Format.Background = Colors.DarkOrange;
-    args.Format.Foreground = Colors.OrangeRed;
-    args.Text = ((SampleDataType)args.SelectedItem).Text;
+    args.Format.BackgroundColor = Colors.DarkOrange;
+    args.Format.ForegroundColor = Colors.OrangeRed;
+    args.Format.Bold = FormatEffect.On;
+    args.Format.Italic = FormatEffect.On;
+    args.DisplayText = ((SampleDataType)args.SelectedItem).Text;
   }
   else
   {
-    args.Text = ((SampleEmailDataType)args.SelectedItem).DisplayName;
+    args.DisplayText = ((SampleEmailDataType)args.SelectedItem).DisplayName;
   }
 }
 
-private void SuggestingBox_OnSuggestionsRequested(RichSuggestBox sender, SuggestionsRequestedEventArgs args)
+private void SuggestingBox_OnSuggestionRequested(RichSuggestBox sender, SuggestionRequestedEventArgs args)
 {
   if (args.Prefix == "#")
   {
     sender.ItemsSource =
-      this._samples.Where(x => x.Text.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+      this._samples.Where(x => x.Text.Contains(args.QueryText, StringComparison.OrdinalIgnoreCase));
   }
   else
   {
     sender.ItemsSource =
-      this._emailSamples.Where(x => x.DisplayName.Contains(args.Query, StringComparison.OrdinalIgnoreCase));
+      this._emailSamples.Where(x => x.DisplayName.Contains(args.QueryText, StringComparison.OrdinalIgnoreCase));
   }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
index e061d59f6e3..e5325501dab 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxXaml.bind
@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -83,7 +83,7 @@
                                  ClipboardCopyFormat="PlainText"
                                  ClipboardPasteFormat="PlainText"
                                  DisabledFormattingAccelerators="All"
-                                 Header="Plain text suggest box with on token selected flyout"
+                                 Header="Plain text suggest box with on token pointer over flyout"
                                  ItemTemplate="{StaticResource EmailTemplate}"
                                  Prefixes="@"
                                  FlyoutBase.AttachedFlyout="{StaticResource TokenSelectedFlyout}" />

From 8eba48b084958a9afa83115ade84bbef51fcffcc Mon Sep 17 00:00:00 2001
From: Daniel Paulino <dpaulino@users.noreply.github.com>
Date: Fri, 20 Aug 2021 22:29:05 -0700
Subject: [PATCH 122/200] Fixed tests

---
 .../UI/Triggers/Test_ControlSizeTrigger.cs    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
index 2e0d501032b..0cd0f790e1e 100644
--- a/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
+++ b/UnitTests/UnitTests.UWP/UI/Triggers/Test_ControlSizeTrigger.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI.Triggers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -22,9 +23,10 @@ public class Test_ControlSizeTrigger : VisualUITestBase
         [DataRow(400, 399, false)]
         public async Task ControlSizeTriggerTest(double width, double height, bool expectedResult)
         {
-            await App.DispatcherQueue.EnqueueAsync(() =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 Grid grid = CreateGrid(width, height);
+                await SetTestContentAsync(grid);
                 var trigger = new ControlSizeTrigger();
 
                 trigger.TargetElement = grid;
@@ -42,9 +44,10 @@ await App.DispatcherQueue.EnqueueAsync(() =>
         [DataRow(400, 399, false)]
         public async Task ControlSizeMinHeightTriggerTest(double width, double height, bool expectedResult)
         {
-            await App.DispatcherQueue.EnqueueAsync(() =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 Grid grid = CreateGrid(width, height);
+                await SetTestContentAsync(grid);
                 var trigger = new ControlSizeTrigger();
 
                 trigger.TargetElement = grid;
@@ -59,9 +62,10 @@ await App.DispatcherQueue.EnqueueAsync(() =>
         [DataRow(400, 400, true)]
         public async Task ControlSizeMinWidthTriggerTest(double width, double height, bool expectedResult)
         {
-            await App.DispatcherQueue.EnqueueAsync(() =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 Grid grid = CreateGrid(width, height);
+                await SetTestContentAsync(grid);
                 var trigger = new ControlSizeTrigger();
 
                 trigger.TargetElement = grid;
@@ -76,9 +80,10 @@ await App.DispatcherQueue.EnqueueAsync(() =>
         [DataRow(450, 449, true)]
         public async Task ControlSizeMaxHeightTriggerTest(double width, double height, bool expectedResult)
         {
-            await App.DispatcherQueue.EnqueueAsync(() =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 Grid grid = CreateGrid(width, height);
+                await SetTestContentAsync(grid);
                 var trigger = new ControlSizeTrigger();
 
                 trigger.TargetElement = grid;
@@ -93,9 +98,10 @@ await App.DispatcherQueue.EnqueueAsync(() =>
         [DataRow(449, 450, true)]
         public async Task ControlSizeMaxWidthTriggerTest(double width, double height, bool expectedResult)
         {
-            await App.DispatcherQueue.EnqueueAsync(() =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 Grid grid = CreateGrid(width, height);
+                await SetTestContentAsync(grid);
                 var trigger = new ControlSizeTrigger();
 
                 trigger.TargetElement = grid;
@@ -112,9 +118,6 @@ private Grid CreateGrid(double width, double height)
                 Height = height,
                 Width = width
             };
-            grid.Measure(new Windows.Foundation.Size(1000, 1000));
-            grid.Arrange(new Windows.Foundation.Rect(0, 0, 1000, 1000));
-            grid.UpdateLayout();
 
             return grid;
         }

From 9b349125c44fa299adb8e7e060642a39bf55ee3b Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 21 Aug 2021 17:26:15 -0700
Subject: [PATCH 123/200] improve some comments

---
 .../RichSuggestBox/RichSuggestBox.Properties.cs                | 3 +++
 .../RichSuggestBox/RichSuggestBox.cs                           | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
index e0f6ec17ad3..dbaf4ca58ee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs
@@ -313,6 +313,9 @@ public SolidColorBrush TokenForeground
         /// <summary>
         /// Gets or sets prefix characters to start a query.
         /// </summary>
+        /// <remarks>
+        /// Prefix characters must be punctuations (must satisfy <see cref="char.IsPunctuation(char)"/> method).
+        /// </remarks>
         public string Prefixes
         {
             get => (string)GetValue(PrefixesProperty);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index b93fc9df513..549f30bd2ec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -75,8 +75,7 @@ public RichSuggestBox()
         }
 
         /// <summary>
-        /// Clear unused tokens and undo/redo history. <see cref="RichSuggestBox"/> saves all of previously committed tokens
-        /// even when they are removed from the text. They have to be manually removed using this method.
+        /// Clear unused tokens and undo/redo history.
         /// </summary>
         public void ClearUndoRedoSuggestionHistory()
         {

From 32c37438e337467263322070e1deaf5aec60741f Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 21 Aug 2021 17:30:03 -0700
Subject: [PATCH 124/200] fix suggestions not showing if no SuggestionRequested
 handler

---
 .../RichSuggestBox/RichSuggestBox.cs               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 549f30bd2ec..bb1e1ee00ec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -561,10 +561,10 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     CancellationTokenSource = tokenSource
                 };
 
+                var cancellationToken = tokenSource.Token;
+                var eventArgs = new SuggestionRequestedEventArgs { QueryText = query, Prefix = prefix };
                 if (SuggestionRequested != null)
                 {
-                    var cancellationToken = tokenSource.Token;
-                    var eventArgs = new SuggestionRequestedEventArgs { QueryText = query, Prefix = prefix };
                     try
                     {
                         await SuggestionRequested.InvokeAsync(this, eventArgs, cancellationToken);
@@ -573,12 +573,12 @@ private async Task RequestSuggestionsAsync(ITextRange range = null)
                     {
                         return;
                     }
+                }
 
-                    if (!eventArgs.Cancel)
-                    {
-                        _suggestionChoice = 0;
-                        ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
-                    }
+                if (!eventArgs.Cancel)
+                {
+                    _suggestionChoice = 0;
+                    ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
                 }
 
                 tokenSource.Cancel();

From ad4fd040fe8a683a650744e205c96cf98559f305 Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Sat, 21 Aug 2021 21:55:17 -0700
Subject: [PATCH 125/200] Add ToCompositionString

---
 .../ExpressionNodes/Matrix3x2Node.cs          |  2 +-
 .../ExpressionNodes/Matrix4x4Node.cs          |  8 ++--
 .../ExpressionNodes/QuaternionNode.cs         |  2 +-
 .../Expressions/ExpressionNodes/ScalarNode.cs |  3 +-
 .../ExpressionNodes/Vector2Node.cs            |  2 +-
 .../ExpressionNodes/Vector3Node.cs            |  2 +-
 .../ExpressionNodes/Vector4Node.cs            |  2 +-
 .../Extensions/System/FloatExtensions.cs      | 48 +++++++++++++++++++
 8 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
index 5c8ca867818..4fe297e34f8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
@@ -332,7 +332,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Matrix3x2({_value.M11},{_value.M12},{_value.M21},{_value.M22},{_value.M31},{_value.M32})";
+            return $"Matrix3x2({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()})";
         }
 
         private Matrix3x2 _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
index 7b00d426046..b75ec095e87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
@@ -403,10 +403,10 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Matrix4x4({_value.M11},{_value.M12},{_value.M13},{_value.M14}," +
-                             $"{_value.M21},{_value.M22},{_value.M23},{_value.M24}," +
-                             $"{_value.M31},{_value.M32},{_value.M33},{_value.M34}," +
-                             $"{_value.M41},{_value.M42},{_value.M43},{_value.M44})";
+            return $"Matrix4x4({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M13.ToCompositionString()},{_value.M14.ToCompositionString()}," +
+                             $"{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M23.ToCompositionString()},{_value.M24.ToCompositionString()}," +
+                             $"{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()},{_value.M33.ToCompositionString()},{_value.M34.ToCompositionString()}," +
+                             $"{_value.M41.ToCompositionString()},{_value.M42.ToCompositionString()},{_value.M43.ToCompositionString()},{_value.M44.ToCompositionString()})";
         }
 
         private Matrix4x4 _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
index 4d8b7ed7b90..54b09e738ca 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
@@ -126,7 +126,7 @@ public static implicit operator QuaternionNode(Quaternion value)
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Quaternion({_value.X},{_value.Y},{_value.Z},{_value.W})";
+            return $"Quaternion({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";
         }
 
         private Quaternion _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
index b777663acca..fe3b7408b91 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
@@ -254,8 +254,7 @@ public static implicit operator ScalarNode(int value)
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            // Important to use invariant culture to make sure that floats are written using a .
-            return _value.ToString(System.Globalization.CultureInfo.InvariantCulture);
+            return _value.ToCompositionString();
         }
 
         private float _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
index 9b17ea11c77..31c9885e70e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
@@ -297,7 +297,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector2({_value.X},{_value.Y})";
+            return $"Vector2({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()})";
         }
 
         private Vector2 _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
index f527d4fda54..7493428608a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
@@ -320,7 +320,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector3({_value.X},{_value.Y},{_value.Z})";
+            return $"Vector3({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()})";
         }
 
         private Vector3 _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
index 3aeaf76d43b..83b85093088 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
@@ -343,7 +343,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector4({_value.X},{_value.Y},{_value.Z},{_value.W})";
+            return $"Vector4({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";
         }
 
         private Vector4 _value;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
new file mode 100644
index 00000000000..e88a41eb0fc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// An extension <see langword="class"/> for the <see cref="float"/> type
+    /// </summary>
+    internal static class FloatExtensions
+    {
+        /// <summary>
+        /// Returns a <see cref="string"/> representation of a <see cref="float"/> that avoids scientific notation, which is not compatible with the composition expression animations API
+        /// </summary>
+        /// <param name="number">The input <see cref="float"/> to process</param>
+        /// <returns>A <see cref="string"/> representation of <paramref name="number"/> that can be used in a expression animation/returns>
+        [Pure]
+        public static string ToCompositionString(this float number)
+        {
+            var defaultString = number.ToString();
+            var eIndex = defaultString.IndexOf('E');
+
+            // If the default string representation is not in scientific notation, we can use it
+            if (eIndex == -1)
+            {
+                return defaultString;
+            }
+
+            // If the number uses scientific notation because it is too large, we can print it without the decimal places
+            var exponent = int.Parse(defaultString.Substring(eIndex + 1));
+            if (exponent >= 0)
+            {
+                return number.ToString($"F0");
+            }
+
+            // Otherwise, we need to print it with the right number of decimals
+            var decimalPlaces = -exponent // The number of decimal places is the exponent of 10
+                + eIndex // Plus each number in the mantissa
+                + (number < 0 ?
+                    -3 : // Minus the sign, dot and first number of the mantissa if negative
+                    -2); // Minus the dot and first number of the mantissa otherwise
+
+            return number.ToString($"F{decimalPlaces}");
+        }
+    }
+}
\ No newline at end of file

From 7c205fee8ad242784145e5630ff394f284588ff1 Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Sat, 21 Aug 2021 22:03:14 -0700
Subject: [PATCH 126/200] Remove clearreferenceinfo

---
 .../Expressions/CompositionExtensions.cs           |  2 --
 .../Expressions/ExpressionNodes/ExpressionNode.cs  | 14 --------------
 2 files changed, 16 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
index 78251ecc1c0..16f0525b369 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs
@@ -176,7 +176,6 @@ public static void StartAnimation(this CompositionObject compObject, string prop
         /// <param name="easing">The easing function to use when interpolating between frames.</param>
         public static void InsertExpressionKeyFrame(this KeyFrameAnimation keyframeAnimation, float normalizedProgressKey, ExpressionNode expressionNode, CompositionEasingFunction easing = null)
         {
-            expressionNode.ClearReferenceInfo();
             keyframeAnimation.InsertExpressionKeyFrame(normalizedProgressKey, expressionNode.ToExpressionString(), easing);
 
             expressionNode.SetAllParameters(keyframeAnimation);
@@ -253,7 +252,6 @@ private static ExpressionAnimation CreateExpressionAnimationFromNode(Compositor
             // Only create a new animation if this node hasn't already generated one before, so we don't have to re-parse the expression string.
             if (expressionNode.ExpressionAnimation == null)
             {
-                expressionNode.ClearReferenceInfo();
                 expressionNode.ExpressionAnimation = compositor.CreateExpressionAnimation(expressionNode.ToExpressionString());
             }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
index 9c0c9d4dc6b..e02d4500201 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
@@ -260,20 +260,6 @@ internal string ToExpressionString()
             return ToExpressionStringInternal();
         }
 
-        /// <summary>
-        /// Clears the reference information.
-        /// </summary>
-        /// <exception cref="System.Exception">Reference and paramName can't both be null</exception>
-        internal void ClearReferenceInfo()
-        {
-            _objRefList = null;
-            ParamName = null;
-            foreach (var child in Children)
-            {
-               child.ClearReferenceInfo();
-            }
-        }
-
         /// <summary>
         /// Ensures the reference information.
         /// </summary>

From 43975b75d5a0fee0549571e79a2e51a70c51501a Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Sat, 21 Aug 2021 22:24:33 -0700
Subject: [PATCH 127/200] Use invariant culture

---
 .../Extensions/System/FloatExtensions.cs                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
index e88a41eb0fc..37d25a0887a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
@@ -19,7 +19,7 @@ internal static class FloatExtensions
         [Pure]
         public static string ToCompositionString(this float number)
         {
-            var defaultString = number.ToString();
+            var defaultString = number.ToString(System.Globalization.CultureInfo.InvariantCulture);
             var eIndex = defaultString.IndexOf('E');
 
             // If the default string representation is not in scientific notation, we can use it
@@ -32,7 +32,7 @@ public static string ToCompositionString(this float number)
             var exponent = int.Parse(defaultString.Substring(eIndex + 1));
             if (exponent >= 0)
             {
-                return number.ToString($"F0");
+                return number.ToString($"F0", System.Globalization.CultureInfo.InvariantCulture);
             }
 
             // Otherwise, we need to print it with the right number of decimals
@@ -42,7 +42,7 @@ public static string ToCompositionString(this float number)
                     -3 : // Minus the sign, dot and first number of the mantissa if negative
                     -2); // Minus the dot and first number of the mantissa otherwise
 
-            return number.ToString($"F{decimalPlaces}");
+            return number.ToString($"F{decimalPlaces}", System.Globalization.CultureInfo.InvariantCulture);
         }
     }
 }
\ No newline at end of file

From ee71863d523d46e07eff1c7ee579426a45ca9733 Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Sat, 21 Aug 2021 22:26:31 -0700
Subject: [PATCH 128/200] Reword comment

---
 .../Extensions/System/FloatExtensions.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
index 37d25a0887a..63b1a1f8abf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
@@ -37,7 +37,7 @@ public static string ToCompositionString(this float number)
 
             // Otherwise, we need to print it with the right number of decimals
             var decimalPlaces = -exponent // The number of decimal places is the exponent of 10
-                + eIndex // Plus each number in the mantissa
+                + eIndex // Plus each character in the mantissa
                 + (number < 0 ?
                     -3 : // Minus the sign, dot and first number of the mantissa if negative
                     -2); // Minus the dot and first number of the mantissa otherwise

From 81b350e6092068a8f23d02b16b315e8afbf387f9 Mon Sep 17 00:00:00 2001
From: Arcadio Garcia Salvadores <arcadiog@microsoft.com>
Date: Sat, 21 Aug 2021 22:51:08 -0700
Subject: [PATCH 129/200] Fix comment

---
 .../Extensions/System/FloatExtensions.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
index 63b1a1f8abf..61885c718c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/FloatExtensions.cs
@@ -15,7 +15,7 @@ internal static class FloatExtensions
         /// Returns a <see cref="string"/> representation of a <see cref="float"/> that avoids scientific notation, which is not compatible with the composition expression animations API
         /// </summary>
         /// <param name="number">The input <see cref="float"/> to process</param>
-        /// <returns>A <see cref="string"/> representation of <paramref name="number"/> that can be used in a expression animation/returns>
+        /// <returns>A <see cref="string"/> representation of <paramref name="number"/> that can be used in a expression animation</returns>
         [Pure]
         public static string ToCompositionString(this float number)
         {

From f5a97d4a319d10cb05275e6ed3e7d830af6ea848 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 22 Aug 2021 22:42:52 -0700
Subject: [PATCH 130/200] add icon for sample

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj       |   1 +
 .../RichSuggestBox/RichSuggestBox.png            | Bin 0 -> 3233 bytes
 .../SamplePages/samples.json                     |   6 +++---
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBox.png

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index ba573e9e803..fca708e35d4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -274,6 +274,7 @@
     <Content Include="SamplePages\Graph\PersonView.png" />
     <Content Include="SamplePages\Primitives\ConstrainedBox.png" />
     <Content Include="SamplePages\Primitives\SwitchPresenter.png" />
+    <Content Include="SamplePages\RichSuggestBox\RichSuggestBox.png" />
     <Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.png" />
     <Content Include="SamplePages\Animations\Effects\FadeBehavior.png" />
     <Content Include="SamplePages\ColorPicker\ColorPicker.png" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBox.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBox.png
new file mode 100644
index 0000000000000000000000000000000000000000..5988c55941f58ec5959b88ca01a64e03ca2c3637
GIT binary patch
literal 3233
zcmds4XIPV27LI}qbOljSS1`sxGnHlnfu&?2VgLiu1tR%E0%;~6B!m$kbrA&>S=xxm
zU_nJGGOk3#2#(805wOB2C?kj{odE<aFgF1~M`!o{<oS{(_rB+xd(Qiwd-CLvyQ|Y8
zja3>51Y!}@*^!Pw%tC_i<@0BQPm>2mFAxZIImgon_MvShg$Q^U22-#T!bo{SfFlsr
zwo)M@BpiZ~JE2expN#4&EkhwWOft&boQ9(b9UwNxStf!!WUihevhWZh6J=|oVJ#(r
z06Yk0Af-GmUrdscQL4Bk@Ljo$MIluta5x#|Lvu$u2t*Ll9Al2bp=>me)*>d0M0fn>
zlrvb7QEV6%lCW5bM1ql+Vg#a4ES^XtVsQj4fq(`UXmJ!DW=PR|@j7LQ$rz51I7Gw|
z!W;n~sf@|kDTsi{C=|evQ^6rAXC^vdJXJm*0;@!@cnl8vxjD>X{fW5}`N~|#7Qg~A
zTOgb+;EN-s;jbJ4ecyJGGKAkUrqTYlIgj^68Df|c35b{?^^2T79U%6M5<*xyBo;)7
zLLf>c#D~|Zm{9UUa_2}Pu8$*!2l2&#T{4QWdGjAo-_KAykuZZg2)F`~2WTsZjKZt7
zmE4i2JVq$w&0)gqnP@Y>R)`;}L_S4QA<FEy5lVTt^EsfN$wO3-&kROJSrR~FDMeR7
zzTbqVwIHeTqY0QGJyVs}3`BKsa2E+!94^4bbSHZxmEvH5Ct6sb37E-JfN&(>%V9-1
zGGJguz!C6h+-5X^;7K5mOo=3d1sZ2b!cFF*vIh5o$$%OE&tBQpNNeChqmi6BVpt%G
zQf*DPx(Bptay7Z+a#THzM5>e~F+!9ikx@dCfEf`2F;!)OaFeK5z=9<V5o8w%L?)x`
zSS${pGYSc=4=0oliI8{<9yi6{w3CDlDP{lD@~~6MVU-u}Q+C$aukyE68GLqAf#2jF
zm;hjuV5esZSWHhNhz~}P2+SIh+R_0q)An+JGG8fzKo}-PB-Oas+bxZ=MH^M)3@=bL
z7lfxW=F-*ChkwlWyI@y%Brs_2)Aqo1r+N3h3=cjX@_Q8I-jp4owUnaOv#)`|+rsa-
znC)1H6W<)GCB~VCmalR(S*dugcAV>~Irl@|SS%&<w#gAVIGMO)8yvCGO#9rcQCa!U
zr&jXgmx^1;&JdS3F1u`|k!XA|O($z<R$zVZ#y$<XNv`wO(SU1i$+KhoXk@=u%jDz@
z<9J`qd3Va68h3B?+V!9K)RZ*swDh*>vyCYt@++6_f$jijt~?I|?^Ew@W5)0LxgTGC
zx!a~$`X*h+yp>!r>g%<^D`^L$c4XPV&sN?y=*(ayCeRM*rypnC?w)A5*?GuLU{v~S
zak1|0(bszq=o!9T)b{=toQ8q>$U^TYTRwDZFWeoURmd)I5OQx-L{JiXZ?#*%Ho4kp
zdP*nLS7(9Lc7NI&c4_Rn9D05ANT!Xw)Z=F7+_#Ify+7#Hl=1RH-#9Mp+6I0!76_ev
z#R!C^j`BSVk&(FqftagCb+q%8X7)TIvpqD|+!;8#@$H724>gv})4rdpQP3IyUwTZ@
zTm7%oCp?$dBKPs*4Gr0r_p9i-lvd+?{;^y0Nk-dU2IdrnUG2GIeQ-qfLk%^0JZpV@
zhw0C+hMa!AM6Eki<!zk0TI<ZQns%8?_G8v8+6BM-Vy0qN#_@9GvA^QuzIH4z=H1Yn
z<`QvB*`7pywP9{W{Ibxx%&LyTsy@0yu#S$-;x#tb5uKhrx3gESwu;OP!00Aayp-gw
zy&Qm%i`uKz=Kbx_HI0n_4z%3~S0pqBYdHsNT_`?(a5y9^tg}fj@GTq-&Ckz2dGh2$
zms^V>dZfK3-L}M_B*!H^G9m&}oX$0420I;Hy;5JlPF7L&<VtA$a987=vfV;q|Et;)
zdt%%~3WY+>e^xD{46<*WKe)y=CU5Y%sHC~Fvhw{%-$Z2F-Me>tn&hTWk^^$+QNx|v
z8%#2s+U7JE8nni=5G^e&t*lN|eV<`gy{=hn6&A-v&ffozKRnyKMR)7!TwPu3YHQJ>
z^TQkRI0Av&t|bX0V}l)lfDdCW{+pJUUcVmp4(WB$+4gc#QPJNm`PR{Ixhxh7e+SUj
z)mYfq)zzekmiRUKd_OiemXwqfJ<_X)8f3-9*d#B~)6?^p^YvD&c-`Au$1MNp>}sDJ
zddYWVzwI1<@s1M{GY)w1E(lnur-x3jNw7s~np#?VW73_RoUWY2lgS@nRwbWz`yq=Q
z9obaOdvcVDsclrM(^#;>C8r>WEE{@#YyZ4A`pGYQn@f_TcG&Lz_-?qhBH`h~hrWxc
z#<k@K;^Ow(*wZH(D=msjC4DUN3+zS%13+fxaQxW^3%fy~M*2P89v&XYZxo-iSu-{;
zFpy`kzMUtVpTY`0VZqxnz%J|T?DV@Dw*B6%F<l^N#Av19`3+*%0&336U!E(X{r&wt
ztbcU_q9ktKL>(F)hQJ{W1v^SZ?i|hYUZ2Ve?rO-lk`1w4T&mryBp}i7#sWBzDtiC6
zr|IVI=mwMVOZoXcq44sVGwZt6Qggo3&y&j~w+}3GaBygAYjZWTj7v*P8|<i0Jbbvh
zY|jK}6j!sx^&d@$#oQ;N7eB>P0*zDaJG=`6d+52Or23Bcs@D$V?UycuYo~AWec-d_
z;W5WtPvg`rzJ=`d&(Fopbixr`pXlglTF||eL-wco-}`6B+MmkLM<<i3+6Tv=nl#X=
zQD)C4XhFuQu9=(hW@euCLF2;F{ue;FiJrIir`$2=g@Fn`dC<7~rsa$EtzW-iLr*F6
zG$xbD)EJn{<pu|5@3k>Pyy@)ijTvaA{AS?(IPB^`7Rp{tdxiRv73vpzXh-FOmMojy
zB(}z*5}?f^S^BEkP1km{RV5qf_FH8W1Fpll4IYl>>R#XoJ(6b=YINe2xyl;^_)9*<
kFGVF`S2KnevRx-;wLi9%_!haSEB{$gDXxwM_QCsp2YVU&i~s-t

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index ffbee19f204..a2771156e93 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -490,11 +490,11 @@
         "Type": "RichSuggestBoxPage",
         "Subcategory": "Input",
         "About": "A text input control that makes suggestions and keeps track of data token items in a rich document.",
-        "CodeUrl": "https://github.com/huynhsontung/WindowsCommunityToolkit/tree/RichSuggestBox/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox",
+        "CodeUrl": "https://github.com/huynhsontung/WindowsCommunityToolkit/tree/RichSuggestBox/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox",
         "CodeFile": "RichSuggestBoxCode.bind",
         "XamlCodeFile": "RichSuggestBoxXaml.bind",
-        "Icon": "/SamplePages/TokenizingTextBox/TokenizingTextBox.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TokenizingTextBox.md"
+        "Icon": "/SamplePages/RichSuggestBox/RichSuggestBox.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/huynhsontung/WindowsCommunityToolkitDocs/RichSuggestBox/docs/controls/RichSuggestBox.md"
       }
     ]
   },

From ab1d3b34b5c860e0c7d3830705e46f1f9d030daf Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 23 Aug 2021 00:21:41 -0700
Subject: [PATCH 131/200] improve sample icon

---
 .../RichSuggestBox/RichSuggestBox.png         | Bin 3233 -> 35512 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBox.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBox.png
index 5988c55941f58ec5959b88ca01a64e03ca2c3637..47e34d69c0cf94b9337fed01eda4416e07505f34 100644
GIT binary patch
delta 34170
zcmV)!K#;$o8Mu`Ku!#c-GgL4zIx;XiFgKHv111VHR4_0)GB7$YH<QByr3y1tFfckY
zFgh?dlX3)Z1hGvxFSFzXqyc{*07*naRCt{1y-lcoUs?Zut+n@kpSzS)OhJ$oHS>W;
zG8;sL%%DLH0-KZ#;ztlhgR&CTf%Gs4f+#F75=uy+8l*UA5KW98At<R-N=38M24=;#
z&bjZs_xcas=X#y@TKjyzMSdUj@7aS7_vb$Q-g~WUT@UZ;VO^`d_q~7b-L@?vN+}UB
zP1CxrrIcFhvMdo%Yt;?&Ja5~^pXPa9mZi0(8%inq)4HzHG%d?gYi+Hy*7R82vu&Gx
z$Yb^D!{Kl~pZPD3jsDV~_TL;1hs)*S-}6naRp0pQBEm;LJX4oQvHu>L=oLQBd7eut
zm&;{%=J9xBcKhdWGZTLo-Sl5pMAWObivIhzGiFWMzZcDiSL>yW)90(l)>=y``qJrq
zb#--fb2B_j&++m20|$Z(<Jm94G)=8FjX@7&NYgYi@%=cV01ONnTV9XGU<~7MIEc5W
zX{xn4okd%28<rKW<56=&yzFH!o2IFhGOPhpou)|-f-Vd?B7A>h^E`_#dN*w0BWSHH
z%c3WU^IV4YbHtL>_2)Rh`sYUzzfy{1-k)<k9@lkU*Of8AC3n;@UEsgf_xB2z=yN<C
zw{4rI$r&*suCA`ubw$gd+MGLi2u$Yph`Fz>uFmH(ldZMR^DJ6vBEFQvIPYC+$mlN(
zQvsU$p2B+dehGhgo$EdgUK6~!x{8RKn;TaOVk*Ywiwm#&z#?_`Aib?MsNwbl1K_Ij
za5!k#+qOxU4ct;n!JN2ixYq_ShIL&(`q7WxDgcd1Q<B(ll~VTFS2v46=Xus`^E_(;
z5dq5%(sj99G(J5+Pv)LwS=M!R>B8FRgJyL;pJglbgu{Q~FpQj=87(j6U6;#6w9^=z
zbu<@^Cw8Wf@3rL8CM=#m{O0E7a5(5uy4H1-TxpqEUHw&S5vC?#4(^e}N?=&aZQDc>
zv7igj>2wlPItw~`9goMu;ovV~z+x|nTo}f24$-UmuTTs`lRbwBx>LhjmgVN=#w`yE
z&15f^i++D7+M?X`{NwScxnNHs*+!B8ZW1e^AJLLN1<7Qs_3G+M+7pVo(wE@*noiRs
z-jmAENHm69#35GDTgBp{5p(82dODBR6PIN<9*;|2`~*V*$A~Qi2z`iQKu%=R5cR!=
zKHvl_xE`wyFqQzoAZEh_V2HG4{#Rd1e<ojEU0r`&Uti1MXaI-@%ce0nyNgy@UGcp{
zQGXQ&xHgHjNFo>iN<`r>tbqog_15R>>uY@w&Bf4~%kg-WwvtRr#VpH$z@SDW6_73m
zej4H7aL^L$Rh#DMj3NBS`sz;MYJEV%Vj?h}dYAsnIDv?$<AID?roqs$E*c3h5@yj~
zrL%v~0usM4%_~cFKA&-mn8Gb_=6RM56DzxL>!FUz!{qI7I7pic_AnFf)N-Qy4u^w)
zleC(YguV>35@I_ZC_p7u7pA=;g;3vUl95UQgytgQJmG2>BPLRWsRj-HbUNuanH_zp
zxeHDVv|`rVwrM)z3DHXLVn$j&_)NcD*A;&a>ZV>|fXWv!9l&!l+WPA1O7bc8VkD?-
zR?{(plM7~m;}PR9m;?m|-;Xy!@M)UFZ_(RQcu&HwnGP6?$%>==hoXjaj{6sGHeAf$
z2N1Z#h85)Vo@mISXf6_oEG%3-pU>y>S%wSmkOkxQz~2GOI<M?42HH*!*ApO_zQKR~
zL~peb4-JV`<XyrK&J8>Sc9fcTWhT*r^s*0HDk*Q+eOZ>%=`>B#_4PH2!2rY}t+kt*
z8<_%#J}`uTDY0~DfECq3O8a8USa>KS6)se-JC|kAq#UiW@HaO%dh9e!PzGw~1LhQI
z*9i4ksX`~d)<TbhR<6tRoYU#VqDOzq((!n_TrMCc>>h|iBX=L$$t4hkxzJCbze|ot
zC(d!la)2sWX^}_+liwlvIiJrOgPUllgRlPOazS>av#N%RQ4aH_w8oCnH6XD<v8aOv
zeP<RkhT~%rH^3|IeX??}g=7GVxXut+aW@Bgfz+9^RstDDvAK)r=#E)Pw0M8Mlm%99
zfOh&I+&|zDSF4Nx-2rjL$677TPFI+w)Wpx{Gxx&>pbv%w$7=vmqme$temvW@NnuNS
z`mlk=`UbC?B?GRb_*-k&*Via7EFqF}b#<kg!u^aNZ$*Nn!QkPrlyW=uK_mCS5_<KS
zYVLj~92*(1!QB7?2=Y0Sbbo)rM-GQC%OcQw8+`&p3*7sJ&*$^?^|dbvOrrq-r6Tn@
zgCiyr328(!Y@;)TC?2VM;PNm$pp|pgK0L(bB+^|GI}Xc(<wV7}J!FIkr@QZt=pt=6
zfhJyrO8|ShnwQ!VO&GJxGBH>M*#O=pBlQ4dOo5_GjI&x49#SA4*fD>Ns#)x3%Sf6S
z8eT_R3t7mvI|#=Hq8GGem&-*Q;!7~kvqsMATuJ$YiauJPtE(%;$#lQS1?fb5*D^>2
zAwg+vjRZZ5sgUP_wTQIszzWvgm&^kbm=*><dvMm{kM2YgEfuA3L(y<zO`%QLQ7-@(
z=n2gNoeGU$LqNCsi9&z6C=8L3=afDvR5Nx0oMYj&Br=JJHzbzk*4i*C4~wy8aO$vx
z`hZayTxYF{=jinOlHoOx2;r20(w(@YCH;HM1wn#hVR1<^f0`^DufIwe6DZfaBzV$;
zm&*m@e|>!o(KH2Eg6BJrhQ(30OcH7$;tEjGkg-GwI^9^8;dOu5NqqZ3&kiV&zy{wB
z`3caI`_f?u3rRzJx^2gQ!G=55<A!>DeT~?OG}03T?i`SS)Rk5d(GnF<V<m&>dMnr_
zdhAy$$LDhp#^AP=xj#uJ3?yCUmRkSSM4%(V11aDz{}_6O>8Igy^wJd;R?>V4v4kP*
z!CZsW#4)H?Uu=KecU`!MgRkpmT<XT51Pm(JsjxT}iQ5Q>VS-o}X$?^K0CX`sBEFR1
zmQgr&tr?--QY_4kGZL9FKpysvV)TK{VK90fFl5SjePp;hGMd2JK|_fmk3F4EpskkC
zc_@ZI#suXUvzm-~nx^W?L)_q|e9J&&q#04z7tcYuL{fhW)mBS|ks~@DkKjzKJXit}
zkhFmisI*AW$L$8|<ng7J!FQjn#vlx)2s^)ZCU7G>WzrL7LU>SJ!iU1#k`QEGm%<DR
zi$QJO%p3_l>q5uty&jL&OV`Zlhshh(L*@}0%KOsitE(&NP{M|KCaj4%D5WSEtL287
zcpWY}XoY`;7_5X(F#6ydff)f;hkTfhW?@@GBan{!QBP0<20(xZPmgTSmT_tQ>H7K_
zCkW!e^QdyX53N40cIUbJK&4=O*#w-NUe%H+ET`V2We|xmfTWTMus{(+SGa{gIhlkX
z!V-&+-Y-Gt!{Kl`ov^N61fWb8j*XaxZ1UCBm9Kx<KK0B?0lHyXDb_$S@y&uaINuD$
z<r$dgCSuLpJp_m2B^62=;8!>`N@lBA(9`LJn{hgwB<&y+DJ-n0n=imB?z9#+Omk^{
zw+vr_`3E00A_U!;V5B?e+QI+pE2|G4$`g^LESy#{$mmDMO_A9Pe>jFnL>sWHLiX5v
zjHiE4m51-c?4fu7+%(pDpr|C8K4;Ji_?X#>;zYM3`lZjY$`GRqg-g*K9z?;J8O$jd
z1{kS7d2s*w`Wo-t6&MjG)Q4-9o0}UE4m5%bcW3LZ#)4-OdWi_&=<p)P-qHI2!W+I$
zxEYaUWzO*$Cw}IZsV(u@KJYVTjzMcAk}`h_UwT*11GFO_Agt(uhc5HAYrFEU=#jQW
z#S@+-vw!$$kv`<{c+`SQJRCa0Z_z^-nQnh0UYs0J2e-1ojvK|IQp7%B^eIV2t?AX(
zm29JKmWe_%?y{WtBs^<aZ{Y{UwSXKgvlEUYYQ}tVyPf*dL)dzKPZfeY%6f~UYK(sb
znzqdCxOQ>6@By&r)igD$>=>TZm_$OBM=b6TXwXNp050K?*-4%Wo1#IXm4Kq(=I?^r
z9J0cBurE%69!23;7-)35?Pn1Q9c6rk1$+vkgVv&2mU*BF1zeuB(+78uH0x#+A<Z)2
zVTMk^ED)}h5>suK|0R|)O%o*nEkl1+crHFW#P8<jhU^9Wsmn<uw*o~eOjk0D31Za4
zQASfH;<`+H%d9^t92ZDFoC-K_3W03|G)sn786R3fN()vfSxKqtRfmFert=wFwd#Jn
zi`EB!2h|I1fnEySN#76ElITSkNcoA9@pt`I3e1s4?Sq6`JkNYM^C1#jW<P)T?!G5E
zBE5^r!o1QW{1E+8v(h~JbQ5erNCWRHQf{xWuLo<)l*L9GymO~tXavm*%n6$kesp9-
zVy5;bxzU$>XtJyn!yYijvMkrv*YZ0=9BB=b6B@tB<zW)BnF1Tl0>#L@utUkq`2^Vx
zgE^9mTftc~>7f|T@px3M$#H)UF9TfibcF<})w#Mc5u97H0M8dA`f5N~8+XdLjB63*
za+}$9+YN>&qLi6DF};N_3FcRjNxl;m1EmjpN^uCQl*~TC++|mmj_Jlau^!bbBv=M0
z>@pnbRYSJ{xj~#_88%lvVW=-m13C@2-2EYSKqd`R;AYo;2aOC1)>wb96T!F4qsH!%
zj_~-69729Ypew8_!Pk!QgeCfk8i;9mi$rV95{=8{!t;?6_)T%I0Vxb|3nm`P`7EEr
z4;+X8KTXpuxp6`u93NZ&xQ2H_Wv7wsKBae<JNKOi?~6#3vj~wGshO6gBn~ot3FRe<
zYMTYG{m#Y8ixj_>(Vu^Id%$G$L>XS~T%r%|hj@4}vdnL?s4*W@z(yDYa9%QQBsU|n
z9C-+xN#<pmK!DDgtduImi{))0_+TwdW-m*YFCmjunSjvTo4_-4vS7wFesQFJ)%p@J
zc^@sqzvAYpul$sO;-%H{Z$vN2f`sMz(TohtRe*@Y$cerAHK>14={{scfenpT+A8ow
z_zgaf6qqK-dOINogdi@_I^jx*rKpIFG$vA+Q&yu$4^cMirT4^<9Z$QBf@%X5fcVlV
z{6vfh5-S<y<2fii=MtbPs9kzNi$|Ew7t8?<$a$zUa4mzgDi*=ba1;bmh>SCZMLS74
zx%1|5OQ;_49zuWE)sm{sw)SWM5{A?1B=+@(uU2Y^@T1qK%v_fY=;3a_uR~tmUB~D}
zf+YYoY?<CAv=#;hTP8?imuAGQv8F5v+H<has0m-?V&M?#a>7zg^E`J&+|;&+1kA)m
zT;EGh&~1Ze#ZXGcw%nzQlj_QN%S;G{Rm?<H0V1tCH8y{*u=F*EzW5TpcWt-z$yS(n
z05<L_L|O(S``k~ME_w{(tWf%BvM&|iQ$d0U>k)#IK|H1MeB=&0eF@M($Q6oT0k@$V
zeIR4xZb+GKg?uUGV|R%!{XEZ#RqDU16-nTngux$oX~d30rN}@`bmEj->3r2hC9hg0
z2aCVsUfh51@aR!Go`~P+`5Ub}fmt_kL=(j4U4Rl?A!Vi^y7ebivhFq}0Q#q_Q9$9j
zyR~KN%;z=?(UpxPO<XRmQ?f|!bULv}K<Ad*fqd<yUA)*iOby2_aPL1vgb;hwJi)if
z{c=8|EjP1jkS=3Gs1t`|*u3Kl5A@Y%S$L44GuD69?@ER~D1K=!k_sAL>-V8KuRvs!
zbQqqjnP>BqDQgiH?Lgjm0#C!m4RbVxFa|%-(z|nBG7#eKC6Y|e(D@_`%nOpB^$7jD
z@-3Od(Ob|~P+r={QCMs34s>m{r!9Jr%8Q3cfFcCgXnvygV=)*XYQF6XHJCH_r&)w8
zj3a;DfstbhAA3}K(Cf}RiVDK?m>rnlbUG32=7-gaIET$zK9NDEZW$HCn|d@J;)i@7
z{-hO^*2C;bg%zuY(WsiGMi`{lewrqLH)LOP|7DoV1nH!qneSrT7x;3s+8U9Opcf41
zlZ8;8l*6B?wQ8-`zPSj}csiX3@NV0t_;Y{DKp*sRH76R@TIIv9SvQAr)arO4M5I`<
zl|(dLvS1C&4^`#K`!1e{=ulS6ED+@2^}6Ab8znVduRbp6?J+pd4taq^wfbd|Ln1fl
z#y<C&qQ8bv;gtEbEu(6zp9ex>muV4bDVZmT9!wHY^4)dLLok_wCBCRGMIs21{o#L4
z0BPnWU#0ciBIWf(?;+spqO-luNFq%nu;#YqW`)|3DSL!jXi(J9RxX}~Mt7Ar)IDGy
z=Dx&%=g2n`o6fl@JB$|<mxD^xwiSngeD-K7)<V24`buI28%l0>kp7ieGQ8QUa0XpW
zeAOT54nL_veLwZpTU&1YsWrFmX@-B2kim#a0fafhCEeeefnBgAGPY(>{K1;<Y_>f)
z63UAqu=s-#Vo`?@*lKyb;rp=dfLe0UIiVg5#lR@iGW?uKlzT+zEe%^<D}gl^8{y<7
z+i$U!0)$#W9EO%rO8HvI<X+K)?Qz5(c8uTvp;_??Y#P1M4%?Yht;&o)x!r$bEvn_j
z@U)k{>YShGnNrG&HNEf{lH)yn#{b`JXNE6UvwcQW)@p=pU}3V@H?$Hg;VHY8+l%z%
zy#>|{m)xr^eo(m1HKX2sD_V25Ns_;TS6!``x>|z-Uv))br`*(l)^GR4_r*6<17a{m
z?k)Rmu)32~jxL!#*G?7$cxZni1}>d)w*oN<kHSl~5q^}SyNIq$*W5O;W?P~)D<?!;
zN!@0d*0|62-AfA&!_?OnJFa%s?!LIISRmqN9VuGwQMmNYaKg6VvtF~c;u{9pEIC`P
z+GcQ&Sh#9kH=M^JQH;tX@FsZaW@!W8^CDyzeTs5fmec7(j6j@#TMK_^qSSp*roO~m
z?tTJ5ZWi4|3KWZS)xgh77I5erJ?A#xI_PpTl8&b#(=bHjaLfK)vAbq#0!6PSAe>^^
z2!mu**xKhnpxGsmP525PLN6t_S<y&^s(h$4NVCmXU@A}ka=A&zuGY+4`<+Oje_8s7
zmTHTmulx*)$I7FathRqp$#+dhQ;1BEKpZF6fHQrNED*mfR;n8r&SByuYfy`AITg7a
z_sUhnnRIEyo#S<GE#*z<nf|M=ZWNI|*k(mSQn((0Q_ze19XCSEp^%k}Oj^t9kSzwW
zoaMd_Yg{!qI^Z5xH>^xvH1%y%9#b9yW#H5)_rtMTJS|d&2_k<<o8la=ndL-&#9==A
z>Ap=6Ew_h-ZRypeuriJTpS2zyx^U_+WrtFH$xG+#Y6!23w}>1#rk5Lb$$lj3x?+AE
z)B6~TrM!JoVn<v=4@h89!Gyl`Bl^7J&@w=m2q+clrW^2y0N{JL<FRB`bFhBpzK#iu
z0Sh+Z|NSb!4~&0p+7&ksdqLb5Nv(&4WWyqAQZD>flSSP?ACD605*!72GGI1w-+FQ)
zD>x0?8htg818xZ6amA(IaZTF9e-2G+*2Qz70;9i*g*T%wl~}F3&4u5?#OtmEE-cE7
zZPDk=^1Qkqtt@2>s+9WFnB7Dy+1*idzqz>?DnGF2hires5q*GU%UTNDV|SDAUI-CE
zJtvx5Q9XR9_NrDv;(lhcZSZ&+CBv2C2bO!DXD_jZuq==ibgdO-qziWu@K$&EdchDD
z0^_3x66y7KMaH)rW<%9T=z;LG4A)^xYaJ`#eP#6%0u2Hh{`@gm;_K&VUWJ%YT$AB(
z?%hIb-#33juuBO|?t!LaXx~iUGREZ+4#`|^`F|s0tb_2QHOT|AcoKjqx3W_4=uQjt
z!tR&61`DuQ*8_N+uuaK+bz%FC7_D4ZUjk<@R|?K~ddQ$w!kR9&j4MJwVKxxgmX||@
zn$-o2gbcfH4AJymuWO4?%jym3CP<`465F=P@REO2z@#IYZvCY9HDKPwPsBC?BfcR`
zBXr?`n30|>4l@qtW{qA@j$2kl=m`k39_}Sd9@!R^6x(dM5xGv*?I1FQt)M=^kO6Pt
z3+~r`vHf6zI+HcADVFZkPuxEVvp=(SilpetgD%__CbaRtxEy4Qf)uK{+(NP`chM0N
zbWDHm(_d@{9mJ6o0U!_AhlA<E1jV*Lsba&SDRytk4kEszR39$c3Rhn4woAC9n~?!6
zlh+BLM^HoL7^N(Hhc#AO->kW<PTW6iDG&jRbyMCfhZe>a9!bV>vU^%K$5qmR6$fqQ
zfs-(ui#7pUNg^=yH3Pp`8n^sjitTU!1=@eKA8fPc7UBcZ3(MnB+m%htU^FAfzHPZ3
zqh(P^u@1(}yjpiR?0~|OgU7{tK^oP1GY&!<2CsPz0E37ET0`j(Zu1}ns#Jd+qRBpy
zl5ub!FpUyW&zI~Q6;_fXVUXt2yP73`oexk(bQD!9n@FGmVjsL^-MMC|(VDGVOBR2~
zJKD#xt=R-Y6S?f#?m}J{V^<#-e-_1EoxL}x=lG`5#SRi_Rw3z>;lG5hc%Y+wkqB1j
zwmIu9BP}HS78!GjEa9(t;r8QSz~L+9K}!}{Q_$czXKw`Io4vjlmkd5Dj0F(F20ArS
ztCMxJLS1>+Z<V+6KnKBo4S9*M9a(?=YOZGcSpWde94NU+*&bF=xZ;w{F!X8xBxjwP
z?JUDol9t@>)TSZL7v3U+v}M`BvMiLe${=g-=WO3!EM&)?AcqgkOA=f9jk95ZlSI~R
zMM>Pb^$AHa`p|q~&qxG~hvoA%MPCDCT2@5V%)am$oprR1rHFKxkuRC-nzDZ?U3!*X
zYD~vfPtAr)TejoYa>z61OAO$cd2q3AxiNwIdgko;6Zpfc*To8;4(CEXJ3%$XX01!W
zU<v`@v^bj8!1mw}9WlrrMzUCh%D4TYcp~w@nw8gJBw&L-*@ZCr$T-PLH?xEpnXfY_
zdf{TdYcLBwNPeP29-PIOU7vrzNC4x$8RNv^A@^OZ@@Td_1dCOQFyERjhZ$tc7%#fj
z9ce7jYCD2y=j3yA{v?3OjxYYC@q;zkkLTz&%(l<DHFL1HD6D3I{?#fIik0k!F~2HQ
z+}p1nFoBx~e7R()zbaXXNcytPRuu(_57utYh0{GQ&y7$tdB~=2Oj3VzkHl=?2OQji
zjTpn=r63zE11dEu-x!QM_|>|pMbF&QUY-vj<kM^uL?pVyUU{$%?L*xeWb`53t&<^7
z7cD3Zs}-v%Mm*eGh?KplZ!`krZkh2HAJ17MFPY(ul0Y7^Wi^A3e9dBj+D8b{lGI*H
z4!t){$u@x=9iTvY2poSv9L7dqi3O_tUTopOB{$tdVbvbFR|XK!YPM|b5j`T4QGpX~
zZS0`rKtx-1i3(Ge?Y_Q<(O0{yxyQu$z}XRy<1cMiNPf=F;6xYHggJTv9%kq)<;GLw
zb4V?kdfmD^RD<t#%)?O7EZpg|+HzM_v(OU|SF79lLsC}TyCHvoKwlS^s7R@X)i!I~
zFV~2XM4vFc*pVepG)y8ttbL`+lx;usD=fcTKSI8P+ZomYP7CdO<imiL)4XL*B;E_E
zbg0Jt>$)DYQ;XYeUO~mM)3BtI#`B>n!F`3k9d<3YDTJr-4Zc-maXqTDlrolOw5-!x
zvf&IF%*bS7*g1cCTNWBStQS!(cIX>{b$vr(IuhGVxp5t5#=&~YgoZM<ULG}NA5vJ#
zS+ML<?<G5{uGaU4L3(`B)1w3oU|+xCm}mJ#B766#rpz?9Os`>_OKvT3Jn4|h@e+VX
z?)7HnqfE2q>4y&FU|)vO@~lcm5{8hY2lFlo(W|6p30Z&Cd}P9a0r+jvJ4IfnI{0<P
zVlBu1BtEedwGgabv4}rB10ckMbwjsiNmTR^-Ocg`VcLAkG6|x=OID&3b8Q-XrkD@b
zvt&SAx~KN7m}}N~z-L--jXn%&vJ5QtmU}lGFh~)KW47F8=1Qw&7OrL)sK00^v6Jaj
z$;_qi#K?at3L8vWi4QH%(@;ZPLeSQ&6YHv|)M^{pJRB_Q3DWF6y?J+j1@yu6MekAq
zI8ng3p!n`Y2=!kD$51HIyIxGzF@+vZY-#TiY<Uq6XqMj#E3Dc3fsxtaW~FN4*J3fP
zDRVGW=GK_6N?{y5!f%mcARt#WU%V^}{UjNK+w*@gcmfX)d2SX1i!AO#E(YC!VBZNC
zh!%axJKQWvI}S64e03MO9#A`z;a4bB5={=DrmQ()tFLd6fq{llp`g4=9dySP85nn<
zF9v+gvjV_uK0)aYCfG9I?w}loUiw~9LI=*}v-R}UGm%w7ZMZZ{1mge%7;xPsn=yxN
z0QG-aBXxS_A^S;qu+gU+mdTA?AB91(k|*HIR*+sZ@xT+@TgKL@tVt@nX6Cc)3Xxow
zZCM*xGK0r6H3nRFf8&<bEqn=#R4MEwJF-L{q~V$}$Gcf>6XJ9N78W8S*M!##Pu$xV
z(bX+$wq-cgotC{<s#VuxwKsw7ajSLDJ7j;0!srD<%Gga@&E6jS+2XUpxc;cwdJ}L(
z4}Mzuia<LoIm`zrm+()0oD(KMy5xW@RwCdM+gg)BW_2&wjIpHWEsV+p_k6Hf9roa4
zvTy)VtS;^V^x-GWB~oAjQQRZJkU2%dBRxa^24;gvs_g{#q_b3sP|u()kwY<3&CY)a
z8URax7!YMyvJGbBzSWv(lDO~u)RKoB%z17Ge2xvjlLgU2CgS?~`qFpRgLZN#VS<{w
z6{pPWwT#OV@$--!AAD`7A%ZPHq&ysQXr90@eF?8C*o8=MR_4q4X%pdQ^+7{u%d@C+
zc5!eVKjmJsFhdk6y6&`4Aa}{L4z_>n?c>$l+B)q>$$>hw!XSH!63^QKVa@C((+8Kb
zOvN019u-!g80oBsMR%ibz^HGU?Tq4^u<{F*$(1ZHY_M-qa9Td9y4EZu=V@BO*-l<3
z-h<FeJX&s1b43qmWW88x;grkeGUz_E04b|xIZ1+<_$*Wig#^sCh?EBuM7@70VnGBG
zb?!V7*}oP_L47$JPL!7UmPm^S<fxerW;vntPzvCZyjUd)rmWePDmDEIyO0*If|dP5
zU7=$1<fFAu6B|)*<bD6UE&u=^07*naRQz<#uBPr~p}cTc&}dG4D8E?%#^;D#^||1H
zF}9jpX#o^rmAD!kY^VAaF%5s{LsKI+!`KLb`7q$ung@S^$<Njl9`p;3Vz?YpM~~Pe
zg7O;FN|;QBSp|MYxX2SfTb}uVc3!MCz-kQ?RQTcsUk<S2TePjSmRA3kw;_s;X~~j)
zoG9Y0_;#Sj)efQH=kP8{MeEo4>KI@#PMu3X0><KT?)aR$cPKn9c^ZF6DMj#lV2dy-
zUo&)GZL16Zo@*RXxHI~eX>l*q2tyr=tyq~~v-rDfB{*r#9f8$al%hmyzxe=~l#F_Z
zZJN>rONnBUNc)n#pqm|^EBK%{&Us*k=16Q7rYzR-S;Ls;8DPc;U7rrnomE@=2CRH=
zh%Vl9G!85Tf`W~~!|;EJLrR5DYpw8J$q3Dyg&obRr5SuAv~gwOxP36Qw+zGoqffBR
zxp#fbDwVK{a0pt~1HL@4S!fQUKWzRhw*5gI#%~9B#;+V8g*7Mf@Y-xO`_8hFv6&&3
zQ!}vPICj5XeAtzQxo~|pXJO%zXBr855fiF?rPU$3JFs%I9W#HuSzEhd75pM0Nrj%U
zI>nGnR+?j1^+T$e!kp*LHrHb1pb60hDNS4y)j;s5!L=L00MKo~HU2IvPs{2j{)<8x
zN=&D0wY_F#HZN6v6>kFOX<7Eoyj+}M;7Bv;dS8MKz=^&OZ$wmIR0u)Rpjx-4npMW7
zKbO|8A%=1L4l94mq2LXII*vzSP~R}%Ll#Cl5AU(%VU4^I#0cUiGPz~Y%txyMpsH);
z(1x&T%jQIUsXcG*_$^uOzGW_D&H4`?0K*XIuYKwwQt(=qT<}-D5f8Rl^R_U2#cqzX
z9bxP`OHPYW?v~9OQ0G47mK7E5@3q~g*f6Wrtj8@YyIOz4)35`F{R#Wfd}I|rHQB>L
zSIgibet?Byp*6Hj%>)vT6BL%16)VBvLf5;$SNhFkAii5vh&U1pc4ffI4StuN5~ewj
zPoEXg7JWt?tp}7_CXwCXhN%twz%Y;_mgOOXfo4*JB3P~K8zUbyt3tF6dSMIA*Q@VA
z(Gq*F&<THolqGBJ*Q{o$83k#XlpAaXAxc;OEXtCniWUpuN(N?YhZc__fly#Dj4kVi
z-MQx>D20Kfpq}A57wbL2OMQZH%kZV!gvgC^VctaS+|)3W+cKw*c6R@bdIm`0QK+!C
z5ye7fSeMmKl#gV{*-ER0_(a<~AFNnbd+YblVDx{_yCcjTrwz=sT6ar~uddCi&e5!4
zxWX5#W{e10b3Z-7Ywl|E)$+BJNTb!}Jo(n+3cgKsn7&tq`=-W{4R>ocZ9n%tqV)vS
zzlQ-~i_(|v*FLuCm&c2nHABb9Xo8y8X31G-=*w3!HsCsb&SM0bsgMhi9z}haNU`%W
z-5-A|S(C6?&D{{_Z`nVq<yMhnHm~0@hRlEwMZ%tg=!V4u_21Rfumj&t+4n{NmHs+s
zSG7GHn6ksMdl0&$Z7J{Y>~?GI_DuN28WIe@k2Lr01rAH@Y=Nv6+haD{k#?@<w%jZn
ziLBh06M!E45N8gK6|J^8$GOvYv*TU3f8T#BjaDqET{9)hqj>e%ntw2TH}8JGU=p4H
z@X3oLS_WgC8wg7<1r~z$7R%0sh16a9XtFhfke<%gE99#2sC8WxPQYkL8`j*}eaVBE
zDb5scH4D80H4nMTUEq)#HY-h(gac^j?04eMvoM81M~?U0=EUv*ibEa<I`s`**!F(`
zR2~d0yy{*FWOv-;InT)b-EN;M;e39;#CQsZ5(tZJK{;&}XWv5$H?pFUR+nXf+x&xT
z0_S57I+aZCxY!dvly-4%JFM-Actw0U&$DiJy$ioOd<6_>**yNaSlOQFfb~F%^y(p|
zJj@+to$QFpNL8Znu`>;N7l68DR0)3_9JYxD-*U+_wVd_wPavIKjzROTeHpGKaJIc6
zEf4EqTSv8SzKDHT`o3DDgf;u#Nao$o0Yg&l2|Z`4GDl@Qpdf0>M93uR)hGg2uS;&5
z)PIM)CSisYhgNUA3qQbHhuqG{k`G%{{45Ap!1{*PS-!NF{`ik#yXB(Ca$J8xbY<6*
zNb?`c<eJqMdRT(kn$uUjg5$AeeJXL$AtEZ)8Q^rJ%Z{6bG!n>)Gzj`(vHeSfD&b23
z442ZdI9|zsb!6_vJzJuqYxa9;w(%sa2N8b?D=}q|ENjag3~jI+eIN-i%#?-2;P7f?
zC9V?@LY{_h^2|-Ku0)Y|XK;UHq6hOsl+WKQpnkDqE1b0e?b1H5gzg-66?t<Sr`|EU
zQ{e$tzyn6pU0(4b`fSdVHJnmJob*?=mJF_TwSKWn?olI^IV^A_K=-}O@X*#b`jgJ^
zdK?dO>|q<)gh5i!1RtZk582Ig%EQON;;;x#AbxPmKvwM93_&q(qRfBvDM6U6_k-T<
z3Kea&X8qxomEG{!W|izvV*oi*cHQHimKmWil*RXMc81jqi*~@EIOJ|sO7^tXuRvLm
z2}YiV%8Op(AG6hd*d_mm|3YN^Pv1R&(sbVpiQRHzKH~)Sfn{);o27hxkhj`xcqoiG
zWx3}xO)}8p9t=ff^%sASLmyx_hJ-_ydlMPV39C`!)!fg~ruZJ{0!X8kR_J`nUQrOm
z^&dp{WsAN}S8eoRf-S>MHG_V$HQ2#?l|DcphGW;hI}kI)fs73IPnkj;>@!|m%UGpn
z4p`IyjzTod1=g?FmKhEOpRy!^Tz|88y>bSe^c!}t;K91bv7mo&ZOaH-%kAooc1y;)
zI09^tYgw*|LB=LX$7vP3Rl8?<MN%pOysoNReKXqA!#pK>^b)MbDlU0Y<CH}a4mTFd
z-RqmXc7Hh8lVys+BIaJk!B|}Z5Gi(*Nsg5#Z+*Tf3}=SL8$lx!#f1gX_!kS{XaB)i
zb6>F@SzR7hbjyEZ5osQ~S#DIw0nca4qxZrfG|UH9QG~5!#TFjIV3Cw;1^IAJN3+Iq
z`r*~p)!BNjIL>Lg8BG5@+ChrZU#)NOQZr||W=WT89LTsVi+4cLZG(q1G(QY0UW>jx
z6E_s=8x=j*!2@C&N497U_ku`aL8z&3_%T~$>>(S)*F1lJd>A>a>FMT@0X#(=aR&&K
zR@-w~YrQ*!*X<IVRC+JjFEulAG>AH%t>nbLNr!)7k`QTC);wd|$5U+I8>VT_^Bf2|
z)%&W*-CADktoShblop4HT~oq#{M@~r#de@z<p3V&av%!HlPMeVBE}wh2O3Sb|02>H
zsk>m!k_&&(ss2kH(3X3vF&YCU^;^xz?cpIi79O&{5R~B|1gluSsc&<y0Z>7*=6;CP
z${3mz;5w7Izz>VHW>KCa%spr7@?1-?&6f^4BmFDLRjkb}Pv)D+diB8}Qy%>1PA|93
z#1iyk@c|3t*oFZ~r=GL5730(Ek9iivU^?b3JY|1X96Q0d&J%cm)TCc>J2P<}Ouv&%
zqTBk`^I_pv#c8%IxaRGMkeuvuHh*_ki$2g-a(`;G?Ru;Pzw!fz+$kRvCsB~dAc_>0
z$AM6{;8=%zaUV`|4G3D(#38JU88inHvpR4aZWV)(H^JIT!Gng*d2063*Iw|(nj1_|
zTakaV%0v!_18uWPf8zMP#y|{-@DBtp7Buon?UnV^=VN^E&RQrDo_1Gpyjr4$!6Bnz
z-8n`2W+!^BcJhP5B#UjYz+G{~1t=ZPP3O?cnpKzr)>~%GAcx#m6lx^c*zT)&TeFKn
zShQ{H_lmC;@e_8!<YFhowv7>`C>b*G_v(MI`yvUyu-IYdo$!=c2iIbNIy_KXMjIVG
z2%+nc?E`o|%2d>w`f$Gss#}Sc+hLh3j$b5m19?iGUXAcjT8R!~vY0Ygh+G5vN>3@I
zE^hW9d+B%LL~cDUyY4cRRSb(2hgb_sz<zK?ScBoIR>SFUZ>`<gvMDnj!+I-tK&F2$
z%=N+>kq0a=u=QsdJ2eO1S~Di&Zlbo|YOL@p(90uomu%4IRfq%_;FxNgUvQSr{mFV*
zHb#Qa5Gh^UFLC9KtL=0wmgKm%PH*t1Bh3N_6qek~$7;=as<)HTkvV7fT&!*0oJ|TG
z@8Rk&{+5@R$;V9a1Kt2WxoB;>410fA>c3^m+vgiuFA~-w$ye61;m(a)mO99g>iKi_
zWxywN;xIvX6uFIugE=)SG<D5X>fvxu!g{kUEnDC76J~HOs(=c;Ln`xNhoi|6RI43?
z9w%EItZcQj5oiReIpg~L&*w8qMl1>B2BDQcw(BlI^z~E4j?ZIXs`G)Y8O48)gaHn=
zIUE%QaMyc@ux*wqfYn-Va&rq%vMWaP2`EH#pox?&^nsGT`)17@*$kCqne-@>oevcc
zWVZ54rnB{7WZ`fexjFaCYJDS}ZI4e>EAk>NF-?=2*Ap?9rNtJlSqTla_Lvjsv|8@~
zloS+hxgCaAY}o@8DZ;6v5*L467Kz>1Q4ar??2>eSeGTV?#rngpwcn+-u4|R?kpjb@
zFV<t-uV$5RHMeg7w5Umobk*P?w&Lsuq-h^)CnaHMDwqIBV&5qX?KVq0z+TPv*o*%N
ztRWILBb-wvA)?>0H)V%SEeyjJ>zAy2_5Bq3o<(&}cd<fEkvc3HD7$|>XS-a`f!9y8
zj9EKlIV*7J{a%;x-*R8C1lL*2$ZeF5)^9GEZ7aL7!yz>+l_ys5M5{Y6Yqlz2tv5^V
zyW{6x0Nzcpt~*nP*OxpDg}<_hTUHl%ipaT0sBO*`nqg)BuFdbgq>^rxtc;I{g4@F~
zyR#uWa*Xt#h9fm4lbnAnYffu#-6<V5WxD~{caK{Xi?GkuI*yD=q<PtsCNkO0Tn2L*
z$(MNc!}`I9($E92_F6=DvAmjQvoj{cssu`Zs_Nhya8G359!*?wcQ7;=pe7e891c)g
zc2Gt@N7&Ax6qda9J+ZfpG`5VMQM$pRz>zg~SSpWCP}E1e?M{DqT&>In9s@8pYaav}
z_l3S>Lp~>nPlt*HU<I!OK-FwN19+MH)|w0tivo@))`<RaINY66?Cn+<8L_5FB`R}|
zM<`wB?}$wK$@Auc&J7-p^C8weNmWS9trj*Gwdb>%a|bRXFT1K`Ft_|kM(aAF<q@0k
znFpXEP4QyejTnCh78M*-`XU<mfY<qpJSzwg73GKgb>!KWTb3p|d21FKF+!yW%C4l{
z<D${m<>(SCgS#fHF<?}a?IhBL<&lmcKLK%~zkESi1x8r1sxC|)=^_Pk$g_nIn=O;q
zRK@{u*KC6AmBB0r>*#U9X6IaPmT7e798%*}C<u4A6J&qTE`t^3BGcj?b4$0<9oAvB
zhR9wd6lP4#>IP_Bfh6m*`=(*3VGmjk&=L6u>AB3zc{p{L?)NQ&oYv={-0=oY)Jg^<
zFhTxy^3=YZp8xUvIPMN{p$Z)YZW&EMRp|z(8g@>frUQ)hu!ldvHO^!eLu(c^`ce*2
z?~<qEL1%x-o*Z2=w*HDiY<vI|)43yEtzvk~Z6;w(lmpaDp1_7j=h&V%hS~gio~h;u
zGv@b>3N~A<iYjbR`t815FGpf<_acys^$86tlT!#)ZYTjsM(IR^&s5ky^)(HCQA#^y
zuM2naBaI%Pmn<N5(yV<|RP+uEbjPo|^hYQVtjB*bU?O@T2Uz+la)UFvw4fC2yxZle
z^<W`@i(+~|;ckck#jdk5Zzn{=zrJdvj|w_Xi1LMnf)N}1E?-b+?mJl{i-`%-w>%7m
z(!n{8LXU)Vo^0^i5s0=di(tsG^%EVm?}kqxjmPQ(0S|}AAQTi3!lRf48+pQXsHYiG
zowtANc*(9HfPrEuxoWZhDH8~+sDQ8d5}2nskg#udY>KP_RBP5|#IIsquia0G?4IR*
zOIVGWR_@RrNsN10EHMhXahdjm!FD+ZW9_RIiwT_6+=SmUPv|$-?0W5y$>@($skMU@
zEgPo8WDc2PSJK(6<Dy$IafUMHa~>?hGb4YiG3M+b;5$db5f1RMC(#Ff`4hoFcSj+z
z0*R$R4LmYn*sQE<&_p65$ylWmTs|WqkGkTO?03yu02h&J2(?9Prm#|5(G4OyTw;P@
zUVyJ@SMCiFoyn>-_lWd3;U1?rb90P@)JY99`ITeXYvrV4SJiGe+zp-VoKL@p6r6t?
zMJNKIbF;?0P#l=1mc^N|yYLB{m8&ugVS3F@Z^zg7RSz>$ZVZtz(SfI}SzZLLV-|R8
z*m*7i_12nN{~z+4u_<?ygrQB`&T40u0h_^uFo4%L0+U*vgM%zh7Dfihv^-3`*-^BI
zY}7Ml9aG(%z=md7?TA-}G@6wWyH9`UUGZ9G<l22{00IrfknrNdB8tulL+(D(0plK4
z|28>56=}<Ta!@erv?Xf5K@M(<4ta8^bL5r<>0%lN>RuLFd1%{&kRS$YrgZ1N1k>qQ
zvxQ@1O1kzb3lCtz+03YAz}K;&{)E0Hw6zC&TbB7n+DQzrZdkMT3#(hKeJ6i56B?qV
zYPR%1sxP@`RO)lhI#gnn@XgVVW%A_GF!D&hOFRI|CBn4ytzf`1Yj$xuT9Zkz)}Sb(
z-z6D_?ik5HeCH*x8CFXz6FvM3wGVwmXaJ`_+@0Z)L2o#u=0TpGs6eL-gXGm<hYE||
z+}yZqFpX+85W`h6j9aZgDdT@wte_L~6}#5WfRNSBd4Q#m-eT#jYUxf#Utv3i*rzZc
zNuJiSi3Pi2$q(w`XwbnSZh4@1n4;NpDm=~LiHok*o5_hFf-`si<jB@n*PTf!i4j_7
zk+3E|HAB^<FU-S1K>Xb6bHuCr-EW8ETWcI(2V~f6BbhspjGsWU_)ULwa~+4jpto$9
z<I?xQMRGr~guXM_V{#sGrIJ>h1E|5+ZhZl5>s#Wwydk=bZCRG;sF6T0=TJb_p>mg(
zwG0ihDy&V-s)d$YFv9lR^AKF{W;;jF9IG7(w`I5YC0iCVH=>K!-oa>a)ok11Kd;$w
z)nSP*f24EebQs`q%~F3UHcb&mn=&Qnm^Lgj?((o@VrR~ZA+!J%h7^!L?U2XDArh`!
z9BAN>F#gp#$ny;!ChMNhJszEsA(h#5gc24|0gQx6DYm6$D7<Cuo1;V)MXvyBun>#&
zm&cORrx797{qDuU|Kt+DoQ$w$LeEiXSQtqJcaDmbj@m5zAbNj+2Frc*my%jR(kXYv
zfxKaT2rA+pk4H*lr@qE_@OIF+44uUQS+Urz>04iK1_>ONL^`ZIu;nhbx+{BueWh+%
z791-3OlV=U&G`}}P_A2{Lw05k!_}lOL1kO+c4=8VyY&61!eWe(ISF8PBtzHio9#0i
z<joO|7HH{D!{C1>`!R%tPlw0e1<*1_=b#tY1rOGjiEox&zdfoQB2@_r3m0_B?fTV1
zh%PNHgIEZafJU`F*YF7tbWq3Otijn~s5q;kAcqDD$A|^1Rn3KMU)^%g87MzYm$0#l
zZ?<fHf>P(hoW=OMbIPt`K30EA&E^p7BGCvHEb^bYxhQ{qnq}~ppxUsUo@wz|wzSV;
zwZGMB9Z*cn{g8dUJo=B@hNyeJGE<)Wv&J23_?OZ5pQ#z?cE3XUb<j1sQ!bNAnGg?m
zV4OI`8ZEnOo3pmqbsVr|@X0|pZc-vGj~|)MuTG~EbuCKZPSy<p!vJ}`)&v|VmT*y-
zvsj!Jq|Sc>OzU1NiVWPeUmB((RdSc1C*SJ6KFbD#(<t3}WxtK|ceMzzvw~Db$%41m
z@5O}Y97ym47A*RJn+D^-A|D&Bl>S6SD9qzxAsx6*wrx53{01{xvODb7XO_Y=Tx5yN
z03MhlLIu;n8DZk8$O<|h`k<0p`ns~Q_#{5;l3{<6LpC7UvgSSP62w@tPLl60cDl`!
z+xEgrTh@$r`tYLfpzJa^=m_YelEq?G3bO5lmozq9GP*1ic~Sy^2iD9RHH%nAnx;sA
zhu%NtSx{a&gCcWJ5~J$u%5_^i;@FYUFgL;6GNX7zw6)lB&-t8X(F16{mxvz4@&IUk
z^g4gK==-*MP3qta!2$dU(RJGbV8cK;X9GU9Yz{d<K7<hAr!7;TdzaM_$YzHH`y1h#
z)wUtyClsqBUacXF%TMgItV1u&T1MFYA~%ei9R@u_ch*dVxW7%IMr0%%g16kD4SF0P
z55D4LZ9wrwd3DY6(Zy-{72r_i3N>r(kH>!_x#L0CN5Vy4i$iv$=QiB<DK|;5`Xuym
zVyEo=I(Rx$raf*;vwZIjkW?SGY#y>@U#`{a4B!~xc)f22Va?5|EOtrfp85|MYp9@g
zgiUCR2qDkW{f9hA0SOdHQ}GLks99!g;32HgoJZL=i`P}lB@DL02Novwlcm?3-SL0v
z!#0)SK4IU^=kxXTwE}BHdYao{uS52kK+!Nx^aX<IOzbQr4%4rYv6h=eT!rC7dRAI?
zGBR|;E1cjsu4q6BzdJ~J4t-IPXUPK`&od>Ta;x06Lj~-2MU~uD7`;jG`YgP`DVu08
z7ha^b<M}c_!lidnV-(Ce58hM)M45leFcjxb8pDF2-6T5spc>%wkWHA;G>8Y!Bp%>U
z7#a=nw8-3xDodmw1k%KI5_0bnN2Cssz>4BrZTFRv^SNaMnE{J}{+-EOcSaggXFGk<
z(o@Hhcu|X^!RYrWU=8rQAnazvoU(7jUUH-b1r&WwMPrLT6yfjz=4+YJ_M3kv>xKkC
zg#oG^yy(S*&cWzY-gwR)h9!$#YUW7Gt`t_IU9y8qSkM9jiZ{Gtv`?R?n0u#aE+V~d
z<?ghsyK!Pry;560j@I|soh2wsEL*SftimB%3x;XdQp!2|Bzus@&DXlFAndT94Ri->
zLkJ(0C*^8J)lR3ADs+m~jA4IT!;p_A&c$O}=Er#{&>BzyG{UgsXDbLfWjsAh-msrr
zrf!E=NZ64pVG$!uhgkVwob{aAH`5Kv=}Vuo5S}_meQ>$w87c6`?AK472Lrg|Ha0w;
z0kh%m0*IFE{TwFYD#B3JtB=G%DL93)73nxuAD!q6DzZ=6X~s!9Fgbs^e#s`vbDkRE
zYE-!9u2gEaYRh$3RHirK=!ex8mpl``*%`IfT9=3yvBF`#oGZD(MtcP(E!Mm+VzGv#
zDC{r^WbvF|0SrD1|H+zV5D--HsJX9_Ml!2qY<Yqd_F%P899y4eK~)ijJLb_u`Yp`u
z9)dQp7dyg}>A)P$8DW2>Qr{0XvYSOpwbqb@urMLb%_@C~wVwN)cFrU$lLOAM{7sl@
zyX4U-LRD`6<$#@ct(F+ZJkP@p6nxIjIyksv=IUnc4_ne?nI_3zq=P7n<BKV?FEsh7
z_%>Sx_nbKvJJOqBsR{|ddDvx*F_gK$R+KD4f!)_kO0p`K{)B&MxTNJF1}*csm%hbh
zwG%*~Q88Z`yeF&-R9pHTb#tDb$6u*Mii|tqhpg)=rt#I<G9FX2E@AKLY!(#8LlZa1
zY@YMTMsdtB4@1Kac(Ac#8;|HKvpf_rTmA7No8-t!Q2aS()0oH*^YM6;hdkwhozeII
zaqCes35#G93zL6}+b(&i57eW|9yZ0!6btRRRa|nb6*OP0wh-~tXDa3*wN<mN{;r0w
zLbEmYVYCB$gZRTCz>(#`JpcCC3*RE;=y|q=VUIlW$UENgj<xT;;_R!>lGT<Oy)ARN
z9z-gZ5g*($XH$3c_^ZA_LiAsPHp~LYbjy8yd^4bV_f>yf7+fSupMxq^BL?c=bvXC9
z?9Gmf_GdCv#^6+P!up2+;kX5hL>4|;C#nAm!t%i><0OUS`LEAtPg~yWV24%n3Hmfq
zg8a%q43y#WxJa`+@?hKjY5x77f(JH(MMaaRKmF-H_G3SGI-Q1czpxsvHM?lue(x%F
zwebIB`-OjWefG1T{on^b_|~_+bwA06>*4xxxPJV{fBZ*(^hbw&VUrz+7#a5$p4ztU
zuHgh43w4DZ<DO?c;~8&w!yBH0nLS(&*B8O{lRx>Bu|qlo$imIJ4NAwZ*{E-TFS}gi
z!}V}|nO}n}ctF*^C+pLl1|Pd)X^^)eSN(83Twi~N7im(yA+9!rvNz6XE|%dPq?7pa
z5M6w@9<DFX%ah2u6vU4#8}hJ4Ddo0We6!s$k+rA#jL1D$u!rm6s=2{DtR{gB{^fF^
z0$35nTYKjjfUu}P8NhkBG5+CtxV{XpE&E@@t_vHP-mvV*ZHiiH%_W<kkf@<%2cY?I
zJzRfZ&X@0$Yq<wE?%Ud{eLA;wJt|)~*vSUb`(qDL#E0wQ3M*sq-J%{p^!*3xx>l^y
zl3n?IOTv>q{D<q|`r^K*u#N2IJLRPtsNvF~B9+qYq1r0?zCRDw!}V}Qf6`xMNv+DG
z5EeOHp-S|9RTVcy-;CkGpgmj<7ki*^rl^1VRdpeU9@Sbem&>ik<~=Rit_ch^wNL(h
z9<GP$i|TSrH?)>fDK8roZ;P`fUF_g!xzV-e#`Wksx;$JD*O&7}WxWhkyYE1zu&Dja
z21IQiyt%odL#Wp%*1o^OV~^m2AN=6o{oUXF(?9*w7m_-A_OqY;(wDyUwXc2cSABog
zS3SmUAOHBrKk$JMeCR_T`uyiV|9^hh<8@8b^r9EN=ryl-&G&rI_dGVD{^&<P`WJuk
z7a#lB$M&aGJqg#-p7yktyyPX{@-5%;f)~8tF>d?hCqMcA_rL!`ANtV0{oB8Nfp4s}
zzTgEfc=fAa{rcCxe%S8$C3k7-TFZaqp-Xlv@I6^~d!T;nw|?stuXx41e~Sc%vUi{O
z#3$bR*0=u2pZv*Vy!$hs`OGw(b9CU|^Y?4pw(WMe-rC)^TW)RJNNwBZ*6r5T*0yci
z?bFZqIlr8olRt8DgFExSlbe}WCO_XMfjx3!_jan=F;jtCIa`leZs3-C^L5d+<5c_W
z9tGbMuZ|3Lt9|avH=ie5JFkM6*FMd)|F`?nbMrOZVTgb77JuU^`0};$5@>s@?z+bB
zx_)Ttdhhyt?IPYx$r2jK|G#8{&bNK$&j#JshLo<i{g_L`oXk`ANzV=9_i18#2Jt<j
z-z(;bi<_VCn`+%;??y}BlBc28t|+q|i**cwul0hjJkn~SULUtPpDj7BEegQP?5p7W
z$K~gT*2YaT^N-_jAhhdkwCk;h_^rqDHR^NX@@?YsedCgUe+CnEw66Vi{qiF~@G0Ou
z=i>_b^J?7I=XRG#8})h{8F+&B*@7l=--{c3A68fyAo?8l=*yI+t|8+cH_oK<_Jw5@
zU+^$vb{$4XCw?6ue(Hu6c&LrxzqtJ>;_Z4V?`r-0_-YQg-TkN<ynb2z>Zi@O@lArx
zx3xoo$Lz=U!!n$S0-Z~*L*B>mtrDM;lI&(~pA+RAkHIgY>*xOr>*V_wG`;V=0%x^p
zy7df^-Y=0MI-IZ5xa$-d>R8PAe9jSMWe@-FRCtYXK0D|+PycloM90N->x113Iq~yQ
z!M+%f{pU1Jg6O%QT3~zA>t#0Q<4br3sqcz_mlEJ5P~cOl`G7B@r)#bJ&q(D)nWb6O
zoC{*=MaRdk;K!~#?#qWo<@+J<Q3Bi!EBM^NdMxg`d4F9bUgz_U3f$)n^XJazI`XT1
zS0_dC<usFC-pwe+;_1!S0wYO#XQ%2kG?2lZ!guE8wqw}!^lj38VwXQ<_0)||;5KdY
z&bIU7wDaPBZFYRY6Yx8q)2pA;ON=ODyb){rsr?#t(MDY_f1Oi+Od#GfTq_#rnn%-D
z9A$0tJ^pg3e0W&2)O}qU1b(2RURQ3uR0h0zZQN!*hO4#jz<R9jI(xr10k6Q-_^9s3
z&3`JbFsw&(?s4Im!yEek<)de69VfpOj%2!ac{_Juy+6=he?klH|GeOwls>#cXQ8v!
zExVlhCyN|!Cb;y8Bl*^7``RcGQ38-IvS(jM5`SzHZvdZPrZxIWZs84Az1VT#Tn)UR
zhA`(m{4MFYj<WTV{^xiJ{E~K`&Di++SOpxX_#AJr%MquX&VM=2=PU4e3G4BM?){uC
zh4+NGHG$u|&V{yi^OVoX%vo@wGu8Kv`%%Z%eN?OSmbdHHK66q=_hm-+DM;7tAA5G~
z=WMyo{h!T`^G%=s%%7+8tJ^!j{OfZOcwfAHpFP!iY|VKJ19IF}z9fVK*&N_M)tK~n
zUETDluJzcb*L`m5dTmpH$bG-K{J8isM}FN_=SrupqT%*VSMIU4sg%dg#|~!iW0`l<
zvla}|J=Fh1Z1bV9iQgq(WARIYhQEBIFX!W~<WoZB8E5goM_T>9Qtka;+e;DGL*y}U
z%Q?XNvhL@-F0efhrTfGwHyfe*wqyHJZ2LltUiSH)qy8r@3cn}^)qM8VI`=4<pI@p!
zUj~zJKfktUU%3Y@lmB1czGUX@pY7NB6m0thMtqN<^Cc6vUmu!3mv9|)leXp71#aSE
z692mqX3ynOO(LkiWppPlpeX8e@XIkji+ukZM?aaF>Atli)}+`YXeWPefA!)+|6Y7a
z*R=9#8xjKI0`b?NF#51_HZT;f^IboLa95J!;{wB!tJ2MJb6B3{jjUbZb$PP$();pt
zlP5&s=KencZ|gj5%Rc$}wpk5)90ER{ubZC``~5k$nTKANz@yJ4wxjO}Yt>f`D<MrD
zd8M~&od5=}cIASH>G}~iOJ)^W&+Tqar(2cobCRz6A@An1O3cp3X&>>&l^SrbCOBX4
zB&gH%6w&o`;o9{Y=K1m8BV24h;8a+<&6%>SM-K{S)7|{$-liS2)pkiV+i5m&5FW`P
zaP0U@Tty7L<PpDwS3iY&T3Y0+oQg4fOs7;iiS^@eKK(QOvIvD(NY5{qcrC&|QCv=d
z2y^^?iHRt7Wx5$Nyv-WEGMfH8EUs{(@`1ewuXE)eGOLpvdOE=DbG^Fp&{*Pup&N;9
zI_0jx7j(N9^=<50{z-*etP8~Xb}A>7QUDU&qZ#-LGdd%lNK<3UY5P{3|1Ml0kyN|5
zRW*v7*7skBjh+hrH_9%EIagcogcG8krNr*7gGL?RrWw}oPt*#Ay#5ztSXHM>NID)c
zk|I`9_W%AB?HHq9pnegGgueV=jKJ1)v^y#=JhYWp65)iVYgu^%p2-z&7I)14Y@!Ra
z-W&cGE4XQYZ`wfaeL(NynG@#Td?=0y-MtR=)t@>d0h#iuGrj#USTah<zh#1737+{i
z_2|ug(rE3_-5YIkz<?EYfNe^2_H`-Qd+?XE|Djm^j_!S-EW|^7c!Ue%{?G*Bl@&<H
ze#IEaPOY7tRSh4fT_30ajX^+(jmv-MSJ9yhqP{MYSES3h3Ai6}PExwiG(F8_Az)#S
z{5nE_0BI8VxCQnkd_=Pe_8(gPz{<S?cxv{w>Hk%n5W7evh~w1ID1fX8K&jvVZS7mh
z8%wk7TG#s|_@F>L#vdu|sPS-<#G%>zoEPRpceN8VVhO25%plJN-a7Pr+`!0Vv}2q~
zYE&vy!e7HZSt7+7@jj>Ql4tP=h0Xb1*<gr<rnh6nx8G$S6Sp(;F^3?PHEMOQ^OkLB
z_f35cO!op9M;-Wxe#P|Qj)FHGji%x0D$NyPr14FrOMx|rEtUxTC0*JrbKmXz3R3s`
zoToJ!<d)2uYha}UZf?cR5ISkaVGhzWfTk5uo9@piB`2Z9nzxr0&peObui9%9yOQJ1
z(XNjmDm67V5pceDSRdm-6z)<lPi-}!P=o%I(SZ<GKBD1&%~g?S{z&+>b+z=QI8=~f
z7L|v$?&=yjXV-3PDZdqF_o_vTzL+c1{4djU*EQeU#VjiU<^~i##+$$PQT;%<=NzGk
zIzlqKg<)j~El(3ok}O@svowa3D`J}(U5=ZX<@v#Zcpz3(a8q~!PcBvfjji0Db>i}<
z8BT>cJ_4kZ0rX+GBfYy!)r*%GO-!x$!__hE=t1-I2s#}MYy)&M{t2x<{z)gY?SSHf
z!*V->Xk=bMPR((8fe5OABh(cB(n*~N<(G6zOUraD%y;ulD-9g~rk$ZLW%y^;^1G2w
zRV$M0d*-C6ZB5gDSU6sdmlaw8f)ety-k!WKTfW*a{pFvRk%bKcIg>MagS&C;B<s`7
zt*tY^rMc1{dV~GU6j$$4Ho#sjbo@<;RAMIv)Q=efiV9IO+rm6sjMghK;5wrqZ*)ID
z4*8HnQam@F-N>@?q{Xi9*a=RVLeq`*C(y*B-fFF_rcf&d&n9{u%R_RLD%d}>m=Pz%
z^5(2RzNaUAP>o+RXIEm>y<Oz9PZyhx2^0`V{)35wu)#+uDEwKy#eygcZHO}Mv;~zB
zN<s)U{tOgbG}AT;xrb06m)X+fGW4S+P}OF_#t>D1l5vxz5walqz&b=UhPoO{j^Y@Y
zQdt_m^=kQDY9m%UHL8^8VKtmk`#XtuAiOApVt9=zXlOh$WNgODy^xJPy;zDV!HJun
zE4Y05x<<d&t;|;T$8fIR-S%UfNoQPUWpy9`QCdF}F3lwhgG3T>_niNDeiX6EmP_0E
zD!Vo69XwwC*Qu{256XoYu9<^Nn&#f3i1><op`8r#D!WdfXvhRIO@E(Z=Z7v1BRjzX
zp6KZwnoRM`GE8}?90E9n_-TapQVX_f2qRe=D+J~&ZzQh<XXQ<DNU+(}EC-?{X9YRn
z#23zuxm*V}g=9}cQn9n*x6@Hm#df4o3att@0V>6EfP|{eR@CkWBOleA-t#IwFp=L2
zLhzcK6Jaof>S3yptVL(0Poaqcw)=y}NH<w5IenVlslqyS=v$}*y`MBu>M&{bKPcbp
z5Z_b9A~)K0d3M*SedZsh5_EGt$0=X@sl+=qVM1JeQvvf4&dFUu4&nzy*HHbGGmrd9
zGXbm_iE>XPvMc#*G#EBTv|CIlbcn;=5m%@~ltCyd{O=z<Xj94hdQ!cze$^Gq{~9O+
zG8T|jfNEC^^9DuM=Af6#YRC?Sqr74<&?n(T{)8ct+afZI7c?XZUdd>TA(|p!&7X1{
z4sTu{w}iO}UsQNFb>nbjqq`yQ<yV1z?~0Z9D^DfI1lkH1slC7zb{+%aZQwU#l%TD{
z8ord#{gV?ocKi;S>`7B;4rAgyQ7KRTpYC|0;71NsU!rN!&4U&|do{e1_%eSp29gu{
zH!qXPTaQm<Ex#eSoR0+3n<op9$D2QPnrZdDSaT8c5awIM)dsh-h4_GnM>tXNclS&z
zO_`BHvG#O!4sz*!@srV}EL+T7=taCSd52jqj6jF-M;8Nsuw5{UqNHE$lH&l~c0CYd
zxH!!lh-IBdFAA&Gj6>V;kR+#Z`4;>o5fet0oMLY2gtyQTVjf}(ON0PD%+oa{<ZUj)
zPxdNXQ9Lz02CqflnW?M<8DJ(ZuePsa8ecXKCYASw1Ya+hX;FFtIyyg1tTq@WRdG9k
zh45#6g~}JXrSBSYa*h;g=9H}SAHvZ-wE<czb^3QQjIw~=%}3GAss3)TYeZD%Urd`_
zX!T=!|J{rrp~oR&B@kfr=Z;o3jSAyJotkMAOZ5VyB|In8-_$)-WnV{*M=gX3Eo#f<
zo>|srOPjVmB051Q+Q9wrS;XFCd$IRXbK{pv#}bC>1s$cRojAZ>cvo}r7auC>m$nPh
zzUbUOx={Kcb~bocF;R!sLV&wUj_u_yu^AJ4yJ6WXB5<3HlL7)4>SBPyJh@TPeR7mP
zZ5~dk)bF4aNVwE<K0+O6<hjm!;@QLbI21h?G#>e|NLdzCZxHClinx8Xff+L<1X;zs
z{f`dvC>v)el0-_w&@sa|XyxN;>ctisGyBj~+!kXC%>{cqvWrA-uXV)x`2nhAgz+%i
ztOcZPvH;JjZlKi1NxZ*fdK|nFmt>Z2^3N~fQYREn<hj**VcLfGVE_2*-#C&l$0sM@
zG{l>)bGeZl@btOoLX`}u1V7$?m2=9WlOm4i8!L}`NA{Q>k&5;>x8zQ@>Ek_Eh<)>_
zehtag!XdsDVp1iDvs_-mO5ZXdxh2vfN5MSEKm?6^paE!U{lWT9ak{XaCPWnYyqIwp
zPEM=il_sh6Kbs=GUbZ+bQv-$QWx&6~&#LZ(Xud{5WR7P>?90A$#Ua@8#^?NA(B|)Z
z;hb!8?!ZxPLkYv;gF1N<{tWUoa^Ld~Pwd1QA#b5j8%<&dSrk#i+VS1J{whAlIjJ=H
z<2-5sE)Gyu4yTLVJa)4l5iUY98dA(eBmK@ghBdiDG#9skfAH_=3TNzD=vRR`M9G?s
za1vy48jY<c_ab}c6mgG7H?{Yl31n)J#d||x3Yio6!O4(7pHZ)o1SOwax~I>->>id@
zD47Z$tywVwrl8~GQq*qbleCrQD5I{I{HwejAr5f<P5&c6A@w}bn8A{&APkyGHDLD*
zy0QVPk`vcviy=Fh1=+TLDhXk#zLn^QB80zDUp(%KWHs}QR|ugop}9O|sVo5l+#ro3
zBr3>tCz^-(Syknv62@w#L?|Vje2pM@caY=wUf?O%v36{#8zDXoE(-VP5*#=>DlSV`
z4jB-_&1p>U?8N?er)kV!q#|9-6M;@#Fp=mQriP>_Bwd;cU%EJhvqpIR^d}Fe8Jq?Y
zf`Ih+a;gO9C{}CYOHGT$4<eHuO_TW|b@F_q4iJJz30=2p=Re8k>*(@*KUlA*r|eRF
z!UfhS^5<lwE~ksN@QH$+Xc>-KoQLTUn>2wQoeQV;fpj8<Fekz+%sXaj*LpUju>SbL
z*+d4zzL-H&I@~^<oJpl*1Nep&tz<}Yf_EupS(k|qcO2{YUvJR5I~0oMMJEL76~`#l
zzDWJBLvf;X<Q;fA1b>Bwf85lB{?)<L*n!~9Qy_QtJ1Z<mH7N335)YEX90%9sup9*X
zQ~4))V*iNM=pC>$Nn51<&c}(*K{*wVx&U=4Y>?<#PyTt4K+V@{o#H9_A?hlm0WLx1
zBZ!;_Ml<G>r&oAm&rfJ2gbl`PU`YZ>kX!b$N{$F~HUzRJw%mxQ9!iAhh}O%aplg#h
zV-GX2W^76j#k<<`&X_<sZOL>%b_WBH*kf{O8N))Mmr9{3*Q<n+&r7P_ULS=hW98b%
zU<58@v5>H?`kgzm(>F7GMb8F#P1fkCMq^qF{w*W1)^S{->($<zITBsZl{P{>`XI>+
z+=e)8yj7`g>GZ#U9PLaBFNR_;-a<D`&^+{<Q|<XutN(cXy$|0qN$pO8I8q11ErfDZ
zgQ3m*3OHZ*19C@*bsC^Ish36G;T1Wb3`@*CL6Q*f92T8Dfc}M-5wXr|>qVhZ+Q;Ul
z5vfiN{a!3F8xdBd8Y@oBg^ViPKjH~_ct+_AE`c<Sbk*K05i@gZPuSDJIa=I{_oq)N
zQdrnA4@zh^8C1(k<xY5g=<g+9HDAKW9;lDK4YK5ovL0{#xE(ShY?&;J(u%WV^n#9X
z4EOjIbb>MSN1O6a)?Y<Car9WnXon=J&mAcfoOebgku`;u+LJh&*>?e_^dK61y#aAG
zT00ltK{T=9QI2J#zf+WJuCur}kqaD|m~tZG^d$SozT20>4-_#UFth`AX%=uHe8(s#
zIANLtUNk`i(cS;94Xw(>z#2?;7#YJCoJktQFC0oQLp&xVL022)G{cy+lDk_iHy8qW
zHJ%Ob4Ej!TJ;<D)A&l;+%i|!y`Y#+@9E|#Paj8iNpdKPZBH}{-4IoLy)9MFml023!
zGC&^uJR;nNnQ|^{Ut0jUSipP`BJFjAK|_mhW;2sUh1^wL>-h2BhDAPW{2wyhDb4Om
z9aboFFDrlO$pl3xtK-e(JuieHdS`LqfVxsO8~w^-ZnT-w6GbO(Y^TD$p$)h{Z5<Ka
zWq39#VThk%sbL`#7-6gUV3{dAk{|F~qnbPOEK?(=_V5Sy`xXJTsK2vpO|iienZ!c3
z%tKDh<s;Mv4$-&_>s@9h(J+KdZhPvl$+K|{o_}b0H#2ICq&^6kxjH(MH%GTJ;Hr|+
zAVT(kQvxUr^Xzi9vb5@MJ=?d1rFLQb8q%Hp=rv*jK=dfr7k4TZDLh`O=+ETg<4PqN
zO75mv(vB?cpltxXZ#@Yg|2Vn9t{p3@^b{zjG%Nq$1tNG0BLxUhrH($z*a+jSol2Tt
zpHWwnpNuE0-y@5VD<>O-1WkLZ=s`<Jf2FJ6m^9SKZEFx0A{T2&MU8@>lR|JZqz#sX
z$c@&~3>{y<s%H6Oi77Er=;J{^j%Tqz5fh9z3M|WkOf>*Psn-k|=M+DrezGwSgBi6{
zMuXNM-R9KO=op+h*@OM0Ze2OR*3LCmh!e9Vf=1f%+)z4qa;c_GtFWq5e^#o^#oDO9
zgt;q)1;KMF46<jZp(9_FQKc3)38z}+4OB|4GwAM<)a?3Je&e>qA$K#9iBa_jq$=*&
z7y_Yquu%lSVhK7e)_<0!+A&)8&5E>sV);FXkf`)`EjE36p~3-)-ZD@XNx{i+m@Sb-
zjIWf%RU{vqNVLfKsdJC%;K;eD7h1GrP0QYhqkD+-JF;=ViO!uP_9~@B;CE5Z@H@A1
z&Imb0E||y6{Te#VBqGY{9dWPNK9)Ypfvx3K#&Tld!3Q#j@Ms5F6wl8DpO};w#z%Yc
zi_FLc-B|V97Pt)cL}Z?`j;J@rBd=~%6Mi)8@MD<t;8<uyu8ApdO1NPc?4oNgh&c)t
zGP{LkG-zwIN7c;+giphP+kQRin1%M;E;ngU?h$3k{;b2~8?!L>Vjka!A3{6Dc%8;i
z2MQ9v0UT1#p7HD<*ek%Zq$oyU>(Rgaiyiwq#R%s%@qNc&bvIDmHzJ-pEFb*ni~osg
zaKhdQVjqiX8T>R~!L?%OyPZM$=lCbdQPs^=1M}PV^P8xB<uKP!sAn)=-YDZ5E>=3V
zjf_9&2h42Tj>8}GpL=}}Ei}AWR;w$Q(bq+Q)1{<raIb^CMa$}pW3Wmty1W^#J{{JU
zu^jDiQMXrpG+rcb<>BtnTF?b4Z!)3Cs(}2(l34815P6MyFd4&J=SNY05!XWkQ_>!E
zUC2iRiwmxQdM}E$=mwti<?)c|B4$B+!Q16STMN#R?JrY5VU;hgAE;60^YogG!_rd#
z&$yWM${~I>0r}YVEXs?P&d%g?r%WtdavjHV$UDsnrHtm;jud9J%lX9eeU9}GBpKPH
zwLq6z>rfI%3ArzW4({u*!==ieJIfRUbxUK0!YzyW_4W3mcthS6@&`%~oEEz9@E_d!
zs6$&cdWLk*vktX(^xq;F9Ih&6VUj!`X_-!Mt+BwnxPq)(q8Dvw2}u#=`D<=kAWPok
zGO?0Ac7`*<QOFwR2UmN<v;U&hZCq7QQL~2OuV0}G!T7&_cyUw}Mp$$1tHnv}agsk#
z-cBegx5|lV*A2u7Vv&qsaIL<h27`n(T5Gry{@a8Rul0{y(%u0N@zUCC6**W37>S6V
z!qAs(52|Mj!i{`In)Mqx##S5M>rxlZ-!Kw?njjG`BIH)9W*l?|ym|`B$<F5L(^>{Y
zhK(To986A0*@&2SZ$^oYcVh}!dN_I|0Re-Ixrca(202WJY|Teb5MMCLi_mv7${?=N
zh$d+1+FO7I?+=i;)?#^SzNuvgkS;*X%q_+DYCS1=qj+S*zVj`;7_{MJtrqS|ElOG$
z3EpefB!2|n=)C%%k(9HL{$`)Qcx=Xyn%D->jSP)VHuvsRn`_x39%F4jX6ZS0`T^og
zAWwt5nvWDH!jh!!z(i{(g#B~Y`>0x@jP*nanCY!GBtalSOtWtSKf;RvY$D`p{g`HI
z*;nF{V!<Jq8tZN93II*jF;QTAxffyqPle*Mqv0Fv%-j#(CgkPBa9!)PWiWokv-N>=
zmMmperG)s$Ct3qdYqcNhPG<FFDK$H&OQRwdYs&RCOI^AzRqJ4X>(=!che%C92D=OJ
ze0?O~aX5Y^Gu|<d-fGzZ8yfY!OV9yT1{A(aw4<~}A(&5T)_~j{QGw-4PctiD<xr;F
z+?_~?Y(p>KV#QhVV-Cv3o~NGscs8HnuZl)Z|Lc<zi&15~i02m;C`B<im@u&zU#=$W
zgqMG2w}0KUlgP6wRl$p3yBL=nY;>s!%Z|$C{MvsDy&F7-rLQIcgmmb6i1jp<7cP%>
z-I-d%wjxqA&K*AE(iXiuooLyib38`eObfK;p}|QE=3&~ED@Lo0{DcT4@jU63Y)?+#
zTNYv}V!?{$JQi(49Zn&YJN3Yyiy5daRPD*iZfPdwE*}P0A7aI8dugH+36?8-&@|nt
z7H=i1dSM9joLKPyWiFZT>e#J~yfmg0=SpV^uBruVtQGG+jY41u{wRg-M(53hBXjN+
zVT=Tp-3+wuq3Q2@v!M*s6_us%8b49~8Dnu4k1sVXtqy-a81+h*v>Z8_&w@6X(7xgg
zssJO*&*(%r6@3v(l=u9qmuR5BPs@8bui5agVH1J4qvfg_5E@^AOlU}1sS_+N6kANr
z@*rbus6%%XXiejZ$wV>sl%YBxuY|ibaKj-+A-8}W5-m%)<*(kQHiKC6z%Z)i3u{Mp
zk1-2RudS{bACkGa&}Y>Aha;`ayHcU0Tq{Hd-=XepR~sxX02$e0<U0vrD2mva^X<<0
zbytCDVU_v?;9$)OLHh`>cJ>?36l0Yhu;@=euX8T+{@=pbr9DHF7oSd5#je%kD=lQ;
zYTuO#8g`S5E$fVp8zZ3m&pX>$%v4#o-IyvnC)R0&dVzwDbJWqo#RT#69vl)<<<EYc
zpJ{)aSuCD+p7MCaTrX=Il&p77Lf<yY02KqpAz<B*P)2TCSImt}xUI577HfY#+K~El
z^h#*73eG05{NDZH7YWYMrt<rdPAqT2M89XuS^%iBP6!|LJgUG#YLlnpN9-YPU<)OV
z<3_W(E!l}!ZzG6=i<v9U(Imw~=!aO6%wt|n??axrEk4A^okn-IPCgQ0%<_53a<*Re
z6A+>OoDJ?X80#v#E6jr3pGTh4&CQDkO3L^u66ik0=QU9&T1diLe9=v#ewpt3YkIZg
z4}3ziiH%B%tm^sdA_{{>Wws(pj)_8KyQW}R&D<KuGt>g}vRciZoIWVm#pY{l?r?Gv
zZ^fMjK5;N{e5;-Jwo8NhkLTDDP5Z-GOyGB=l-W38avg%QON?{CR;RAfLN+EU&h&Q!
zJ87s^zO++T*euo^nM-DaVXwMqQ9cIl$EXFU<b!&0Yl$RNOWP5CmA6`TqcCJ|3C*-k
zEwM>uU-#*@q1K7z61g%VwZnGjh7F$SK2>Bb(9`GB%z09>avUV~W|L{`uAB3_8i24k
zau|67hMv)S=3<rGcePPH?X1V6oo6pXWrnP_-oKml8AJi95h0Vu{))2nl=OOQ#>ci9
z;c!YS$|VFlMO$sWY*S^$LHE`qn%8i(B6k5B+Yv8WnXUzYM()nyJgm6$hag%_vxXzc
z+20#JIC71}`Gnrkmk#+9aJUkp6`)=-6~se4W_OL#Orr$sQ&GzkIz?L_q@gb`>i%Ji
z_Eus!rIS(0Xl9)H(no)o4^)2ro0g8JNkCJZcC-%ruTdPV)vO{=D=c5}aYG%82X=#^
zl8Wzb>d<3DGbp7k>H!ovDoYPOs0oGWUV<9vsi2(^i<kr=e;^Ik7puK}0|7C8CV5IS
zPXuNq8}l@x<5$!G=V^y#%(C_9Wr|UHzOB+cjDNc4r|NZ!mFPW--Xl6G4hGN!ynM<9
zKf2e*=Cyf~IZsijEM*G?heaIOiH5rwK<}upk2IeqFdwee3dfBX8I8m^!CY!hN+JH0
zNZH^r%oMLAGe#eteb%lowgQ|l)?msH*P`p;qwb4F?oK5FClq6;HMBT5WkV3=AIVW7
zvEmCN%Yq8K^2-F$DX%~Ezi&iw1rIn=*NY=ecsFS$qvN`CA8d@8ytDIx)M#>YMe8<<
zsZ*Gq?jagkjnZq#uK!;yf$U$c(fA}~P1*<A5Yke{*Ej?sJ)oAK8DV}@S^cp_HpYhu
z@kkz3A;S@U<=M-GyAZuZ!`^Wz`S-q0@1H*M`mv`sa9KSjf9-(U=@8x$0v&rgODZDb
zn5>1snDx`xUZhn~7(2SgYJ``YJ!6fU`_3GPh6|Xus>Kd<REGk2C?aP@9S4bI1}O87
zAsQ4vT<-SlGXT#ji0O_gx-;T8jx_A)Z~==*{gv8qZoS|#<fIt9N9$Qo!!o(fzM^RZ
zM;5YABNKmv>gL{L!u7W@ga>o5>5S*SbPQ1aTHH9J#@fY-2dHwHd?*nJwZC^NLFNS^
zK{iKFxjnu;=ajCdufK7w65Umj5jJhldFPLx8#FR0TmWtE^sI%R#}OXXMl>6Hbc*3Z
zs5xS$PwQdrcMx`DB9tXmVdw|#m&%b3?{T~R?s5HJUa|{>#vLn*$V~lO^o_P7gTB$G
zpms!Sku_C&ZThHQ$ljgmGBxSP6Z*5<IT4(tGn`hQeeS6aF^mIg%3T9)wE^uG;)gX3
zsYiJmnLv9G55CLyJtkY2eO6Z<{BoWt$K%Jj?^zlGJGl0n`;=-7xRn0Wwqo$`X;*pY
z4{+jO&Qv>~{w&3RG!(ql&gBRB+_4!&HUbh3(L%L}rs^#{xZmT-WS_rL=pQg7P0h0*
zmy4=4xREGi7fWqBtC`2wlF~@y`Kn5@^yDH<E(1Pea(4nARBn9DSO%7Ig-ajLl=y}O
zXQG_aL(eVv90FG&O9QtVQ$5b2sS)%Jd8kwI4z<Z++2!|--5f{*?gwAhXcj}K7mEx6
zPB~GOhB^W%^CKQm%ezX~A&%C=?6G9p$gIBg%?p}^F5L@tQU?a6ETUbt#v__KL#521
z20$dSxL6kn2Dn93sQW6Hb4Sqt!>rw&s#T8p*Y`O)>Y;5nK8xKgi)V?RyJTwVo`|aC
zbWD$M>SA*Tl%e<hpbfBtJHBFiJ!fX~G<hMpRy5RE_?*9;3kmMyE)Jxv8f#SbU-;J7
zdZHp}lT&K$`;L$_&0(d30i;DOYwWX3NT4%aK!;MY!G!V^1r(p@cQYsQC>;A-2BqVo
z#J88Yd`0Jg6^0AJH3nnR0mpiV0lkpgz?pWvtr=oMO|}VE<7b^z*S$*A?J<!HCC8|L
zSHY8x7f?p$IQWe+1WZuL;d#p&l%8}Jk|BNDjbnj-35gnMAQ$svwq>x0u2H686M;C%
zp4GVT)oD>;nyD1>KZfVfzo)7Z+>9x3NYrCN2~c#$|7`%<d`cMV^6_lEHCO|8=~~co
z-~N6Y@**|-u}#;_dyodw56+)G_tL5l3XSEzj5tH4%xCv6abN8MpSNK<Rg&1SrW=p?
z9rovg4}Q--N$B~ILuZ^g3!N7O7!@G*qow7}R03wAxq-kAeP-sYU2F*fg~?3rCk_>V
z1qIv7X#F#`<u(%j7Hz1&Om?_ik`-l*yEziXyqc(HmO4v90UK!h7vH;<&}zH$#zJB`
zjwhvmcM}|`?=N0at7W#PDx2MzeTtv#$OWrI>(Y<5^jg|5{<YmOJ@4Juh8BRO#7?l3
zxdJcO7@ej}KPq`fU~z5i)Q)G05)C1s*58;PVxS*2PiB*kSt%k6Cd5jqV>$Ygu^w_q
z1rt5!SHq2P%|f~M;TbuYX+ga&h|#>)654^GOE|Kl_F5tROoZFq+LIPr0Gn}^eS?9f
zk?rUh#94R>P49^(U%}CS)D)23KLZ*08O|U>RCFqTNjTcVdqD-6A;dV=Xbrc{wpz0U
z)XJCZ^G`|^qi*o;wX~-4E)7M<X;Vg6hOy?BT$gOK6!R-0X0RBa44)I7#Io4mZLlL>
zZ$Y09ay!}xYO#%vn=KEhurc@nWFbU5SC<Qm$6WNO1W%Z5?71W=IzWBG;FKJt>vE;L
zyjLL{^f@_lx%CO@9(qd-T^$cj1?u}gTN%9JKCHp}T2Qi}wZ?ga@s;8n%7+T1?6A>F
zr$dlLQY3X)+uK!CydP95N<sh7I_8~_%y4n=)9}tSFOC1Kzpf60lx{^Bt@OmL%2laP
z=gPzUP;M+1h%03B3c#QN+S<0HdYW!eEiO|?;eqWwO2y}x%sJ8MxN)kye$i5mbBt({
zmio`;YL&(8?|yWyBhfrIEMa+&P#F*UKk`tzG65r9I8+Ho+XZUx#u?$%?zEZre@CkW
zdds4KX}`<^-N4Y5IuGm*RDPuwOqVtC!y{wZ;YV3y7%(6HGvL9}!;F-T^@v+98tarx
ztB%#Aem8WjEO<MDav`mZI`&|Vr%wIUYs@4yOZ0eaR+^1h6!ln?=^eK%E>}_$F7vya
zz*F@YqJ_n;Zjc*p4AS2fTsdO-tqNF%_5K(eki$475~`v*<149Vy}s&-$(EMdGr62v
z0Tpd<0W7?@?ts~PW|kCTQKEp(4+JWu469{$k46F9T6VBE*ZS|~2bkuYf!ps2{^NRj
zy@Ic}tdi{*vcjp@fyb$Jv0pz@F@c#6{$^f#%VpWvLhV<6$-KNjP@tiF;Afx~u;Ea^
zO7F?svghNO#ds0csZn?3aGsEy>TMM%0;@~714dVbLJWlax^@<O3R9vtaNc@T#?;=a
z=ZlmXX5;KRiH<Bf-`96QRxfkq;|Mia{2b!w??GDD1XomHD1^0qDg2YgSffGu079C&
z_?1?%w=5>Y0W_k6G)B_;9l#c_&as#isCF2uC}W!whmgI1fDLjpdBcD2N@PQ#|0E?1
z<9l-8g#_N5E81S2X{f|Buud`iP_gDm`hA1gdN)2ihCb@CexSop7?5|ZgVTY*Fv__6
z7DTJu-qvb-G`I*^8^mZ~>}wDo-8Eh3Nf8L%I~Y9uK}ak&tMb#9l3vwsg%Ka$>_dk@
zr9N13p+!@I6e8ZPCPM|LUufGF45S8cVKXUej{=yn9^l=vz}4_?rjW|2^y_ER`$}^7
z6TR#JpMZ?d+Wbpi^*WLccMksv!VeXDXAGg$PLZZCW}(7)iYMeo-gL@vvxjYlXO~o=
zQEVlSh#o&#etsl;-m5g4;yGSZ$7`r&2JYJi-)0YmKg2yjvcfV$sQ+*TCp+JsDu1fu
zNC!}&pXXO8xEHv*%?&5)hTt-;L~7N{4(@WVHx4vkwBy&6<59lj!`v_|czD*caI3Eo
za~qEk$lwg`>t!63gXRx<)&(X&R`4U9$Uh`rYmgb{nv%^W4vSSgD5}Y`by4_TWFx8$
z4I=2#H%=;~w2`&;2Z><lH$$gnNrE_u69eGH6kIq2TYm*~wY9@ws-zD(^+;a4TH&b$
z{uyYu_0g%Vi^6juKasu2oj%20^arPzY13%95|?5|Cgw|i9_mS)<VNN$eZ&95ronGl
zOV&dv)7opGslMxJ%)mCa^0F|kAC+WtidTmCn5%gHSk8{rvFp$hs>b&=QxU1T+yo5M
zRYKjLDWWXG$dqpDoH3}bcbl+`5z2>Va~)n|XeFP2BOpt!GtxTvR{j@bBeN1|UZaQo
zhqCzIHhwSZK;z_-5urRUe$OulX_<c}<;LLzS_TNyPK@<nXOy>ygd=Tk$;`5^SgYGm
z5(@%Sn8k7ne0)lq@E=!;<4AR7s-A$@Gg1s>Q3&Yk@`|Q!D>W}eo{7|6W}9K3EE5Zy
z5vnS1);-TEUu#V;{&xFqa&*p`2y<7nG7+qjTPUFI#T86-s^h_$_`SEsE>F`6-ej0(
zd&YLl{$L3o#b{VRqmi0tCU*sm9ICc=#WfD6yFwV_6IKuTfP~!rn0uJrRRAyyZM3>O
zR8n(s?#`Bo-uN9Fm2O?+mvk?rKe{5Jh!fC8S#_*I(j;Sp)wqUqdZAH&1=XzugUC}L
z$(&91oGSCcd(|TY&&~TA*>Zu+^~}H3IA8V=9WHs^fVR&HQjiovaG42ORbLT+14~*P
zrvOCzw9XhpkKTVJHV~8JQ2`;oiEVOcZ!Ja~Uc=*rL@OyfEx(yOIAGmWq78N5Pcj*O
z`f?#R*&Po8HhPaKGIM$P*Kv!to@-1#r_u*8k`O@0T{=Arqq||?(aGpqB{BnD7&Ksi
z-eUAQ65;GGx6sP$PJ?l-a^*d&J)L4gulga=7x1hNCNPn2(dO0}hXZv+Agc5Y#_msw
zw$l!SzPxB!2NX?K$$w2ctZH`@##@d3GE)ACQAx52kjQc)m2$1SOgO&a2n|Pnq1FcS
zg%qw9Eym$X6Ea^DU>}0bYCsdiCfxC&cN19<+a6xO6*Fu-glv8XY!Jo#hertbXV%$5
zV{}C$`{yZC4Mt3k#(~DN7D=nd`UWHK@cif}6@5yt-{sc7VCq9S`+}8|o2<Qmy?*1(
zH1nrmB`f$f{VLW;EhH%v*`~2xEZS<EAWn+j5!x&{Zu5r^7e2V#a}Q77PNr9qFY9Q7
z#NFLriQodYjop~$?4e@U1omR!iyiTZ7iRxJ1kp8c&>S&<vjP-Q$Y>I;g&+y_5A}*w
zroUnQPMVj$&ZmO)Jbkt4BXO#i7xrj4l+lOclY)NGdFaq29o6n<o9VbFgX%zQNw3d>
zdD+MUUF6pPm(r7`?B~uB6+rNba?C1oJh7Zueb9m~YddifRGx$ckF#}#v>cR9D*DDR
z`CIy@YRGFGw+k?rH_!u{S`i=j%OV=9ynhv%J(bqbkxPlQ-U>!?@?BjWrH8)7{Exbr
zLMqZulh%RE8WoGL1uCJM660x1#xD$(gLGb-dm*s7i-+#?D(R`hi=$S(CfVpwkBT&3
zD7%{t8Jm{{v*YH{xgYf|0g7Xky0%95A=*EX_<gOgdG~<a19Kc#pMtBH6p|}28zmOF
zNx02i<J48La?SV+Qvp$)eB^Jf1v`0v#={@`3v7PIsb{Lu{GbwD&H0*Vx<ldnplw=q
z|5?@tn>8U$!cmb8vI*6Ci-J76PFuhBDDd^(;8G|(BjyaFnEA_f2&B+nc?&{f$kZ}I
z>Pnl7m^>JG5cS};l*TTG?xB5>kMyeLvK^0>wkO0Z{;h5=zFIMt3bH=%{VZUQpO+wv
zii2Y13vMApi$%sZ#`9R>#ex7w<mG1(EOKxbhMbVX5ZF2@htAc$D19TEln?h8#JW#b
zahS?8y}mk@Tr&s!Mv+kveK=PudCC2VlFY0HoU{-KY($_LwI*CyW_xA?Cu+A$bxUQk
z#Z}CzgeRO0OHAXOgoco1Y6MMo;Pj%?zVc|Wk}bqie}%iKsWfI3fviAkX=vDdWW0?K
z4laE8hKslCwFD!{jJ3(8IEK%<QncBRalEFWp#-Cgbb_f&n<l8PV0O{-Y5orC{>E7`
zS6~D{K+b>jRp|a^S6rm^cW>VYP<QIwmvYj#-*R+`zCNks<Q0-=wJ=1zjyL^R)7m@~
zsdU=E(jB3WLv?^+TzgBXAqH*U8lLrsP6noTVRmkLlzQ!>t9QbB)EYlHAB9rk=2Lf3
z!JI#N4tnp*O6m9yQ5{tyLmUYV!SA$0_Ci{qbrE&46A}7=Od6K9abahb|EK(>EYf|N
zjog}`ld2wNfq{(ZspRZ3oCkziZRSSi(ztkx5nXR0<A+`MZ*z<FlN85ytk<Y*)|>cF
zNSQ7ts{z7YpV|=obS3tW_xE>cU{d6{IzyUO+GCOcW@T?)Ya(LRDRd+4g%%x9)<gzI
z7C^QYi37>g5O^{r{JF1Y(u|6=Xxj#N73nuZqd<s11YGT=1LO*H3WKm^j%o|<P;Fgi
z?Ln<-ip6_D&gfm>Z9%t?o=rg*L(v<(X=RdF>@zHqD6$w4Uo_E_gI?|mR2tX7e!#4g
zVXqi^7XEffNQ+SZn}|HzCnJxM3;GARkyX@>5SuW(lyG=&l8-He*<ybVIV$?V()#2r
zx#<zAte`RB#RN0R0guIzO*ynG>-|gnA*;yY`THAsXh@D@nNC8=^0E=6z#449HOjvO
zIp+hnbQ4&Hf&n>gw!VwGfILZ$V#<Cu3c|>sRrIj;^|nDJh)3*^#1zKjKgT+NA2-U}
z@}oQv_*na_#0raZ8eQ)$PxQYZAUNRdj2nz|-^C%-L(B8r6WVZh<XK0_Z0r`|8o|QU
z!Bv*gtuJ8tyXMBByc(8R#$2xt3IHt01%Cu6gE5&&Q;a7EEnCl3FdDCrdJ=h9*ZaHG
z$ABYI<fVc>1z9WxBT?DWXfeny{(~%DwpSrPu4h@td51fLv{my(8IecVCh+;r-Sg5p
z+wg{D*Dz6Y4}q8xHF84!>XTQY%zEr8VC{U}r#ZoTk(Ypr<t!mZd+Jn<mMs(o_|yC#
z7k-I(@k>TSwbNcZIoEWYz+apJUtSm}bD%YhtgdE`{Lagmt20c(r$h&Yvj|KkoV-*!
zNqA{eRbt6ER2+rzLi>&)I8EXfI)!~dd;@<S$KiU0mPdJ)*R}a@y8*#C?XaJSda|Fz
z1+x>DC2A<)M~?veg8i8=MusXwwjET7VDh`tr6z~*y$gAFI2*`Qnh(#QD*=ak;o+h@
z@$CzJPlSH=mZ7G7?q@(q9vJ>@@-;rPD4WJPPTb=`p6VaL%g+tCB)4mZ?O?dw2hkrI
z!Gb2FH|V>`w|vKSb)g&K-5W|Ckriw!pkO3tmPk-Ho9ua9iUQ!L=6HIS!^1b4DuJcA
zNM1T8DUIcROnK4t?ip6Q3w)OZsRmDrw_^J%yDKSvrTh?l1PFi$Xl>C#{my26#vsD-
z2xwnq&TaBQj||S0EE?CtDs{_>HEZw8r~@+sxR)Mkm$LF^?!kx#fm^`Doo8p;?*TuR
z0%1kOyi>8A4e97WuV82`O|zwjfp8nzaL_qYgGvPiY1~8BLxH{^mRA0!5<F!6Kcu=6
zaAdr<yDdG^sT+V8Wn?mFH~K;0N5LzoTJLA$qYI&|{6A%>=g+t2di4IznfkqS`Z^gM
z21Trwgldn|2U5fATz1Q92zAd4T<N<;j$7Ph-Qh;|dk?V-o`xoCa+V<0Hz~&mcJJRz
zE!8nb8>xdfn4oJG7|`AJ=Ca6V(OJL$^!ci0IIQUjjz$0`_)uLX=V*myvsHow=8bAu
z!=P_Cbaj7cn&WX*Rs^|>7#+MAV_y>ROlK?<eaR)tSwNHZK`9QXbrBFch5yVmfQ{)a
zAZrmY23JUYSF#R&(r8&9Q5pbSQ^{QXbm2iVH(-u)79ihDqL2e4(%Qe}X<Ge3__0MF
zaOfHhO*0R8lfK3n^=W?(A*xI8JNNCOE}<tJi8~}!o7tpGg`>NtmyF*?V653+Q5NPk
z5oEmWn0XB9A!)#ln)C0Zy^<OwpYuUStXiGf9k;0YvtqS6<Gq)hVLcSX-{X)l3GqE1
zX4V1@Q_!Tk)VPIsTz#Aa#&>^$m3Xx;HamR<aI*o{Oj5LUH$c3<?YIxHLh44dt^t<`
zq77=A_y`RgCz!@6RJFgt*D+nwW7nnGY}T4fB#dF51J0NU*B!<f!5=uluILzWnvGHn
zw(d8hM>2<l+vYZ62kX8qzqtvoB=jG~?#u6jZ_QSoZSYGec=vEc*$W(R?&&kgLgITV
z;e7%{;BAj?+a0i$oo+BAC}=-_H&x^gDsBrU_N47qoFGC0HD8H1qvX<m`l2ON*fXGi
zMu}wp>d7Rz%%im&)~v%#e$<i1+d?O}9^(7w!l&88lI4QfKqqdAI=ePc;5TWnm6nlr
zM*VE82Iq#|S2hS`EjI>yJRfS5thKG^H5UN?h>O^o4DQ;K_b(NW)(0Wq+UCBwp}yhZ
z6bX?XweFB>Y%B?KunErUBEa~9X!8AgPcSuV$+wM*EHX(7S)oadn;=jeF<>0(@=tAS
zNwU>F?`yuym}Nygd%WWX-%V5;W8Taj4lngQwc^AwET#Pz(l|EF_k-u68Sd4R>$L(#
zHGdRbOQ31R*70GLBC4NPw-!$^G3XLwiW*+lp}FZME8Z~bLPFe!bE)0?UT^={iH>0o
zH<mhTEN=Lx(+*iYSqb(nmyo<amUl*dW*3;W9^<Fwn2ej<f7P;L*OKriZG33K)sV_(
z9PMxVxa1-(@*Lj>BTpLg8co11lzRf~NhM)})fdoPPI&#+HjlB*w7Q?3Rjw(Q=3fd7
zZr;*W#*+g;V-P)T+MK6!V1GRVu<&l@))=S<fKqbP+tW3;Xm~^y_hB5DcE*@8HRa~W
ztoh!0`@~r$S7%w!!iS{f>H!($8#H{z%DD67au__$zb)42L+yzMV^5&`M;c&cmwYR&
zgSMty8-=ZJH8izYb>T|s9?2ZXd+lww7BlzJBU>b^vf=Z7Je7%sVw&G4=_2bv{)rXM
zS80hMo8uboK#3Ld9#(aV8#iy>)dWd^lowNHt*_TMn>v>jdAQNNwJOEbo$?vP<hGV}
zg57No*eFcAzT4o|luNhUS^`6J-)tM>FWpp{0&mSr73(nq?br1N*Yq&t0hpQcG`uC}
z(QnK}XlzQm^ms|Mk<YPOyn$Gk@EP@mo-)tMFkrn@rKr8a67hF6Wga^i2DLKQv!3S7
z=_}`3U&!i{e<&MbE<2pRq|o&6QIcBbLGiP{&2eDUhnnXHwWqgt=mNERECh2M{p(Cc
zDx)wxmxE~+TAB=xs`jqaFA4J}jCvuwg{y~e6c}SeQdBB~c3J&BosM|AmkA<iTL|#z
z0~gHf<E|?%DSUiuh6PAtU+}n2^hWj*o?obIo(Dy@G${GeCOq-*96|M@JMS=jTMkRR
zA`%M=YZ*l$wKbAO{s27rxit5ij+LW$hEj)GwS;TaN2ZvtT!U``)N!<0ur6!1+KH;h
zS@?2f?qA3yU~7V??6F=W6jqL6-O*JK5glB>&~49-L0{LhUWBsdlAy`77CsMUKSJ>A
z_W6lr1M9T=uQqM&hT)l=3<}SnPME7l$KTp0qY9&8_Oc$bdqBL2{77*WRS_$@v?R5{
zid_N|G}(t<#)tkQQnOj*bEbL7_}f!r6-P2YEXW-?$T!~*F-Ainwn8MOWws3roF2dF
zIiXw*qDErO&8@UXw}{ls@;IE6QlcHNxSa<hC%X#c=i<OfF}}7=oFsS@%{LCyXyuBb
zL`V75zd;)H?7)~Mx6+Pw_|%!bD0k2Bc6W>JEhkYWTUK2YhMB#oV{cWVbl?!KX*0SR
zSCOt-g<`(}<vIG%v<jz#AB@a01=dvcan0VLyUQRO)s#WEL+v{6!2mPi-0=LTm}&#Z
z_ju+}`o^b-NU|#=)))3|c$u<^3Tx|+^wBMuye0ZW1|S(J9+I9tGTBb|B!K&1C2*hm
z%*g6gX1`=8m({g*%bY*H$wST)^Zj2Z0*!3Ar^|O+SOV|KtncT65I0dA${?$^=!N2t
zlHlBpcdc7$MJGwTo%svjk_#&|$HPd@J(e*pm*+V3o=JDtl89$#^ixET>sF)Y0)XS+
z^B-%>tw3TzSgv0%4%?F7JAJ@yb_4iD!179Se}<?v3_br0>Hu@qw@Ji~c6Dsd66QSF
z>3VV^FTD<TBvuo+<d<D?iL~3adh*oIAq@w;;5d?hI~&$|*6^Ks2zu6693U~CZ4U=c
zW8m7W9X)6la4cuvx>7KHg>LmuePv$Uo$9rDGXcZqtbwyIV$*BB3Foq)NRywXt;h1)
zoAIJE&aBOLSeS$To5vfq<@ptRVn>qycEssGORG8VIJx895PhqKJcb4waE=~Mzl#O`
zTAJTFmxeC%bWvLJe<x3Dn}t1bwM5J~9=A>|ev3NHZNe3>gi`>ah|r$ay_dcVT|MwA
zvIq92{Eles$5<}MOfW82<GEWN`EI~=?Sw1sw$sK~?Eu}J!oysUm_0IwjC%yCdwND^
z(iCkS-|qo5u|L>ZYoo;DUGi~e*td8ag10snz@e~H>Sp+A;`*Sq^IQ8PB+^e3!7w@L
zmBM*Y5~EB)>R>LKbAKZFy3cyKw`r6*T?34seVdI*VvN5}VG&xe^e-RVv=_#G<kPz5
z-;vnIpy1QPe)>&EQ)F46@2USlN5H^#!B1a<0=9C2BL5`=9CJ9~Y0S|-DSUyEPth?A
zi43~+EysulzWBO~Q~rmB;b->l#B_jqb1b#j+%mS3og;k}(MB42m5Z@<WWT!yIzYyz
zsieM`bkjdB#Z$-hD_6B~meBOO6lsPBH_5%+xnUKQQD-P7yhE|x{VC;Y;?;BH!j;fM
zB5i=Ppd)ASH}sS~#;#hz_yg9NthDBDm4;$lUh4VYTT306nf-b}_Ja|t()WrF_27kF
z&J3UK{3~ylCvxZUbe@Kh_2+|s+krp=mXLs-5-$mJk&EvlKBH{RfBGW){9mqjCFrG^
zLG6G-3m9%82_$j6&4j&Lv&Q5$m;DTT*2Gs6i&_n$Snu&)Gl!X=e2H!AM*Ty=MkEKR
zoHU~nQH&p_Trv|zKLM4KI+{S4^>B-csn-#yL2-J{OX$OeU!oMDwPeDIYycD_4K%pk
z(}+RQ0eq(aT2tuWxzAbE40GxUJ>%w5CX!kr&V2$BL2>u-Zsph1CbM0S#^D2gVN~G{
zwsWN{W(;%1xsgiZrO<_$CQy!kk21A1;q_!uTYPiO2>3#^IPuUc8M$}&E$VM_5lDYw
zHWLIKsT?fYRSfLg!8&X&0|7kx+7NnE@xF#e{qJ}>^<K|o+9Gx--ls$Uowt%`+;_hz
z(wQ6ki)gMSyj^5E6S6;2THTqj{Iubd<Qfil%rQ&mvXIy**UhxGg=wsUOZozw0}m#j
zH!QAudEzeZ<^-q**bx|h`9jqW2Bqr21ZW9-GU5|3So(zvSulgqKLWC8w<4Fz4Ul%!
zlxqP?^J8`j_WHKSI38-AeQ+YWjs~w~jt-<)k6uau=)7KTxM7q!MWb-NgCkVT`T;~@
zTsxxP%d0&BOOHWC-9Ts)rR=av8BB_3^8&c))?<N1{a?ep%B}`~I(yjA3&lzQ86SMw
za>z(V-(|Al-ln9JEP%kEB(j!Yaos0n+l*fYi{mgmP8C3m1M!4nM!4twe*qi><NFO}
z7UHlo`#Ik_0K^i%L?Jwf000B(Nkl<ZW`K&$Tvm1rWpnxNO(*#ok1=y{0zGZp^zBw6
z&QO24Ai<VAYs4F(y2as{Jen)XvNqL9Cj&TCV!$wRp#ZVYdz0+xqkzwU;Pd%3+;ZN@
zrc>)-L?kq?W_$Evf2Z4K!;e;aO~aODpi@?ntfKbiVtb(5tteoES5ASb*g|HDkFr&U
z4(w#T;7hjCJALgDjw9&{rC>}2zg;>`u_yS>frB0VtvL*HtJg1kzT3`z&4<V=k`CC+
z=M7Bm_?gcXl^;nqYQ|oFJXKFNMvjzxb-ni}haU;FUg;Rws|@@7!ZPralQ3Xh8ykD7
z8;G=);@`$#y;LnBaFj86_;SQ;=-WWOu#t<spRl_GdoU7wCzzzY@K&L~%Pql5YfBst
z{Y)egGRPJ=W=}<CFVY>+c<GF?TUm>j&Iq@@Ds7~paCUFh<)tNm^zq91hS2|>o$O7D
z{`=?8pKaoo#Pc85u980u{<ocmUE0mapmx&=k&QHOGYQlHN$E*$By3!51<<SWn$IG&
z5=P(N>7TQ!`O1}M6UU>q9#3d4I+X-tiC|wB`kAbQDMnGrvaulSuRvJ{j4KWDYwpv~
zOJ#9xMT}8ogB9j~Fz7#0{D-sEBtFtT6X3*77<17YH0n>h3>XF&wYy5tuXJ2Jbckr_
z2+We|FeAQoyilbs25ag{r~}b>rajn*r?KV~ic@7y5V`*2c-8hcd4HC+4cq`4wB5fr
z1~B}*j+<(nD~f%jcp08EOzq2PsxPRzxU$_v!U(H^ca{o&hFi6{4ea~oksgGLd-<cF
z>pr)F+mu97f>*c=*_?(I_@6Cqj^h{ro;?|{XY#nWc<|}<$>3f&Q+UDm%<51Bzy=29
zKWKqn<Xp)!Wrcw3Eitja0S)e$%q2f847#f>c!31STHjMD18F$dkrUg;6=ldKEHS#L
zS#deM(}!n&j43X%#S?p^8`rn`hXEInHP?0h{Q1*B-{=M70f9)>g5ft0WZl_ymul4*
z+cKk)FQ?|+Vx?iE-Rg7^aBv~u>PVGMKL>$=b^;UL_ua6$=G+EKC_pjS>~*9_5Aee4
zjNPmohLW~NTK{iJ=Kd%%yIBIl{t_J9w*B?jUvO%Fzi-SLs6*MSrKm9=XCyy=%Sj)*
z8rCtr#Y6!_jYr|oc+}Ej{EWG_#n1H5hhp~ET$~4&e3V%HeBGW_R=d3Cmz-uS?V(o5
zjB}qeFj;_QvOEM+WPvE2W&`g%$+-VZidRl#1-dT|s-eP)#a=}Mf@V$C{~94f!q$C$
z)fa<0Sw_x~p8UXv`=2^k{_o|nEo#aWDFvt&;agd+p;nV#6v7@n{9kc^xQ4Hk*U10?
N002ovPDHLkV1iEi<4FJj

delta 1637
zcmdlnm1&{mhE8TKqYxt_D`QJ5BeThqnbnZFhnbfmbBkE=Sc;fMK5l-(vV^gojoH)1
zF{EP7+q<?I!QAr4KQ2-Grn>Jkmngg7#g$y^9>tWbzUnF~)3RuGh{#!mro1i<jSTaP
zCxgUYA89p3xB9HL(hT+f$ht9W>)XvX9p9_wpZ2W&H&5mKbK_&rzPLYF?Rl>AWVqH;
z8G*$UPCu=xs@gP<(RW4E+HEO&8E4Hrpin>IfWkncdfHeYp!l=D?$?)>cXk%v-(TM!
z&HOdzXqRaExj84Fe?Iv>$T>k+SeRel&Ze~fRmj`J3nXQ%%htr`iFY4;Qod4gLyX?`
zqNk^r+4-*Q;F@*h<KyGmd%LeE2zVq2tk|}^<7;wO)~nmw^CQ>)NME~l?cBL@|G)OX
zzqk7P)6>)KcdGAP>OH-zv@~_^qLn5o3GRI|l5%qAs*dizxjFs(*VotU_tzE_e0X+t
zc72_H(cZoFd$;G^JyqrUIb+ZA4te{!HJ^7C?Ywj1#EIYE-~TUreCEuVx3{+&-<%w?
zG^q0HtI%uOv)muEUei#2RCnLf+}zySdiKc~vrJAY-w}|~H^@+6YIZ<Ff#F4G&Ykn~
z^E-F;tnLqv>}zW>^Yi@+g}T50{QR6>zTWQ7&->9jV!L<k%KD`cHrK;`!^VvprOoqf
zs=wu=rKK4j2Zq?|>+9dYetmmyb$Qh7h#5bB{+u{*V)gfTdn-Su)z#Te=9QI|jozLo
zD<SdX-Me!s2M#TfiC7x6v*zcgq<;^8W!BaG1BOiax)@1WS>5TUyX_UYjm^!&^`^VK
zyKk<aYiMix_sPl0%l+riv#l<>y)E}<pQqm0>!29AzAn~#>AHB^sxL1NHnYE!oBZV6
zot={_W9@7I{`&gpX!qsImm~Q-way-BYj1D1a|-%@{e;=Z-R1AoY#-{YsjCBnbI#YU
zC6{>K0KKXy_clB@IC$osZOiQBe}4S<agDml)7+|hjwxvgv(0k7K4$EH_3BmB)~wJA
z2Y-qKBenF$iTrzeEMIeaE|t7-Z*O&Ubab%I1Akz=^jqk7e);+}6==(~b+NmXkN2$!
zSDBiY@cP<X>#8pq-rlGDt;>Nf&Az^_q~EjX_qVsV_tjQk)Bd-5?b_Uef(?roE5BCs
zTv{WyX8ZQ~^22Ss&d$z{A3ydpF>jwXZQAGO=lgql?(DDs4@@n7Cf8N|YFlp0xmon^
zP^)X4*3|RQ!`H{X4O(e6@%;1OU=XVnx_U*n;B=kHOA+;#C%CK((VFTNxjsYX-m-Q?
zYUmY@sIIQ|jlVFZ(`n&{-_Z+NoffWLt6M+W_T<ygKT}Un118u?lY9St<F%&x&9N{v
zF$p;z|F7W3hljw(`~UWv)4~9~>FeY6Ms1J(7oa1?FK6@Ow|vl)^&wiewzi&iB{?}c
z2?+}t?KBx)zIykr?&BlZPwD|zv$lSmr{u&eD8V8m!LsVDZ{PO(`}6E-tunZ->;y*7
zm8$ybQcSmZ6h1yVSzY{t^#aS7T_r281-qECgaPf4wF<ed^yB|CQ?PcR3DigRv@nze
pGgU!;(t1*~Gi&RtuRIxk{~4cNwJ(p{=*_|a1fH&bF6*2UngD?6+BpCK


From 2e9b350f501d66711f5a229b180fbc01b08b5ee9 Mon Sep 17 00:00:00 2001
From: Tung Huynh <31434093+huynhsontung@users.noreply.github.com>
Date: Mon, 23 Aug 2021 00:26:21 -0700
Subject: [PATCH 132/200] update code url for sample

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index a2771156e93..e30e3695147 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -490,7 +490,7 @@
         "Type": "RichSuggestBoxPage",
         "Subcategory": "Input",
         "About": "A text input control that makes suggestions and keeps track of data token items in a rich document.",
-        "CodeUrl": "https://github.com/huynhsontung/WindowsCommunityToolkit/tree/RichSuggestBox/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox",
         "CodeFile": "RichSuggestBoxCode.bind",
         "XamlCodeFile": "RichSuggestBoxXaml.bind",
         "Icon": "/SamplePages/RichSuggestBox/RichSuggestBox.png",

From 7b7974b3c6ffe9d405e6d83df99126f6c0bd4107 Mon Sep 17 00:00:00 2001
From: Tung Huynh <31434093+huynhsontung@users.noreply.github.com>
Date: Mon, 23 Aug 2021 00:27:51 -0700
Subject: [PATCH 133/200] update doc url for sample

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index e30e3695147..fe67e2f4940 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -494,7 +494,7 @@
         "CodeFile": "RichSuggestBoxCode.bind",
         "XamlCodeFile": "RichSuggestBoxXaml.bind",
         "Icon": "/SamplePages/RichSuggestBox/RichSuggestBox.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/huynhsontung/WindowsCommunityToolkitDocs/RichSuggestBox/docs/controls/RichSuggestBox.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RichSuggestBox.md"
       }
     ]
   },

From d529d4850916141bcd694bc83186193585b5dd09 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Mon, 23 Aug 2021 10:18:42 -0700
Subject: [PATCH 134/200] Added FrameworkElementExtension test

---
 .../Test_FrameworkElementExtensions.cs        | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
new file mode 100644
index 00000000000..52eadeb27c1
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -0,0 +1,48 @@
+using Microsoft.Toolkit.Uwp;
+using Microsoft.Toolkit.Uwp.UI;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace UnitTests.Extensions
+{
+    public class Test_FrameworkElementExtensions : VisualUITestBase
+    {
+        [TestCategory("FrameworkElementExtensions")]
+        [TestMethod]
+        public async Task Test_Ancestor_WeakReference()
+        {
+            // Need to sim loading the control, and not just load the XAML via XamlReader
+            var view = App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
+           @"<Page
+                    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+                    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+                    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""
+                    xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
+
+                    <Grid x:Name=""OuterGrid"" Width=""200"" Background=""Khaki"">
+                        <Button x:Name=""InnerButton"" ui:FrameworkElementExtensions.AncestorType=""Grid"" />
+                    </Grid>
+
+                </Page>") as Page;
+
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                await SetTestContentAsync(treeRoot);
+
+                // Need to simulate loading the control (and not just rely upon XamlReader.Load)
+                var frame = new Frame();
+                frame.Navigate(treeRoot.GetType());
+                Assert.IsInstanceOfType(frame.Content, typeof(Page));
+
+                var btn = treeRoot.FindChild("InnerButton") as Button;
+
+                btn.SetValue(FrameworkElementExtensions.AncestorProperty, new object());
+
+                Assert.IsNull(btn.Parent);
+            });
+        }
+    }
+}

From 94dc7bf7825761833a97fb5459816e6f0ce577ce Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 17 Aug 2021 16:11:35 -0400
Subject: [PATCH 135/200] Update winui ref to 2.6.2

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj                      | 2 +-
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj              | 2 +-
 SmokeTests/SmokeTest.csproj                                     | 2 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj                    | 2 +-
 build/Windows.Toolkit.UWP.Controls.targets                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 9dddf4fb6b0..2967f2df8ee 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -111,7 +111,7 @@
     </PackageReference>
     -->
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1</Version>
+      <Version>2.6.2</Version>
     </PackageReference>
     <PackageReference Include="Monaco.Editor">
       <Version>0.7.0-alpha</Version>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 7c9fef026fd..df160b65ffe 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" />
+    <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="Win2D.uwp" Version="1.25.0" />
   </ItemGroup>
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 619ad268ac0..38793d4d463 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -111,7 +111,7 @@
   <!-- Only the Layout package have a dependency on WinUI -->
   <ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI'  or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1</Version>
+      <Version>2.6.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index c5f0e63ffe8..fef868d9e62 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -129,7 +129,7 @@
       <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1</Version>
+      <Version>2.6.2</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>2.1.2</Version>
diff --git a/build/Windows.Toolkit.UWP.Controls.targets b/build/Windows.Toolkit.UWP.Controls.targets
index eb94457ec4f..5b8442b5302 100644
--- a/build/Windows.Toolkit.UWP.Controls.targets
+++ b/build/Windows.Toolkit.UWP.Controls.targets
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" />
+    <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
   </ItemGroup>
 
   <PropertyGroup>

From 4bc7f214ea1ff73e453f732d3137da68d7ac8067 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Mon, 23 Aug 2021 13:24:24 -0700
Subject: [PATCH 136/200] Fix for ConstrainedBox test in high DPI

---
 .../UnitTests.UWP/UI/Controls/Test_ConstrainedBox.Infinity.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_ConstrainedBox.Infinity.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_ConstrainedBox.Infinity.cs
index 012d19a7ed0..43c459d5ab5 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_ConstrainedBox.Infinity.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_ConstrainedBox.Infinity.cs
@@ -120,7 +120,7 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
     <ScrollViewer x:Name=""ScrollArea""
                   HorizontalScrollMode=""Enabled"" HorizontalScrollBarVisibility=""Visible""
                   VerticalScrollMode=""Enabled"" VerticalScrollBarVisibility=""Visible"">
-      <controls:ConstrainedBox x:Name=""ConstrainedBox"" AspectRatio=""1:2"">
+      <controls:ConstrainedBox x:Name=""ConstrainedBox"" AspectRatio=""1:2"" UseLayoutRounding=""False"">
         <Border HorizontalAlignment=""Stretch"" VerticalAlignment=""Stretch"" Background=""Red""/>
       </controls:ConstrainedBox>
     </ScrollViewer>

From b2851d3328f98a26acfea01efc26f6db3d2d427c Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Wed, 25 Aug 2021 11:14:21 -0700
Subject: [PATCH 137/200] add test file, wip framework extension

---
 ...eworkElementExtensions.RelativeAncestor.cs | 20 ++++++++++++++-----
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index 2dc95954d67..e17fe1fb893 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -25,16 +25,22 @@ public static object GetAncestor(DependencyObject obj)
         /// </summary>
         /// <param name="obj">Parent object</param>
         /// <param name="value">FrameworkElement</param>
+        //public static void SetAncestor(DependencyObject obj, WeakReference<object> value)
         public static void SetAncestor(DependencyObject obj, object value)
         {
-            obj.SetValue(AncestorProperty, value);
+            //obj.SetValue(AncestorProperty, value);
+            obj.SetValue(AncestorProperty, new WeakReference<object>(value));
         }
 
         /// <summary>
         /// Attached <see cref="DependencyProperty"/> for retrieving a parent <see cref="object"/> for the <see cref="AncestorProperty"/>
         /// </summary>
         public static readonly DependencyProperty AncestorProperty =
-            DependencyProperty.RegisterAttached("Ancestor", typeof(object), typeof(FrameworkElementExtensions), new PropertyMetadata(null));
+            DependencyProperty.RegisterAttached("Ancestor",
+                typeof(WeakReference<object>), 
+                //typeof(object),
+                typeof(FrameworkElementExtensions), 
+                new PropertyMetadata(null));
 
         /// <summary>
         /// Gets the Type of Ancestor to look for from this element.
@@ -57,19 +63,22 @@ public static void SetAncestorType(DependencyObject obj, Type value)
         /// Attached <see cref="DependencyProperty"/> for retrieving a parent <see cref="object"/> for the <see cref="AncestorProperty"/> based on the provided <see cref="Type"/> in the <see cref="AncestorTypeProperty"/>.
         /// </summary>
         public static readonly DependencyProperty AncestorTypeProperty =
-            DependencyProperty.RegisterAttached("AncestorType", typeof(Type), typeof(FrameworkElementExtensions), new PropertyMetadata(null, AncestorType_PropertyChanged));
+            DependencyProperty.RegisterAttached("AncestorType", 
+                typeof(Type), 
+                typeof(FrameworkElementExtensions), 
+                new PropertyMetadata(null, AncestorType_PropertyChanged));
 
         private static void AncestorType_PropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
             if (obj is FrameworkElement fe)
             {
                 fe.Loaded -= FrameworkElement_Loaded;
-                fe.Unloaded -= FrameworkElement_Unloaded;
+                //fe.Unloaded -= FrameworkElement_Unloaded;
 
                 if (args.NewValue != null)
                 {
                     fe.Loaded += FrameworkElement_Loaded;
-                    fe.Unloaded += FrameworkElement_Unloaded;
+                    //fe.Unloaded += FrameworkElement_Unloaded;
 
                     if (fe.Parent != null)
                     {
@@ -83,6 +92,7 @@ private static void FrameworkElement_Loaded(object sender, RoutedEventArgs e)
         {
             if (sender is FrameworkElement fe)
             {
+                //SetAncestor(fe, new WeakReference<object>(fe.FindAscendant(GetAncestorType(fe))));
                 SetAncestor(fe, fe.FindAscendant(GetAncestorType(fe)));
             }
         }
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index c5f0e63ffe8..61329e3afc8 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -165,6 +165,7 @@
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
     <Compile Include="Converters\Test_TypeToObjectConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
+    <Compile Include="Extensions\Test_FrameworkElementExtensions.cs" />
     <Compile Include="Extensions\Test_StringExtensions.cs" />
     <Compile Include="Extensions\Test_UIElementExtensions_Coordinates.cs" />
     <Compile Include="Extensions\Test_VisualTreeExtensions.cs" />

From ab486ec0b53ee0fb069e9d654fc27473a9cd8fc1 Mon Sep 17 00:00:00 2001
From: Christopher Blackman <cblackman@microsoft.com>
Date: Wed, 30 Jun 2021 19:11:05 -0400
Subject: [PATCH 138/200] Initial attached shadow code

---
 .../Shadows/AttachedCardShadow.cs             | 175 ++++++++++
 .../AttachedShadowBaseWithOpacityMask.cs      | 111 +++++++
 .../AttachedShadowBase.cs                     | 299 ++++++++++++++++++
 .../AttachedShadowElementContext.cs           | 285 +++++++++++++++++
 Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs   |  26 ++
 Microsoft.Toolkit/TypedResourceKey.cs         |  27 ++
 6 files changed, 923 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs
 create mode 100644 Microsoft.Toolkit/TypedResourceKey.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
new file mode 100644
index 00000000000..4fc3f5a3a53
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -0,0 +1,175 @@
+// ------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// ------------------------------------------------------
+
+using Microsoft.Graphics.Canvas.Geometry;
+using System.Numerics;
+using Windows.Foundation;
+using Windows.Foundation.Metadata;
+using Windows.UI;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Media.Shadows
+{
+    public class AttachedCardShadow : AttachedShadowBase
+    {
+        private const float MaxBlurRadius = 72;
+        private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
+        private static readonly bool SupportsCompositionVisualSurface;
+        private static readonly bool SupportsCompositionGeometricClip;
+
+        private static readonly TypedResourceKey<CompositionPathGeometry> PathGeometryResourceKey = "PathGeometry";
+        private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RoundedRectangleGeometryResourceKey = "RoundedGeometry";
+        private static readonly TypedResourceKey<CompositionSpriteShape> ShapeResourceKey = "Shape";
+        private static readonly TypedResourceKey<ShapeVisual> ShapeVisualResourceKey = "ShapeVisual";
+        private static readonly TypedResourceKey<CompositionSurfaceBrush> SurfaceBrushResourceKey = "SurfaceBrush";
+        private static readonly TypedResourceKey<CompositionVisualSurface> VisualSurfaceResourceKey = "VisualSurface";
+
+        public static readonly DependencyProperty CornerRadiusProperty =
+            DependencyProperty.Register(
+                nameof(CornerRadius),
+                typeof(double),
+                typeof(AttachedCardShadow),
+                new PropertyMetadata(8d, OnDependencyPropertyChanged));
+
+        static AttachedCardShadow()
+        {
+            SupportsCompositionGeometricClip = ApiInformation.IsTypePresent(typeof(CompositionGeometricClip).FullName);
+            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); ;
+        }
+
+        /// <summary>
+        /// Gets or sets the roundness of the shadow's corners
+        /// </summary>
+        public double CornerRadius
+        {
+            get => (double)GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
+        }
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public override bool IsSupported => SupportsCompositionVisualSurface;
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public override bool SupportsOnSizeChangedEvent => true;
+
+        protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
+        {
+            context.ClearAndDisposeResources();
+            base.OnElementContextUninitialized(context);
+        }
+
+        protected override void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
+        {
+            if (property == CornerRadiusProperty)
+            {
+                var geometry = context.GetResource(RoundedRectangleGeometryResourceKey);
+                if (geometry != null)
+                {
+                    geometry.CornerRadius = new Vector2((float)(double)newValue);
+                }
+
+                UpdateShadowClip(context);
+            }
+            else
+            {
+                base.OnPropertyChanged(context, property, oldValue, newValue);
+            }
+        }
+
+        protected override CompositionBrush GetShadowMask(AttachedShadowElementContext context)
+        {
+            if (!SupportsCompositionVisualSurface)
+            {
+                return null;
+            }
+
+            // Create rounded rectangle geometry and add it to a shape
+            var geometry = context.GetResource(RoundedRectangleGeometryResourceKey) ?? context.AddResource(
+                RoundedRectangleGeometryResourceKey,
+                context.Compositor.CreateRoundedRectangleGeometry());
+            geometry.CornerRadius = new Vector2((float)CornerRadius);
+
+            var shape = context.GetResource(ShapeResourceKey) ?? context.AddResource(ShapeResourceKey, context.Compositor.CreateSpriteShape(geometry));
+            shape.FillBrush = context.Compositor.CreateColorBrush(Colors.Black);
+
+            // Create a ShapeVisual so that our geometry can be rendered to a visual
+            var shapeVisual = context.GetResource(ShapeVisualResourceKey) ??
+                              context.AddResource(ShapeVisualResourceKey, context.Compositor.CreateShapeVisual());
+            shapeVisual.Shapes.Add(shape);
+
+            // Create a CompositionVisualSurface, which renders our ShapeVisual to a texture
+            var visualSurface = context.GetResource(VisualSurfaceResourceKey) ??
+                                context.AddResource(VisualSurfaceResourceKey, context.Compositor.CreateVisualSurface());
+            visualSurface.SourceVisual = shapeVisual;
+
+            // Create a CompositionSurfaceBrush to render our CompositionVisualSurface to a brush.
+            // Now we have a rounded rectangle brush that can be used on as the mask for our shadow.
+            var surfaceBrush = context.GetResource(SurfaceBrushResourceKey) ?? context.AddResource(
+                SurfaceBrushResourceKey,
+                context.Compositor.CreateSurfaceBrush(visualSurface));
+
+            geometry.Size = visualSurface.SourceSize = shapeVisual.Size = context.Element.RenderSize.ToVector2();
+
+            return surfaceBrush;
+        }
+
+        protected override CompositionClip GetShadowClip(AttachedShadowElementContext context)
+        {
+            var pathGeom = context.GetResource(PathGeometryResourceKey) ??
+                           context.AddResource(PathGeometryResourceKey, context.Compositor.CreatePathGeometry());
+            var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(pathGeom));
+
+            // Create rounded rectangle geometry at a larger size that compensates for the size of the stroke,
+            // as we want the inside edge of the stroke to match the edges of the element.
+            // Additionally, the inside edge of the stroke will have a smaller radius than the radius we specified.
+            // Using "(StrokeThickness / 2) + Radius" as our rectangle's radius will give us an inside stroke radius that matches the radius we want.
+            var canvasRectangle = CanvasGeometry.CreateRoundedRectangle(
+                null,
+                -MaxBlurRadius / 2,
+                -MaxBlurRadius / 2,
+                (float)context.Element.ActualWidth + MaxBlurRadius,
+                (float)context.Element.ActualHeight + MaxBlurRadius,
+                (MaxBlurRadius / 2) + (float)CornerRadius,
+                (MaxBlurRadius / 2) + (float)CornerRadius);
+
+            var canvasStroke = canvasRectangle.Stroke(MaxBlurRadius);
+
+            pathGeom.Path = new CompositionPath(canvasStroke);
+
+            return clip;
+        }
+
+        protected override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
+        {
+            var sizeAsVec2 = newSize.ToVector2();
+
+            var geometry = context.GetResource(RoundedRectangleGeometryResourceKey);
+            if (geometry != null)
+            {
+                geometry.Size = sizeAsVec2;
+            }
+
+            var visualSurface = context.GetResource(VisualSurfaceResourceKey);
+            if (geometry != null)
+            {
+                visualSurface.SourceSize = sizeAsVec2;
+            }
+
+            var shapeVisual = context.GetResource(ShapeVisualResourceKey);
+            if (geometry != null)
+            {
+                shapeVisual.Size = sizeAsVec2;
+            }
+
+            UpdateShadowClip(context);
+
+            base.OnSizeChanged(context, newSize, previousSize);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
new file mode 100644
index 00000000000..746cc7f8451
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
@@ -0,0 +1,111 @@
+using Microsoft.Graphics.Canvas.Effects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Composition;
+using Windows.UI.Xaml.Hosting;
+
+namespace Microsoft.Toolkit.Uwp.UI.Media.Shadows
+{
+    /// <summary>
+    /// A base class for attached shadows that use an opacity mask to clip content from the shadow.
+    /// </summary>
+    public abstract class AttachedShadowBaseWithOpacityMask : AttachedShadowBase
+    {
+        private const string AlphaMaskSourceKey = "AttachedShadowAlphaMask";
+        private const string SpriteVisualSourceKey = "AttachedShadowSpriteVisual";
+
+        private static readonly TypedResourceKey<CompositionEffectBrush> OpacityMaskEffectBrushResourceKey = "AttachedShadowSpriteVisualEffectBrush";
+        private static readonly TypedResourceKey<CompositionBrush> OpacityMaskResourceKey = "AttachedShadowSpriteVisualOpacityMask";
+        private static readonly TypedResourceKey<SpriteVisual> OpacityMaskVisualResourceKey = "AttachedShadowSpriteVisualOpacityMaskVisual";
+        private static readonly TypedResourceKey<CompositionVisualSurface> OpacityMaskVisualSurfaceResourceKey = "AttachedShadowSpriteVisualOpacityMaskSurface";
+        private static readonly TypedResourceKey<CompositionSurfaceBrush> OpacityMaskSurfaceBrushResourceKey =
+            "AttachedShadowSpriteVisualOpacityMaskSurfaceBrush";
+        private static readonly TypedResourceKey<AlphaMaskEffect> AlphaMaskEffectResourceKey = "AttachedShadowSpriteVisualAlphaMaskEffect";
+
+        /// <summary>
+        /// Update the opacity mask for the shadow's <see cref="SpriteVisual"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="AttachedShadowElementContext"/> this operation will be performed on.</param>
+        protected void UpdateVisualOpacityMask(AttachedShadowElementContext context)
+        {
+            if (!context.IsInitialized)
+            {
+                return;
+            }
+
+            var brush = GetisualOpacityMask(context);
+            if (brush != null)
+            {
+                context.AddResource(OpacityMaskResourceKey, brush);
+            }
+            else
+            {
+                context.RemoveResource(OpacityMaskResourceKey)?.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Override and return a <see cref="CompositionBrush"/> that serves as an opacity mask for the shadow's <see cref="SpriteVisual"/>
+        /// </summary>
+        protected abstract CompositionBrush GetisualOpacityMask(AttachedShadowElementContext context);
+
+        protected override void OnElementContextInitialized(AttachedShadowElementContext context)
+        {
+            UpdateVisualOpacityMask(context);
+            base.OnElementContextInitialized(context);
+        }
+
+        protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
+        {
+            context.RemoveAndDisposeResource(OpacityMaskResourceKey);
+            context.RemoveAndDisposeResource(OpacityMaskVisualResourceKey);
+            context.RemoveAndDisposeResource(OpacityMaskVisualSurfaceResourceKey);
+            context.RemoveAndDisposeResource(OpacityMaskSurfaceBrushResourceKey);
+            context.RemoveAndDisposeResource(OpacityMaskEffectBrushResourceKey);
+            context.RemoveAndDisposeResource(AlphaMaskEffectResourceKey);
+            base.OnElementContextUninitialized(context);
+        }
+
+        protected override void SetElementChildVisual(AttachedShadowElementContext context)
+        {
+            if (context.TryGetResource(OpacityMaskResourceKey, out var opacityMask))
+            {
+                var visualSurface = context.GetResource(OpacityMaskVisualSurfaceResourceKey) ?? context.AddResource(
+                    OpacityMaskVisualSurfaceResourceKey,
+                    context.Compositor.CreateVisualSurface());
+                visualSurface.SourceVisual = context.SpriteVisual;
+                visualSurface.StartAnimation(nameof(visualSurface.SourceSize), context.Compositor.CreateExpressionAnimation("this.SourceVisual.Size"));
+
+                var surfaceBrush = context.GetResource(OpacityMaskSurfaceBrushResourceKey) ?? context.AddResource(
+                    OpacityMaskSurfaceBrushResourceKey,
+                    context.Compositor.CreateSurfaceBrush(visualSurface));
+                var alphaMask = context.GetResource(AlphaMaskEffectResourceKey) ?? context.AddResource(AlphaMaskEffectResourceKey, new AlphaMaskEffect());
+                alphaMask.Source = new CompositionEffectSourceParameter(SpriteVisualSourceKey);
+                alphaMask.AlphaMask = new CompositionEffectSourceParameter(AlphaMaskSourceKey);
+
+                using (var factory = context.Compositor.CreateEffectFactory(alphaMask))
+                {
+                    context.RemoveResource(OpacityMaskEffectBrushResourceKey)?.Dispose();
+                    var brush = context.AddResource(OpacityMaskEffectBrushResourceKey, factory.CreateBrush());
+                    brush.SetSourceParameter(SpriteVisualSourceKey, surfaceBrush);
+                    brush.SetSourceParameter(AlphaMaskSourceKey, opacityMask);
+
+                    var visual = context.GetResource(OpacityMaskVisualResourceKey) ?? context.AddResource(
+                        OpacityMaskVisualResourceKey,
+                        context.Compositor.CreateSpriteVisual());
+                    visual.RelativeSizeAdjustment = Vector2.One;
+                    visual.Brush = brush;
+                    ElementCompositionPreview.SetElementChildVisual(context.Element, visual);
+                }
+            }
+            else
+            {
+                base.SetElementChildVisual(context);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
new file mode 100644
index 00000000000..f7fa355b199
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
@@ -0,0 +1,299 @@
+
+
+using System;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using Windows.Foundation;
+using Windows.UI;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Hosting;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    /// <summary>
+    /// The base class for attached shadows.
+    /// </summary>
+    public abstract class AttachedShadowBase : DependencyObject
+    {
+        public static AttachedShadowBase GetShadow(DependencyObject obj)
+        {
+            return (AttachedShadowBase)obj.GetValue(ShadowProperty);
+        }
+
+        public static void SetShadow(DependencyObject obj, AttachedShadowBase value)
+        {
+            obj.SetValue(ShadowProperty, value);
+        }
+
+        public static readonly DependencyProperty ShadowProperty =
+            DependencyProperty.RegisterAttached("Shadow", typeof(AttachedShadowBase), typeof(AttachedShadowBase), new PropertyMetadata(null, OnShadowChanged));
+
+        private static void OnShadowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(d is FrameworkElement element))
+            {
+                return;
+            }
+
+            if (e.OldValue is AttachedShadowBase oldShadow)
+            {
+                oldShadow.DisconnectElement(element);
+            }
+
+            if (e.NewValue is AttachedShadowBase newShadow)
+            {
+                newShadow.ConnectElement(element);
+            }
+        }
+
+        public static readonly DependencyProperty BlurRadiusProperty =
+            DependencyProperty.Register(nameof(BlurRadius), typeof(double), typeof(AttachedShadowBase), new PropertyMetadata(12d, OnDependencyPropertyChanged));
+
+        public static readonly DependencyProperty ColorProperty =
+            DependencyProperty.Register(nameof(Color), typeof(Color), typeof(AttachedShadowBase), new PropertyMetadata(Colors.Black, OnDependencyPropertyChanged));
+
+        public static readonly DependencyProperty OffsetProperty =
+            DependencyProperty.Register(
+                nameof(Offset),
+                typeof(Vector3),
+                typeof(AttachedShadowBase),
+                new PropertyMetadata(Vector3.Zero, OnDependencyPropertyChanged));
+
+        public static readonly DependencyProperty OpacityProperty =
+            DependencyProperty.Register(nameof(Opacity), typeof(double), typeof(AttachedShadowBase), new PropertyMetadata(1d, OnDependencyPropertyChanged));
+
+        /// <summary>
+        /// Returns whether or not this <see cref="AttachedShadowBase"/> implementation is supported on the current platform
+        /// </summary>
+        public abstract bool IsSupported { get; }
+
+        /// <summary>
+        /// Returns the collection of <see cref="AttachedShadowElementContext"/> for each element this <see cref="AttachedShadowBase"/> is connected to
+        /// </summary>
+        protected ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; private set; }
+
+        /// <summary>
+        /// Gets or set the blur radius of the shadow
+        /// </summary>
+        public double BlurRadius
+        {
+            get => (double)GetValue(BlurRadiusProperty);
+            set => SetValue(BlurRadiusProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity of the shadow
+        /// </summary>
+        public double Opacity
+        {
+            get => (double)GetValue(OpacityProperty);
+            set => SetValue(OpacityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the offset of the shadow
+        /// </summary>
+        public Vector3 Offset
+        {
+            get => (Vector3)GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the shadow
+        /// </summary>
+        public Color Color
+        {
+            get => (Color)GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+
+        /// <summary>
+        /// Returns whether or not OnSizeChanged should be called when <see cref="FrameworkElement.SizeChanged"/> is fired
+        /// </summary>
+        public abstract bool SupportsOnSizeChangedEvent { get; }
+
+        private void ConnectElement(FrameworkElement element)
+        {
+            if (!IsSupported)
+            {
+                return;
+            }
+
+            ShadowElementContextTable = ShadowElementContextTable ?? new ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext>();
+            if (ShadowElementContextTable.TryGetValue(element, out var context))
+            {
+                return;
+            }
+
+            context = new AttachedShadowElementContext();
+            context.ConnectToElement(this, element);
+            ShadowElementContextTable.Add(element, context);
+        }
+
+        private void DisconnectElement(FrameworkElement element)
+        {
+            if (ShadowElementContextTable == null)
+            {
+                return;
+            }
+
+            if (ShadowElementContextTable.TryGetValue(element, out var context))
+            {
+                context.DisconnectFromElement();
+                ShadowElementContextTable.Remove(element);
+            }
+        }
+
+        /// <summary>
+        /// Override to handle when the <see cref="AttachedShadowElementContext"/> for an element is being initialized.
+        /// </summary>
+        /// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being initialized.</param>
+        protected internal virtual void OnElementContextInitialized(AttachedShadowElementContext context)
+        {
+            OnPropertyChanged(context, OpacityProperty, Opacity, Opacity);
+            OnPropertyChanged(context, BlurRadiusProperty, BlurRadius, BlurRadius);
+            OnPropertyChanged(context, ColorProperty, Color, Color);
+            OnPropertyChanged(context, OffsetProperty, Offset, Offset);
+            UpdateShadowClip(context);
+            UpdateShadowMask(context);
+            SetElementChildVisual(context);
+        }
+
+        /// <summary>
+        /// Override to handle when the <see cref="AttachedShadowElementContext"/> for an element is being uninitialized.
+        /// </summary>
+        /// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
+        protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
+        {
+            ElementCompositionPreview.SetElementChildVisual(context.Element, null);
+        }
+
+        /// <summary>
+        /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>
+        /// </summary>
+        public AttachedShadowElementContext GetElementContext(FrameworkElement element)
+        {
+            if (ShadowElementContextTable != null && ShadowElementContextTable.TryGetValue(element, out var context))
+            {
+                return context;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Sets <see cref="AttachedShadowElementContext.SpriteVisual"/> as a child visual on <see cref="AttachedShadowElementContext.Element"/>
+        /// </summary>
+        /// <param name="context">The <see cref="AttachedShadowElementContext"/> this operaiton will be performed on.</param>
+        protected virtual void SetElementChildVisual(AttachedShadowElementContext context)
+        {
+            ElementCompositionPreview.SetElementChildVisual(context.Element, context.SpriteVisual);
+        }
+
+        /// <summary>
+        /// Use this method as the <see cref="PropertyChangedCallback"/> for <see cref="DependencyProperty">DependencyProperties</see> in derived classes
+        /// </summary>
+        protected static void OnDependencyPropertyChanged(object sender, DependencyPropertyChangedEventArgs args)
+        {
+            (sender as AttachedShadowBase)?.CallPropertyChangedForEachElement(args.Property, args.OldValue, args.NewValue);
+        }
+
+        private void CallPropertyChangedForEachElement(DependencyProperty property, object oldValue, object newValue)
+        {
+            if (ShadowElementContextTable == null)
+            {
+                return;
+            }
+
+            foreach (var context in ShadowElementContextTable)
+            {
+                if (context.Value.IsInitialized)
+                {
+                    OnPropertyChanged(context.Value, property, oldValue, newValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get a <see cref="CompositionBrush"/> in the shape of the element that is casting the shadow
+        /// </summary>
+        protected virtual CompositionBrush GetShadowMask(AttachedShadowElementContext context)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Get the <see cref="CompositionClip"/> for the shadow's <see cref="SpriteVisual"/>
+        /// </summary>
+        protected virtual CompositionClip GetShadowClip(AttachedShadowElementContext context)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Update the mask that gives the shadow its shape
+        /// </summary>
+        protected void UpdateShadowMask(AttachedShadowElementContext context)
+        {
+            if (!context.IsInitialized)
+            {
+                return;
+            }
+
+            context.Shadow.Mask = GetShadowMask(context);
+        }
+
+        /// <summary>
+        /// Update the clipping on the shadow's <see cref="SpriteVisual"/>
+        /// </summary>
+        protected void UpdateShadowClip(AttachedShadowElementContext context)
+        {
+            if (!context.IsInitialized)
+            {
+                return;
+            }
+
+            context.SpriteVisual.Clip = GetShadowClip(context);
+        }
+
+        /// <summary>
+        /// This method is called when a DependencyProperty is changed
+        /// </summary>
+        protected virtual void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
+        {
+            if (!context.IsInitialized)
+            {
+                return;
+            }
+
+            if (property == BlurRadiusProperty)
+            {
+                context.Shadow.BlurRadius = (float)(double)newValue;
+            }
+            else if (property == OpacityProperty)
+            {
+                context.Shadow.Opacity = (float)(double)newValue;
+            }
+            else if (property == ColorProperty)
+            {
+                context.Shadow.Color = (Color)newValue;
+            }
+            else if (property == OffsetProperty)
+            {
+                context.Shadow.Offset = (Vector3)newValue;
+            }
+        }
+
+        /// <summary>
+        /// This method is called when the element size changes, and <see cref="SupportsOnSizeChangedEvent"/> = <see cref="bool">true</see>
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="newSize"></param>
+        /// <param name="previousSize"></param>
+        protected internal virtual void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs
new file mode 100644
index 00000000000..92950a93362
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs
@@ -0,0 +1,285 @@
+// ------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// ------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Hosting;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    public sealed class AttachedShadowElementContext
+    {
+        private bool _isConnected;
+
+        private Dictionary<string, object> _resources;
+
+        /// <summary>
+        /// Gets whether or not this <see cref="AttachedShadowElementContext"/> has been initialized.
+        /// </summary>
+        public bool IsInitialized { get; private set; }
+
+        /// <summary>
+        /// Gets the <see cref="AttachedShadowBase"/> that contains this <see cref="AttachedShadowElementContext"/>.
+        /// </summary>
+        public AttachedShadowBase Parent { get; private set; }
+
+        /// <summary>
+        /// Get the <see cref="FrameworkElement"/> this instance is attached to
+        /// </summary>
+        public FrameworkElement Element { get; private set; }
+
+        /// <summary>
+        /// Gets the <see cref="Visual"/> for the <see cref="FrameworkElement"/> this instance is attached to.
+        /// </summary>
+        public Visual ElementVisual { get; private set; }
+
+        /// <summary>
+        /// Gets the <see cref="Windows.UI.Composition.Compositor"/> for this instance.
+        /// </summary>
+        public Compositor Compositor { get; private set; }
+
+        /// <summary>
+        /// Get the <see cref="SpriteVisual"/> that contains the <see cref="DropShadow">shadow</see> for this instance
+        /// </summary>
+        public SpriteVisual SpriteVisual { get; private set; }
+
+        /// <summary>
+        /// Get the <see cref="DropShadow"/> that is rendered on this instance's <see cref="Element"/>
+        /// </summary>
+        public DropShadow Shadow { get; private set; }
+
+        public void ConnectToElement(AttachedShadowBase parent, FrameworkElement element)
+        {
+            if (_isConnected)
+            {
+                throw new InvalidOperationException("This AttachedShadowElementContext has already been connected to an element");
+            }
+
+            _isConnected = true;
+            Parent = parent ?? throw new ArgumentNullException(nameof(parent));
+            Element = element ?? throw new ArgumentNullException(nameof(element));
+            Element.Loaded += OnElementLoaded;
+            Element.Unloaded += OnElementUnloaded;
+            Initialize();
+        }
+
+        internal void DisconnectFromElement()
+        {
+            if (!_isConnected)
+            {
+                return;
+            }
+
+            Uninitialize();
+
+            Element.Loaded -= OnElementLoaded;
+            Element.Unloaded -= OnElementUnloaded;
+            Element = null;
+
+            Parent = null;
+
+            _isConnected = false;
+        }
+
+        /// <summary>
+        /// Force early creation of this instance's resources, otherwise they will be created automatically when <see cref="Element"/> is loaded.
+        /// </summary>
+        public void CreateResources() => Initialize(true);
+
+        private void Initialize(bool forceIfNotLoaded = false)
+        {
+            if (IsInitialized || !_isConnected || (!Element.IsLoaded && !forceIfNotLoaded))
+            {
+                return;
+            }
+
+            IsInitialized = true;
+
+            ElementVisual = ElementCompositionPreview.GetElementVisual(Element);
+            Compositor = ElementVisual.Compositor;
+
+            Shadow = Compositor.CreateDropShadow();
+
+            SpriteVisual = Compositor.CreateSpriteVisual();
+            SpriteVisual.RelativeSizeAdjustment = Vector2.One;
+            SpriteVisual.Shadow = Shadow;
+
+            if (Parent.SupportsOnSizeChangedEvent)
+            {
+                Element.SizeChanged += OnElementSizeChanged;
+            }
+
+            Parent?.OnElementContextInitialized(this);
+        }
+
+        private void Uninitialize()
+        {
+            if (!IsInitialized)
+            {
+                return;
+            }
+
+            IsInitialized = false;
+
+            Parent.OnElementContextUninitialized(this);
+
+            SpriteVisual.Shadow = null;
+            SpriteVisual.Dispose();
+
+            Shadow.Dispose();
+
+            ElementCompositionPreview.SetElementChildVisual(Element, null);
+
+            Element.SizeChanged -= OnElementSizeChanged;
+
+            SpriteVisual = null;
+            Shadow = null;
+            ElementVisual = null;
+        }
+
+        private void OnElementUnloaded(object sender, RoutedEventArgs e)
+        {
+            Uninitialize();
+        }
+
+        private void OnElementLoaded(object sender, RoutedEventArgs e)
+        {
+            Initialize();
+        }
+
+        private void OnElementSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            Parent?.OnSizeChanged(this, e.NewSize, e.PreviousSize);
+        }
+
+        /// <summary>
+        /// Adds a resource to this instance's resource dictionary with the specified key
+        /// </summary>
+        /// <returns>The resource that was added</returns>
+        public T AddResource<T>(string key, T resource)
+        {
+            _resources = _resources ?? new Dictionary<string, object>();
+            if (_resources.ContainsKey(key))
+            {
+                _resources[key] = resource;
+            }
+            else
+            {
+                _resources.Add(key, resource);
+            }
+
+            return resource;
+        }
+
+        /// <summary>
+        /// Retrieves a resource with the specified key and type if it exists
+        /// </summary>
+        /// <returns>True if the resource exists, false otherwise</returns>
+        public bool TryGetResource<T>(string key, out T resource)
+        {
+            if (_resources != null && _resources.TryGetValue(key, out var objResource) && objResource is T tResource)
+            {
+                resource = tResource;
+                return true;
+            }
+
+            resource = default;
+            return false;
+        }
+
+        /// <summary>
+        /// Retries a resource with the specified key and type
+        /// </summary>
+        public T GetResource<T>(string key)
+        {
+            if (TryGetResource(key, out T resource))
+            {
+                return resource;
+            }
+
+            return default;
+        }
+
+        /// <summary>
+        /// Removes an existing resource with the specified key and type
+        /// </summary>
+        /// <returns>The resource that was removed, if any</returns>
+        public T RemoveResource<T>(string key)
+        {
+            if (_resources.TryGetValue(key, out var objResource))
+            {
+                _resources.Remove(key);
+                if (objResource is T resource)
+                {
+                    return resource;
+                }
+            }
+
+            return default;
+        }
+
+        /// <summary>
+        /// Removes an existing resource with the specified key and type, and <see cref="IDisposable.Dispose">disposes</see> it
+        /// </summary>
+        /// <returns>The resource that was removed, if any</returns>
+        public T RemoveAndDisposeResource<T>(string key) where T : IDisposable
+        {
+            if (_resources.TryGetValue(key, out var objResource))
+            {
+                _resources.Remove(key);
+                if (objResource is T resource)
+                {
+                    resource.Dispose();
+                    return resource;
+                }
+            }
+
+            return default;
+        }
+
+        /// <summary>
+        /// Adds a resource to this instance's collection with the specified key
+        /// </summary>
+        /// <returns>The resource that was added</returns>
+        public T AddResource<T>(TypedResourceKey<T> key, T resource) => AddResource(key.Key, resource);
+
+        /// <summary>
+        /// Retrieves a resource with the specified key and type if it exists
+        /// </summary>
+        /// <returns>True if the resource exists, false otherwise</returns>
+        public bool TryGetResource<T>(TypedResourceKey<T> key, out T resource) => TryGetResource(key.Key, out resource);
+
+        /// <summary>
+        /// Retries a resource with the specified key and type
+        /// </summary>
+        public T GetResource<T>(TypedResourceKey<T> key) => GetResource<T>(key.Key);
+
+        /// <summary>
+        /// Removes an existing resource with the specified key and type
+        /// </summary>
+        /// <returns>The resource that was removed, if any</returns>
+        public T RemoveResource<T>(TypedResourceKey<T> key) => RemoveResource<T>(key.Key);
+
+        /// <summary>
+        /// Removes an existing resource with the specified key and type, and <see cref="IDisposable.Dispose">disposes</see> it
+        /// </summary>
+        /// <returns>The resource that was removed, if any</returns>
+        public T RemoveAndDisposeResource<T>(TypedResourceKey<T> key) where T : IDisposable => RemoveAndDisposeResource<T>(key.Key);
+
+        /// <summary>
+        /// Disposes of any resources that implement <see cref="IDisposable"/> and then clears all resources
+        /// </summary>
+        public void ClearAndDisposeResources()
+        {
+            foreach (var kvp in _resources)
+            {
+                (kvp.Value as IDisposable)?.Dispose();
+            }
+            _resources.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs b/Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs
new file mode 100644
index 00000000000..f3adc98848d
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs
@@ -0,0 +1,26 @@
+// ------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// ------------------------------------------------------
+
+using System.Numerics;
+using Windows.Foundation;
+using Windows.UI;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    public interface IAttachedShadow
+    {
+        double BlurRadius { get; set; }
+        double Opacity { get; set; }
+        Vector3 Offset { get; set; }
+        Color Color { get; set; }
+        bool SupportsOnSizeChangedEvent { get; }
+        void ConnectElement(FrameworkElement element);
+        void DisconnectElement(FrameworkElement element);
+        void OnElementContextInitialized(AttachedShadowElementContext context);
+        void OnElementContextUninitialized(AttachedShadowElementContext context);
+        void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize);
+        AttachedShadowElementContext GetElementContext(FrameworkElement element);
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/TypedResourceKey.cs b/Microsoft.Toolkit/TypedResourceKey.cs
new file mode 100644
index 00000000000..9fc439fbe8d
--- /dev/null
+++ b/Microsoft.Toolkit/TypedResourceKey.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace Microsoft.Toolkit
+{
+    /// <summary>
+    /// A generic classed that can be used to retrieve keyed resources of the specified type.
+    /// </summary>
+    /// <typeparam name="TValue">The <see cref="Type"/> of resource the <see cref="TypedResourceKey{TValue}"/> will retrieve.</typeparam>
+    public class TypedResourceKey<TValue>
+    {
+        /// <summary>
+        /// Create a new <see cref="TypedResourceKey{TValue}"/> with the specified key
+        /// </summary>
+        /// <param name="key">The resource's key</param>
+        public TypedResourceKey(string key) => Key = key;
+
+        /// <summary>
+        /// The key of the resource to be retrieved.
+        /// </summary>
+        public string Key { get; }
+
+        public static implicit operator TypedResourceKey<TValue>(string key)
+        {
+            return new TypedResourceKey<TValue>(key);
+        }
+    }
+}
\ No newline at end of file

From 795c57ed07b1a5ceb8329dc9419c964c8213bf88 Mon Sep 17 00:00:00 2001
From: Christopher Blackman <cblackman@microsoft.com>
Date: Tue, 6 Jul 2021 17:09:34 -0400
Subject: [PATCH 139/200] Documentation update

---
 .../AttachedShadowBase.cs                     | 67 +++++++++++++------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
index f7fa355b199..60efaed47aa 100644
--- a/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
@@ -16,16 +16,29 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// </summary>
     public abstract class AttachedShadowBase : DependencyObject
     {
-        public static AttachedShadowBase GetShadow(DependencyObject obj)
+        /// <summary>
+        /// Gets the shadow attached to a <see cref="FrameworkElement"/> by getting the value of the <see cref="ShadowProperty"/> property.
+        /// </summary>
+        /// <param name="obj">The <see cref="FrameworkElement"/> the <see cref="AttachedShadowBase"/> is attached to.</param>
+        /// <returns>The <see cref="AttachedShadowBase"/> that is attached to the <paramref name="obj">FrameworkElement.</paramref></returns>
+        public static AttachedShadowBase GetShadow(FrameworkElement obj)
         {
             return (AttachedShadowBase)obj.GetValue(ShadowProperty);
         }
 
-        public static void SetShadow(DependencyObject obj, AttachedShadowBase value)
+        /// <summary>
+        /// Attaches a shadow to an element by setting the <see cref="ShadowProperty"/> property.
+        /// </summary>
+        /// <param name="obj">The <see cref="FrameworkElement"/> to attach the shadow to.</param>
+        /// <param name="value">The <see cref="AttachedShadowBase"/> that will be attached to the element</param>
+        public static void SetShadow(FrameworkElement obj, AttachedShadowBase value)
         {
             obj.SetValue(ShadowProperty, value);
         }
 
+        /// <summary>
+        /// Backing dependency property used to attach shadows to UI elements.
+        /// </summary>
         public static readonly DependencyProperty ShadowProperty =
             DependencyProperty.RegisterAttached("Shadow", typeof(AttachedShadowBase), typeof(AttachedShadowBase), new PropertyMetadata(null, OnShadowChanged));
 
@@ -47,12 +60,21 @@ private static void OnShadowChanged(DependencyObject d, DependencyPropertyChange
             }
         }
 
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="BlurRadius"/>.
+        /// </summary>
         public static readonly DependencyProperty BlurRadiusProperty =
             DependencyProperty.Register(nameof(BlurRadius), typeof(double), typeof(AttachedShadowBase), new PropertyMetadata(12d, OnDependencyPropertyChanged));
 
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="Color"/>.
+        /// </summary>
         public static readonly DependencyProperty ColorProperty =
             DependencyProperty.Register(nameof(Color), typeof(Color), typeof(AttachedShadowBase), new PropertyMetadata(Colors.Black, OnDependencyPropertyChanged));
 
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="Opacity"/>.
+        /// </summary>
         public static readonly DependencyProperty OffsetProperty =
             DependencyProperty.Register(
                 nameof(Offset),
@@ -60,21 +82,24 @@ private static void OnShadowChanged(DependencyObject d, DependencyPropertyChange
                 typeof(AttachedShadowBase),
                 new PropertyMetadata(Vector3.Zero, OnDependencyPropertyChanged));
 
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="Opacity"/>
+        /// </summary>
         public static readonly DependencyProperty OpacityProperty =
             DependencyProperty.Register(nameof(Opacity), typeof(double), typeof(AttachedShadowBase), new PropertyMetadata(1d, OnDependencyPropertyChanged));
 
         /// <summary>
-        /// Returns whether or not this <see cref="AttachedShadowBase"/> implementation is supported on the current platform
+        /// Returns whether or not this <see cref="AttachedShadowBase"/> implementation is supported on the current platform.
         /// </summary>
         public abstract bool IsSupported { get; }
 
         /// <summary>
-        /// Returns the collection of <see cref="AttachedShadowElementContext"/> for each element this <see cref="AttachedShadowBase"/> is connected to
+        /// Gets or sets the collection of <see cref="AttachedShadowElementContext"/> for each element this <see cref="AttachedShadowBase"/> is connected to.
         /// </summary>
-        protected ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; private set; }
+        private ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
 
         /// <summary>
-        /// Gets or set the blur radius of the shadow
+        /// Gets or set the blur radius of the shadow.
         /// </summary>
         public double BlurRadius
         {
@@ -83,7 +108,7 @@ public double BlurRadius
         }
 
         /// <summary>
-        /// Gets or sets the opacity of the shadow
+        /// Gets or sets the opacity of the shadow.
         /// </summary>
         public double Opacity
         {
@@ -92,7 +117,7 @@ public double Opacity
         }
 
         /// <summary>
-        /// Gets or sets the offset of the shadow
+        /// Gets or sets the offset of the shadow.
         /// </summary>
         public Vector3 Offset
         {
@@ -101,7 +126,7 @@ public Vector3 Offset
         }
 
         /// <summary>
-        /// Gets or sets the color of the shadow
+        /// Gets or sets the color of the shadow.
         /// </summary>
         public Color Color
         {
@@ -110,9 +135,9 @@ public Color Color
         }
 
         /// <summary>
-        /// Returns whether or not OnSizeChanged should be called when <see cref="FrameworkElement.SizeChanged"/> is fired
+        /// Returns whether or not OnSizeChanged should be called when <see cref="FrameworkElement.SizeChanged"/> is fired.
         /// </summary>
-        public abstract bool SupportsOnSizeChangedEvent { get; }
+        protected internal abstract bool SupportsOnSizeChangedEvent { get; }
 
         private void ConnectElement(FrameworkElement element)
         {
@@ -171,7 +196,7 @@ protected internal virtual void OnElementContextUninitialized(AttachedShadowElem
         }
 
         /// <summary>
-        /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>
+        /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>.
         /// </summary>
         public AttachedShadowElementContext GetElementContext(FrameworkElement element)
         {
@@ -193,7 +218,7 @@ protected virtual void SetElementChildVisual(AttachedShadowElementContext contex
         }
 
         /// <summary>
-        /// Use this method as the <see cref="PropertyChangedCallback"/> for <see cref="DependencyProperty">DependencyProperties</see> in derived classes
+        /// Use this method as the <see cref="PropertyChangedCallback"/> for <see cref="DependencyProperty">DependencyProperties</see> in derived classes.
         /// </summary>
         protected static void OnDependencyPropertyChanged(object sender, DependencyPropertyChangedEventArgs args)
         {
@@ -217,7 +242,7 @@ private void CallPropertyChangedForEachElement(DependencyProperty property, obje
         }
 
         /// <summary>
-        /// Get a <see cref="CompositionBrush"/> in the shape of the element that is casting the shadow
+        /// Get a <see cref="CompositionBrush"/> in the shape of the element that is casting the shadow.
         /// </summary>
         protected virtual CompositionBrush GetShadowMask(AttachedShadowElementContext context)
         {
@@ -233,7 +258,7 @@ protected virtual CompositionClip GetShadowClip(AttachedShadowElementContext con
         }
 
         /// <summary>
-        /// Update the mask that gives the shadow its shape
+        /// Update the mask that gives the shadow its shape.
         /// </summary>
         protected void UpdateShadowMask(AttachedShadowElementContext context)
         {
@@ -246,7 +271,7 @@ protected void UpdateShadowMask(AttachedShadowElementContext context)
         }
 
         /// <summary>
-        /// Update the clipping on the shadow's <see cref="SpriteVisual"/>
+        /// Update the clipping on the shadow's <see cref="SpriteVisual"/>.
         /// </summary>
         protected void UpdateShadowClip(AttachedShadowElementContext context)
         {
@@ -259,7 +284,7 @@ protected void UpdateShadowClip(AttachedShadowElementContext context)
         }
 
         /// <summary>
-        /// This method is called when a DependencyProperty is changed
+        /// This method is called when a DependencyProperty is changed.
         /// </summary>
         protected virtual void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
         {
@@ -287,11 +312,11 @@ protected virtual void OnPropertyChanged(AttachedShadowElementContext context, D
         }
 
         /// <summary>
-        /// This method is called when the element size changes, and <see cref="SupportsOnSizeChangedEvent"/> = <see cref="bool">true</see>
+        /// This method is called when the element size changes, and <see cref="SupportsOnSizeChangedEvent"/> = <see cref="bool">true</see>.
         /// </summary>
-        /// <param name="context"></param>
-        /// <param name="newSize"></param>
-        /// <param name="previousSize"></param>
+        /// <param name="context">The <see cref="AttachedShadowElementContext"/> for the <see cref="FrameworkElement"/> firing its SizeChanged event</param>
+        /// <param name="newSize">The new size of the <see cref="FrameworkElement"/></param>
+        /// <param name="previousSize">The previous size of the <see cref="FrameworkElement"/></param>
         protected internal virtual void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
         }

From 5d1c7bf56caaf359afc9d4507bb6c06ea76dd124 Mon Sep 17 00:00:00 2001
From: Christopher Blackman <cblackman@microsoft.com>
Date: Tue, 6 Jul 2021 17:10:52 -0400
Subject: [PATCH 140/200] Fixed member access

---
 .../Shadows/AttachedCardShadow.cs                  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index 4fc3f5a3a53..5deb64afc8b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -26,6 +26,9 @@ public class AttachedCardShadow : AttachedShadowBase
         private static readonly TypedResourceKey<CompositionSurfaceBrush> SurfaceBrushResourceKey = "SurfaceBrush";
         private static readonly TypedResourceKey<CompositionVisualSurface> VisualSurfaceResourceKey = "VisualSurface";
 
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="CornerRadius"/>
+        /// </summary>
         public static readonly DependencyProperty CornerRadiusProperty =
             DependencyProperty.Register(
                 nameof(CornerRadius),
@@ -40,7 +43,7 @@ static AttachedCardShadow()
         }
 
         /// <summary>
-        /// Gets or sets the roundness of the shadow's corners
+        /// Gets or sets the roundness of the shadow's corners.
         /// </summary>
         public double CornerRadius
         {
@@ -48,15 +51,8 @@ public double CornerRadius
             set => SetValue(CornerRadiusProperty, value);
         }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
         public override bool IsSupported => SupportsCompositionVisualSurface;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        public override bool SupportsOnSizeChangedEvent => true;
+        protected override bool SupportsOnSizeChangedEvent => true;
 
         protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
         {

From bb9dc4bd18f27cb5ff5c1ce4bea9aaee4a5dc8c0 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:26:54 -0700
Subject: [PATCH 141/200] Move DropShadowPanel sample into shared folder and
 remove backing page for simplification

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  15 +++-------
 .../DropShadowPanel/DropShadowPanelPage.xaml  |  26 ------------------
 .../DropShadowPanelPage.xaml.cs               |  22 ---------------
 .../DropShadowPanel.png                       | Bin
 .../DropShadowPanelXaml.bind                  |   4 +--
 .../{DropShadowPanel => Shadows}/Trex.png     | Bin
 .../{DropShadowPanel => Shadows}/Unicorn.png  | Bin
 .../SamplePages/XamlOnlyPage.xaml             |   1 +
 .../SamplePages/samples.json                  |   6 ++--
 9 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{DropShadowPanel => Shadows}/DropShadowPanel.png (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{DropShadowPanel => Shadows}/DropShadowPanelXaml.bind (96%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{DropShadowPanel => Shadows}/Trex.png (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{DropShadowPanel => Shadows}/Unicorn.png (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 9dddf4fb6b0..0180bf898a5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -315,10 +315,10 @@
     <Content Include="SamplePages\FocusTracker\FocusTracker.png" />
     <Content Include="SamplePages\BladeView\BladeView.png" />
     <Content Include="SamplePages\Carousel\Carousel.png" />
-    <Content Include="SamplePages\DropShadowPanel\DropShadowPanel.png" />
+    <Content Include="SamplePages\Shadows\DropShadowPanel.png" />
     <Content Include="SamplePages\Expander\Expander.png" />
-    <Content Include="SamplePages\DropShadowPanel\Trex.png" />
-    <Content Include="SamplePages\DropShadowPanel\Unicorn.png" />
+    <Content Include="SamplePages\Shadows\Trex.png" />
+    <Content Include="SamplePages\Shadows\Unicorn.png" />
     <Content Include="SamplePages\GazeInteraction\GazeInteraction.png" />
     <Content Include="SamplePages\GazeTracing\GazeTracing.png" />
     <Content Include="SamplePages\GridSplitter\GridSplitter.png" />
@@ -397,7 +397,7 @@
     <Content Include="SamplePages\ImageCache\ImageCacheXaml.bind" />
     <Content Include="SamplePages\Incremental Loading Collection\IncrementalLoadingCollectionCode.bind" />
     <Content Include="SamplePages\ImageCache\ImageCacheCode.bind" />
-    <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
+    <Content Include="SamplePages\Shadows\DropShadowPanelXaml.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
     <Content Include="SamplePages\ListDetailsView\ListDetailsView.bind" />
@@ -809,9 +809,6 @@
     <Compile Include="SamplePages\DispatcherQueueHelper\DispatcherQueueHelperPage.xaml.cs">
       <DependentUpon>DispatcherQueueHelperPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\DropShadowPanel\DropShadowPanelPage.xaml.cs">
-      <DependentUpon>DropShadowPanelPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\Expander\ExpanderPage.xaml.cs">
       <DependentUpon>ExpanderPage.xaml</DependentUpon>
     </Compile>
@@ -1269,10 +1266,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\DropShadowPanel\DropShadowPanelPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SamplePages\GridSplitter\GridSplitterPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
deleted file mode 100644
index 10d089fe69c..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.DropShadowPanelPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="TitleText"
-               TargetType="TextBlock">
-            <Setter Property="Margin" Value="5,20,0,5" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="Foreground" Value="{ThemeResource Brush-Grey-03}" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
-        <Style x:Key="DividingBorder"
-               TargetType="Border">
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="Black" />
-            <Setter Property="Margin" Value="0,0,0,20" />
-        </Style>
-    </Page.Resources>
-
-    <Grid x:Name="XamlRoot"/>
-</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
deleted file mode 100644
index 0c6c06a95a6..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelPage.xaml.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    /// <summary>
-    /// A page that shows how to use the DropShadowPanel control.
-    /// </summary>
-    public sealed partial class DropShadowPanelPage : Page
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DropShadowPanelPage"/> class.
-        /// </summary>
-        public DropShadowPanelPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanel.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/DropShadowPanel.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanel.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/DropShadowPanel.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/DropShadowPanelXaml.bind
similarity index 96%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelXaml.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/DropShadowPanelXaml.bind
index 175499746cd..678a9eaf17d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/DropShadowPanelXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/DropShadowPanelXaml.bind
@@ -88,7 +88,7 @@
                                     VerticalAlignment="Center"
                                     HorizontalAlignment="Center"
                                     IsMasked="@[Is Masked]">
-            <Image Width="200" Source="/SamplePages/DropShadowPanel/Unicorn.png" Stretch="Uniform" />
+            <Image Width="200" Source="/SamplePages/Shadows/Unicorn.png" Stretch="Uniform" />
           </controls:DropShadowPanel>
           <controls:DropShadowPanel BlurRadius="@[BlurRadius]"
                                     ShadowOpacity="@[Opacity]"
@@ -98,7 +98,7 @@
                                     VerticalAlignment="Center"
                                     HorizontalAlignment="Center"
                                     IsMasked="@[Is Masked]">
-            <Image Width="200" Source="/SamplePages/DropShadowPanel/Trex.png" Stretch="Uniform" />
+            <Image Width="200" Source="/SamplePages/Shadows/Trex.png" Stretch="Uniform" />
           </controls:DropShadowPanel>
         </StackPanel>
       </StackPanel>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/Trex.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/Trex.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/Trex.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/Trex.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/Unicorn.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/Unicorn.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel/Unicorn.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/Unicorn.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 780f14479e8..5eddad6e0fa 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -49,6 +49,7 @@
             </controls:CaseCollection>
         </controls:SwitchPresenter>
         <controls:ConstrainedBox x:Key="ConstrainedBoxControl" />
+        <controls:DropShadowPanel x:Key="DropShadowPanel" />
     </Page.Resources>
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 2447ae36db2..4cbc804ec09 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -185,13 +185,11 @@
       },
       {
         "Name": "DropShadowPanel",
-        "Type": "DropShadowPanelPage",
         "Subcategory": "Media",
         "About": "DropShadowPanel contol allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel",
-        "XamlCodeFile": "DropShadowPanelXaml.bind",
-        "Icon": "/SamplePages/DropShadowPanel/DropShadowPanel.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
+        "XamlCodeFile": "/SamplePages/Shadows/DropShadowPanelXaml.bind",
+        "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DropShadowPanel.md"
       },
       {

From 863e75c3cc963c0a013d190d28f608afe831f85f Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:27:45 -0700
Subject: [PATCH 142/200] Clean-up out-dated min version warnings on samples as
 the Toolkit min itself is 1809+ now.

Add Deprecation message we missed to RadialProgressBar control.
---
 .../SamplePages/samples.json                        | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 4cbc804ec09..426164933d6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -126,6 +126,8 @@
       {
         "Name": "RadialProgressBar",
         "Type": "RadialProgressBarPage",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "Please migrate to the ProgressRing control from WinUI with IsIndeterminate set to false, this control will be removed in a future release. https://aka.ms/winui",
         "Subcategory": "Status and Info",
         "About": "The radial progress bar displays progress as a circle getting filled.",
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar",
@@ -357,7 +359,6 @@
         "XamlCodeFile": "InfiniteCanvas.bind",
         "Icon": "/SamplePages/InfiniteCanvas/InfiniteCanvas.png",
         "ApiCheck": "Windows.UI.Xaml.Controls.ColorPicker",
-        "BadgeUpdateVersionRequired": "Fall Creators Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/InfiniteCanvas.md"
       },
       {
@@ -557,7 +558,6 @@
         "CodeFile": "/SamplePages/Animations/Behaviors/BlurBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/BlurBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/BlurBehavior.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineVisualFactory.md"
       },
       {
@@ -568,7 +568,6 @@
         "CodeFile": "/SamplePages/Animations/Behaviors/SaturationBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/SaturationBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/SaturationBehavior.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineVisualFactory.md"
       },
       {
@@ -598,7 +597,6 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Animations",
         "XamlCodeFile": "ItemsReorderAnimation.bind",
         "Icon": "/SamplePages/ItemsReorderAnimation/ItemsReorderAnimation.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ItemsReorderAnimation.md"
       },
       {
@@ -618,7 +616,6 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Animations",
         "Icon": "/SamplePages/Implicit Animations/ImplicitAnimations.png",
         "XamlCodeFile": "ImplicitAnimationsCode.bind",
-        "BadgeUpdateVersionRequired": "Creators Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ImplicitAnimationSet.md"
       },
       {
@@ -630,7 +627,6 @@
         "XamlCodeFile": "ConnectedAnimationsCode.bind",
         "DisableXamlEditorRendering": true,
         "Icon": "/SamplePages/Connected Animations/ConnectedAnimations.png",
-        "BadgeUpdateVersionRequired": "Creators Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ConnectedAnimations.md"
       }
     ]
@@ -713,8 +709,7 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper",
         "CodeFile": "BluetoothLEHelperCode.bind",
         "Icon": "/SamplePages/BluetoothLEHelper/BluetoothLEHelper.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/BluetoothLEHelper.md",
-        "BadgeUpdateVersionRequired": "Creators Update required"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/BluetoothLEHelper.md"
       },
       {
         "Name": "SystemInformation",
@@ -1168,7 +1163,6 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBox/TextBoxExtensions.SurfaceDial.cs",
         "XamlCodeFile": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind",
         "Icon": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/SurfaceDialTextboxHelper.md"
       },
       {
@@ -1178,7 +1172,6 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/VisualExtensions.cs",
         "XamlCodeFile": "VisualExtensionsCode.bind",
         "Icon": "/SamplePages/Visual Extensions/VisualExtensions.png",
-        "BadgeUpdateVersionRequired": "Creators Update required",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/VisualExtensions.md"
       },
       {

From e3c6fe28a0b8e08cd5eda15f730a54a482b7a1a8 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:58:23 -0700
Subject: [PATCH 143/200] Move common Shadow base helpers to a folder in Uwp.UI

---
 .../{ => Shadows}/AttachedShadowBase.cs          |  5 +++--
 .../AttachedShadowElementContext.cs              | 14 +++++++-------
 .../{Helpers => Shadows}/IAlphaMaskProvider.cs   |  0
 .../{ => Shadows}/IAttachedShadow.cs             | 16 +++++++++++++---
 4 files changed, 23 insertions(+), 12 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI/{ => Shadows}/AttachedShadowBase.cs (98%)
 rename Microsoft.Toolkit.Uwp.UI/{ => Shadows}/AttachedShadowElementContext.cs (93%)
 rename Microsoft.Toolkit.Uwp.UI/{Helpers => Shadows}/IAlphaMaskProvider.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI/{ => Shadows}/IAttachedShadow.cs (79%)

diff --git a/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 60efaed47aa..f398a422b89 100644
--- a/Microsoft.Toolkit.Uwp.UI/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -1,6 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
-
-using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Windows.Foundation;
diff --git a/Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index 92950a93362..c9687d04160 100644
--- a/Microsoft.Toolkit.Uwp.UI/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -1,6 +1,6 @@
-// ------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// ------------------------------------------------------
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Generic;
@@ -18,7 +18,7 @@ public sealed class AttachedShadowElementContext
         private Dictionary<string, object> _resources;
 
         /// <summary>
-        /// Gets whether or not this <see cref="AttachedShadowElementContext"/> has been initialized.
+        /// Gets a value indicating whether or not this <see cref="AttachedShadowElementContext"/> has been initialized.
         /// </summary>
         public bool IsInitialized { get; private set; }
 
@@ -28,7 +28,7 @@ public sealed class AttachedShadowElementContext
         public AttachedShadowBase Parent { get; private set; }
 
         /// <summary>
-        /// Get the <see cref="FrameworkElement"/> this instance is attached to
+        /// Gets the <see cref="FrameworkElement"/> this instance is attached to
         /// </summary>
         public FrameworkElement Element { get; private set; }
 
@@ -43,12 +43,12 @@ public sealed class AttachedShadowElementContext
         public Compositor Compositor { get; private set; }
 
         /// <summary>
-        /// Get the <see cref="SpriteVisual"/> that contains the <see cref="DropShadow">shadow</see> for this instance
+        /// Gets the <see cref="SpriteVisual"/> that contains the <see cref="DropShadow">shadow</see> for this instance
         /// </summary>
         public SpriteVisual SpriteVisual { get; private set; }
 
         /// <summary>
-        /// Get the <see cref="DropShadow"/> that is rendered on this instance's <see cref="Element"/>
+        /// Gets the <see cref="DropShadow"/> that is rendered on this instance's <see cref="Element"/>
         /// </summary>
         public DropShadow Shadow { get; private set; }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Helpers/IAlphaMaskProvider.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI/Helpers/IAlphaMaskProvider.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs
diff --git a/Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
similarity index 79%
rename from Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
index f3adc98848d..3ea72a1f3d1 100644
--- a/Microsoft.Toolkit.Uwp.UI/IAttachedShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
@@ -1,6 +1,6 @@
-// ------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// ------------------------------------------------------
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
 using System.Numerics;
 using Windows.Foundation;
@@ -12,15 +12,25 @@ namespace Microsoft.Toolkit.Uwp.UI
     public interface IAttachedShadow
     {
         double BlurRadius { get; set; }
+
         double Opacity { get; set; }
+
         Vector3 Offset { get; set; }
+
         Color Color { get; set; }
+
         bool SupportsOnSizeChangedEvent { get; }
+
         void ConnectElement(FrameworkElement element);
+
         void DisconnectElement(FrameworkElement element);
+
         void OnElementContextInitialized(AttachedShadowElementContext context);
+
         void OnElementContextUninitialized(AttachedShadowElementContext context);
+
         void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize);
+
         AttachedShadowElementContext GetElementContext(FrameworkElement element);
     }
 }
\ No newline at end of file

From f2a82541f0b09622094a813dc79f44886dcf01a3 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:58:51 -0700
Subject: [PATCH 144/200] Move AttachedShadow to root namespace for
 Uwp.UI.Media

---
 .../Shadows/AttachedCardShadow.cs                   | 10 +++++-----
 .../Shadows/AttachedShadowBaseWithOpacityMask.cs    | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index 5deb64afc8b..aceb04473cd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -1,16 +1,16 @@
-// ------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// ------------------------------------------------------
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
-using Microsoft.Graphics.Canvas.Geometry;
 using System.Numerics;
+using Microsoft.Graphics.Canvas.Geometry;
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 
-namespace Microsoft.Toolkit.Uwp.UI.Media.Shadows
+namespace Microsoft.Toolkit.Uwp.UI.Media
 {
     public class AttachedCardShadow : AttachedShadowBase
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
index 746cc7f8451..71d09734992 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
@@ -1,14 +1,13 @@
-using Microsoft.Graphics.Canvas.Effects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.Graphics.Canvas.Effects;
 using Windows.UI.Composition;
 using Windows.UI.Xaml.Hosting;
 
-namespace Microsoft.Toolkit.Uwp.UI.Media.Shadows
+namespace Microsoft.Toolkit.Uwp.UI.Media
 {
     /// <summary>
     /// A base class for attached shadows that use an opacity mask to clip content from the shadow.

From 72d524cd7a63d989f847c9e2a5b0746a469dfac5 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:44:57 -0700
Subject: [PATCH 145/200] Add Vector3 support for Sample Bindings

Add additional shortcuts/fallbacks for parsing other Vector formats to different types
---
 .../Common/Vector3Converter.cs                | 57 +++++++++++++++++++
 .../Controls/PropertyControl.xaml.cs          |  8 +++
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  2 +-
 .../Models/PropertyDescriptor/PropertyKind.cs |  3 +-
 .../ThicknessPropertyOptions.cs               | 10 ----
 .../Models/Sample.cs                          | 27 +++++++--
 .../Extensions/StringExtensions.cs            | 12 ++++
 7 files changed, 103 insertions(+), 16 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/ThicknessPropertyOptions.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs b/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
new file mode 100644
index 00000000000..2c4dd68e623
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using System.Numerics;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.Common
+{
+    public class Vector3Converter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string)
+            {
+                return value;
+            }
+
+            var thickness = (Vector3)value;
+
+            return thickness.ToString().TrimStart('<').Replace(" ", string.Empty).TrimEnd('>');
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string vectorString)
+            {
+                var vectorTokens = vectorString.Split(',')
+                                                     .Where(tkn => !string.IsNullOrWhiteSpace(tkn))
+                                                     .ToArray();
+                switch (vectorTokens.Length)
+                {
+                    case 1:
+                        var vectorValue = float.Parse(vectorString);
+                        return new Vector3(vectorValue, vectorValue, vectorValue);
+                    case 2:
+                        var xValue = float.Parse(vectorTokens[0]);
+                        var yValue = float.Parse(vectorTokens[1]);
+
+                        return new Vector3(xValue, yValue, 0);
+                    case 3:
+                        return new Vector3(
+                            float.Parse(vectorTokens[0]),
+                            float.Parse(vectorTokens[1]),
+                            float.Parse(vectorTokens[2]));
+                    default:
+                        return default(Vector3);
+                }
+            }
+
+            return value.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/PropertyControl.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/PropertyControl.xaml.cs
index 51526c86135..e992f56166c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/PropertyControl.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/PropertyControl.xaml.cs
@@ -179,6 +179,14 @@ private void PropertyControl_OnDataContextChanged(FrameworkElement sender, DataC
                             converter = new ThicknessConverter();
                             break;
 
+                        case PropertyKind.Vector3:
+                            var vectorTextBox = new TextBox { Text = (propertyDict[option.Name] as ValueHolder).Value.ToString() };
+
+                            controlToAdd = vectorTextBox;
+                            dependencyProperty = TextBox.TextProperty;
+                            converter = new Vector3Converter();
+                            break;
+
                         default:
                             var textBox = new TextBox { Text = (propertyDict[option.Name] as ValueHolder).Value.ToString() };
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 0180bf898a5..37e339ff9e3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -488,6 +488,7 @@
     <Content Include="SamplePages\DataGrid\DataGridCode.bind" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
+    <Compile Include="Common\Vector3Converter.cs" />
     <Compile Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorPage.xaml.cs">
       <DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
     </Compile>
@@ -663,7 +664,6 @@
     <Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
       <DependentUpon>UniformGridPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Models\PropertyDescriptor\ThicknessPropertyOptions.cs" />
     <Compile Include="Models\ThemeChangedArgs.cs" />
     <Compile Include="Pages\SampleController.xaml.cs">
       <DependentUpon>SampleController.xaml</DependentUpon>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/PropertyKind.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/PropertyKind.cs
index fcb07035933..f45876a6aae 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/PropertyKind.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/PropertyKind.cs
@@ -13,6 +13,7 @@ public enum PropertyKind
         Bool,
         Brush,
         TimeSpan,
-        Thickness
+        Thickness,
+        Vector3,
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/ThicknessPropertyOptions.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/ThicknessPropertyOptions.cs
deleted file mode 100644
index 11b5325b1c1..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/ThicknessPropertyOptions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.Models
-{
-    public class ThicknessPropertyOptions : PropertyOptions
-    {
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 6e512819c70..e26a5076895 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -418,8 +418,12 @@ public string UpdatedXamlCode
                 {
                     if (proxy[option.Name] is ValueHolder value)
                     {
-                        var newString = value.Value is Windows.UI.Xaml.Media.SolidColorBrush brush ?
-                                            brush.Color.ToString() : value.Value.ToString();
+                        var newString = value.Value switch
+                        {
+                            Windows.UI.Xaml.Media.SolidColorBrush brush => brush.Color.ToString(),
+                            System.Numerics.Vector3 vector => vector.ToString().TrimStart('<').Replace(" ", string.Empty).TrimEnd('>'),
+                            _ => value.Value.ToString()
+                        };
 
                         result = result.Replace(option.OriginalString, newString);
                         result = result.Replace("@[" + option.Label + "]@", newString);
@@ -630,12 +634,27 @@ public async Task PreparePropertyDescriptorAsync()
                                 case PropertyKind.Thickness:
                                     try
                                     {
-                                        var thicknessOptions = new ThicknessPropertyOptions { DefaultValue = value };
+                                        var thicknessOptions = new PropertyOptions { DefaultValue = value };
                                         options = thicknessOptions;
                                     }
                                     catch (Exception ex)
                                     {
-                                        Debug.WriteLine($"Unable to extract slider info from {value}({ex.Message})");
+                                        Debug.WriteLine($"Unable to extract thickness info from {value}({ex.Message})");
+                                        TrackingManager.TrackException(ex);
+                                        continue;
+                                    }
+
+                                    break;
+
+                                case PropertyKind.Vector3:
+                                    try
+                                    {
+                                        var vector3Options = new PropertyOptions { DefaultValue = value };
+                                        options = vector3Options;
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        Debug.WriteLine($"Unable to extract vector3 info from {value}({ex.Message})");
                                         TrackingManager.TrackException(ex);
                                         continue;
                                     }
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
index 7f4982ff932..0aeadc70d80 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
@@ -95,6 +95,10 @@ public static Vector3 ToVector3(this string text)
                             return new(x, y, z);
                         }
                     }
+                    else if (values.Length == 2)
+                    {
+                        return new(text.ToVector2(), 0);
+                    }
                 }
             }
 
@@ -140,6 +144,14 @@ public static Vector4 ToVector4(this string text)
                             return new(x, y, z, w);
                         }
                     }
+                    else if (values.Length == 3)
+                    {
+                        return new(text.ToVector3(), 0);
+                    }
+                    else if (values.Length == 2)
+                    {
+                        return new(text.ToVector2(), 0, 0);
+                    }
                 }
             }
 

From ed42e4118140dc6590112d738b55bdb67d79c985 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:48:30 -0700
Subject: [PATCH 146/200] Add AttachedShadow Sample

Had to create static Attached Property location
Had to convert Vector3 to string for XAML parsing
Made empty strings return zerod
---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  3 +-
 .../Shadows/AttachedShadowWin2DXaml.bind      | 24 ++++++++
 .../SamplePages/XamlOnlyPage.xaml             |  4 +-
 .../SamplePages/samples.json                  | 11 +++-
 .../Extensions/StringExtensions.cs            | 24 ++++++--
 .../Shadows/AttachedShadowBase.cs             | 60 +++----------------
 Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs   | 59 ++++++++++++++++++
 7 files changed, 126 insertions(+), 59 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 37e339ff9e3..adcd8ef2a48 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -627,6 +627,7 @@
     <Content Include="SamplePages\Primitives\ConstrainedBox.bind">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="SamplePages\Shadows\AttachedShadowWin2DXaml.bind" />
     <Content Include="SamplePages\KeyDownTriggerBehavior\KeyDownTriggerBehaviorXaml.bind" />
   </ItemGroup>
   <ItemGroup>
@@ -1534,4 +1535,4 @@
   </Target>
   <!-- No-op to avoid build error when packing solution from commandline -->
   <Target Name="Pack" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
new file mode 100644
index 00000000000..4e8ceb2cccf
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -0,0 +1,24 @@
+<Page
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+  xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+  mc:Ignorable="d">
+  
+  <!-- TODO: Show using as Resource as well... -->
+
+  <Grid>
+    <Button Content="Hello Shadows!" HorizontalAlignment="Center" VerticalAlignment="Center"
+            CornerRadius="8">
+      <ui:Shadows.Attached>
+        <media:AttachedCardShadow BlurRadius="@[BlurRadius:DoubleSlider:8.0:0.0-10.0]"
+                                  CornerRadius="8"
+                                  Color="@[Color:Brush:Black]"
+                                  Offset="@[Offset:Vector3:16,16]"
+                                  Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"/>
+      </ui:Shadows.Attached>
+    </Button>
+  </Grid>
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 5eddad6e0fa..7aac9725731 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -49,7 +49,9 @@
             </controls:CaseCollection>
         </controls:SwitchPresenter>
         <controls:ConstrainedBox x:Key="ConstrainedBoxControl" />
-        <controls:DropShadowPanel x:Key="DropShadowPanel" />
+        <media:AttachedCardShadow x:Key="AttachedShadow" />
+        <controls:DropShadowPanel x:Key="DropShadowPanel"
+                                  ui:Shadows.Attached="{StaticResource AttachedShadow}" />
     </Page.Resources>
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 426164933d6..4756dff8571 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -170,7 +170,7 @@
         "Type": "ScrollHeaderPage",
         "Subcategory": "Layout",
         "About": "A UI control that works as a ListView or GridView header control with quick return, sticky and fade behavior.",
-        "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers",
         "XamlCodeFile": "ScrollHeaderCode.bind",
         "Icon": "/SamplePages/ScrollHeader/ScrollHeader.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/HeaderBehaviors.md"
@@ -185,6 +185,15 @@
         "Icon": "/SamplePages/GridSplitter/GridSplitter.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/GridSplitter.md"
       },
+      {
+        "Name": "AttachedDropShadow (Win2D)",
+        "Subcategory": "Media",
+        "About": "An AttachedDropShadow allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Media/Shadows",
+        "XamlCodeFile": "/SamplePages/Shadows/AttachedShadowWin2DXaml.bind",
+        "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DropShadowPanel.md"
+      },
       {
         "Name": "DropShadowPanel",
         "Subcategory": "Media",
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
index 0aeadc70d80..68c5a6cfbbe 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
@@ -26,7 +26,11 @@ public static class StringExtensions
         [Pure]
         public static Vector2 ToVector2(this string text)
         {
-            if (text.Length > 0)
+            if (text.Length == 0)
+            {
+                return Vector2.Zero;
+            }
+            else
             {
                 // The format <x> or <x, y> is supported
                 text = Unbracket(text);
@@ -71,7 +75,11 @@ public static Vector2 ToVector2(this string text)
         [Pure]
         public static Vector3 ToVector3(this string text)
         {
-            if (text.Length > 0)
+            if (text.Length == 0)
+            {
+                return Vector3.Zero;
+            }
+            else
             {
                 text = Unbracket(text);
 
@@ -119,7 +127,11 @@ public static Vector3 ToVector3(this string text)
         [Pure]
         public static Vector4 ToVector4(this string text)
         {
-            if (text.Length > 0)
+            if (text.Length == 0)
+            {
+                return Vector4.Zero;
+            }
+            else
             {
                 text = Unbracket(text);
 
@@ -171,7 +183,11 @@ public static Vector4 ToVector4(this string text)
         [Pure]
         public static Quaternion ToQuaternion(this string text)
         {
-            if (text.Length > 0)
+            if (text.Length == 0)
+            {
+                return new();
+            }
+            else
             {
                 text = Unbracket(text);
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index f398a422b89..2d8e2ccd682 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -17,50 +17,6 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// </summary>
     public abstract class AttachedShadowBase : DependencyObject
     {
-        /// <summary>
-        /// Gets the shadow attached to a <see cref="FrameworkElement"/> by getting the value of the <see cref="ShadowProperty"/> property.
-        /// </summary>
-        /// <param name="obj">The <see cref="FrameworkElement"/> the <see cref="AttachedShadowBase"/> is attached to.</param>
-        /// <returns>The <see cref="AttachedShadowBase"/> that is attached to the <paramref name="obj">FrameworkElement.</paramref></returns>
-        public static AttachedShadowBase GetShadow(FrameworkElement obj)
-        {
-            return (AttachedShadowBase)obj.GetValue(ShadowProperty);
-        }
-
-        /// <summary>
-        /// Attaches a shadow to an element by setting the <see cref="ShadowProperty"/> property.
-        /// </summary>
-        /// <param name="obj">The <see cref="FrameworkElement"/> to attach the shadow to.</param>
-        /// <param name="value">The <see cref="AttachedShadowBase"/> that will be attached to the element</param>
-        public static void SetShadow(FrameworkElement obj, AttachedShadowBase value)
-        {
-            obj.SetValue(ShadowProperty, value);
-        }
-
-        /// <summary>
-        /// Backing dependency property used to attach shadows to UI elements.
-        /// </summary>
-        public static readonly DependencyProperty ShadowProperty =
-            DependencyProperty.RegisterAttached("Shadow", typeof(AttachedShadowBase), typeof(AttachedShadowBase), new PropertyMetadata(null, OnShadowChanged));
-
-        private static void OnShadowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (!(d is FrameworkElement element))
-            {
-                return;
-            }
-
-            if (e.OldValue is AttachedShadowBase oldShadow)
-            {
-                oldShadow.DisconnectElement(element);
-            }
-
-            if (e.NewValue is AttachedShadowBase newShadow)
-            {
-                newShadow.ConnectElement(element);
-            }
-        }
-
         /// <summary>
         /// The <see cref="DependencyProperty"/> for <see cref="BlurRadius"/>.
         /// </summary>
@@ -79,9 +35,9 @@ private static void OnShadowChanged(DependencyObject d, DependencyPropertyChange
         public static readonly DependencyProperty OffsetProperty =
             DependencyProperty.Register(
                 nameof(Offset),
-                typeof(Vector3),
+                typeof(string), // Needs to be string as we can't convert in XAML natively from Vector3, see https://github.com/microsoft/microsoft-ui-xaml/issues/3896
                 typeof(AttachedShadowBase),
-                new PropertyMetadata(Vector3.Zero, OnDependencyPropertyChanged));
+                new PropertyMetadata(string.Empty, OnDependencyPropertyChanged));
 
         /// <summary>
         /// The <see cref="DependencyProperty"/> for <see cref="Opacity"/>
@@ -118,11 +74,11 @@ public double Opacity
         }
 
         /// <summary>
-        /// Gets or sets the offset of the shadow.
+        /// Gets or sets the offset of the shadow as a string representation of a <see cref="Vector3"/>.
         /// </summary>
-        public Vector3 Offset
+        public string Offset
         {
-            get => (Vector3)GetValue(OffsetProperty);
+            get => (string)GetValue(OffsetProperty);
             set => SetValue(OffsetProperty, value);
         }
 
@@ -140,7 +96,7 @@ public Color Color
         /// </summary>
         protected internal abstract bool SupportsOnSizeChangedEvent { get; }
 
-        private void ConnectElement(FrameworkElement element)
+        internal void ConnectElement(FrameworkElement element)
         {
             if (!IsSupported)
             {
@@ -158,7 +114,7 @@ private void ConnectElement(FrameworkElement element)
             ShadowElementContextTable.Add(element, context);
         }
 
-        private void DisconnectElement(FrameworkElement element)
+        internal void DisconnectElement(FrameworkElement element)
         {
             if (ShadowElementContextTable == null)
             {
@@ -308,7 +264,7 @@ protected virtual void OnPropertyChanged(AttachedShadowElementContext context, D
             }
             else if (property == OffsetProperty)
             {
-                context.Shadow.Offset = (Vector3)newValue;
+                context.Shadow.Offset = (Vector3)(newValue as string)?.ToVector3();
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs
new file mode 100644
index 00000000000..2755dbb797f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    /// <summary>
+    /// Helper class for attaching <see cref="AttachedShadowBase"/> shadows to <see cref="FrameworkElement"/>s.
+    /// </summary>
+    public static class Shadows
+    {
+        /// <summary>
+        /// Gets the shadow attached to a <see cref="FrameworkElement"/> by getting the value of the <see cref="AttachedProperty"/> property.
+        /// </summary>
+        /// <param name="obj">The <see cref="FrameworkElement"/> the <see cref="AttachedShadowBase"/> is attached to.</param>
+        /// <returns>The <see cref="AttachedShadowBase"/> that is attached to the <paramref name="obj">FrameworkElement.</paramref></returns>
+        public static AttachedShadowBase GetAttached(FrameworkElement obj)
+        {
+            return (AttachedShadowBase)obj.GetValue(AttachedProperty);
+        }
+
+        /// <summary>
+        /// Attaches a shadow to an element by setting the <see cref="AttachedProperty"/> property.
+        /// </summary>
+        /// <param name="obj">The <see cref="FrameworkElement"/> to attach the shadow to.</param>
+        /// <param name="value">The <see cref="AttachedShadowBase"/> that will be attached to the element</param>
+        public static void SetAttached(FrameworkElement obj, AttachedShadowBase value)
+        {
+            obj.SetValue(AttachedProperty, value);
+        }
+
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for setting an <see cref="AttachedShadowBase"/> to a <see cref="FrameworkElement"/>.
+        /// </summary>
+        public static readonly DependencyProperty AttachedProperty =
+            DependencyProperty.RegisterAttached("Attached", typeof(AttachedShadowBase), typeof(Shadows), new PropertyMetadata(null, OnShadowChanged));
+
+        private static void OnShadowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(d is FrameworkElement element))
+            {
+                return;
+            }
+
+            if (e.OldValue is AttachedShadowBase oldShadow)
+            {
+                oldShadow.DisconnectElement(element);
+            }
+
+            if (e.NewValue is AttachedShadowBase newShadow)
+            {
+                newShadow.ConnectElement(element);
+            }
+        }
+
+    }
+}

From f48df97bc15019f8624eb35eaa4074fcd8a17918 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:04:31 -0700
Subject: [PATCH 147/200] Clean-up some documentation and info about min
 version to sample app

---
 .../SamplePages/samples.json                       |  4 +++-
 .../Shadows/AttachedCardShadow.cs                  | 14 ++++++++++----
 .../Shadows/AttachedShadowBase.cs                  |  7 ++++---
 .../Shadows/AttachedShadowElementContext.cs        |  1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 4756dff8571..9689141122c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -192,7 +192,9 @@
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Media/Shadows",
         "XamlCodeFile": "/SamplePages/Shadows/AttachedShadowWin2DXaml.bind",
         "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DropShadowPanel.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DropShadowPanel.md",
+        "BadgeUpdateVersionRequired": "May 2019 update required",
+        "ApiCheck": "Windows.UI.Composition.CompositionVisualSurface"
       },
       {
         "Name": "DropShadowPanel",
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index aceb04473cd..8c57b8a9c1b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -17,7 +17,6 @@ public class AttachedCardShadow : AttachedShadowBase
         private const float MaxBlurRadius = 72;
         private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
         private static readonly bool SupportsCompositionVisualSurface;
-        private static readonly bool SupportsCompositionGeometricClip;
 
         private static readonly TypedResourceKey<CompositionPathGeometry> PathGeometryResourceKey = "PathGeometry";
         private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RoundedRectangleGeometryResourceKey = "RoundedGeometry";
@@ -34,12 +33,11 @@ public class AttachedCardShadow : AttachedShadowBase
                 nameof(CornerRadius),
                 typeof(double),
                 typeof(AttachedCardShadow),
-                new PropertyMetadata(8d, OnDependencyPropertyChanged));
+                new PropertyMetadata(4d, OnDependencyPropertyChanged)); // Default WinUI ControlCornerRadius is 4
 
         static AttachedCardShadow()
         {
-            SupportsCompositionGeometricClip = ApiInformation.IsTypePresent(typeof(CompositionGeometricClip).FullName);
-            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); ;
+            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); // Note: This is 1903 (18362) min
         }
 
         /// <summary>
@@ -51,15 +49,20 @@ public double CornerRadius
             set => SetValue(CornerRadiusProperty, value);
         }
 
+        /// <inheritdoc/>
         public override bool IsSupported => SupportsCompositionVisualSurface;
+
+        /// <inheritdoc/>
         protected override bool SupportsOnSizeChangedEvent => true;
 
+        /// <inheritdoc/>
         protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
         {
             context.ClearAndDisposeResources();
             base.OnElementContextUninitialized(context);
         }
 
+        /// <inheritdoc/>
         protected override void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
         {
             if (property == CornerRadiusProperty)
@@ -78,6 +81,7 @@ protected override void OnPropertyChanged(AttachedShadowElementContext context,
             }
         }
 
+        /// <inheritdoc/>
         protected override CompositionBrush GetShadowMask(AttachedShadowElementContext context)
         {
             if (!SupportsCompositionVisualSurface)
@@ -115,6 +119,7 @@ protected override CompositionBrush GetShadowMask(AttachedShadowElementContext c
             return surfaceBrush;
         }
 
+        /// <inheritdoc/>
         protected override CompositionClip GetShadowClip(AttachedShadowElementContext context)
         {
             var pathGeom = context.GetResource(PathGeometryResourceKey) ??
@@ -141,6 +146,7 @@ protected override CompositionClip GetShadowClip(AttachedShadowElementContext co
             return clip;
         }
 
+        /// <inheritdoc/>
         protected override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
             var sizeAsVec2 = newSize.ToVector2();
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 2d8e2ccd682..685fca8ac72 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -46,7 +46,7 @@ public abstract class AttachedShadowBase : DependencyObject
             DependencyProperty.Register(nameof(Opacity), typeof(double), typeof(AttachedShadowBase), new PropertyMetadata(1d, OnDependencyPropertyChanged));
 
         /// <summary>
-        /// Returns whether or not this <see cref="AttachedShadowBase"/> implementation is supported on the current platform.
+        /// Gets a value indicating whether or not this <see cref="AttachedShadowBase"/> implementation is supported on the current platform.
         /// </summary>
         public abstract bool IsSupported { get; }
 
@@ -56,7 +56,7 @@ public abstract class AttachedShadowBase : DependencyObject
         private ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
 
         /// <summary>
-        /// Gets or set the blur radius of the shadow.
+        /// Gets or sets the blur radius of the shadow.
         /// </summary>
         public double BlurRadius
         {
@@ -92,7 +92,7 @@ public Color Color
         }
 
         /// <summary>
-        /// Returns whether or not OnSizeChanged should be called when <see cref="FrameworkElement.SizeChanged"/> is fired.
+        /// Gets a value indicating whether or not OnSizeChanged should be called when <see cref="FrameworkElement.SizeChanged"/> is fired.
         /// </summary>
         protected internal abstract bool SupportsOnSizeChangedEvent { get; }
 
@@ -155,6 +155,7 @@ protected internal virtual void OnElementContextUninitialized(AttachedShadowElem
         /// <summary>
         /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>.
         /// </summary>
+        /// <returns>The <see cref="AttachedShadowElementContext"/> for the element.</returns>
         public AttachedShadowElementContext GetElementContext(FrameworkElement element)
         {
             if (ShadowElementContextTable != null && ShadowElementContextTable.TryGetValue(element, out var context))
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index c9687d04160..ae17bdf1706 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -279,6 +279,7 @@ public void ClearAndDisposeResources()
             {
                 (kvp.Value as IDisposable)?.Dispose();
             }
+
             _resources.Clear();
         }
     }

From 75e53c9116e7ff001dc25e663b7abed396bf65fc Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:06:01 -0700
Subject: [PATCH 148/200] Rename Shadows.Attached to Effects.Shadow

---
 .../Shadows/AttachedShadowWin2DXaml.bind      |  4 ++--
 .../SamplePages/XamlOnlyPage.xaml             |  2 +-
 .../Shadows/{Shadows.cs => Effects.cs}        | 20 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI/Shadows/{Shadows.cs => Effects.cs} (71%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
index 4e8ceb2cccf..4f3679a3e23 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -12,13 +12,13 @@
   <Grid>
     <Button Content="Hello Shadows!" HorizontalAlignment="Center" VerticalAlignment="Center"
             CornerRadius="8">
-      <ui:Shadows.Attached>
+      <ui:Effects.Shadow>
         <media:AttachedCardShadow BlurRadius="@[BlurRadius:DoubleSlider:8.0:0.0-10.0]"
                                   CornerRadius="8"
                                   Color="@[Color:Brush:Black]"
                                   Offset="@[Offset:Vector3:16,16]"
                                   Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"/>
-      </ui:Shadows.Attached>
+      </ui:Effects.Shadow>
     </Button>
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 7aac9725731..0741b8a8f7f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -51,7 +51,7 @@
         <controls:ConstrainedBox x:Key="ConstrainedBoxControl" />
         <media:AttachedCardShadow x:Key="AttachedShadow" />
         <controls:DropShadowPanel x:Key="DropShadowPanel"
-                                  ui:Shadows.Attached="{StaticResource AttachedShadow}" />
+                                  ui:Effects.Shadow="{StaticResource AttachedShadow}" />
     </Page.Resources>
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
similarity index 71%
rename from Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
index 2755dbb797f..d7af17ae7d0 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/Shadows.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,33 +9,33 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// <summary>
     /// Helper class for attaching <see cref="AttachedShadowBase"/> shadows to <see cref="FrameworkElement"/>s.
     /// </summary>
-    public static class Shadows
+    public static class Effects
     {
         /// <summary>
-        /// Gets the shadow attached to a <see cref="FrameworkElement"/> by getting the value of the <see cref="AttachedProperty"/> property.
+        /// Gets the shadow attached to a <see cref="FrameworkElement"/> by getting the value of the <see cref="ShadowProperty"/> property.
         /// </summary>
         /// <param name="obj">The <see cref="FrameworkElement"/> the <see cref="AttachedShadowBase"/> is attached to.</param>
         /// <returns>The <see cref="AttachedShadowBase"/> that is attached to the <paramref name="obj">FrameworkElement.</paramref></returns>
-        public static AttachedShadowBase GetAttached(FrameworkElement obj)
+        public static AttachedShadowBase GetShadow(FrameworkElement obj)
         {
-            return (AttachedShadowBase)obj.GetValue(AttachedProperty);
+            return (AttachedShadowBase)obj.GetValue(ShadowProperty);
         }
 
         /// <summary>
-        /// Attaches a shadow to an element by setting the <see cref="AttachedProperty"/> property.
+        /// Attaches a shadow to an element by setting the <see cref="ShadowProperty"/> property.
         /// </summary>
         /// <param name="obj">The <see cref="FrameworkElement"/> to attach the shadow to.</param>
         /// <param name="value">The <see cref="AttachedShadowBase"/> that will be attached to the element</param>
-        public static void SetAttached(FrameworkElement obj, AttachedShadowBase value)
+        public static void SetShadow(FrameworkElement obj, AttachedShadowBase value)
         {
-            obj.SetValue(AttachedProperty, value);
+            obj.SetValue(ShadowProperty, value);
         }
 
         /// <summary>
         /// Attached <see cref="DependencyProperty"/> for setting an <see cref="AttachedShadowBase"/> to a <see cref="FrameworkElement"/>.
         /// </summary>
-        public static readonly DependencyProperty AttachedProperty =
-            DependencyProperty.RegisterAttached("Attached", typeof(AttachedShadowBase), typeof(Shadows), new PropertyMetadata(null, OnShadowChanged));
+        public static readonly DependencyProperty ShadowProperty =
+            DependencyProperty.RegisterAttached("Shadow", typeof(AttachedShadowBase), typeof(Effects), new PropertyMetadata(null, OnShadowChanged));
 
         private static void OnShadowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {

From 4a651dd3d7c895d1d5e41b98f9b6711163542ea5 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:33:30 -0700
Subject: [PATCH 149/200] Add more samples (though one doesn't work for some
 reason with raw Border)

---
 .../Shadows/AttachedShadowWin2DXaml.bind      | 80 +++++++++++++++----
 1 file changed, 65 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
index 4f3679a3e23..04e4a8ffdfc 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -6,19 +6,69 @@
   xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
   xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
   mc:Ignorable="d">
-  
-  <!-- TODO: Show using as Resource as well... -->
 
-  <Grid>
-    <Button Content="Hello Shadows!" HorizontalAlignment="Center" VerticalAlignment="Center"
-            CornerRadius="8">
-      <ui:Effects.Shadow>
-        <media:AttachedCardShadow BlurRadius="@[BlurRadius:DoubleSlider:8.0:0.0-10.0]"
-                                  CornerRadius="8"
-                                  Color="@[Color:Brush:Black]"
-                                  Offset="@[Offset:Vector3:16,16]"
-                                  Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"/>
-      </ui:Effects.Shadow>
-    </Button>
-  </Grid>
-</Page>
\ No newline at end of file
+  <!-- TODO: Animation-->
+  <Page.Resources>
+    <media:AttachedCardShadow x:Key="CommonShadow" Offset="4"/>
+
+    <Style TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}">
+      <Setter Property="ui:Effects.Shadow" Value="{StaticResource CommonShadow}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+    </Style>
+  </Page.Resources>
+
+  <ScrollViewer>
+    <StackPanel Spacing="32" VerticalAlignment="Center">
+      <!-- All buttons on this page have the shadow from the common style!
+           The Shadow definition is Shared! -->
+      <Button Content="I Have a Shadow!"/>
+      <!-- Can apply the same shadow to any type of element! -->
+      <Image ui:Effects.Shadow="{StaticResource CommonShadow}"
+             Height="100" Width="100"
+             Source="ms-appx:///Assets/Photos/Owl.jpg"/>
+      <!-- You can still apply a Shadow directly and even use binding with it to manipulate at runtime! -->
+      <Rectangle RadiusX="32" RadiusY="32"
+                 Height="100" Width="100"
+                 Stroke="Blue" StrokeThickness="1">
+        <Rectangle.Fill>
+          <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
+        </Rectangle.Fill>
+        <ui:Effects.Shadow>
+          <media:AttachedCardShadow BlurRadius="@[BlurRadius:DoubleSlider:8.0:0.0-10.0]"
+                                    CornerRadius="32"
+                                    Color="@[Color:Brush:Black]"
+                                    Offset="@[Offset:Vector3:4,4]"
+                                    Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"/>
+        </ui:Effects.Shadow>
+      </Rectangle>
+      <Border CornerRadius="32"
+              Height="100" Width="100"
+              BorderBrush="White" BorderThickness="1">
+        <Border.Background>
+          <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
+        </Border.Background>
+        <!-- TODO: Doesn't work? -->
+        <ui:Effects.Shadow>
+          <media:AttachedCardShadow CornerRadius="32"
+                                    Offset="4,4"/>
+        </ui:Effects.Shadow>
+      </Border>
+      <!-- Note how even though this element is transparent, the shadow only shows on its edges still! -->
+      <Rectangle ui:Effects.Shadow="{StaticResource CommonShadow}"
+                 Fill="#80FF0000"
+                 RadiusX="4" RadiusY="4"
+                 Width="200" Height="100"/>
+      <!-- Compared to the old DropShadowPanel where the shadow bleeds through and
+       the Shadow opacity is tied to the Rectangle itself -->
+      <controls:DropShadowPanel xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                                OffsetX="4" OffsetY="4"
+                                BlurRadius="12"
+                                HorizontalAlignment="Center">
+        <Rectangle Fill="#80FF0000"
+                   RadiusX="4" RadiusY="4"
+                   Width="200" Height="100"/>
+      </controls:DropShadowPanel>
+      <Button Content="I Also have a Shadow!"/>
+    </StackPanel>
+  </ScrollViewer>
+</Page>

From 2096e5d5ad7d39e317fec744af8d82fa70c796f0 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 13 Aug 2021 12:26:06 -0700
Subject: [PATCH 150/200] Fix Border based Example

---
 .../Shadows/AttachedShadowWin2DXaml.bind      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
index 04e4a8ffdfc..9cd4b2974bd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -41,13 +41,18 @@
                                     Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"/>
         </ui:Effects.Shadow>
       </Rectangle>
-      <Border CornerRadius="32"
-              Height="100" Width="100"
-              BorderBrush="White" BorderThickness="1">
-        <Border.Background>
-          <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
-        </Border.Background>
-        <!-- TODO: Doesn't work? -->
+      <!-- If you want to apply a shadow directly in your visual tree to an untemplated element
+           You need to at least have a layer of depth as seen in this next example. -->
+      <Border Height="100" Width="100">
+        <Border CornerRadius="32"
+                BorderBrush="White" BorderThickness="1">
+          <Border.Background>
+            <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
+          </Border.Background>
+        </Border>
+        <!-- We need to put the Shadow on a parent element here as otherwise the
+             rounding of the border of the image above clips the shadow itself -->
+        <!-- TODO: This specific scenario should be simpler in the Composition based one? -->
         <ui:Effects.Shadow>
           <media:AttachedCardShadow CornerRadius="32"
                                     Offset="4,4"/>

From 0459a898adf7d4cef809016d546774defc89e39f Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 19 Aug 2021 10:54:52 -0700
Subject: [PATCH 151/200] Add initial Composition based AttachedDropShadow
 support

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |   8 +
 .../Models/Samples.cs                         |   3 +-
 .../Shadows/AttachedDropShadowPage.xaml       |   9 +
 .../Shadows/AttachedDropShadowPage.xaml.cs    |  30 ++
 .../AttachedShadowCompositionXaml.bind        |  86 +++++
 .../Shadows/AttachedShadowWin2DXaml.bind      |   5 +-
 .../SamplePages/XamlOnlyPage.xaml             |   1 +
 .../SamplePages/samples.json                  |  14 +-
 .../DropShadowPanel/DropShadowPanel.cs        |  33 +-
 .../ImageEx/ImageExBase.cs                    |   5 +-
 .../Shadows/AttachedCardShadow.cs             |  13 -
 .../Shadows/AttachedDropShadow.cs             | 353 ++++++++++++++++++
 .../Shadows/AttachedShadowBase.cs             |  14 +-
 .../Shadows/AttachedShadowElementContext.cs   |  11 +-
 .../Shadows/IAlphaMaskProvider.cs             |   5 +
 .../Extensions/PointExtensions.cs             |  13 +
 16 files changed, 561 insertions(+), 42 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml.cs
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index adcd8ef2a48..05b7f2d9e8a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -507,6 +507,9 @@
     <Compile Include="SamplePages\MetadataControl\MetadataControlPage.xaml.cs">
       <DependentUpon>MetadataControlPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\Shadows\AttachedDropShadowPage.xaml.cs">
+      <DependentUpon>AttachedDropShadowPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\TilesBrush\TilesBrushPage.xaml.cs">
       <DependentUpon>TilesBrushPage.xaml</DependentUpon>
     </Compile>
@@ -628,6 +631,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\Shadows\AttachedShadowWin2DXaml.bind" />
+    <Content Include="SamplePages\Shadows\AttachedShadowCompositionXaml.bind" />
     <Content Include="SamplePages\KeyDownTriggerBehavior\KeyDownTriggerBehaviorXaml.bind" />
   </ItemGroup>
   <ItemGroup>
@@ -984,6 +988,10 @@
     <Content Include="SamplePages\Primitives\SwitchPresenter.bind">
       <SubType>Designer</SubType>
     </Content>
+    <Page Include="SamplePages\Shadows\AttachedDropShadowPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
index a05c2c19f22..8170fb9f29c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
@@ -60,7 +60,8 @@ public static async Task<List<SampleCategory>> GetCategoriesAsync()
                 {
                     allCategories = await JsonSerializer.DeserializeAsync<List<SampleCategory>>(jsonStream.AsStream(), new JsonSerializerOptions
                     {
-                        ReadCommentHandling = JsonCommentHandling.Skip
+                        ReadCommentHandling = JsonCommentHandling.Skip,
+                        AllowTrailingCommas = true,
                     });
                 }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml
new file mode 100644
index 00000000000..95866761d0b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml
@@ -0,0 +1,9 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.AttachedDropShadowPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <!--  Shallow Copy in XamlOnlyPage  -->
+</Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml.cs
new file mode 100644
index 00000000000..d750e12f30b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedDropShadowPage.xaml.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Toolkit.Uwp.UI;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    public sealed partial class AttachedDropShadowPage : IXamlRenderListener
+    {
+        public AttachedDropShadowPage()
+        {
+            InitializeComponent();
+        }
+
+        public void OnXamlRendered(FrameworkElement control)
+        {
+            // This is done as we don't have x:Bind in live xaml, so we find and attach after.
+            var castToTarget = control.FindChild("ShadowTarget");
+            if (castToTarget != null)
+            {
+                if (control.Resources.TryGetValue("CommonShadow", out var resource) && resource is AttachedDropShadow shadow)
+                {
+                    shadow.CastTo = castToTarget;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
new file mode 100644
index 00000000000..1d5fd2c52d6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
@@ -0,0 +1,86 @@
+<Page
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+  mc:Ignorable="d">
+
+  <!-- TODO: Animation-->
+  <Page.Resources>
+    <ui:AttachedDropShadow x:Key="CommonShadow" Offset="4"/><!-- CastTo="{x:Bind ShadowTarget}"/>-->
+
+    <Style TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}">
+      <Setter Property="ui:Effects.Shadow" Value="{StaticResource CommonShadow}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <!-- We set a solid color for the background button otherwise the shadow bleeds through as 
+         the new style is transparent. See AttachedCardShadow for proper element clipping. -->
+      <Setter Property="Background" Value="Red"/>
+    </Style>
+  </Page.Resources>
+
+  <ScrollViewer>
+    <Grid>
+      <!-- The ShadowTarget Grid here is a *sibling* element behind where our elements which will cast
+           shadows are located, this is important as otherwise if we used a parent element the
+           shadows would appear on top of our elements instead!
+           It is also placed within the ScrollViewer here so shadows move with their elements. -->
+      <Grid x:Name="ShadowTarget"/>
+      <StackPanel Spacing="32" VerticalAlignment="Center">
+        <!-- All buttons on this page have the shadow from the common style!
+             The Shadow definition is Shared! -->
+        <Button Content="I Have a Shadow!"/>
+        <!-- Can apply the same shadow to any type of element! -->
+        <Image ui:Effects.Shadow="{StaticResource CommonShadow}"
+               Height="100" Width="100"
+               Source="ms-appx:///Assets/Photos/Owl.jpg"/>
+        <!-- You can still apply a Shadow directly and even use binding with it to manipulate at runtime! -->
+        <Rectangle RadiusX="32" RadiusY="32"
+                   Height="100" Width="100"
+                   Stroke="Blue" StrokeThickness="1">
+          <Rectangle.Fill>
+            <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
+          </Rectangle.Fill>
+          <ui:Effects.Shadow>
+            <ui:AttachedDropShadow BlurRadius="@[BlurRadius:DoubleSlider:8.0:0.0-10.0]"
+                                   CornerRadius="32"
+                                   Color="@[Color:Brush:Black]"
+                                   Offset="@[Offset:Vector3:4,4]"
+                                   Opacity="@[Opacity:DoubleSlider:1.0:0.0-1.0]"
+                                   CastTo="{Binding ElementName=ShadowTarget}"/>
+          </ui:Effects.Shadow>
+        </Rectangle>
+        <!-- This particular scenario of attaching directly to a raw element is easier than the Win2D equivelent. -->
+        <Border Height="100" Width="100"
+                CornerRadius="32"
+                BorderBrush="White" BorderThickness="1">
+          <Border.Background>
+            <ImageBrush ImageSource="ms-appx:///Assets/Photos/Owl.jpg"/>
+          </Border.Background>
+          <ui:Effects.Shadow>
+            <ui:AttachedDropShadow CornerRadius="32"
+                                   Offset="4,4" 
+                                   CastTo="{Binding ElementName=ShadowTarget}"/>
+          </ui:Effects.Shadow>
+        </Border>
+        <!-- Note how even though this element is transparent, the shadow still shows through,
+             to have this not occur use the AttachedCardShadow. -->
+        <Rectangle ui:Effects.Shadow="{StaticResource CommonShadow}"
+                   Fill="#80FF0000"
+                   RadiusX="4" RadiusY="4"
+                   Width="200" Height="100"/>
+        <!-- This is the same behavior as the old DropShadowPanel where the shadow bleeds through and
+             the Shadow opacity is tied to the Rectangle itself -->
+        <controls:DropShadowPanel xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                                  OffsetX="4" OffsetY="4"
+                                  BlurRadius="12"
+                                  HorizontalAlignment="Center">
+          <Rectangle Fill="#80FF0000"
+                     RadiusX="4" RadiusY="4"
+                     Width="200" Height="100"/>
+        </controls:DropShadowPanel>
+        <Button Content="I Also have a Shadow!"/>
+      </StackPanel>
+    </Grid>
+  </ScrollViewer>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
index 9cd4b2974bd..717d8a31515 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -51,8 +51,9 @@
           </Border.Background>
         </Border>
         <!-- We need to put the Shadow on a parent element here as otherwise the
-             rounding of the border of the image above clips the shadow itself -->
-        <!-- TODO: This specific scenario should be simpler in the Composition based one? -->
+             rounding of the border of the image above clips the shadow itself.
+             This is easier to perform with the Composition only based shadow as the
+             Shadow is projected to another element. -->
         <ui:Effects.Shadow>
           <media:AttachedCardShadow CornerRadius="32"
                                     Offset="4,4"/>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 0741b8a8f7f..f89f1e00fa7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -50,6 +50,7 @@
         </controls:SwitchPresenter>
         <controls:ConstrainedBox x:Key="ConstrainedBoxControl" />
         <media:AttachedCardShadow x:Key="AttachedShadow" />
+        <ui:AttachedDropShadow x:Key="AttachedDropShadow" />
         <controls:DropShadowPanel x:Key="DropShadowPanel"
                                   ui:Effects.Shadow="{StaticResource AttachedShadow}" />
     </Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 9689141122c..39f1038c465 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -186,9 +186,19 @@
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/GridSplitter.md"
       },
       {
-        "Name": "AttachedDropShadow (Win2D)",
+        "Name": "AttachedDropShadow (Composition)",
+        "Type": "AttachedDropShadowPage",
         "Subcategory": "Media",
         "About": "An AttachedDropShadow allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI/Shadows",
+        "XamlCodeFile": "/SamplePages/Shadows/AttachedShadowCompositionXaml.bind",
+        "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DropShadowPanel.md"
+      },
+      {
+        "Name": "AttachedCardShadow (Win2D)",
+        "Subcategory": "Media",
+        "About": "An AttachedCardShadow allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Media/Shadows",
         "XamlCodeFile": "/SamplePages/Shadows/AttachedShadowWin2DXaml.bind",
         "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
@@ -200,6 +210,8 @@
         "Name": "DropShadowPanel",
         "Subcategory": "Media",
         "About": "DropShadowPanel contol allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
+        "BadgeUpdateVersionRequired": "DEPRECATED",
+        "DeprecatedWarning": "This control will be removed in a future major release. Please use the AttachedDropShadow or AttachedCardShadow extensions instead.",
         "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel",
         "XamlCodeFile": "/SamplePages/Shadows/DropShadowPanelXaml.bind",
         "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
index be04c145f24..e2e031865b6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
@@ -171,7 +171,14 @@ private void UpdateShadowMask()
                 // alpha mask even if Content happens to extend any of the other classes
                 if (Content is IAlphaMaskProvider maskedControl)
                 {
-                    mask = maskedControl.GetAlphaMask();
+                    if (maskedControl.WaitUntilLoaded && maskedControl is FrameworkElement element && !element.IsLoaded)
+                    {
+                        element.Loaded += CustomMaskedElement_Loaded;
+                    }
+                    else
+                    {
+                        mask = maskedControl.GetAlphaMask();
+                    }
                 }
                 else if (Content is Image)
                 {
@@ -185,17 +192,6 @@ private void UpdateShadowMask()
                 {
                     mask = ((TextBlock)Content).GetAlphaMask();
                 }
-                else if (Content is ImageExBase imageExBase)
-                {
-                    imageExBase.ImageExInitialized += ImageExInitialized;
-
-                    if (imageExBase.IsInitialized)
-                    {
-                        imageExBase.ImageExInitialized -= ImageExInitialized;
-
-                        mask = ((ImageExBase)Content).GetAlphaMask();
-                    }
-                }
 
                 _dropShadow.Mask = mask;
             }
@@ -205,15 +201,14 @@ private void UpdateShadowMask()
             }
         }
 
-        private void ImageExInitialized(object sender, EventArgs e)
+        private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
         {
-            var imageExBase = (ImageExBase)Content;
-
-            imageExBase.ImageExInitialized -= ImageExInitialized;
-
-            CompositionBrush mask = ((ImageExBase)Content).GetAlphaMask();
+            if (sender is FrameworkElement element)
+            {
+                element.Loaded -= CustomMaskedElement_Loaded;
 
-            _dropShadow.Mask = mask;
+                _dropShadow.Mask = ((IAlphaMaskProvider)element).GetAlphaMask();
+            }
         }
 
         private void UpdateShadowOffset(float x, float y, float z)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
index e58b8349229..132fab12417 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplateVisualState(Name = UnloadedState, GroupName = CommonGroup)]
     [TemplateVisualState(Name = FailedState, GroupName = CommonGroup)]
     [TemplatePart(Name = PartImage, Type = typeof(object))]
-    public abstract partial class ImageExBase : Control
+    public abstract partial class ImageExBase : Control, IAlphaMaskProvider
     {
         private bool _isInViewport;
 
@@ -58,6 +58,9 @@ public abstract partial class ImageExBase : Control
         /// </summary>
         protected object Image { get; private set; }
 
+        /// <inheritdoc/>
+        public bool WaitUntilLoaded => true;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageExBase"/> class.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index 8c57b8a9c1b..2a937a58c33 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -16,7 +16,6 @@ public class AttachedCardShadow : AttachedShadowBase
     {
         private const float MaxBlurRadius = 72;
         private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
-        private static readonly bool SupportsCompositionVisualSurface;
 
         private static readonly TypedResourceKey<CompositionPathGeometry> PathGeometryResourceKey = "PathGeometry";
         private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RoundedRectangleGeometryResourceKey = "RoundedGeometry";
@@ -35,11 +34,6 @@ public class AttachedCardShadow : AttachedShadowBase
                 typeof(AttachedCardShadow),
                 new PropertyMetadata(4d, OnDependencyPropertyChanged)); // Default WinUI ControlCornerRadius is 4
 
-        static AttachedCardShadow()
-        {
-            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); // Note: This is 1903 (18362) min
-        }
-
         /// <summary>
         /// Gets or sets the roundness of the shadow's corners.
         /// </summary>
@@ -55,13 +49,6 @@ public double CornerRadius
         /// <inheritdoc/>
         protected override bool SupportsOnSizeChangedEvent => true;
 
-        /// <inheritdoc/>
-        protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
-        {
-            context.ClearAndDisposeResources();
-            base.OnElementContextUninitialized(context);
-        }
-
         /// <inheritdoc/>
         protected override void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
         {
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
new file mode 100644
index 00000000000..235e60cbf02
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -0,0 +1,353 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.UI;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Hosting;
+using Windows.UI.Xaml.Shapes;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    /// <summary>
+    /// A helper to add a composition based drop shadow to a <see cref="FrameworkElement"/>.
+    /// </summary>
+    public class AttachedDropShadow : AttachedShadowBase
+    {
+        private const float MaxBlurRadius = 72;
+
+        /// <inheritdoc/>
+        public override bool IsSupported => true;
+
+        /// <inheritdoc/>
+        protected internal override bool SupportsOnSizeChangedEvent => true;
+
+        private static readonly TypedResourceKey<ContainerVisual> ShadowContainerResourceKey = "ShadowContainer";
+
+        private static readonly TypedResourceKey<CompositionPathGeometry> PathGeometryResourceKey = "PathGeometry";
+        private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RectangleGeometryResourceKey = "RectGeometry";
+        private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
+
+        private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RoundedRectangleGeometryResourceKey = "RoundedGeometry";
+        private static readonly TypedResourceKey<CompositionSpriteShape> ShapeResourceKey = "Shape";
+        private static readonly TypedResourceKey<ShapeVisual> ShapeVisualResourceKey = "ShapeVisual";
+        private static readonly TypedResourceKey<CompositionSurfaceBrush> SurfaceBrushResourceKey = "SurfaceBrush";
+        private static readonly TypedResourceKey<CompositionVisualSurface> VisualSurfaceResourceKey = "VisualSurface";
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the panel uses an alpha mask to create a more precise shadow vs. a quicker rectangle shape.
+        /// </summary>
+        /// <remarks>
+        /// Turn this off to lose fidelity and gain performance of the panel.
+        /// </remarks>
+        public bool IsMasked
+        {
+            get { return (bool)GetValue(IsMaskedProperty); }
+            set { SetValue(IsMaskedProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IsMasked"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty IsMaskedProperty =
+            DependencyProperty.Register(nameof(IsMasked), typeof(bool), typeof(AttachedDropShadow), new PropertyMetadata(true, OnDependencyPropertyChanged));
+
+        /// <summary>
+        /// Gets or sets the roundness of the shadow's corners.
+        /// </summary>
+        public double CornerRadius
+        {
+            get => (double)GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="CornerRadius"/>
+        /// </summary>
+        public static readonly DependencyProperty CornerRadiusProperty =
+            DependencyProperty.Register(
+                nameof(CornerRadius),
+                typeof(double),
+                typeof(AttachedDropShadow),
+                new PropertyMetadata(4d, OnDependencyPropertyChanged)); // Default WinUI ControlCornerRadius is 4
+
+        /// <summary>
+        /// Gets or sets the <see cref="Panel"/> to be used as a backdrop to cast shadows on.
+        /// </summary>
+        public FrameworkElement CastTo
+        {
+            get { return (FrameworkElement)GetValue(CastToProperty); }
+            set { SetValue(CastToProperty, value); }
+        }
+
+        /// <summary>
+        /// The <see cref="DependencyProperty"/> for <see cref="CastTo"/>
+        /// </summary>
+        public static readonly DependencyProperty CastToProperty =
+            DependencyProperty.Register(nameof(CastTo), typeof(FrameworkElement), typeof(AttachedDropShadow), new PropertyMetadata(null, OnCastToPropertyChanged)); // TODO: Property Change
+
+        private ContainerVisual _container;
+
+        private static void OnCastToPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is AttachedDropShadow shadow)
+            {
+                if (e.OldValue is FrameworkElement element)
+                {
+                    ElementCompositionPreview.SetElementChildVisual(element, null);
+                    element.SizeChanged -= shadow.CastToElement_SizeChanged;
+                }
+
+                if (e.NewValue is FrameworkElement elementNew)
+                {
+                    var prevContainer = shadow._container;
+
+                    var child = ElementCompositionPreview.GetElementChildVisual(elementNew);
+                    if (child is ContainerVisual visual)
+                    {
+                        shadow._container = visual;
+                    }
+                    else
+                    {
+                        var compositor = ElementCompositionPreview.GetElementVisual(shadow.CastTo).Compositor;
+                        shadow._container = compositor.CreateContainerVisual();
+
+                        ElementCompositionPreview.SetElementChildVisual(elementNew, shadow._container);
+                    }
+
+                    // Need to remove all old children from previous container if it's changed
+                    if (prevContainer != null && prevContainer != shadow._container)
+                    {
+                        foreach (var context in shadow.ShadowElementContextTable)
+                        {
+                            if (context.Value.IsInitialized &&
+                                prevContainer.Children.Contains(context.Value.SpriteVisual))
+                            {
+                                prevContainer.Children.Remove(context.Value.SpriteVisual);
+                            }
+                        }
+                    }
+
+                    // Make sure all child shadows are hooked into container
+                    foreach (var context in shadow.ShadowElementContextTable)
+                    {
+                        if (context.Value.IsInitialized)
+                        {
+                            shadow.SetElementChildVisual(context.Value);
+                        }
+                    }
+
+                    elementNew.SizeChanged += shadow.CastToElement_SizeChanged;
+
+                    // Re-trigger updates to all shadow locations for new parent
+                    shadow.CastToElement_SizeChanged(null, null);
+                }
+            }
+        }
+
+        private void CastToElement_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            // Don't use sender or 'e' here as related to container element not
+            // element for shadow, grab values off context. (Also may be null from internal call.)
+            foreach (var context in ShadowElementContextTable)
+            {
+                if (context.Value.IsInitialized)
+                {
+                    // TODO: Should we use ActualWidth/Height instead of RenderSize?
+                    OnSizeChanged(context.Value, context.Value.Element.RenderSize, context.Value.Element.RenderSize);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        protected internal override void OnElementContextUninitialized(AttachedShadowElementContext context)
+        {
+            if (_container != null && _container.Children.Contains(context.SpriteVisual))
+            {
+                _container.Children.Remove(context.SpriteVisual);
+            }
+
+            base.OnElementContextUninitialized(context);
+        }
+
+        /// <inheritdoc/>
+        protected override void SetElementChildVisual(AttachedShadowElementContext context)
+        {
+            if (_container != null && !_container.Children.Contains(context.SpriteVisual))
+            {
+                _container.Children.InsertAtTop(context.SpriteVisual);
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override CompositionBrush GetShadowMask(AttachedShadowElementContext context)
+        {
+            CompositionBrush mask = null;
+
+            if (DesignTimeHelpers.IsRunningInLegacyDesignerMode)
+            {
+                return null;
+            }
+
+            if (context.Element != null)
+            {
+                if (IsMasked)
+                {
+                    // We check for IAlphaMaskProvider first, to ensure that we use the custom
+                    // alpha mask even if Content happens to extend any of the other classes
+                    if (context.Element is IAlphaMaskProvider maskedControl)
+                    {
+                        if (maskedControl.WaitUntilLoaded && !context.Element.IsLoaded)
+                        {
+                            context.Element.Loaded += CustomMaskedElement_Loaded;
+                        }
+                        else
+                        {
+                            mask = maskedControl.GetAlphaMask();
+                        }
+                    }
+                    else if (context.Element is Image)
+                    {
+                        mask = ((Image)context.Element).GetAlphaMask();
+                    }
+                    else if (context.Element is Shape)
+                    {
+                        mask = ((Shape)context.Element).GetAlphaMask();
+                    }
+                    else if (context.Element is TextBlock)
+                    {
+                        mask = ((TextBlock)context.Element).GetAlphaMask();
+                    }
+                }
+
+                // If we don't have a mask and have specified rounded corners, we'll generate a simple quick mask.
+                // This is the same code from link:AttachedCardShadow.cs:GetShadowMask
+                if (mask == null && SupportsCompositionVisualSurface && CornerRadius > 0)
+                {
+                    // Create rounded rectangle geometry and add it to a shape
+                    var geometry = context.GetResource(RoundedRectangleGeometryResourceKey) ?? context.AddResource(
+                        RoundedRectangleGeometryResourceKey,
+                        context.Compositor.CreateRoundedRectangleGeometry());
+                    geometry.CornerRadius = new Vector2((float)CornerRadius);
+
+                    var shape = context.GetResource(ShapeResourceKey) ?? context.AddResource(ShapeResourceKey, context.Compositor.CreateSpriteShape(geometry));
+                    shape.FillBrush = context.Compositor.CreateColorBrush(Colors.Black);
+
+                    // Create a ShapeVisual so that our geometry can be rendered to a visual
+                    var shapeVisual = context.GetResource(ShapeVisualResourceKey) ??
+                                      context.AddResource(ShapeVisualResourceKey, context.Compositor.CreateShapeVisual());
+                    shapeVisual.Shapes.Add(shape);
+
+                    // Create a CompositionVisualSurface, which renders our ShapeVisual to a texture
+                    var visualSurface = context.GetResource(VisualSurfaceResourceKey) ??
+                                        context.AddResource(VisualSurfaceResourceKey, context.Compositor.CreateVisualSurface());
+                    visualSurface.SourceVisual = shapeVisual;
+
+                    // Create a CompositionSurfaceBrush to render our CompositionVisualSurface to a brush.
+                    // Now we have a rounded rectangle brush that can be used on as the mask for our shadow.
+                    var surfaceBrush = context.GetResource(SurfaceBrushResourceKey) ?? context.AddResource(
+                        SurfaceBrushResourceKey,
+                        context.Compositor.CreateSurfaceBrush(visualSurface));
+
+                    geometry.Size = visualSurface.SourceSize = shapeVisual.Size = context.Element.RenderSize.ToVector2();
+
+                    mask = surfaceBrush;
+                }
+            }
+
+            // Position our shadow in the correct spot to match the corresponding element.
+            context.SpriteVisual.Size = context.Element.RenderSize.ToVector2();
+            context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
+
+            return mask;
+        }
+
+        private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
+        {
+            var context = GetElementContext(sender as FrameworkElement);
+
+            context.Element.Loaded -= CustomMaskedElement_Loaded;
+
+            UpdateShadowClip(context);
+            UpdateShadowMask(context);
+        }
+
+        /// <inheritdoc/>
+        /*protected override CompositionClip GetShadowClip(AttachedShadowElementContext context)
+        {
+            var rectGeom = context.GetResource(RectangleGeometryResourceKey) ??
+               context.AddResource(RectangleGeometryResourceKey, context.Compositor.CreateRoundedRectangleGeometry());
+
+            rectGeom.Offset = Offset.ToVector2();
+            rectGeom.Size = new Vector2((float)context.Element.ActualWidth, (float)context.Element.ActualHeight);
+            rectGeom.CornerRadius = new Vector2((float)CornerRadius, (float)CornerRadius);
+
+            var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(rectGeom));
+
+            return clip;*/
+
+            /*var pathGeom = context.GetResource(PathGeometryResourceKey) ??
+               context.AddResource(PathGeometryResourceKey, context.Compositor.CreatePathGeometry());
+
+            // Create rounded rectangle geometry at a larger size that compensates for the size of the stroke,
+            // as we want the inside edge of the stroke to match the edges of the element.
+            // Additionally, the inside edge of the stroke will have a smaller radius than the radius we specified.
+            // Using "(StrokeThickness / 2) + Radius" as our rectangle's radius will give us an inside stroke radius that matches the radius we want.
+            var radius = (MaxBlurRadius / 2) + (float)CornerRadius;
+            var canvasRectangle = context.Compositor.CreateRoundedRectangleGeometry();
+            canvasRectangle.Offset = new Vector2(-MaxBlurRadius / 2, -MaxBlurRadius / 2);
+            canvasRectangle.Size = new Vector2((float)context.Element.ActualWidth + MaxBlurRadius, (float)context.Element.ActualHeight + MaxBlurRadius);
+            canvasRectangle.CornerRadius = new Vector2(radius, radius);
+
+            var rectangleShape = context.Compositor.CreateSpriteShape(canvasRectangle);
+            rectangleShape.StrokeThickness = MaxBlurRadius;
+
+            var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(rectangleShape.Geometry));
+
+            return clip;*/
+
+////            return null;
+        ////}
+
+        /// <inheritdoc/>
+        protected internal override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
+        {
+            var sizeAsVec2 = newSize.ToVector2();
+
+            context.SpriteVisual.Size = sizeAsVec2;
+            context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
+
+            UpdateShadowClip(context);
+
+            base.OnSizeChanged(context, newSize, previousSize);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
+        {
+            if (property == IsMaskedProperty)
+            {
+                UpdateShadowMask(context);
+            }
+            else if (property == CornerRadiusProperty)
+            {
+                //var geometry = context.GetResource(RectangleGeometryResourceKey);
+                //if (geometry != null)
+                //{
+                //    geometry.CornerRadius = new Vector2((float)(double)newValue);
+                //}
+
+                UpdateShadowClip(context);
+            }
+            else
+            {
+                base.OnPropertyChanged(context, property, oldValue, newValue);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 685fca8ac72..70d7db7245e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -5,6 +5,7 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Windows.Foundation;
+using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -17,6 +18,16 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// </summary>
     public abstract class AttachedShadowBase : DependencyObject
     {
+        /// <summary>
+        /// Gets a value indicating whether or not Composition's VisualSurface is supported.
+        /// </summary>
+        protected static readonly bool SupportsCompositionVisualSurface;
+
+        static AttachedShadowBase()
+        {
+            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); // Note: This is 1903 (18362) min
+        }
+
         /// <summary>
         /// The <see cref="DependencyProperty"/> for <see cref="BlurRadius"/>.
         /// </summary>
@@ -53,7 +64,7 @@ public abstract class AttachedShadowBase : DependencyObject
         /// <summary>
         /// Gets or sets the collection of <see cref="AttachedShadowElementContext"/> for each element this <see cref="AttachedShadowBase"/> is connected to.
         /// </summary>
-        private ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
+        protected ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
 
         /// <summary>
         /// Gets or sets the blur radius of the shadow.
@@ -149,6 +160,7 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen
         /// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
         protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
         {
+            context.ClearAndDisposeResources();
             ElementCompositionPreview.SetElementChildVisual(context.Element, null);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index ae17bdf1706..c9cd0d02e17 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -275,12 +275,15 @@ public T RemoveAndDisposeResource<T>(string key) where T : IDisposable
         /// </summary>
         public void ClearAndDisposeResources()
         {
-            foreach (var kvp in _resources)
+            if (_resources != null)
             {
-                (kvp.Value as IDisposable)?.Dispose();
-            }
+                foreach (var kvp in _resources)
+                {
+                    (kvp.Value as IDisposable)?.Dispose();
+                }
 
-            _resources.Clear();
+                _resources.Clear();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs
index dbd6be7e8ba..011560e8201 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/IAlphaMaskProvider.cs
@@ -11,6 +11,11 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// </summary>
     public interface IAlphaMaskProvider
     {
+        /// <summary>
+        /// Gets a value indicating whether the AlphaMask needs to be retrieved after the element has loaded.
+        /// </summary>
+        bool WaitUntilLoaded { get; }
+
         /// <summary>
         /// This method should return the appropiate alpha mask to be used in the shadow of this control
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
index af0a413ad0d..e8c393bc779 100644
--- a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Contracts;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using Point = Windows.Foundation.Point;
 using Rect = Windows.Foundation.Rect;
@@ -54,5 +55,17 @@ public static Rect ToRect(this Point point, Size size)
         {
             return new Rect(point, size);
         }
+
+        /// <summary>
+        /// Creates a new <see cref="Vector3"/> of the specified point with 0 for the <see cref="Vector3.Z"/> coordinate.
+        /// </summary>
+        /// <param name="point"><see cref="Point"/> to transform to a <see cref="Vector3"/>.</param>
+        /// <returns>New <see cref="Vector3"/> representing the X,Y position of the <see cref="Point"/>.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector3 ToVector3(this Point point)
+        {
+            return new Vector3(point.ToVector2(), 0f);
+        }
     }
 }
\ No newline at end of file

From 864791961c5884cd02bc04017dba8a81013a7607 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 23 Aug 2021 10:12:42 -0700
Subject: [PATCH 152/200] Add initial basic animation support for Shadows

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  1 +
 .../Animations/Effects/FadeBehaviorXaml.bind  |  1 -
 .../Shadows/AnimatedCardShadowXaml.bind       | 42 +++++++++
 .../SamplePages/XamlOnlyPage.xaml             |  1 +
 .../SamplePages/samples.json                  |  9 ++
 ...adowAnimation{TShadow,TValue,TKeyFrame}.cs | 91 +++++++++++++++++++
 .../Xaml/Shadows/OffsetDropShadowAnimation.cs | 25 +++++
 7 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 05b7f2d9e8a..9ce613af59a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -632,6 +632,7 @@
     </Content>
     <Content Include="SamplePages\Shadows\AttachedShadowWin2DXaml.bind" />
     <Content Include="SamplePages\Shadows\AttachedShadowCompositionXaml.bind" />
+    <Content Include="SamplePages\Animations\Shadows\AnimatedCardShadowXaml.bind" />
     <Content Include="SamplePages\KeyDownTriggerBehavior\KeyDownTriggerBehaviorXaml.bind" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/FadeBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/FadeBehaviorXaml.bind
index 1a0f0eb9081..faa19146253 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/FadeBehaviorXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/FadeBehaviorXaml.bind
@@ -7,7 +7,6 @@
     xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
     xmlns:ani="using:Microsoft.Toolkit.Uwp.UI.Animations"
     xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     mc:Ignorable="d">
 
   <Button Background="Gray" Width="200" Height="200" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
new file mode 100644
index 00000000000..18f9ad5f6a6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
@@ -0,0 +1,42 @@
+<Page
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+  xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+  xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+  xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
+  xmlns:ani="using:Microsoft.Toolkit.Uwp.UI.Animations"
+  xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
+  mc:Ignorable="d">
+
+  <Page.Resources>
+    <media:AttachedCardShadow x:Key="CommonShadow" Offset="4" CornerRadius="0"/>
+  </Page.Resources>
+
+  <Grid>
+    <Image x:Name="ImageWithShadow"
+           ui:Effects.Shadow="{StaticResource CommonShadow}"
+           Height="100" Width="100"
+           Source="ms-appx:///Assets/Photos/Owl.jpg">
+      <interactivity:Interaction.Behaviors>
+        <interactions:EventTriggerBehavior EventName="PointerEntered">
+          <behaviors:StartAnimationAction Animation="{Binding ElementName=ShadowEnterAnimation}"/>
+        </interactions:EventTriggerBehavior>
+        <interactions:EventTriggerBehavior EventName="PointerExited">
+          <behaviors:StartAnimationAction Animation="{Binding ElementName=ShadowExitAnimation}"/>
+        </interactions:EventTriggerBehavior>
+      </interactivity:Interaction.Behaviors>
+      <ani:Explicit.Animations>
+        <ani:AnimationSet x:Name="ShadowEnterAnimation">
+          <ani:OffsetDropShadowAnimation From="4" To="12" Target="{Binding ElementName=ImageWithShadow}"/>
+        </ani:AnimationSet>
+
+        <ani:AnimationSet x:Name="ShadowExitAnimation">
+          <ani:OffsetDropShadowAnimation From="12" To="4" Target="{Binding ElementName=ImageWithShadow}"/>
+        </ani:AnimationSet>
+      </ani:Explicit.Animations>
+    </Image>
+  </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index f89f1e00fa7..1c39dc489f6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -67,6 +67,7 @@
                 <ani:SaturationEffectAnimation />
                 <ani:AnimationScope />
                 <ani:ExposureEffectAnimation />
+                <ani:OffsetDropShadowAnimation />
             </ani:AnimationSet>
         </ani:Explicit.Animations>
         <media:UIElementExtensions.VisualFactory>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 39f1038c465..0ac5c32309e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -651,6 +651,15 @@
         "DisableXamlEditorRendering": true,
         "Icon": "/SamplePages/Connected Animations/ConnectedAnimations.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ConnectedAnimations.md"
+      },
+      {
+        "Name": "Shadow Animations",
+        "Subcategory": "Effect",
+        "About": "Example of animating an Attached Shadow",
+        "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows",
+        "XamlCodeFile": "/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind",
+        "Icon": "/SamplePages/Shadows/DropShadowPanel.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ConnectedAnimations.md"
       }
     ]
   },
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
new file mode 100644
index 00000000000..c9a678455d8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
@@ -0,0 +1,91 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media.Animation;
+using static Microsoft.Toolkit.Uwp.UI.Animations.AnimationExtensions;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// A custom animation targeting a property on an <see cref="AttachedShadowBase"/> instance.
+    /// </summary>
+    /// <typeparam name="TShadow">The <see cref="FrameworkElement"/> containing the shadow to animate.</typeparam>
+    /// <typeparam name="TValue">
+    /// The type to use for the public <see cref="Animation{TValue,TKeyFrame}.To"/> and <see cref="Animation{TValue,TKeyFrame}.From"/>
+    /// properties. This can differ from <typeparamref name="TKeyFrame"/> to facilitate XAML parsing.
+    /// </typeparam>
+    /// <typeparam name="TKeyFrame">The actual type of keyframe values in use.</typeparam>
+    public abstract class ShadowAnimation<TShadow, TValue, TKeyFrame> : Animation<TValue, TKeyFrame>
+        where TShadow : FrameworkElement
+        where TKeyFrame : unmanaged
+    {
+        /// <summary>
+        /// Gets or sets the linked <typeparamref name="TShadow"/> instance to animate.
+        /// </summary>
+        public TShadow? Target
+        {
+            get => (TShadow?)GetValue(TargetProperty);
+            set => SetValue(TargetProperty, value);
+        }
+
+        /// <summary>
+        /// Identifies the <seealso cref="Target"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
+            nameof(Target),
+            typeof(TShadow),
+            typeof(ShadowAnimation<TShadow, TValue, TKeyFrame>),
+            new PropertyMetadata(null));
+
+        /// <inheritdoc/>
+        public override AnimationBuilder AppendToBuilder(AnimationBuilder builder, TimeSpan? delayHint, TimeSpan? durationHint, EasingType? easingTypeHint, EasingMode? easingModeHint)
+        {
+            if (Target is not TShadow target)
+            {
+                static AnimationBuilder ThrowTargetNullException() => throw new ArgumentNullException("The target element is null, make sure to set the Target property");
+
+                return ThrowTargetNullException();
+            }
+
+            var shadowBase = Effects.GetShadow(Target);
+            if (shadowBase == null)
+            {
+                static AnimationBuilder ThrowArgumentNullException() => throw new ArgumentNullException("The target's shadow is null, make sure to set the Target property to an element with a Shadow");
+
+                return ThrowArgumentNullException();
+            }
+
+            if (ExplicitTarget is not string explicitTarget)
+            {
+                static AnimationBuilder ThrowArgumentNullException()
+                {
+                    throw new ArgumentNullException(
+                        "The target shadow cannot be animated at this time.");
+                }
+
+                return ThrowArgumentNullException();
+            }
+
+            var shadow = shadowBase.GetElementContext(Target).Shadow;
+
+            NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
+                explicitTarget,
+                Delay ?? delayHint ?? DefaultDelay,
+                Duration ?? durationHint ?? DefaultDuration,
+                Repeat,
+                DelayBehavior);
+
+            AppendToBuilder(keyFrameBuilder, easingTypeHint, easingModeHint);
+
+            CompositionAnimation animation = keyFrameBuilder.GetAnimation(shadow, out _);
+
+            return builder.ExternalAnimation(shadow, animation);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
new file mode 100644
index 00000000000..9c37718e99b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Numerics;
+using Windows.UI.Composition;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// An offset animation working on the composition layer.
+    /// </summary>
+    public sealed class OffsetDropShadowAnimation : ShadowAnimation<FrameworkElement, string, Vector3>
+    {
+        /// <inheritdoc/>
+        protected override string ExplicitTarget => nameof(DropShadow.Offset);
+
+        /// <inheritdoc/>
+        protected override (Vector3?, Vector3?) GetParsedValues()
+        {
+            return (To?.ToVector3(), From?.ToVector3());
+        }
+    }
+}
\ No newline at end of file

From ca6f772a99ca92b4b4b1ddadb942cb8e740cc3dd Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:30:03 -0700
Subject: [PATCH 153/200] Clean-up and simplify Shadow Animations, add support
 for animating all shadows

---
 .../Shadows/AnimatedCardShadowXaml.bind       | 59 +++++++++++----
 .../Properties/AssemblyInfo.cs                |  3 +-
 ...adowAnimation{TShadow,TValue,TKeyFrame}.cs | 75 ++++++++++++-------
 .../Xaml/AnimationSet.cs                      | 13 +++-
 .../Xaml/Interfaces/IAttachedTimeline.cs      | 35 +++++++++
 .../Xaml/Interfaces/ITimeline.cs              |  2 +-
 .../Xaml/Shadows/OffsetDropShadowAnimation.cs |  2 +-
 .../Animations/StartAnimationAction.cs        |  8 +-
 .../Animations/StopAnimationAction.cs         |  8 +-
 .../Shadows/AttachedDropShadow.cs             | 20 ++---
 .../Shadows/AttachedShadowBase.cs             | 15 +++-
 11 files changed, 184 insertions(+), 56 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/IAttachedTimeline.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
index 18f9ad5f6a6..bae8962c3c3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Shadows/AnimatedCardShadowXaml.bind
@@ -13,30 +13,63 @@
 
   <Page.Resources>
     <media:AttachedCardShadow x:Key="CommonShadow" Offset="4" CornerRadius="0"/>
+
+    <ani:AnimationSet x:Key="ShadowEnterAnimation">
+      <ani:OffsetDropShadowAnimation To="12"/>
+    </ani:AnimationSet>
+
+    <ani:AnimationSet x:Key="ShadowExitAnimation">
+      <ani:OffsetDropShadowAnimation To="4"/>
+    </ani:AnimationSet>
+
+    <ani:AnimationSet x:Key="ShadowPopAnimation" IsSequential="True">
+      <ani:TranslationAnimation To="-8" Duration="0:0:1"/>
+      <ani:OffsetDropShadowAnimation To="16" Duration="0:0:2" Target="{StaticResource CommonShadow}"/>
+      <ani:OffsetDropShadowAnimation To="4" Delay="0:0:0.5" Duration="0:0:2" Target="{StaticResource CommonShadow}"/>
+      <ani:TranslationAnimation To="0" Duration="0:0:1"/>
+    </ani:AnimationSet>
   </Page.Resources>
 
   <Grid>
-    <Image x:Name="ImageWithShadow"
-           ui:Effects.Shadow="{StaticResource CommonShadow}"
+    <Grid.RowDefinitions>
+      <RowDefinition/>
+      <RowDefinition/>
+    </Grid.RowDefinitions>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition/>
+      <ColumnDefinition/>
+    </Grid.ColumnDefinitions>
+    <Image ui:Effects.Shadow="{StaticResource CommonShadow}"
            Height="100" Width="100"
            Source="ms-appx:///Assets/Photos/Owl.jpg">
       <interactivity:Interaction.Behaviors>
         <interactions:EventTriggerBehavior EventName="PointerEntered">
-          <behaviors:StartAnimationAction Animation="{Binding ElementName=ShadowEnterAnimation}"/>
+          <behaviors:StartAnimationAction Animation="{StaticResource ShadowEnterAnimation}"/>
         </interactions:EventTriggerBehavior>
         <interactions:EventTriggerBehavior EventName="PointerExited">
-          <behaviors:StartAnimationAction Animation="{Binding ElementName=ShadowExitAnimation}"/>
+          <behaviors:StartAnimationAction Animation="{StaticResource ShadowExitAnimation}"/>
+        </interactions:EventTriggerBehavior>
+      </interactivity:Interaction.Behaviors>
+    </Image>
+    <Image ui:Effects.Shadow="{StaticResource CommonShadow}"
+           Height="100" Width="100"
+           Grid.Column="1"
+           Source="ms-appx:///Assets/Photos/Owl.jpg">
+      <interactivity:Interaction.Behaviors>
+        <interactions:EventTriggerBehavior EventName="PointerEntered">
+          <behaviors:StartAnimationAction Animation="{StaticResource ShadowEnterAnimation}"/>
+        </interactions:EventTriggerBehavior>
+        <interactions:EventTriggerBehavior EventName="PointerExited">
+          <behaviors:StartAnimationAction Animation="{StaticResource ShadowExitAnimation}"/>
         </interactions:EventTriggerBehavior>
       </interactivity:Interaction.Behaviors>
-      <ani:Explicit.Animations>
-        <ani:AnimationSet x:Name="ShadowEnterAnimation">
-          <ani:OffsetDropShadowAnimation From="4" To="12" Target="{Binding ElementName=ImageWithShadow}"/>
-        </ani:AnimationSet>
-
-        <ani:AnimationSet x:Name="ShadowExitAnimation">
-          <ani:OffsetDropShadowAnimation From="12" To="4" Target="{Binding ElementName=ImageWithShadow}"/>
-        </ani:AnimationSet>
-      </ani:Explicit.Animations>
     </Image>
+    <Button Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Top" Content="Click Me">
+      <interactivity:Interaction.Behaviors>
+        <interactions:EventTriggerBehavior EventName="Click">
+          <behaviors:StartAnimationAction Animation="{StaticResource ShadowPopAnimation}"/>
+        </interactions:EventTriggerBehavior>
+      </interactivity:Interaction.Behaviors>
+    </Button>
   </Grid>
 </Page>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Properties/AssemblyInfo.cs
index b9d3571a05b..94d361ddf36 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Properties/AssemblyInfo.cs
@@ -4,4 +4,5 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.Toolkit.Uwp.UI.Media")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.Toolkit.Uwp.UI.Behaviors")]
+[assembly: InternalsVisibleTo("Microsoft.Toolkit.Uwp.UI.Media")]
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
index c9a678455d8..f0c8420c92b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
@@ -21,8 +21,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     /// properties. This can differ from <typeparamref name="TKeyFrame"/> to facilitate XAML parsing.
     /// </typeparam>
     /// <typeparam name="TKeyFrame">The actual type of keyframe values in use.</typeparam>
-    public abstract class ShadowAnimation<TShadow, TValue, TKeyFrame> : Animation<TValue, TKeyFrame>
-        where TShadow : FrameworkElement
+    public abstract class ShadowAnimation<TShadow, TValue, TKeyFrame> : Animation<TValue, TKeyFrame>, IAttachedTimeline
+        where TShadow : AttachedShadowBase
         where TKeyFrame : unmanaged
     {
         /// <summary>
@@ -46,21 +46,12 @@ public TShadow? Target
         /// <inheritdoc/>
         public override AnimationBuilder AppendToBuilder(AnimationBuilder builder, TimeSpan? delayHint, TimeSpan? durationHint, EasingType? easingTypeHint, EasingMode? easingModeHint)
         {
-            if (Target is not TShadow target)
-            {
-                static AnimationBuilder ThrowTargetNullException() => throw new ArgumentNullException("The target element is null, make sure to set the Target property");
-
-                return ThrowTargetNullException();
-            }
-
-            var shadowBase = Effects.GetShadow(Target);
-            if (shadowBase == null)
-            {
-                static AnimationBuilder ThrowArgumentNullException() => throw new ArgumentNullException("The target's shadow is null, make sure to set the Target property to an element with a Shadow");
-
-                return ThrowArgumentNullException();
-            }
+            throw new NotSupportedException();
+        }
 
+        /// <inheritdoc/>
+        public AnimationBuilder AppendToBuilder(AnimationBuilder builder, UIElement parent, TimeSpan? delayHint = null, TimeSpan? durationHint = null, EasingType? easingTypeHint = null, EasingMode? easingModeHint = null)
+        {
             if (ExplicitTarget is not string explicitTarget)
             {
                 static AnimationBuilder ThrowArgumentNullException()
@@ -72,20 +63,52 @@ static AnimationBuilder ThrowArgumentNullException()
                 return ThrowArgumentNullException();
             }
 
-            var shadow = shadowBase.GetElementContext(Target).Shadow;
+            if (Target is TShadow allShadows)
+            {
+                // in this case we'll animate all the shadows being used.
+                foreach (var context in allShadows.GetElementContextEnumerable()) //// TODO: Find better way!!!
+                {
+                    NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
+                        explicitTarget,
+                        Delay ?? delayHint ?? DefaultDelay,
+                        Duration ?? durationHint ?? DefaultDuration,
+                        Repeat,
+                        DelayBehavior);
 
-            NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
-                explicitTarget,
-                Delay ?? delayHint ?? DefaultDelay,
-                Duration ?? durationHint ?? DefaultDuration,
-                Repeat,
-                DelayBehavior);
+                    AppendToBuilder(keyFrameBuilder, easingTypeHint, easingModeHint);
 
-            AppendToBuilder(keyFrameBuilder, easingTypeHint, easingModeHint);
+                    CompositionAnimation animation = keyFrameBuilder.GetAnimation(context.Shadow, out _);
 
-            CompositionAnimation animation = keyFrameBuilder.GetAnimation(shadow, out _);
+                    builder.ExternalAnimation(context.Shadow, animation);
+                }
+
+                return builder;
+            }
+            else
+            {
+                var shadowBase = Effects.GetShadow(parent as FrameworkElement);
+                if (shadowBase == null)
+                {
+                    static AnimationBuilder ThrowArgumentNullException() => throw new ArgumentNullException("The target's shadow is null, make sure to set the Target property to an element with a Shadow");
+
+                    return ThrowArgumentNullException();
+                }
+
+                var shadow = shadowBase.GetElementContext((FrameworkElement)parent).Shadow;
+
+                NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
+                    explicitTarget,
+                    Delay ?? delayHint ?? DefaultDelay,
+                    Duration ?? durationHint ?? DefaultDuration,
+                    Repeat,
+                    DelayBehavior);
 
-            return builder.ExternalAnimation(shadow, animation);
+                AppendToBuilder(keyFrameBuilder, easingTypeHint, easingModeHint);
+
+                CompositionAnimation animation = keyFrameBuilder.GetAnimation(shadow, out _);
+
+                return builder.ExternalAnimation(shadow, animation);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/AnimationSet.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/AnimationSet.cs
index c3631c9d945..39472358cb0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/AnimationSet.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/AnimationSet.cs
@@ -119,7 +119,15 @@ public async Task StartAsync(UIElement element, CancellationToken token)
             {
                 foreach (object node in this)
                 {
-                    if (node is ITimeline timeline)
+                    if (node is IAttachedTimeline attachedTimeline)
+                    {
+                        var builder = AnimationBuilder.Create();
+
+                        attachedTimeline.AppendToBuilder(builder, element);
+
+                        await builder.StartAsync(element, token);
+                    }
+                    else if (node is ITimeline timeline)
                     {
                         var builder = AnimationBuilder.Create();
 
@@ -166,6 +174,9 @@ public async Task StartAsync(UIElement element, CancellationToken token)
                 {
                     switch (node)
                     {
+                        case IAttachedTimeline attachedTimeline:
+                            builder = attachedTimeline.AppendToBuilder(builder, element);
+                            break;
                         case ITimeline timeline:
                             builder = timeline.AppendToBuilder(builder);
                             break;
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/IAttachedTimeline.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/IAttachedTimeline.cs
new file mode 100644
index 00000000000..ea4339a2cf2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/IAttachedTimeline.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media.Animation;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// An interface representing a XAML model for a custom animation that requires a specific parent <see cref="UIElement"/> context.
+    /// </summary>
+    public interface IAttachedTimeline
+    {
+        /// <summary>
+        /// Appends the current animation to a target <see cref="AnimationBuilder"/> instance.
+        /// This method is used when the current <see cref="ITimeline"/> instance is explicitly triggered.
+        /// </summary>
+        /// <param name="builder">The target <see cref="AnimationBuilder"/> instance to schedule the animation on.</param>
+        /// <param name="parent">The parent <see cref="UIElement"/> this animation will be started on.</param>
+        /// <param name="delayHint">A hint for the animation delay, if present.</param>
+        /// <param name="durationHint">A hint for the animation duration, if present.</param>
+        /// <param name="easingTypeHint">A hint for the easing type, if present.</param>
+        /// <param name="easingModeHint">A hint for the easing mode, if present.</param>
+        /// <returns>The same <see cref="AnimationBuilder"/> instance as <paramref name="builder"/>.</returns>
+        AnimationBuilder AppendToBuilder(
+            AnimationBuilder builder,
+            UIElement parent,
+            TimeSpan? delayHint = null,
+            TimeSpan? durationHint = null,
+            EasingType? easingTypeHint = null,
+            EasingMode? easingModeHint = null);
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/ITimeline.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/ITimeline.cs
index 092ff4b9114..12544e0af99 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/ITimeline.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Interfaces/ITimeline.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     public interface ITimeline
     {
         /// <summary>
-        /// Appens the current animation to a target <see cref="AnimationBuilder"/> instance.
+        /// Appends the current animation to a target <see cref="AnimationBuilder"/> instance.
         /// This method is used when the current <see cref="ITimeline"/> instance is explicitly triggered.
         /// </summary>
         /// <param name="builder">The target <see cref="AnimationBuilder"/> instance to schedule the animation on.</param>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
index 9c37718e99b..4fcd561cccf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Animations
     /// <summary>
     /// An offset animation working on the composition layer.
     /// </summary>
-    public sealed class OffsetDropShadowAnimation : ShadowAnimation<FrameworkElement, string, Vector3>
+    public sealed class OffsetDropShadowAnimation : ShadowAnimation<AttachedShadowBase, string, Vector3>
     {
         /// <inheritdoc/>
         protected override string ExplicitTarget => nameof(DropShadow.Offset);
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs
index 0ed6bbb2df9..827dc55560b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs
@@ -58,13 +58,19 @@ public object Execute(object sender, object parameter)
                 ThrowArgumentNullException();
             }
 
+            UIElement parent = null;
+
             if (TargetObject is not null)
             {
                 Animation.Start(TargetObject);
             }
+            else if (Animation.ParentReference?.TryGetTarget(out parent) == true) //// TODO: Tidy... apply same pattern to Activities?
+            {
+                Animation.Start(parent);
+            }
             else
             {
-                Animation.Start();
+                Animation.Start(sender as UIElement);
             }
 
             return null!;
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StopAnimationAction.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StopAnimationAction.cs
index b85bfc94120..b4a7e0f5e26 100644
--- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StopAnimationAction.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StopAnimationAction.cs
@@ -58,13 +58,19 @@ public object Execute(object sender, object parameter)
                 ThrowArgumentNullException();
             }
 
+            UIElement parent = null;
+
             if (TargetObject is not null)
             {
                 Animation.Stop(TargetObject);
             }
+            else if (Animation.ParentReference?.TryGetTarget(out parent) == true) //// TODO: Tidy...
+            {
+                Animation.Stop(parent);
+            }
             else
             {
-                Animation.Stop();
+                Animation.Stop(sender as UIElement);
             }
 
             return null!;
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
index 235e60cbf02..6df8015e39e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -123,22 +123,22 @@ private static void OnCastToPropertyChanged(DependencyObject d, DependencyProper
                     // Need to remove all old children from previous container if it's changed
                     if (prevContainer != null && prevContainer != shadow._container)
                     {
-                        foreach (var context in shadow.ShadowElementContextTable)
+                        foreach (var context in shadow.GetElementContextEnumerable())
                         {
-                            if (context.Value.IsInitialized &&
-                                prevContainer.Children.Contains(context.Value.SpriteVisual))
+                            if (context.IsInitialized &&
+                                prevContainer.Children.Contains(context.SpriteVisual))
                             {
-                                prevContainer.Children.Remove(context.Value.SpriteVisual);
+                                prevContainer.Children.Remove(context.SpriteVisual);
                             }
                         }
                     }
 
                     // Make sure all child shadows are hooked into container
-                    foreach (var context in shadow.ShadowElementContextTable)
+                    foreach (var context in shadow.GetElementContextEnumerable())
                     {
-                        if (context.Value.IsInitialized)
+                        if (context.IsInitialized)
                         {
-                            shadow.SetElementChildVisual(context.Value);
+                            shadow.SetElementChildVisual(context);
                         }
                     }
 
@@ -154,12 +154,12 @@ private void CastToElement_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             // Don't use sender or 'e' here as related to container element not
             // element for shadow, grab values off context. (Also may be null from internal call.)
-            foreach (var context in ShadowElementContextTable)
+            foreach (var context in GetElementContextEnumerable())
             {
-                if (context.Value.IsInitialized)
+                if (context.IsInitialized)
                 {
                     // TODO: Should we use ActualWidth/Height instead of RenderSize?
-                    OnSizeChanged(context.Value, context.Value.Element.RenderSize, context.Value.Element.RenderSize);
+                    OnSizeChanged(context, context.Element.RenderSize, context.Element.RenderSize);
                 }
             }
         }
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 70d7db7245e..11e981f5a07 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Windows.Foundation;
@@ -64,7 +65,7 @@ static AttachedShadowBase()
         /// <summary>
         /// Gets or sets the collection of <see cref="AttachedShadowElementContext"/> for each element this <see cref="AttachedShadowBase"/> is connected to.
         /// </summary>
-        protected ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
+        private ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
 
         /// <summary>
         /// Gets or sets the blur radius of the shadow.
@@ -178,6 +179,18 @@ public AttachedShadowElementContext GetElementContext(FrameworkElement element)
             return null;
         }
 
+        /// <summary>
+        /// Gets an enumerator over the current list of <see cref="AttachedShadowElementContext"/> of elements using this shared shadow definition.
+        /// </summary>
+        /// <returns>Enumeration of <see cref="AttachedShadowElementContext"/> objects.</returns>
+        public IEnumerable<AttachedShadowElementContext> GetElementContextEnumerable()
+        {
+            foreach (var kvp in ShadowElementContextTable)
+            {
+                yield return kvp.Value;
+            }
+        }
+
         /// <summary>
         /// Sets <see cref="AttachedShadowElementContext.SpriteVisual"/> as a child visual on <see cref="AttachedShadowElementContext.Element"/>
         /// </summary>

From 08ffdcf84ea4e21a35679e0e2dd646d9f381ce8c Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 25 Aug 2021 10:23:24 -0700
Subject: [PATCH 154/200] Fix issues with XML documentation for new shadows
 feature

---
 .../Shadows/AttachedCardShadow.cs             |  13 ++-
 .../AttachedShadowBaseWithOpacityMask.cs      | 110 ------------------
 .../Shadows/AttachedDropShadow.cs             |  59 ++--------
 .../Shadows/AttachedShadowBase.cs             |  46 +++-----
 .../Shadows/AttachedShadowElementContext.cs   |  37 +++++-
 Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs   |   3 +-
 .../Shadows/IAttachedShadow.cs                |  42 ++++---
 Microsoft.Toolkit/TypedResourceKey.cs         |  16 ++-
 8 files changed, 113 insertions(+), 213 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index 2a937a58c33..e0643ae088e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -5,13 +5,18 @@
 using System.Numerics;
 using Microsoft.Graphics.Canvas.Geometry;
 using Windows.Foundation;
-using Windows.Foundation.Metadata;
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 
 namespace Microsoft.Toolkit.Uwp.UI.Media
 {
+    /// <summary>
+    /// A performant rectangular <see cref="DropShadow"/> which can be attached to any <see cref="FrameworkElement"/>. It uses Win2D to create a clipped area of the outline of the element such that transparent elements don't see the shadow below them, and the shadow can be attached without having to project to another surface. It is animatable, can be shared via a resource, and used in a <see cref="Style"/>.
+    /// </summary>
+    /// <remarks>
+    /// This shadow will not work on <see cref="FrameworkElement"/> which is directly clipping to its bounds (e.g. a <see cref="Windows.UI.Xaml.Controls.Border"/> using a <see cref="Windows.UI.Xaml.Controls.Control.CornerRadius"/>). An extra <see cref="Windows.UI.Xaml.Controls.Border"/> can instead be applied around the clipped border with the Shadow to create the desired effect. Most existing controls due to how they're templated will not encounter this behavior or require this workaround.
+    /// </remarks>
     public class AttachedCardShadow : AttachedShadowBase
     {
         private const float MaxBlurRadius = 72;
@@ -109,6 +114,12 @@ protected override CompositionBrush GetShadowMask(AttachedShadowElementContext c
         /// <inheritdoc/>
         protected override CompositionClip GetShadowClip(AttachedShadowElementContext context)
         {
+            // The way this shadow works without the need to project on another element is because
+            // we're clipping the inner part of the shadow which would be cast on the element
+            // itself away. This method is creating an outline so that we are only showing the
+            // parts of the shadow that are outside the element's context.
+            // Note: This does cause an issue if the element does clip itself to its bounds, as then
+            // the shadowed area is clipped as well.
             var pathGeom = context.GetResource(PathGeometryResourceKey) ??
                            context.AddResource(PathGeometryResourceKey, context.Compositor.CreatePathGeometry());
             var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(pathGeom));
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
deleted file mode 100644
index 71d09734992..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedShadowBaseWithOpacityMask.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Numerics;
-using Microsoft.Graphics.Canvas.Effects;
-using Windows.UI.Composition;
-using Windows.UI.Xaml.Hosting;
-
-namespace Microsoft.Toolkit.Uwp.UI.Media
-{
-    /// <summary>
-    /// A base class for attached shadows that use an opacity mask to clip content from the shadow.
-    /// </summary>
-    public abstract class AttachedShadowBaseWithOpacityMask : AttachedShadowBase
-    {
-        private const string AlphaMaskSourceKey = "AttachedShadowAlphaMask";
-        private const string SpriteVisualSourceKey = "AttachedShadowSpriteVisual";
-
-        private static readonly TypedResourceKey<CompositionEffectBrush> OpacityMaskEffectBrushResourceKey = "AttachedShadowSpriteVisualEffectBrush";
-        private static readonly TypedResourceKey<CompositionBrush> OpacityMaskResourceKey = "AttachedShadowSpriteVisualOpacityMask";
-        private static readonly TypedResourceKey<SpriteVisual> OpacityMaskVisualResourceKey = "AttachedShadowSpriteVisualOpacityMaskVisual";
-        private static readonly TypedResourceKey<CompositionVisualSurface> OpacityMaskVisualSurfaceResourceKey = "AttachedShadowSpriteVisualOpacityMaskSurface";
-        private static readonly TypedResourceKey<CompositionSurfaceBrush> OpacityMaskSurfaceBrushResourceKey =
-            "AttachedShadowSpriteVisualOpacityMaskSurfaceBrush";
-        private static readonly TypedResourceKey<AlphaMaskEffect> AlphaMaskEffectResourceKey = "AttachedShadowSpriteVisualAlphaMaskEffect";
-
-        /// <summary>
-        /// Update the opacity mask for the shadow's <see cref="SpriteVisual"/>.
-        /// </summary>
-        /// <param name="context">The <see cref="AttachedShadowElementContext"/> this operation will be performed on.</param>
-        protected void UpdateVisualOpacityMask(AttachedShadowElementContext context)
-        {
-            if (!context.IsInitialized)
-            {
-                return;
-            }
-
-            var brush = GetisualOpacityMask(context);
-            if (brush != null)
-            {
-                context.AddResource(OpacityMaskResourceKey, brush);
-            }
-            else
-            {
-                context.RemoveResource(OpacityMaskResourceKey)?.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Override and return a <see cref="CompositionBrush"/> that serves as an opacity mask for the shadow's <see cref="SpriteVisual"/>
-        /// </summary>
-        protected abstract CompositionBrush GetisualOpacityMask(AttachedShadowElementContext context);
-
-        protected override void OnElementContextInitialized(AttachedShadowElementContext context)
-        {
-            UpdateVisualOpacityMask(context);
-            base.OnElementContextInitialized(context);
-        }
-
-        protected override void OnElementContextUninitialized(AttachedShadowElementContext context)
-        {
-            context.RemoveAndDisposeResource(OpacityMaskResourceKey);
-            context.RemoveAndDisposeResource(OpacityMaskVisualResourceKey);
-            context.RemoveAndDisposeResource(OpacityMaskVisualSurfaceResourceKey);
-            context.RemoveAndDisposeResource(OpacityMaskSurfaceBrushResourceKey);
-            context.RemoveAndDisposeResource(OpacityMaskEffectBrushResourceKey);
-            context.RemoveAndDisposeResource(AlphaMaskEffectResourceKey);
-            base.OnElementContextUninitialized(context);
-        }
-
-        protected override void SetElementChildVisual(AttachedShadowElementContext context)
-        {
-            if (context.TryGetResource(OpacityMaskResourceKey, out var opacityMask))
-            {
-                var visualSurface = context.GetResource(OpacityMaskVisualSurfaceResourceKey) ?? context.AddResource(
-                    OpacityMaskVisualSurfaceResourceKey,
-                    context.Compositor.CreateVisualSurface());
-                visualSurface.SourceVisual = context.SpriteVisual;
-                visualSurface.StartAnimation(nameof(visualSurface.SourceSize), context.Compositor.CreateExpressionAnimation("this.SourceVisual.Size"));
-
-                var surfaceBrush = context.GetResource(OpacityMaskSurfaceBrushResourceKey) ?? context.AddResource(
-                    OpacityMaskSurfaceBrushResourceKey,
-                    context.Compositor.CreateSurfaceBrush(visualSurface));
-                var alphaMask = context.GetResource(AlphaMaskEffectResourceKey) ?? context.AddResource(AlphaMaskEffectResourceKey, new AlphaMaskEffect());
-                alphaMask.Source = new CompositionEffectSourceParameter(SpriteVisualSourceKey);
-                alphaMask.AlphaMask = new CompositionEffectSourceParameter(AlphaMaskSourceKey);
-
-                using (var factory = context.Compositor.CreateEffectFactory(alphaMask))
-                {
-                    context.RemoveResource(OpacityMaskEffectBrushResourceKey)?.Dispose();
-                    var brush = context.AddResource(OpacityMaskEffectBrushResourceKey, factory.CreateBrush());
-                    brush.SetSourceParameter(SpriteVisualSourceKey, surfaceBrush);
-                    brush.SetSourceParameter(AlphaMaskSourceKey, opacityMask);
-
-                    var visual = context.GetResource(OpacityMaskVisualResourceKey) ?? context.AddResource(
-                        OpacityMaskVisualResourceKey,
-                        context.Compositor.CreateSpriteVisual());
-                    visual.RelativeSizeAdjustment = Vector2.One;
-                    visual.Brush = brush;
-                    ElementCompositionPreview.SetElementChildVisual(context.Element, visual);
-                }
-            }
-            else
-            {
-                base.SetElementChildVisual(context);
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
index 6df8015e39e..d472a6a1d27 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,12 +31,6 @@ public class AttachedDropShadow : AttachedShadowBase
         /// <inheritdoc/>
         protected internal override bool SupportsOnSizeChangedEvent => true;
 
-        private static readonly TypedResourceKey<ContainerVisual> ShadowContainerResourceKey = "ShadowContainer";
-
-        private static readonly TypedResourceKey<CompositionPathGeometry> PathGeometryResourceKey = "PathGeometry";
-        private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RectangleGeometryResourceKey = "RectGeometry";
-        private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
-
         private static readonly TypedResourceKey<CompositionRoundedRectangleGeometry> RoundedRectangleGeometryResourceKey = "RoundedGeometry";
         private static readonly TypedResourceKey<CompositionSpriteShape> ShapeResourceKey = "Shape";
         private static readonly TypedResourceKey<ShapeVisual> ShapeVisualResourceKey = "ShapeVisual";
@@ -277,43 +275,6 @@ private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
             UpdateShadowMask(context);
         }
 
-        /// <inheritdoc/>
-        /*protected override CompositionClip GetShadowClip(AttachedShadowElementContext context)
-        {
-            var rectGeom = context.GetResource(RectangleGeometryResourceKey) ??
-               context.AddResource(RectangleGeometryResourceKey, context.Compositor.CreateRoundedRectangleGeometry());
-
-            rectGeom.Offset = Offset.ToVector2();
-            rectGeom.Size = new Vector2((float)context.Element.ActualWidth, (float)context.Element.ActualHeight);
-            rectGeom.CornerRadius = new Vector2((float)CornerRadius, (float)CornerRadius);
-
-            var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(rectGeom));
-
-            return clip;*/
-
-            /*var pathGeom = context.GetResource(PathGeometryResourceKey) ??
-               context.AddResource(PathGeometryResourceKey, context.Compositor.CreatePathGeometry());
-
-            // Create rounded rectangle geometry at a larger size that compensates for the size of the stroke,
-            // as we want the inside edge of the stroke to match the edges of the element.
-            // Additionally, the inside edge of the stroke will have a smaller radius than the radius we specified.
-            // Using "(StrokeThickness / 2) + Radius" as our rectangle's radius will give us an inside stroke radius that matches the radius we want.
-            var radius = (MaxBlurRadius / 2) + (float)CornerRadius;
-            var canvasRectangle = context.Compositor.CreateRoundedRectangleGeometry();
-            canvasRectangle.Offset = new Vector2(-MaxBlurRadius / 2, -MaxBlurRadius / 2);
-            canvasRectangle.Size = new Vector2((float)context.Element.ActualWidth + MaxBlurRadius, (float)context.Element.ActualHeight + MaxBlurRadius);
-            canvasRectangle.CornerRadius = new Vector2(radius, radius);
-
-            var rectangleShape = context.Compositor.CreateSpriteShape(canvasRectangle);
-            rectangleShape.StrokeThickness = MaxBlurRadius;
-
-            var clip = context.GetResource(ClipResourceKey) ?? context.AddResource(ClipResourceKey, context.Compositor.CreateGeometricClip(rectangleShape.Geometry));
-
-            return clip;*/
-
-////            return null;
-        ////}
-
         /// <inheritdoc/>
         protected internal override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
@@ -336,13 +297,13 @@ protected override void OnPropertyChanged(AttachedShadowElementContext context,
             }
             else if (property == CornerRadiusProperty)
             {
-                //var geometry = context.GetResource(RectangleGeometryResourceKey);
-                //if (geometry != null)
-                //{
-                //    geometry.CornerRadius = new Vector2((float)(double)newValue);
-                //}
+                var geometry = context.GetResource(RoundedRectangleGeometryResourceKey);
+                if (geometry != null)
+                {
+                    geometry.CornerRadius = new Vector2((float)(double)newValue);
+                }
 
-                UpdateShadowClip(context);
+                UpdateShadowMask(context);
             }
             else
             {
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 11e981f5a07..bcd2d405cd0 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// <summary>
     /// The base class for attached shadows.
     /// </summary>
-    public abstract class AttachedShadowBase : DependencyObject
+    public abstract class AttachedShadowBase : DependencyObject, IAttachedShadow
     {
         /// <summary>
         /// Gets a value indicating whether or not Composition's VisualSurface is supported.
@@ -67,36 +67,28 @@ static AttachedShadowBase()
         /// </summary>
         private ConditionalWeakTable<FrameworkElement, AttachedShadowElementContext> ShadowElementContextTable { get; set; }
 
-        /// <summary>
-        /// Gets or sets the blur radius of the shadow.
-        /// </summary>
+        /// <inheritdoc/>
         public double BlurRadius
         {
             get => (double)GetValue(BlurRadiusProperty);
             set => SetValue(BlurRadiusProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets the opacity of the shadow.
-        /// </summary>
+        /// <inheritdoc/>
         public double Opacity
         {
             get => (double)GetValue(OpacityProperty);
             set => SetValue(OpacityProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets the offset of the shadow as a string representation of a <see cref="Vector3"/>.
-        /// </summary>
+        /// <inheritdoc/>
         public string Offset
         {
             get => (string)GetValue(OffsetProperty);
             set => SetValue(OffsetProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets the color of the shadow.
-        /// </summary>
+        /// <inheritdoc/>
         public Color Color
         {
             get => (Color)GetValue(ColorProperty);
@@ -108,6 +100,14 @@ public Color Color
         /// </summary>
         protected internal abstract bool SupportsOnSizeChangedEvent { get; }
 
+        /// <summary>
+        /// Use this method as the <see cref="PropertyChangedCallback"/> for <see cref="DependencyProperty">DependencyProperties</see> in derived classes.
+        /// </summary>
+        protected static void OnDependencyPropertyChanged(object sender, DependencyPropertyChangedEventArgs args)
+        {
+            (sender as AttachedShadowBase)?.CallPropertyChangedForEachElement(args.Property, args.OldValue, args.NewValue);
+        }
+
         internal void ConnectElement(FrameworkElement element)
         {
             if (!IsSupported)
@@ -165,10 +165,7 @@ protected internal virtual void OnElementContextUninitialized(AttachedShadowElem
             ElementCompositionPreview.SetElementChildVisual(context.Element, null);
         }
 
-        /// <summary>
-        /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>.
-        /// </summary>
-        /// <returns>The <see cref="AttachedShadowElementContext"/> for the element.</returns>
+        /// <inheritdoc/>
         public AttachedShadowElementContext GetElementContext(FrameworkElement element)
         {
             if (ShadowElementContextTable != null && ShadowElementContextTable.TryGetValue(element, out var context))
@@ -179,10 +176,7 @@ public AttachedShadowElementContext GetElementContext(FrameworkElement element)
             return null;
         }
 
-        /// <summary>
-        /// Gets an enumerator over the current list of <see cref="AttachedShadowElementContext"/> of elements using this shared shadow definition.
-        /// </summary>
-        /// <returns>Enumeration of <see cref="AttachedShadowElementContext"/> objects.</returns>
+        /// <inheritdoc/>
         public IEnumerable<AttachedShadowElementContext> GetElementContextEnumerable()
         {
             foreach (var kvp in ShadowElementContextTable)
@@ -200,14 +194,6 @@ protected virtual void SetElementChildVisual(AttachedShadowElementContext contex
             ElementCompositionPreview.SetElementChildVisual(context.Element, context.SpriteVisual);
         }
 
-        /// <summary>
-        /// Use this method as the <see cref="PropertyChangedCallback"/> for <see cref="DependencyProperty">DependencyProperties</see> in derived classes.
-        /// </summary>
-        protected static void OnDependencyPropertyChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            (sender as AttachedShadowBase)?.CallPropertyChangedForEachElement(args.Property, args.OldValue, args.NewValue);
-        }
-
         private void CallPropertyChangedForEachElement(DependencyProperty property, object oldValue, object newValue)
         {
             if (ShadowElementContextTable == null)
@@ -227,6 +213,7 @@ private void CallPropertyChangedForEachElement(DependencyProperty property, obje
         /// <summary>
         /// Get a <see cref="CompositionBrush"/> in the shape of the element that is casting the shadow.
         /// </summary>
+        /// <returns>A <see cref="CompositionBrush"/> representing the shape of an element.</returns>
         protected virtual CompositionBrush GetShadowMask(AttachedShadowElementContext context)
         {
             return null;
@@ -235,6 +222,7 @@ protected virtual CompositionBrush GetShadowMask(AttachedShadowElementContext co
         /// <summary>
         /// Get the <see cref="CompositionClip"/> for the shadow's <see cref="SpriteVisual"/>
         /// </summary>
+        /// <returns>A <see cref="CompositionClip"/> for the extent of the shadowed area.</returns>
         protected virtual CompositionClip GetShadowClip(AttachedShadowElementContext context)
         {
             return null;
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index c9cd0d02e17..07116f4c3d2 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -11,6 +11,9 @@
 
 namespace Microsoft.Toolkit.Uwp.UI
 {
+    /// <summary>
+    /// Class which maintains the context of a <see cref="DropShadow"/> for a particular <see cref="UIElement"/> linked to the definition of that shadow provided by the <see cref="AttachedShadowBase"/> implementation being used.
+    /// </summary>
     public sealed class AttachedShadowElementContext
     {
         private bool _isConnected;
@@ -52,7 +55,12 @@ public sealed class AttachedShadowElementContext
         /// </summary>
         public DropShadow Shadow { get; private set; }
 
-        public void ConnectToElement(AttachedShadowBase parent, FrameworkElement element)
+        /// <summary>
+        /// Connects a <see cref="FrameworkElement"/> to its parent <see cref="AttachedShadowBase"/> definition.
+        /// </summary>
+        /// <param name="parent">The <see cref="AttachedShadowBase"/> that is using this context.</param>
+        /// <param name="element">The <see cref="FrameworkElement"/> that a shadow is being attached to.</param>
+        internal void ConnectToElement(AttachedShadowBase parent, FrameworkElement element)
         {
             if (_isConnected)
             {
@@ -159,7 +167,10 @@ private void OnElementSizeChanged(object sender, SizeChangedEventArgs e)
         /// <summary>
         /// Adds a resource to this instance's resource dictionary with the specified key
         /// </summary>
-        /// <returns>The resource that was added</returns>
+        /// <typeparam name="T">The type of the resource being added.</typeparam>
+        /// <param name="key">Key to use to lookup the resource later.</param>
+        /// <param name="resource">Object to store within the resource dictionary.</param>
+        /// <returns>The added resource</returns>
         public T AddResource<T>(string key, T resource)
         {
             _resources = _resources ?? new Dictionary<string, object>();
@@ -178,6 +189,9 @@ public T AddResource<T>(string key, T resource)
         /// <summary>
         /// Retrieves a resource with the specified key and type if it exists
         /// </summary>
+        /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
+        /// <param name="key">Key to use to lookup the resource.</param>
+        /// <param name="resource">Object to retrieved from the resource dictionary or default value.</param>
         /// <returns>True if the resource exists, false otherwise</returns>
         public bool TryGetResource<T>(string key, out T resource)
         {
@@ -194,6 +208,9 @@ public bool TryGetResource<T>(string key, out T resource)
         /// <summary>
         /// Retries a resource with the specified key and type
         /// </summary>
+        /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
+        /// <param name="key">Key to use to lookup the resource.</param>
+        /// <returns>The resource if available, otherwise default value.</returns>
         public T GetResource<T>(string key)
         {
             if (TryGetResource(key, out T resource))
@@ -207,6 +224,8 @@ public T GetResource<T>(string key)
         /// <summary>
         /// Removes an existing resource with the specified key and type
         /// </summary>
+        /// <typeparam name="T">The type of the resource being removed.</typeparam>
+        /// <param name="key">Key to use to lookup the resource.</param>
         /// <returns>The resource that was removed, if any</returns>
         public T RemoveResource<T>(string key)
         {
@@ -225,8 +244,11 @@ public T RemoveResource<T>(string key)
         /// <summary>
         /// Removes an existing resource with the specified key and type, and <see cref="IDisposable.Dispose">disposes</see> it
         /// </summary>
+        /// <typeparam name="T">The type of the resource being removed.</typeparam>
+        /// <param name="key">Key to use to lookup the resource.</param>
         /// <returns>The resource that was removed, if any</returns>
-        public T RemoveAndDisposeResource<T>(string key) where T : IDisposable
+        public T RemoveAndDisposeResource<T>(string key)
+            where T : IDisposable
         {
             if (_resources.TryGetValue(key, out var objResource))
             {
@@ -244,31 +266,38 @@ public T RemoveAndDisposeResource<T>(string key) where T : IDisposable
         /// <summary>
         /// Adds a resource to this instance's collection with the specified key
         /// </summary>
+        /// <typeparam name="T">The type of the resource being added.</typeparam>
         /// <returns>The resource that was added</returns>
         public T AddResource<T>(TypedResourceKey<T> key, T resource) => AddResource(key.Key, resource);
 
         /// <summary>
         /// Retrieves a resource with the specified key and type if it exists
         /// </summary>
+        /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
         /// <returns>True if the resource exists, false otherwise</returns>
         public bool TryGetResource<T>(TypedResourceKey<T> key, out T resource) => TryGetResource(key.Key, out resource);
 
         /// <summary>
         /// Retries a resource with the specified key and type
         /// </summary>
+        /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
+        /// <returns>The resource if it exists or a default value.</returns>
         public T GetResource<T>(TypedResourceKey<T> key) => GetResource<T>(key.Key);
 
         /// <summary>
         /// Removes an existing resource with the specified key and type
         /// </summary>
+        /// <typeparam name="T">The type of the resource being removed.</typeparam>
         /// <returns>The resource that was removed, if any</returns>
         public T RemoveResource<T>(TypedResourceKey<T> key) => RemoveResource<T>(key.Key);
 
         /// <summary>
         /// Removes an existing resource with the specified key and type, and <see cref="IDisposable.Dispose">disposes</see> it
         /// </summary>
+        /// <typeparam name="T">The type of the resource being removed.</typeparam>
         /// <returns>The resource that was removed, if any</returns>
-        public T RemoveAndDisposeResource<T>(TypedResourceKey<T> key) where T : IDisposable => RemoveAndDisposeResource<T>(key.Key);
+        public T RemoveAndDisposeResource<T>(TypedResourceKey<T> key)
+            where T : IDisposable => RemoveAndDisposeResource<T>(key.Key);
 
         /// <summary>
         /// Disposes of any resources that implement <see cref="IDisposable"/> and then clears all resources
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
index d7af17ae7d0..5cb2235c60f 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/Effects.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -54,6 +54,5 @@ private static void OnShadowChanged(DependencyObject d, DependencyPropertyChange
                 newShadow.ConnectElement(element);
             }
         }
-
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
index 3ea72a1f3d1..afababd92a4 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
@@ -9,28 +10,41 @@
 
 namespace Microsoft.Toolkit.Uwp.UI
 {
+    /// <summary>
+    /// Interface representing the common properties found within an attached shadow, <see cref="AttachedShadowBase"/> for implementation.
+    /// </summary>
     public interface IAttachedShadow
     {
+        /// <summary>
+        /// Gets or sets the blur radius of the shadow.
+        /// </summary>
         double BlurRadius { get; set; }
 
+        /// <summary>
+        /// Gets or sets the opacity of the shadow.
+        /// </summary>
         double Opacity { get; set; }
 
-        Vector3 Offset { get; set; }
+        /// <summary>
+        /// Gets or sets the offset of the shadow as a string representation of a <see cref="Vector3"/>.
+        /// </summary>
+        string Offset { get; set; }
 
+        /// <summary>
+        /// Gets or sets the color of the shadow.
+        /// </summary>
         Color Color { get; set; }
 
-        bool SupportsOnSizeChangedEvent { get; }
-
-        void ConnectElement(FrameworkElement element);
-
-        void DisconnectElement(FrameworkElement element);
-
-        void OnElementContextInitialized(AttachedShadowElementContext context);
-
-        void OnElementContextUninitialized(AttachedShadowElementContext context);
-
-        void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize);
-
+        /// <summary>
+        /// Get the associated <see cref="AttachedShadowElementContext"/> for the specified <see cref="FrameworkElement"/>.
+        /// </summary>
+        /// <returns>The <see cref="AttachedShadowElementContext"/> for the element.</returns>
         AttachedShadowElementContext GetElementContext(FrameworkElement element);
+
+        /// <summary>
+        /// Gets an enumeration over the current list of <see cref="AttachedShadowElementContext"/> of elements using this shared shadow definition.
+        /// </summary>
+        /// <returns>Enumeration of <see cref="AttachedShadowElementContext"/> objects.</returns>
+        IEnumerable<AttachedShadowElementContext> GetElementContextEnumerable();
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit/TypedResourceKey.cs b/Microsoft.Toolkit/TypedResourceKey.cs
index 9fc439fbe8d..9e46ed107ce 100644
--- a/Microsoft.Toolkit/TypedResourceKey.cs
+++ b/Microsoft.Toolkit/TypedResourceKey.cs
@@ -1,27 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System;
 
 namespace Microsoft.Toolkit
 {
     /// <summary>
-    /// A generic classed that can be used to retrieve keyed resources of the specified type.
+    /// A generic class that can be used to retrieve keyed resources of the specified type.
     /// </summary>
     /// <typeparam name="TValue">The <see cref="Type"/> of resource the <see cref="TypedResourceKey{TValue}"/> will retrieve.</typeparam>
     public class TypedResourceKey<TValue>
     {
         /// <summary>
-        /// Create a new <see cref="TypedResourceKey{TValue}"/> with the specified key
+        /// Initializes a new instance of the <see cref="TypedResourceKey{TValue}"/> class  with the specified key.
         /// </summary>
         /// <param name="key">The resource's key</param>
         public TypedResourceKey(string key) => Key = key;
 
         /// <summary>
-        /// The key of the resource to be retrieved.
+        /// Gets the key of the resource to be retrieved.
         /// </summary>
         public string Key { get; }
 
+        /// <summary>
+        /// Implicit operator for transforming a string into a <see cref="TypedResourceKey{TValue}"/> key.
+        /// </summary>
+        /// <param name="key">The key string.</param>
         public static implicit operator TypedResourceKey<TValue>(string key)
         {
             return new TypedResourceKey<TValue>(key);
         }
     }
-}
\ No newline at end of file
+}

From 164eefd5c01621c2f08e5d9ad4f3bb5df1091e24 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 25 Aug 2021 10:52:58 -0700
Subject: [PATCH 155/200] Clean-up ShadowAnimation type and add rest of
 animatable properties

---
 .../SamplePages/XamlOnlyPage.xaml             |  3 +++
 ...s => ShadowAnimation{TValue,TKeyFrame}.cs} | 18 ++++++-------
 .../Shadows/BlurRadiusDropShadowAnimation.cs  | 23 ++++++++++++++++
 .../Xaml/Shadows/ColorDropShadowAnimation.cs  | 26 +++++++++++++++++++
 .../Xaml/Shadows/OffsetDropShadowAnimation.cs |  3 +--
 .../Shadows/OpacityDropShadowAnimation.cs     | 23 ++++++++++++++++
 6 files changed, 84 insertions(+), 12 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/{ShadowAnimation{TShadow,TValue,TKeyFrame}.cs => ShadowAnimation{TValue,TKeyFrame}.cs} (87%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/BlurRadiusDropShadowAnimation.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/ColorDropShadowAnimation.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OpacityDropShadowAnimation.cs

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 1c39dc489f6..a0df1395c79 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -67,7 +67,10 @@
                 <ani:SaturationEffectAnimation />
                 <ani:AnimationScope />
                 <ani:ExposureEffectAnimation />
+                <ani:BlurRadiusDropShadowAnimation />
+                <ani:ColorDropShadowAnimation />
                 <ani:OffsetDropShadowAnimation />
+                <ani:OpacityDropShadowAnimation />
             </ani:AnimationSet>
         </ani:Explicit.Animations>
         <media:UIElementExtensions.VisualFactory>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
similarity index 87%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
rename to Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
index f0c8420c92b..b65654bd4bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TShadow,TValue,TKeyFrame}.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
@@ -13,24 +13,22 @@
 namespace Microsoft.Toolkit.Uwp.UI.Animations
 {
     /// <summary>
-    /// A custom animation targeting a property on an <see cref="AttachedShadowBase"/> instance.
+    /// A custom animation targeting a property on an <see cref="IAttachedShadow"/> instance.
     /// </summary>
-    /// <typeparam name="TShadow">The <see cref="FrameworkElement"/> containing the shadow to animate.</typeparam>
     /// <typeparam name="TValue">
     /// The type to use for the public <see cref="Animation{TValue,TKeyFrame}.To"/> and <see cref="Animation{TValue,TKeyFrame}.From"/>
     /// properties. This can differ from <typeparamref name="TKeyFrame"/> to facilitate XAML parsing.
     /// </typeparam>
     /// <typeparam name="TKeyFrame">The actual type of keyframe values in use.</typeparam>
-    public abstract class ShadowAnimation<TShadow, TValue, TKeyFrame> : Animation<TValue, TKeyFrame>, IAttachedTimeline
-        where TShadow : AttachedShadowBase
+    public abstract class ShadowAnimation<TValue, TKeyFrame> : Animation<TValue, TKeyFrame>, IAttachedTimeline
         where TKeyFrame : unmanaged
     {
         /// <summary>
-        /// Gets or sets the linked <typeparamref name="TShadow"/> instance to animate.
+        /// Gets or sets the linked <see cref="IAttachedShadow"/> instance to animate.
         /// </summary>
-        public TShadow? Target
+        public IAttachedShadow? Target
         {
-            get => (TShadow?)GetValue(TargetProperty);
+            get => (IAttachedShadow?)GetValue(TargetProperty);
             set => SetValue(TargetProperty, value);
         }
 
@@ -39,8 +37,8 @@ public TShadow? Target
         /// </summary>
         public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
             nameof(Target),
-            typeof(TShadow),
-            typeof(ShadowAnimation<TShadow, TValue, TKeyFrame>),
+            typeof(IAttachedShadow),
+            typeof(ShadowAnimation<TValue, TKeyFrame>),
             new PropertyMetadata(null));
 
         /// <inheritdoc/>
@@ -63,7 +61,7 @@ static AnimationBuilder ThrowArgumentNullException()
                 return ThrowArgumentNullException();
             }
 
-            if (Target is TShadow allShadows)
+            if (Target is IAttachedShadow allShadows)
             {
                 // in this case we'll animate all the shadows being used.
                 foreach (var context in allShadows.GetElementContextEnumerable()) //// TODO: Find better way!!!
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/BlurRadiusDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/BlurRadiusDropShadowAnimation.cs
new file mode 100644
index 00000000000..4949ef5686a
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/BlurRadiusDropShadowAnimation.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Composition;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// A blur radius animation working on the composition layer.
+    /// </summary>
+    public sealed class BlurRadiusDropShadowAnimation : ShadowAnimation<double?, double>
+    {
+        /// <inheritdoc/>
+        protected override string ExplicitTarget => nameof(DropShadow.BlurRadius);
+
+        /// <inheritdoc/>
+        protected override (double?, double?) GetParsedValues()
+        {
+            return (To, From);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/ColorDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/ColorDropShadowAnimation.cs
new file mode 100644
index 00000000000..68de1449a0f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/ColorDropShadowAnimation.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI;
+using Windows.UI.Composition;
+
+#pragma warning disable CS0419
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// A custom <see cref="Color"/> animation on a <see cref="DropShadow"/>.
+    /// </summary>
+    public sealed class ColorDropShadowAnimation : ShadowAnimation<Color?, Color>
+    {
+        /// <inheritdoc/>
+        protected override string ExplicitTarget => nameof(DropShadow.Color);
+
+        /// <inheritdoc/>
+        protected override (Color?, Color?) GetParsedValues()
+        {
+            return (To, From);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
index 4fcd561cccf..0e8f586ebf2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OffsetDropShadowAnimation.cs
@@ -4,14 +4,13 @@
 
 using System.Numerics;
 using Windows.UI.Composition;
-using Windows.UI.Xaml;
 
 namespace Microsoft.Toolkit.Uwp.UI.Animations
 {
     /// <summary>
     /// An offset animation working on the composition layer.
     /// </summary>
-    public sealed class OffsetDropShadowAnimation : ShadowAnimation<AttachedShadowBase, string, Vector3>
+    public sealed class OffsetDropShadowAnimation : ShadowAnimation<string, Vector3>
     {
         /// <inheritdoc/>
         protected override string ExplicitTarget => nameof(DropShadow.Offset);
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OpacityDropShadowAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OpacityDropShadowAnimation.cs
new file mode 100644
index 00000000000..61ff03941db
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Shadows/OpacityDropShadowAnimation.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Composition;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// An opacity animation working on the composition layer.
+    /// </summary>
+    public sealed class OpacityDropShadowAnimation : ShadowAnimation<double?, double>
+    {
+        /// <inheritdoc/>
+        protected override string ExplicitTarget => nameof(DropShadow.Opacity);
+
+        /// <inheritdoc/>
+        protected override (double?, double?) GetParsedValues()
+        {
+            return (To, From);
+        }
+    }
+}
\ No newline at end of file

From b34f441f6c93ff309e88ff6a2bad67eb98a27a9e Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 25 Aug 2021 11:52:52 -0700
Subject: [PATCH 156/200] Deprecate DropShadowPanel

---
 .../DropShadowPanel/DropShadowPanel.cs                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
index e2e031865b6..dc8d7cbfdac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// The <see cref="DropShadowPanel"/> control allows the creation of a DropShadow for any Xaml FrameworkElement in markup
     /// making it easier to add shadows to Xaml without having to directly drop down to Windows.UI.Composition APIs.
     /// </summary>
+    [Obsolete("DropShadowPanel will be removed in a future release, please use the AttachedDropShadow or AttachedCardShadow implementations instead.")]
     [TemplatePart(Name = PartShadow, Type = typeof(Border))]
     public partial class DropShadowPanel : ContentControl
     {

From c9325796000cf59b6415626ca4d085d5997fbd6b Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:16:21 -0700
Subject: [PATCH 157/200] Update String to Vector Unit Tests to address new
 scenarios added in Shadow PR

---
 .../Extensions/Test_StringExtensions.cs       | 77 ++++++++++++++++---
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_StringExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_StringExtensions.cs
index 8ed73b68686..04b4ad5e321 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_StringExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_StringExtensions.cs
@@ -59,7 +59,15 @@ public void Test_StringExtensions_ToVector2_XYZW(float x, float y)
 
         [TestCategory("StringExtensions")]
         [TestMethod]
-        [DataRow("")]
+        public void Test_StringExtensions_ToVector2_Zero()
+        {
+            var value = string.Empty.ToVector2();
+
+            Assert.AreEqual(Vector2.Zero, value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
         [DataRow("Hello")]
         [DataRow("1, 2, 3")]
         [DataRow("<1, 2, 3")]
@@ -117,11 +125,28 @@ public void Test_StringExtensions_ToVector3_XYZW(float x, float y, float z)
 
         [TestCategory("StringExtensions")]
         [TestMethod]
-        [DataRow("")]
+        public void Test_StringExtensions_ToVector3_Zero()
+        {
+            var value = string.Empty.ToVector3();
+
+            Assert.AreEqual(Vector3.Zero, value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
+        public void Test_StringExtensions_ToVector3_FromTwoValues()
+        {
+            var value = "4, 3".ToVector3();
+
+            Assert.AreEqual(new Vector3(new Vector2(4, 3), 0), value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
         [DataRow("Hello")]
-        [DataRow("1, 2")]
+        [DataRow("1, ")]
         [DataRow("1, 2, 3, 99")]
-        [DataRow("<1, 2>")]
+        [DataRow("1, 2>")]
         [DataRow("<1, 2, 3")]
         [DataRow("<1, 2, 3, 4>")]
         [ExpectedException(typeof(FormatException))]
@@ -179,12 +204,38 @@ public void Test_StringExtensions_ToVector4_XYZW(float x, float y, float z, floa
 
         [TestCategory("StringExtensions")]
         [TestMethod]
-        [DataRow("")]
+        public void Test_StringExtensions_ToVector4_Zero()
+        {
+            var value = string.Empty.ToVector4();
+
+            Assert.AreEqual(Vector4.Zero, value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
+        public void Test_StringExtensions_ToVector4_FromTwoValues()
+        {
+            var value = "4, 3".ToVector4();
+
+            Assert.AreEqual(new Vector4(new Vector2(4, 3), 0, 0), value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
+        public void Test_StringExtensions_ToVector4_FromThreeValues()
+        {
+            var value = "4, 3, -2".ToVector4();
+
+            Assert.AreEqual(new Vector4(new Vector3(4, 3, -2), 0), value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
         [DataRow("Hello")]
-        [DataRow("1, 2")]
-        [DataRow("1, 2, 3")]
+        [DataRow("1, 2, ")]
+        [DataRow("1, 2, 3, ")]
         [DataRow("1, 2, 3, 99, 100")]
-        [DataRow("<1, 2, 3>")]
+        [DataRow("<1, 2, 3")]
         [DataRow("<1, 2, 3, 4")]
         [DataRow("<1, 2, 3, 4, 5>")]
         [ExpectedException(typeof(FormatException))]
@@ -223,7 +274,15 @@ public void Test_StringExtensions_ToQuaternion_XYZW(float x, float y, float z, f
 
         [TestCategory("StringExtensions")]
         [TestMethod]
-        [DataRow("")]
+        public void Test_StringExtensions_ToQuaternion_Zero()
+        {
+            var value = string.Empty.ToQuaternion();
+
+            Assert.AreEqual(default(Quaternion), value);
+        }
+
+        [TestCategory("StringExtensions")]
+        [TestMethod]
         [DataRow("Hello")]
         [DataRow("1, 2")]
         [DataRow("1, 2, 3")]

From 3d03ce7b21eab97dcf8eb0a82af3b5a98bba48ba Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Wed, 25 Aug 2021 17:24:55 -0700
Subject: [PATCH 158/200] dont use ApplicationView when XamlRoot is available

---
 .../RichSuggestBox/RichSuggestBoxPage.xaml.cs    |  1 -
 .../RichSuggestBox/RichSuggestBox.Helpers.cs     | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
index f7a662d2a3f..20251c74c32 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs
@@ -98,7 +98,6 @@ public RichSuggestBoxPage()
 
         public void OnXamlRendered(FrameworkElement control)
         {
-
             if (this._rsb != null)
             {
                 this._rsb.SuggestionChosen -= this.SuggestingBox_OnSuggestionChosen;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 3f01fe4383a..44b49d697db 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Linq;
-using System.Threading;
 using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI.Text;
@@ -21,8 +20,13 @@ public partial class RichSuggestBox
     {
         private static bool IsElementOnScreen(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
-            var toWindow = element.TransformToVisual(Window.Current.Content);
-            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            if (Window.Current == null)
+            {
+                return !ControlHelpers.IsXamlRootAvailable || element.XamlRoot.IsHostVisible;
+            }
+
+            var toWindow = element.TransformToVisual(null);
+            var windowBounds = Window.Current.Bounds;
             var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
             elementBounds = toWindow.TransformBounds(elementBounds);
             elementBounds.X += windowBounds.X;
@@ -35,8 +39,10 @@ private static bool IsElementOnScreen(FrameworkElement element, double offsetX =
 
         private static bool IsElementInsideWindow(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
-            var toWindow = element.TransformToVisual(Window.Current.Content);
-            var windowBounds = ApplicationView.GetForCurrentView().VisibleBounds;
+            var toWindow = element.TransformToVisual(null);
+            var windowBounds = ControlHelpers.IsXamlRootAvailable
+                ? element.XamlRoot.Size.ToRect()
+                : ApplicationView.GetForCurrentView().VisibleBounds;
             windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
             var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
             elementBounds = toWindow.TransformBounds(elementBounds);

From 3401db0b5167d92f276aabeac8fa8ecc04ee2c18 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Thu, 26 Aug 2021 01:03:48 -0700
Subject: [PATCH 159/200] disable element on screen check

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 44b49d697db..74a185d75cf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -20,6 +20,14 @@ public partial class RichSuggestBox
     {
         private static bool IsElementOnScreen(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
+            // DisplayInformation only works in UWP. No alternative to get DisplayInformation.ScreenHeightInRawPixels
+            // Tracking issues:
+            // https://github.com/microsoft/WindowsAppSDK/issues/114
+            // https://github.com/microsoft/microsoft-ui-xaml/issues/4228
+            // TODO: Remove when DisplayInformation.ScreenHeightInRawPixels alternative is available
+            return true;
+
+#pragma warning disable CS0162 // Unreachable code detected
             if (Window.Current == null)
             {
                 return !ControlHelpers.IsXamlRootAvailable || element.XamlRoot.IsHostVisible;
@@ -35,6 +43,7 @@ private static bool IsElementOnScreen(FrameworkElement element, double offsetX =
             var scaleFactor = displayInfo.RawPixelsPerViewPixel;
             var displayHeight = displayInfo.ScreenHeightInRawPixels;
             return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
+#pragma warning restore CS0162 // Unreachable code detected
         }
 
         private static bool IsElementInsideWindow(FrameworkElement element, double offsetX = 0, double offsetY = 0)

From 4e327edd3b29e549bf376de406e6b3f1122e0237 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:10:48 -0700
Subject: [PATCH 160/200] Still apply Screen size algorithm for UWP and
 annotate calculation

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  | 42 +++++++++++++------
 .../Extensions/RectExtensions.cs              | 14 +++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 74a185d75cf..ff89f727b7f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -21,41 +21,57 @@ public partial class RichSuggestBox
         private static bool IsElementOnScreen(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
             // DisplayInformation only works in UWP. No alternative to get DisplayInformation.ScreenHeightInRawPixels
+            // Or Window position in Window.Current.Bounds
             // Tracking issues:
             // https://github.com/microsoft/WindowsAppSDK/issues/114
             // https://github.com/microsoft/microsoft-ui-xaml/issues/4228
             // TODO: Remove when DisplayInformation.ScreenHeightInRawPixels alternative is available
-            return true;
-
-#pragma warning disable CS0162 // Unreachable code detected
             if (Window.Current == null)
             {
-                return !ControlHelpers.IsXamlRootAvailable || element.XamlRoot.IsHostVisible;
+                return true;
             }
 
-            var toWindow = element.TransformToVisual(null);
+            // Get bounds of element from root of tree
+            var elementBounds = element.CoordinatesFrom(null).ToRect(element.ActualWidth, element.ActualHeight);
+
+            // Apply offset
+            elementBounds.X += offsetX;
+            elementBounds.Y += offsetY;
+
+            // Get Window position
             var windowBounds = Window.Current.Bounds;
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
-            elementBounds = toWindow.TransformBounds(elementBounds);
+
+            // Offset Element within Window on Screen
             elementBounds.X += windowBounds.X;
             elementBounds.Y += windowBounds.Y;
+
+            // Get Screen DPI info
             var displayInfo = DisplayInformation.GetForCurrentView();
             var scaleFactor = displayInfo.RawPixelsPerViewPixel;
             var displayHeight = displayInfo.ScreenHeightInRawPixels;
+
+            // Check if top/bottom are within confines of screen
             return elementBounds.Top * scaleFactor >= 0 && elementBounds.Bottom * scaleFactor <= displayHeight;
-#pragma warning restore CS0162 // Unreachable code detected
         }
 
         private static bool IsElementInsideWindow(FrameworkElement element, double offsetX = 0, double offsetY = 0)
         {
-            var toWindow = element.TransformToVisual(null);
+            // Get bounds of element from root of tree
+            var elementBounds = element.CoordinatesFrom(null).ToRect(element.ActualWidth, element.ActualHeight);
+
+            // Apply offset
+            elementBounds.X += offsetX;
+            elementBounds.Y += offsetY;
+
+            // Get size of window itself
             var windowBounds = ControlHelpers.IsXamlRootAvailable
                 ? element.XamlRoot.Size.ToRect()
-                : ApplicationView.GetForCurrentView().VisibleBounds;
-            windowBounds = new Rect(0, 0, windowBounds.Width, windowBounds.Height);
-            var elementBounds = new Rect(offsetX, offsetY, element.ActualWidth, element.ActualHeight);
-            elementBounds = toWindow.TransformBounds(elementBounds);
+                : ApplicationView.GetForCurrentView().VisibleBounds.ToSize().ToRect(); // Normalize
+
+            // Calculate if there's an intersection
             elementBounds.Intersect(windowBounds);
+
+            // See if we are still fully visible within the Window
             return elementBounds.Height >= element.ActualHeight;
         }
 
diff --git a/Microsoft.Toolkit.Uwp/Extensions/RectExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/RectExtensions.cs
index 367bfa3e105..6e9a1e66ec5 100644
--- a/Microsoft.Toolkit.Uwp/Extensions/RectExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Extensions/RectExtensions.cs
@@ -4,7 +4,9 @@
 
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
+using Windows.Foundation;
 using Rect = Windows.Foundation.Rect;
+using Size = Windows.Foundation.Size;
 
 namespace Microsoft.Toolkit.Uwp
 {
@@ -33,5 +35,17 @@ public static bool IntersectsWith(this Rect rect1, Rect rect2)
                    (rect1.Top <= rect2.Bottom) &&
                    (rect1.Bottom >= rect2.Top);
         }
+
+        /// <summary>
+        /// Creates a new <see cref="Size"/> of the specified <see cref="Rect"/>'s width and height.
+        /// </summary>
+        /// <param name="rect">Rectangle to size.</param>
+        /// <returns>Size of rectangle.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Size ToSize(this Rect rect)
+        {
+            return new Size(rect.Width, rect.Height);
+        }
     }
 }
\ No newline at end of file

From 46bd8622f3d9868db8b46d07b79b050f7b304926 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:51:12 -0700
Subject: [PATCH 161/200] Provide better guards for UWP

---
 .../RichSuggestBox/RichSuggestBox.Helpers.cs                 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index ff89f727b7f..0357e261b4b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using Windows.Foundation;
 using Windows.Graphics.Display;
+using Windows.UI.Core;
 using Windows.UI.Text;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
@@ -26,7 +27,7 @@ private static bool IsElementOnScreen(FrameworkElement element, double offsetX =
             // https://github.com/microsoft/WindowsAppSDK/issues/114
             // https://github.com/microsoft/microsoft-ui-xaml/issues/4228
             // TODO: Remove when DisplayInformation.ScreenHeightInRawPixels alternative is available
-            if (Window.Current == null)
+            if (CoreWindow.GetForCurrentThread() == null)
             {
                 return true;
             }
@@ -64,7 +65,7 @@ private static bool IsElementInsideWindow(FrameworkElement element, double offse
             elementBounds.Y += offsetY;
 
             // Get size of window itself
-            var windowBounds = ControlHelpers.IsXamlRootAvailable
+            var windowBounds = ControlHelpers.IsXamlRootAvailable && element.XamlRoot != null
                 ? element.XamlRoot.Size.ToRect()
                 : ApplicationView.GetForCurrentView().VisibleBounds.ToSize().ToRect(); // Normalize
 

From 88af510dcf40ec77ace1e811ebb8da604682d010 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 27 Aug 2021 16:31:35 +0200
Subject: [PATCH 162/200] Fix MVVM Toolkit source generator tests

---
 .../Test_SourceGeneratorsDiagnostics.cs                        | 3 +++
 .../UnitTests.SourceGenerators.csproj                          | 1 +
 2 files changed, 4 insertions(+)

diff --git a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs b/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
index 1df3ac3ab44..36bdb455eb7 100644
--- a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
+++ b/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.SourceGenerators;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -249,6 +250,7 @@ public partial class SampleViewModel
         private void VerifyGeneratedDiagnostics<TGenerator>(string source, params string[] diagnosticsIds)
             where TGenerator : class, ISourceGenerator, new()
         {
+            Type observableObjectType = typeof(ObservableObject);
             Type validationAttributeType = typeof(ValidationAttribute);
 
             SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(source);
@@ -271,6 +273,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies()
 
             Assert.IsTrue(resultingIds.SetEquals(diagnosticsIds));
 
+            GC.KeepAlive(observableObjectType);
             GC.KeepAlive(validationAttributeType);
         }
     }
diff --git a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj b/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
index 6fe4ab2d352..81fd8f291e2 100644
--- a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
+++ b/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" />
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
   </ItemGroup>
 
 </Project>

From 33bdd300944c982b8c55f0ddc07bd045f7a99396 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 27 Aug 2021 16:33:17 +0200
Subject: [PATCH 163/200] Enable source generator tests in CI

---
 build/build.cake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build/build.cake b/build/build.cake
index 585ad201e90..f4f8558189a 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -270,6 +270,18 @@ Task("Test")
         ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
     };
     DotNetCoreTest(file.FullPath, testSettings);
+}).DoesForEach(GetFiles(baseDir + "/**/UnitTests.SourceGenerators.csproj"), (file) =>
+{
+    Information("\nRunning NetCore Source Generator Unit Tests");
+    var testSettings = new DotNetCoreTestSettings
+    {
+        Configuration = configuration,
+        NoBuild = true,
+        Loggers = new[] { "trx;LogFilePrefix=VsTestResults" },
+        Verbosity = DotNetCoreVerbosity.Normal,
+        ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
+    };
+    DotNetCoreTest(file.FullPath, testSettings);
 }).DeferOnError();
 
 Task("UITest")

From f3b0e5c40e9e2b7f3f2e19b2951b68d4582906a1 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 27 Aug 2021 12:34:56 -0700
Subject: [PATCH 164/200] Update
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind

---
 .../SamplePages/Shadows/AttachedShadowCompositionXaml.bind       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
index 1d5fd2c52d6..b594d25096b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowCompositionXaml.bind
@@ -6,7 +6,6 @@
   xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
   mc:Ignorable="d">
 
-  <!-- TODO: Animation-->
   <Page.Resources>
     <ui:AttachedDropShadow x:Key="CommonShadow" Offset="4"/><!-- CastTo="{x:Bind ShadowTarget}"/>-->
 

From 01c9fa37176dbf6b4ec151579a1a47710f8e7453 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 27 Aug 2021 14:05:28 -0700
Subject: [PATCH 165/200] Update
 Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs

---
 Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs b/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
index 2c4dd68e623..2aecfcbba28 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs
@@ -35,7 +35,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
                 {
                     case 1:
                         var vectorValue = float.Parse(vectorString);
-                        return new Vector3(vectorValue, vectorValue, vectorValue);
+                        return new Vector3(vectorValue);
                     case 2:
                         var xValue = float.Parse(vectorTokens[0]);
                         var yValue = float.Parse(vectorTokens[1]);

From 2404be95039ddd5bde961c2f1a61d509b6a04db8 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 27 Aug 2021 14:36:19 -0700
Subject: [PATCH 166/200] Make field initialization static

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index bcd2d405cd0..5c2e5a0d51f 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -22,12 +22,7 @@ public abstract class AttachedShadowBase : DependencyObject, IAttachedShadow
         /// <summary>
         /// Gets a value indicating whether or not Composition's VisualSurface is supported.
         /// </summary>
-        protected static readonly bool SupportsCompositionVisualSurface;
-
-        static AttachedShadowBase()
-        {
-            SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName); // Note: This is 1903 (18362) min
-        }
+        protected static readonly bool SupportsCompositionVisualSurface = ApiInformation.IsTypePresent(typeof(CompositionVisualSurface).FullName);
 
         /// <summary>
         /// The <see cref="DependencyProperty"/> for <see cref="BlurRadius"/>.

From e418928cd9f38177d45728d659109b5a7836f321 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 27 Aug 2021 14:52:40 -0700
Subject: [PATCH 167/200] Clean-up Shadow internal part usage based on
 @Sergio0694 PR comments

---
 .../Abstract/ShadowAnimation{TValue,TKeyFrame}.cs    |  2 +-
 .../Shadows/AttachedCardShadow.cs                    |  6 +++---
 Microsoft.Toolkit.Uwp.UI/Properties/AssemblyInfo.cs  |  7 +++++++
 .../Shadows/AttachedDropShadow.cs                    | 12 ++++--------
 .../Shadows/AttachedShadowBase.cs                    |  2 +-
 .../Shadows/AttachedShadowElementContext.cs          | 10 +++++-----
 Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs  |  2 +-
 .../Shadows}/TypedResourceKey.cs                     |  4 ++--
 8 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI/Properties/AssemblyInfo.cs
 rename {Microsoft.Toolkit => Microsoft.Toolkit.Uwp.UI/Shadows}/TypedResourceKey.cs (93%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
index b65654bd4bd..c7ab02d2af2 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ShadowAnimation{TValue,TKeyFrame}.cs
@@ -64,7 +64,7 @@ static AnimationBuilder ThrowArgumentNullException()
             if (Target is IAttachedShadow allShadows)
             {
                 // in this case we'll animate all the shadows being used.
-                foreach (var context in allShadows.GetElementContextEnumerable()) //// TODO: Find better way!!!
+                foreach (var context in allShadows.EnumerateElementContexts()) //// TODO: Find better way!!!
                 {
                     NormalizedKeyFrameAnimationBuilder<TKeyFrame>.Composition keyFrameBuilder = new(
                         explicitTarget,
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
index e0643ae088e..2373f7adac3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Shadows/AttachedCardShadow.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Media
     /// <remarks>
     /// This shadow will not work on <see cref="FrameworkElement"/> which is directly clipping to its bounds (e.g. a <see cref="Windows.UI.Xaml.Controls.Border"/> using a <see cref="Windows.UI.Xaml.Controls.Control.CornerRadius"/>). An extra <see cref="Windows.UI.Xaml.Controls.Border"/> can instead be applied around the clipped border with the Shadow to create the desired effect. Most existing controls due to how they're templated will not encounter this behavior or require this workaround.
     /// </remarks>
-    public class AttachedCardShadow : AttachedShadowBase
+    public sealed class AttachedCardShadow : AttachedShadowBase
     {
         private const float MaxBlurRadius = 72;
         private static readonly TypedResourceKey<CompositionGeometricClip> ClipResourceKey = "Clip";
@@ -52,7 +52,7 @@ public double CornerRadius
         public override bool IsSupported => SupportsCompositionVisualSurface;
 
         /// <inheritdoc/>
-        protected override bool SupportsOnSizeChangedEvent => true;
+        protected internal override bool SupportsOnSizeChangedEvent => true;
 
         /// <inheritdoc/>
         protected override void OnPropertyChanged(AttachedShadowElementContext context, DependencyProperty property, object oldValue, object newValue)
@@ -145,7 +145,7 @@ protected override CompositionClip GetShadowClip(AttachedShadowElementContext co
         }
 
         /// <inheritdoc/>
-        protected override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
+        protected internal override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
             var sizeAsVec2 = newSize.ToVector2();
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..6cf4a5a1fad
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.Toolkit.Uwp.UI.Media")]
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
index d472a6a1d27..070603cb7d0 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -2,12 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.UI;
 using Windows.UI.Composition;
@@ -21,7 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI
     /// <summary>
     /// A helper to add a composition based drop shadow to a <see cref="FrameworkElement"/>.
     /// </summary>
-    public class AttachedDropShadow : AttachedShadowBase
+    public sealed class AttachedDropShadow : AttachedShadowBase
     {
         private const float MaxBlurRadius = 72;
 
@@ -121,7 +117,7 @@ private static void OnCastToPropertyChanged(DependencyObject d, DependencyProper
                     // Need to remove all old children from previous container if it's changed
                     if (prevContainer != null && prevContainer != shadow._container)
                     {
-                        foreach (var context in shadow.GetElementContextEnumerable())
+                        foreach (var context in shadow.EnumerateElementContexts())
                         {
                             if (context.IsInitialized &&
                                 prevContainer.Children.Contains(context.SpriteVisual))
@@ -132,7 +128,7 @@ private static void OnCastToPropertyChanged(DependencyObject d, DependencyProper
                     }
 
                     // Make sure all child shadows are hooked into container
-                    foreach (var context in shadow.GetElementContextEnumerable())
+                    foreach (var context in shadow.EnumerateElementContexts())
                     {
                         if (context.IsInitialized)
                         {
@@ -152,7 +148,7 @@ private void CastToElement_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             // Don't use sender or 'e' here as related to container element not
             // element for shadow, grab values off context. (Also may be null from internal call.)
-            foreach (var context in GetElementContextEnumerable())
+            foreach (var context in EnumerateElementContexts())
             {
                 if (context.IsInitialized)
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
index 5c2e5a0d51f..b78e2a771fc 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -172,7 +172,7 @@ public AttachedShadowElementContext GetElementContext(FrameworkElement element)
         }
 
         /// <inheritdoc/>
-        public IEnumerable<AttachedShadowElementContext> GetElementContextEnumerable()
+        public IEnumerable<AttachedShadowElementContext> EnumerateElementContexts()
         {
             foreach (var kvp in ShadowElementContextTable)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index 07116f4c3d2..1d8803d23af 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -268,35 +268,35 @@ public T RemoveAndDisposeResource<T>(string key)
         /// </summary>
         /// <typeparam name="T">The type of the resource being added.</typeparam>
         /// <returns>The resource that was added</returns>
-        public T AddResource<T>(TypedResourceKey<T> key, T resource) => AddResource(key.Key, resource);
+        internal T AddResource<T>(TypedResourceKey<T> key, T resource) => AddResource(key.Key, resource);
 
         /// <summary>
         /// Retrieves a resource with the specified key and type if it exists
         /// </summary>
         /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
         /// <returns>True if the resource exists, false otherwise</returns>
-        public bool TryGetResource<T>(TypedResourceKey<T> key, out T resource) => TryGetResource(key.Key, out resource);
+        internal bool TryGetResource<T>(TypedResourceKey<T> key, out T resource) => TryGetResource(key.Key, out resource);
 
         /// <summary>
         /// Retries a resource with the specified key and type
         /// </summary>
         /// <typeparam name="T">The type of the resource being retrieved.</typeparam>
         /// <returns>The resource if it exists or a default value.</returns>
-        public T GetResource<T>(TypedResourceKey<T> key) => GetResource<T>(key.Key);
+        internal T GetResource<T>(TypedResourceKey<T> key) => GetResource<T>(key.Key);
 
         /// <summary>
         /// Removes an existing resource with the specified key and type
         /// </summary>
         /// <typeparam name="T">The type of the resource being removed.</typeparam>
         /// <returns>The resource that was removed, if any</returns>
-        public T RemoveResource<T>(TypedResourceKey<T> key) => RemoveResource<T>(key.Key);
+        internal T RemoveResource<T>(TypedResourceKey<T> key) => RemoveResource<T>(key.Key);
 
         /// <summary>
         /// Removes an existing resource with the specified key and type, and <see cref="IDisposable.Dispose">disposes</see> it
         /// </summary>
         /// <typeparam name="T">The type of the resource being removed.</typeparam>
         /// <returns>The resource that was removed, if any</returns>
-        public T RemoveAndDisposeResource<T>(TypedResourceKey<T> key)
+        internal T RemoveAndDisposeResource<T>(TypedResourceKey<T> key)
             where T : IDisposable => RemoveAndDisposeResource<T>(key.Key);
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
index afababd92a4..74eee795b05 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/IAttachedShadow.cs
@@ -45,6 +45,6 @@ public interface IAttachedShadow
         /// Gets an enumeration over the current list of <see cref="AttachedShadowElementContext"/> of elements using this shared shadow definition.
         /// </summary>
         /// <returns>Enumeration of <see cref="AttachedShadowElementContext"/> objects.</returns>
-        IEnumerable<AttachedShadowElementContext> GetElementContextEnumerable();
+        IEnumerable<AttachedShadowElementContext> EnumerateElementContexts();
     }
 }
diff --git a/Microsoft.Toolkit/TypedResourceKey.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/TypedResourceKey.cs
similarity index 93%
rename from Microsoft.Toolkit/TypedResourceKey.cs
rename to Microsoft.Toolkit.Uwp.UI/Shadows/TypedResourceKey.cs
index 9e46ed107ce..43c7393d83d 100644
--- a/Microsoft.Toolkit/TypedResourceKey.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/TypedResourceKey.cs
@@ -4,13 +4,13 @@
 
 using System;
 
-namespace Microsoft.Toolkit
+namespace Microsoft.Toolkit.Uwp.UI
 {
     /// <summary>
     /// A generic class that can be used to retrieve keyed resources of the specified type.
     /// </summary>
     /// <typeparam name="TValue">The <see cref="Type"/> of resource the <see cref="TypedResourceKey{TValue}"/> will retrieve.</typeparam>
-    public class TypedResourceKey<TValue>
+    internal sealed class TypedResourceKey<TValue>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TypedResourceKey{TValue}"/> class  with the specified key.

From 836a50126b2d4b04ab2852f7ce9b161efaa6f85a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 28 Aug 2021 00:56:18 -0700
Subject: [PATCH 168/200] add design metadata for RichSuggestBox

---
 .../Controls/RichSuggestBox.Metadata.cs       | 44 +++++++++++++++++++
 .../Controls/RichSuggestBox.Typedata.cs       | 32 ++++++++++++++
 ...t.Uwp.UI.Controls.Input.DesignTools.csproj |  4 +-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Typedata.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
new file mode 100644
index 00000000000..1dcb3daa666
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel;
+
+using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
+
+using Microsoft.VisualStudio.DesignTools.Extensibility;
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal class RichSuggestBoxMetadata : AttributeTableBuilder
+    {
+        public RichSuggestBoxMetadata()
+            : base()
+        {
+            AddCallback(ControlTypes.RichSuggestBox,
+                b =>
+                {
+                    b.AddCustomAttributes(nameof(RichSuggestBox.ClipboardCopyFormat), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.ClipboardPasteFormat), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.Description), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.DisabledFormattingAccelerators), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.Header), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.HeaderTemplate), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PlaceholderText), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupCornerRadius), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooter), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooterTemplate), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeader), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeaderTemplate), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.Prefixes), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.RichEditBoxStyle), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenBackground), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenForeground), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
+                }
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Typedata.cs
new file mode 100644
index 00000000000..c36eb0b50c7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Typedata.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal static partial class ControlTypes
+    {
+        internal const string RichSuggestBox = RootNamespace + "." + nameof(RichSuggestBox);
+    }
+
+    internal static class RichSuggestBox
+    {
+        internal const string PlaceholderText = nameof(PlaceholderText);
+        internal const string RichEditBoxStyle = nameof(RichEditBoxStyle);
+        internal const string Header = nameof(Header);
+        internal const string HeaderTemplate = nameof(HeaderTemplate);
+        internal const string Description = nameof(Description);
+        internal const string PopupPlacement = nameof(PopupPlacement);
+        internal const string PopupCornerRadius = nameof(PopupCornerRadius);
+        internal const string PopupHeader = nameof(PopupHeader);
+        internal const string PopupHeaderTemplate = nameof(PopupHeaderTemplate);
+        internal const string PopupFooter = nameof(PopupFooter);
+        internal const string PopupFooterTemplate = nameof(PopupFooterTemplate);
+        internal const string TokenBackground = nameof(TokenBackground);
+        internal const string TokenForeground = nameof(TokenForeground);
+        internal const string Prefixes = nameof(Prefixes);
+        internal const string ClipboardPasteFormat = nameof(ClipboardPasteFormat);
+        internal const string ClipboardCopyFormat = nameof(ClipboardCopyFormat);
+        internal const string DisabledFormattingAccelerators = nameof(DisabledFormattingAccelerators);
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
index bea936c0671..2d2510304dd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -84,6 +84,8 @@
     <Compile Include="Controls\RadialGauge.Typedata.cs" />
     <Compile Include="Controls\RangeSelector.Metadata.cs" />
     <Compile Include="Controls\RangeSelector.Typedata.cs" />
+    <Compile Include="Controls\RichSuggestBox.Typedata.cs" />
+    <Compile Include="Controls\RichSuggestBox.Metadata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>

From a37860dc3c8d2350f8e3a3bd5d1510cbf35300d1 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 28 Aug 2021 01:37:02 -0700
Subject: [PATCH 169/200] adjust category  attributes

---
 .../Controls/RichSuggestBox.Metadata.cs       | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
index 1dcb3daa666..3835ff66236 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
@@ -24,18 +24,27 @@ public RichSuggestBoxMetadata()
                     b.AddCustomAttributes(nameof(RichSuggestBox.Description), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(RichSuggestBox.DisabledFormattingAccelerators), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(RichSuggestBox.Header), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.HeaderTemplate), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.HeaderTemplate),
+                        new CategoryAttribute(Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
                     b.AddCustomAttributes(nameof(RichSuggestBox.PlaceholderText), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupCornerRadius), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupCornerRadius), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooter), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooterTemplate), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooterTemplate),
+                        new CategoryAttribute(Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
                     b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeader), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeaderTemplate), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeaderTemplate),
+                        new CategoryAttribute(Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(nameof(RichSuggestBox.Prefixes), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.RichEditBoxStyle), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenBackground), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenForeground), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.RichEditBoxStyle), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenBackground), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.TokenForeground), new CategoryAttribute(Resources.CategoryBrush));
                     b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
                 }
             );

From 8fa7a8dfd01a5efecec9354429231f330df3b2ab Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Sat, 28 Aug 2021 18:21:56 +0200
Subject: [PATCH 170/200] Applied the suggested name changes by @michael-hawker

---
 .../ListDetailsView.Properties.cs             | 28 +++++++++----------
 .../ListDetailsView/ListDetailsView.cs        |  4 +--
 .../ListDetailsView/ListDetailsView.xaml      | 20 ++++++-------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
index d9c5df75e5d..53a822bfd8c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
@@ -106,21 +106,21 @@ public partial class ListDetailsView
             new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="ListPaneNoItemsContent"/> dependency property.
+        /// Identifies the <see cref="ListPaneEmptyContent"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="ListPaneNoItemsContent"/> dependency property.</returns>
-        public static readonly DependencyProperty ListPaneNoItemsContentProperty = DependencyProperty.Register(
-            nameof(ListPaneNoItemsContent),
+        /// <returns>The identifier for the <see cref="ListPaneEmptyContent"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneEmptyContentProperty = DependencyProperty.Register(
+            nameof(ListPaneEmptyContent),
             typeof(object),
             typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="ListPaneNoItemsContentTemplate"/> dependency property.
+        /// Identifies the <see cref="ListPaneEmptyContentTemplate"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="ListPaneNoItemsContentTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty ListPaneNoItemsContentTemplateProperty = DependencyProperty.Register(
-            nameof(ListPaneNoItemsContentTemplate),
+        /// <returns>The identifier for the <see cref="ListPaneEmptyContentTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneEmptyContentTemplateProperty = DependencyProperty.Register(
+            nameof(ListPaneEmptyContentTemplate),
             typeof(DataTemplate),
             typeof(ListDetailsView),
             new PropertyMetadata(null));
@@ -321,10 +321,10 @@ public DataTemplate ListHeaderTemplate
         /// <returns>
         /// The content of the list pane's header. The default is null.
         /// </returns>
-        public object ListPaneNoItemsContent
+        public object ListPaneEmptyContent
         {
-            get { return GetValue(ListPaneNoItemsContentProperty); }
-            set { SetValue(ListPaneNoItemsContentProperty, value); }
+            get { return GetValue(ListPaneEmptyContentProperty); }
+            set { SetValue(ListPaneEmptyContentProperty, value); }
         }
 
         /// <summary>
@@ -333,10 +333,10 @@ public object ListPaneNoItemsContent
         /// <returns>
         /// The template that specifies the visualization of the list pane no items object. The default is null.
         /// </returns>
-        public DataTemplate ListPaneNoItemsContentTemplate
+        public DataTemplate ListPaneEmptyContentTemplate
         {
-            get { return (DataTemplate)GetValue(ListPaneNoItemsContentTemplateProperty); }
-            set { SetValue(ListPaneNoItemsContentTemplateProperty, value); }
+            get { return (DataTemplate)GetValue(ListPaneEmptyContentTemplateProperty); }
+            set { SetValue(ListPaneEmptyContentTemplateProperty, value); }
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
index 0fbefdeceb3..26b69afa100 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
@@ -38,7 +38,7 @@ public partial class ListDetailsView : ItemsControl
         private const string PartRootPanel = "RootPanel";
         private const string PartDetailsPresenter = "DetailsPresenter";
         private const string PartDetailsPanel = "DetailsPanel";
-        private const string PartMasterList = "MasterList";
+        private const string PartMainList = "MainList";
         private const string PartBackButton = "ListDetailsBackButton";
         private const string PartHeaderContentPresenter = "HeaderContentPresenter";
         private const string PartListPaneCommandBarPanel = "ListPaneCommandBarPanel";
@@ -405,7 +405,7 @@ private void FocusFirstFocusableElementInDetails()
         /// </summary>
         private void FocusItemList()
         {
-            if (GetTemplateChild("PartMasterList") is Control list)
+            if (GetTemplateChild("PartMainList") is Control list)
             {
                 list.Focus(FocusState.Programmatic);
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
index 3fb14c4d4c1..0c22b4468c1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
@@ -91,7 +91,7 @@
                                                       To="NoSelectionNarrow">
                                         <Storyboard>
                                             <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="MasterPresenterTransform"
+                                                             Storyboard.TargetName="ListPresenterTransform"
                                                              Storyboard.TargetProperty="X"
                                                              From="-200"
                                                              To="0"
@@ -118,14 +118,14 @@
                             <VisualStateGroup x:Name="HasItemsStates">
                                 <VisualState x:Name="HasItemsState">
                                     <VisualState.Setters>
-                                        <Setter Target="MasterList.Visibility" Value="Visible" />
-                                        <Setter Target="MasterNoItemsPresenter.Visibility" Value="Collapsed" />
+                                        <Setter Target="MainList.Visibility" Value="Visible" />
+                                        <Setter Target="MainListEmptyItemsPresenter.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="HasNoItemsState">
                                     <VisualState.Setters>
-                                        <Setter Target="MasterList.Visibility" Value="Collapsed" />
-                                        <Setter Target="MasterNoItemsPresenter.Visibility" Value="Visible" />
+                                        <Setter Target="MainList.Visibility" Value="Collapsed" />
+                                        <Setter Target="MainListEmptyItemsPresenter.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
@@ -149,11 +149,11 @@
                                                       Content="{TemplateBinding ListHeader}"
                                                       ContentTemplate="{TemplateBinding ListHeaderTemplate}"
                                                       Visibility="Collapsed" />
-                                    <ContentPresenter x:Name="MasterNoItemsPresenter"
+                                    <ContentPresenter x:Name="MainListEmptyItemsPresenter"
                                                       Grid.Row="1"
-                                                      Content="{TemplateBinding ListPaneNoItemsContent}"
-                                                      ContentTemplate="{TemplateBinding ListPaneNoItemsContentTemplate}" />
-                                    <ListView x:Name="MasterList"
+                                                      Content="{TemplateBinding ListPaneEmptyContent}"
+                                                      ContentTemplate="{TemplateBinding ListPaneEmptyContentTemplate}" />
+                                    <ListView x:Name="MainList"
                                               Grid.Row="1"
                                               IsTabStop="False"
                                               ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
@@ -166,7 +166,7 @@
                                     <Grid x:Name="ListCommandBar"
                                           Grid.Row="2" />
                                     <Grid.RenderTransform>
-                                        <TranslateTransform x:Name="MasterPresenterTransform" />
+                                        <TranslateTransform x:Name="ListPresenterTransform" />
                                     </Grid.RenderTransform>
                                 </Grid>
                             </muxc:TwoPaneView.Pane1>

From a867faddee47caba347464aefd0f1a87fda2d5f0 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Sat, 28 Aug 2021 18:24:57 +0200
Subject: [PATCH 171/200] Removed the additional parentheses spotted by
 @XAML-Knight

---
 .../ListDetailsView/ListDetailsView.BackButton.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs
index ff046c6781b..45e08b80c1e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.BackButton.cs
@@ -40,7 +40,7 @@ private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
 
             if (ViewState == ListDetailsViewState.Details)
             {
-                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
+                if (BackButtonBehavior == BackButtonBehavior.Inline && _inlineBackButton != null)
                 {
                     _inlineBackButton.Visibility = Visibility.Visible;
                 }
@@ -53,7 +53,7 @@ private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
                         // Setting this indicates that the system back button is being used
                         _previousSystemBackButtonVisibility = navigationManager.AppViewBackButtonVisibility;
                     }
-                    else if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
+                    else if (_inlineBackButton != null && (_navigationView == null || _frame == null))
                     {
                         // We can only use the new NavigationView if we also have a Frame
                         // If there is no frame we have to use the inline button
@@ -74,7 +74,7 @@ private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
             }
             else if (previousState == ListDetailsViewState.Details)
             {
-                if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
+                if (BackButtonBehavior == BackButtonBehavior.Inline && _inlineBackButton != null)
                 {
                     _inlineBackButton.Visibility = Visibility.Collapsed;
                 }
@@ -82,7 +82,7 @@ private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
                 {
                     if (!_previousSystemBackButtonVisibility.HasValue)
                     {
-                        if ((_inlineBackButton != null) && ((_navigationView == null) || (_frame == null)))
+                        if (_inlineBackButton != null && (_navigationView == null || _frame == null))
                         {
                             _inlineBackButton.Visibility = Visibility.Collapsed;
                         }
@@ -132,7 +132,7 @@ private void SetNavigationViewBackButtonState(int visible, bool enabled)
         /// <param name="args">The event args</param>
         private void OnFrameNavigating(object sender, NavigatingCancelEventArgs args)
         {
-            if ((args.NavigationMode == NavigationMode.Back) && (ViewState == ListDetailsViewState.Details))
+            if (args.NavigationMode == NavigationMode.Back && ViewState == ListDetailsViewState.Details)
             {
                 ClearSelectedItem();
                 args.Cancel = true;

From 02bbc4db9c4352bd0fc1d9dfc6d1bc91038ad50a Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sat, 28 Aug 2021 12:26:46 -0700
Subject: [PATCH 172/200] adjust category attribute

---
 .../Controls/RichSuggestBox.Metadata.cs                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
index 3835ff66236..3b3bc0c3e34 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs
@@ -28,7 +28,7 @@ public RichSuggestBoxMetadata()
                         new CategoryAttribute(Resources.CategoryAppearance),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PlaceholderText), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PlaceholderText), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(nameof(RichSuggestBox.PopupCornerRadius), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooter), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooterTemplate),
@@ -40,7 +40,7 @@ public RichSuggestBoxMetadata()
                         new CategoryAttribute(Resources.CategoryAppearance),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
-                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(RichSuggestBox.Prefixes), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(nameof(RichSuggestBox.RichEditBoxStyle), new CategoryAttribute(Resources.CategoryAppearance));
                     b.AddCustomAttributes(nameof(RichSuggestBox.TokenBackground), new CategoryAttribute(Resources.CategoryBrush));

From 79f29316572001a2b8147896c26ed2546c3400de Mon Sep 17 00:00:00 2001
From: robloo <robert.looyengoed@gmail.com>
Date: Sun, 29 Aug 2021 13:05:05 -0400
Subject: [PATCH 173/200] Fix ColorPickerButton samples and switch to
 StackPanel

This is now the same as ColorPicker samples
---
 .../ColorPicker/ColorPickerButtonXaml.bind    | 104 ++++++------------
 .../ColorPicker/ColorPickerXaml.bind          |  42 +++----
 2 files changed, 54 insertions(+), 92 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
index 654d66c346a..939f067a2b3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonXaml.bind
@@ -10,19 +10,11 @@
     <SolidColorBrush Color="{ThemeResource SystemChromeLowColor}" x:Key="SystemControlForegroundChromeLowBrush"/>
   </Page.Resources>
 
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="*" />
-      <RowDefinition Height="*" />
-      <RowDefinition Height="*" />
-      <RowDefinition Height="*" />
-    </Grid.RowDefinitions>
-    <!-- Example 1 -->
-    <StackPanel Grid.Row="0"
-                Orientation="Vertical"
+  <ScrollViewer>
+    <StackPanel Orientation="Vertical"
                 HorizontalAlignment="Center"
-                VerticalAlignment="Center"
                 Spacing="20">
+      <!-- Example 1 -->
       <Border Background="{ThemeResource SystemChromeMediumColor}"
               CornerRadius="4"
               Height="100"
@@ -44,13 +36,7 @@
           </Style>
         </controls:ColorPickerButton.ColorPickerStyle>
       </controls:ColorPickerButton>
-    </StackPanel>
-    <!-- Example 2 -->
-    <StackPanel Grid.Row="1"
-                Orientation="Vertical"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Spacing="20">
+      <!-- Example 2 -->
       <Border Background="{ThemeResource SystemChromeMediumColor}"
               CornerRadius="4"
               Height="100"
@@ -72,13 +58,7 @@
           </Style>
         </controls:ColorPickerButton.ColorPickerStyle>
       </controls:ColorPickerButton>
-    </StackPanel>
-    <!-- Example 3 -->
-    <StackPanel Grid.Row="2"
-                Orientation="Vertical"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Spacing="20">
+      <!-- Example 3 -->
       <Border Background="{ThemeResource SystemChromeMediumColor}"
               CornerRadius="4"
               Height="100"
@@ -100,13 +80,7 @@
           </Style>
         </controls:ColorPickerButton.ColorPickerStyle>
       </controls:ColorPickerButton>
-    </StackPanel>
-    <!-- Example 4 -->
-    <StackPanel Grid.Row="3"
-                Orientation="Vertical"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Spacing="20">
+      <!-- Example 4 -->
       <Border Background="{ThemeResource SystemChromeMediumColor}"
               CornerRadius="4"
               Height="100"
@@ -130,44 +104,32 @@
           </Style>
         </controls:ColorPickerButton.ColorPickerStyle>
       </controls:ColorPickerButton>
+      <!-- Example 5 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                   VerticalAlignment="Center">
+          Ring-shaped spectrum <LineBreak />
+          Alpha channel enabled <LineBreak />
+          Only Color Palette Shown
+        </TextBlock>
+      </Border>
+      <controls:ColorPickerButton x:Name="ColorPickerButton5"
+                                  SelectedColor="Teal">
+        <controls:ColorPickerButton.ColorPickerStyle>
+          <Style TargetType="controls:ColorPicker">
+            <Setter Property="ColorSpectrumShape" Value="Ring"/>
+            <Setter Property="IsAlphaEnabled" Value="True"/>
+            <Setter Property="IsHexInputVisible" Value="True"/>
+            <Setter Property="IsColorSpectrumVisible" Value="False"/>
+            <Setter Property="IsColorPaletteVisible" Value="True"/>
+            <Setter Property="IsColorChannelTextInputVisible" Value="False"/>
+          </Style>
+        </controls:ColorPickerButton.ColorPickerStyle>
+      </controls:ColorPickerButton>
     </StackPanel>
-    <!-- Example 5 -->
-    <StackPanel Grid.Row="3"
-                Orientation="Vertical"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Spacing="20">
-        <Border Background="{ThemeResource SystemChromeMediumColor}"
-                CornerRadius="4"
-                Height="100"
-                Width="300"
-                Padding="10">
-            <TextBlock TextAlignment="Center"
-                        VerticalAlignment="Center">
-                Ring-shaped spectrum <LineBreak />
-                Alpha channel enabled <LineBreak />
-                Only Color Palette Shown
-            </TextBlock>
-        </Border>
-        <controls:ColorPickerButton x:Name="ColorPickerButton5"
-                                    SelectedColor="Teal">
-            <controls:ColorPickerButton.ColorPickerStyle>
-                <Style TargetType="controls:ColorPicker">
-                    <Setter Property="ColorSpectrumShape"
-                            Value="Ring"/>
-                    <Setter Property="IsAlphaEnabled"
-                            Value="True"/>
-                    <Setter Property="IsHexInputVisible"
-                            Value="True"/>
-                    <Setter Property="IsColorSpectrumVisible"
-                            Value="False"/>
-                    <Setter Property="IsColorPaletteVisible"
-                            Value="True"/>
-                    <Setter Property="IsColorChannelTextInputVisible"
-                            Value="False"/>
-                </Style>
-            </controls:ColorPickerButton.ColorPickerStyle>
-        </controls:ColorPickerButton>
-    </StackPanel>
-  </Grid>
+  </ScrollViewer>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
index c3116470e48..1502d4ad1f0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerXaml.bind
@@ -84,27 +84,27 @@
                             ColorSpectrumComponents="SaturationValue"
                             IsAlphaEnabled="True"
                             IsHexInputVisible="True"/>
-        <!-- Example 5 -->
-        <Border Background="{ThemeResource SystemChromeMediumColor}"
-                CornerRadius="4"
-                Height="100"
-                Width="300"
-                Padding="10">
-            <TextBlock TextAlignment="Center"
-                       VerticalAlignment="Center">
-                Ring-shaped spectrum <LineBreak />
-                Alpha channel enabled <LineBreak />
-                Only Color Palette Shown
-            </TextBlock>
-        </Border>
-        <controls:ColorPicker x:Name="ColorPicker5"
-                              Color="Teal"
-                              ColorSpectrumShape="Ring"
-                              IsAlphaEnabled="True"
-                              IsHexInputVisible="True"
-                              IsColorSpectrumVisible="False"
-                              IsColorPaletteVisible="True"
-                              IsColorChannelTextInputVisible="False"/>
+      <!-- Example 5 -->
+      <Border Background="{ThemeResource SystemChromeMediumColor}"
+              CornerRadius="4"
+              Height="100"
+              Width="300"
+              Padding="10">
+        <TextBlock TextAlignment="Center"
+                   VerticalAlignment="Center">
+          Ring-shaped spectrum <LineBreak />
+          Alpha channel enabled <LineBreak />
+          Only Color Palette Shown
+        </TextBlock>
+      </Border>
+      <controls:ColorPicker x:Name="ColorPicker5"
+                            Color="Teal"
+                            ColorSpectrumShape="Ring"
+                            IsAlphaEnabled="True"
+                            IsHexInputVisible="True"
+                            IsColorSpectrumVisible="False"
+                            IsColorPaletteVisible="True"
+                            IsColorChannelTextInputVisible="False"/>
     </StackPanel>
   </ScrollViewer>
 </Page>
\ No newline at end of file

From f606fa8e7c77af3870148e5acd638a0ff54f58a2 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 30 Aug 2021 11:26:56 -0700
Subject: [PATCH 174/200] Update UI Test certificate, expires 8/30/2022

---
 UITests/UITests.App/UITests.App.csproj |   2 +-
 UITests/UITests.App/UITests.App.pfx    | Bin 2528 -> 2528 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index a502e95f063..52c7d1b9801 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -22,7 +22,7 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>UITests.App.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>24D62F3B13B8B9514EAD9C4DE48CC30F7CC6151D</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>A39FFC9A7EDC3BC1F62B1FC6409AD9EDD84E8CF0</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
diff --git a/UITests/UITests.App/UITests.App.pfx b/UITests/UITests.App/UITests.App.pfx
index ec83ace8dee66bd5ed3b56449eab930d83815869..946bbe25ddc57fab6ec1cc8c5902770be6f13b34 100644
GIT binary patch
delta 2273
zcmV<72p;#~6W|k&Xn$_neIcN0?5zR<2haq91lXp!ipOM}#N|57;cNpf0h*!_#Lji1
zeg=;4f0WG1>zG=79_-;JDgOjP@ka?Bf`g>t5&VRkyky(GE&62_C*FUyx>rNzI#4_l
zo))^=80mABQR<i$Qr9k^*~Zk4#sXD~*3hORK~5RC1kX<=9Dg#gXz;v)n?KM{dZQok
z{K6I+j-3B%DqN&k)GI)Secw*gqnQSE&Z|PntpZvKJpa#E-~bTZBSc)8dBevWwpll>
zpD}mHdP7htIPmsPC;8mMpq1&4)Uq&ICUoKGb7Jx^WdXvdBgEGtu!AR*f@ph^K_QND
zQR?CeG}Hv6SbwNNLfT@k=KtJriZtO3X&Qs%)QsGYb?Ca+h$)V$`5~`zL0@17*NpPe
ze0__E)G?jd(`5X&(mM?hw%<z_wGrZ5gk?zrvu<dd3~%TADkoGK_(KlJBNaWv4Rn^Z
z7VH4^gWL_^d<+d~0z5Tz(pH2jhs9pB_frFTzXIngr+=#R+L!^Fw;Q8uIJrP{*qIjA
z142j4s$o^I0L73GUw}z*zM7iHfgv|80e1EVA_^iQ#TwY+UP@u-_8jXA+HTdnK{gfO
z!5+nNCeYUgpdYB*nKf_7n7jzD`-a6urkpP^lj3TQQUQV@uY({Yr0{;BvMWFgAOCc2
zzB<d2Fn@8a2^Ljgs(3i2K5<M2oTQpV6_gD_wOBzPps8ZT$WOJc_|-z1DE54JDU3yA
z+>0>t2(gOg9mcn@?;;*MS3sKri^D}YIAnq5LgIARjOJ&&?RN%#g9bcm6(ggKn=gc@
z(wMlbtlraDMXhF;GIsPnhL(%1essv%ceiEVFn^qGcWER1VA0{6WH3Wzc=%Llmp<Up
zIGE%RFbaIN?`NCG?r~-InIx~bkDBKM&{j5hn?F1JH0{@89529DJHFD)=9qdnvm_lb
zRmxx7Y_=^7K%+lyBEVsdJy&m$+!DnC{jM?e9+FmzWwh+&hbYI3Lv2X)qg_(D{;$!g
zUw@GlmYM;sN%nQkn^R&0de-m!LXs}*p{QC=#;akLD(HGk`&5dOwy#zc8+Z1-=(t{n
z83AkCD`k#50^6^h(0LH`Y9>Ma-pfdd3uWb5#U7EOv~+2i=<rru%9OOH$>KYDHL>|n
zj|gP5)rsmp2_}>EqSMwLpUVp?Q?MW*?|;;{?}dFO+&-PCta+e&mn2JeK&-guLOb&4
z!1aS%qXi=rj^#mTV|k*G*RU;cb&&Z&uHzUk5%XHPj9~wV%_%RxPlQN<2;kUASFy(U
zJ^Bc%${R9Hu0(KrWW04TqCOOzm7IeKU=z^2uzV&w?0CCbsPdcGRKVoQgu#q2j(;e~
z&t@Z@7TKS<qz~BI<feA5nyzB^@`5Qk7^{~bDqhYjsMssB^AXY`j?&AJDG&-#)DF&-
z<N-*LC&2kSWAV!VkS8N0bMwV>NR7iG)GW;acvj&uXW1ooFIY93EF{EycC1@g0Fp?m
zp2;p=*RJVWIdgYEb_z{qN6om=eSewZLTe9{#xT2gt(8yowS}w5cxnSs%B^WnC$qAd
zKY|`eA!fY9rvuafD<uoOH*$bXg|A3_HezZ7=jecI8;ubTi*E@OME}f4TY7e<+q`KH
z-w(Wl0p*UhinZe);N6!V%3{RDY|k1`vQ7$q1Oi?$fz2=z1_>&LNQU<f0h3+@97Q+)
zIRIh+VE{M)HvlmJF#s(9H~={SGypdMEdVqCIRG&LF#s(9IRG^PG5})$EdVtDG5}%#
zH~=#MWB@V%H2`4%W&kpizXhCsVh-F8hgT#<0s;rnfPw=!0IMxWAz9zRfnP;YqZMpM
zzTwelT`z$rtU>h$sVH)tbB|-^<jE=4>N+Iz1I6R%<XklmUh^6#>hMmn{Ykc}7r3S;
z$LgTu`Y8MlPC`Lnhq61eiwN(h%*UVl9RyY!#%qCj{~^?ob|65U_9X#-mw*sj->{+N
zxzI@L9!M4R7#K<<w&9VHz6l_#(jM*>T=#s@1tRUZS4#X9$vJ2}<Qjd<_-=%e_PXOX
z$V7l>@)$OX?cuq)lcAd7H=}fXY}|OLFMaA6crD|Rtp#A7IDV$(Cdf2zg<0+@?y&v=
z(WIn%;4W%%ft{XP#Z;Pq;4)%s+Ztw&(cF~JaU~$=2Km;^Go}kJAT|xl#cY>)Qs_@R
z_he+napkQE_@^aW4+Q?Nwm2J8Dq<{h2I{*SCrkp92bSWo)Crc32NOvT8XIyzZ`T1!
z=m;N)EObH3;<>?e&)?!?eIH|>);MN~pNYi4rpOGP5e@jLp(4kB5Hav-lXrc-524eb
zkDz)qev$7&&JIW>#Uj?4#z6Kat?^JiR{3IojSyv3+4pTWwRGE!9n`sc|3alHc%OhS
zr;1qjk2ZQCyKJI7AYsPobG>d>vE0KqOm;e7*vchHJG#3tR{fWwp64{!tAWn?x$9%+
zgBhoId$1PcMc49wBS7HkyvI)Bv9HDDVQCg6(uug6cMVX!GB)wzE&oD`PUz``(K8l}
z(bC{{x$T+BjG0Z3#Mos!Fo$byoY*Aot;mBXEC6IfiaaA-?}Fi^liX~qa{O*9X*g?Q
zJlXz82bmqFtRYBlTLrAnIOba(CovJPQJI70$^u+jbVdn(yCI^t?3&;p9?oTsc#+4N
zoE9;tvGW-~rkD8$INlX?n7OFb_0|_S#NQQ(p<iTR-l`}w!B!Rcfj3EUdU8<x(u5o|
zc_DJKD<Uf`L+`M!lJ~teRgclUQB}+V@f_)Q=o~vhiR?a6yK)#nZ<>X<(!aNMdHR2W
z?-TqcJ5o`9<Cq|q-~%Zc*ozs#Y6GX1^lGf9Af>_dqEp5D$c)$L8_79(+4j`}U<X64
zon`x+JpFrZBgT-;6pXf&_>+*^`ejyAc=xr}g@$lO;vz6RFdr}n1_dh)0|FWZ6syR2
v=yD+SQY7(4SMknF-JLLjwgePU<6^~g@aCmpIyd7CJ23Ui@fYE70s;rn1msNt

delta 2273
zcmV<72p;#~6W|k&Xn$7#D1bN5J+A@+2haq91lZtg4DUK8g~vIKp($^8^)7MHBFc{f
zX@qKCopS-WPICT4!V#&^H<VMK(M1SSiz13pSO`T0JTSl%5qPf_+OM~_LLd~j4#{Lj
zLs?g@C=#IJw9$w}-X{f^hFlVqe1_I8_u;a9Seg0!u`%zs6n|Q=yB-r|+c7&HvgKdK
zsiU1&xtl_<oOur<fhhHksQ5#1)sZKC)TO@M`I7gPxY%PIzAZp|!M!Mh2QjUF9E+lC
z<QwE&m><L!^rXajw}=L?86ip*sLM<);jcaWy;p5uvz5gEQ@_KAo<0NPcz*BKE|n_9
z$%%Z8n~bdr!+#j#wj5xxM53!Q%00O(ILX$CbpjN~{MhRoDGq~j+Gt8STvbue2v2my
z*=eW<CnT}h+rj|dh-&!Gx5M1Gf_bVODJU!_tE_LO>a84>47<u2{{L8>R*hRqXUG{3
zsKg?iInbawi2RGuUtpKotC8oW$A_6rc{s-;4ZdhnbAL@ffhi0d-N=)IIm#BR4DoO0
z4ER}=Qxt<MVCD|=PREfjQoL&9J$xPBV~}1wWh0TJbCoHl(|ikWIDVz8z!9^N<elH;
z^6F<jXRcM0dUgQ2Bf_<%Vi2(=K3(x!PmL*|XB`vQM$T`>#)_9$&=%9fyfe$S39H-_
zc()oUw10@$?m^_PQX@as?(9-kPSbw$E9xvq=*A1dzd8J72fsRAj)00H$pMAyqxaj~
z7ihITrbo_>9llN)*c@Unt37M`!}a?&|H2DHIcK8BLq9C!rRIm>O}>bM6wLXsg@8+b
zSkx$s7}(C~*2lQT1$?Vnl`q_COB<j{x*?ej?tjy@9k{6Z{;RF+UVtR{?PqRdw{Q-8
zFR}RpEE=5tR?#hKoq=lssfxbPXU&3s?jFu2%l#-?V6_p~9iA7KZ8p8lelcot;M2lC
zPRS^6#>);B@X>YDudBE3+8QgpG2}@}c#$)T+(9k>QbH#FRuVCM>7{Itv1^in>?jGq
zK7ZB6FjDR|9<1qQh!Wb*^=I$ODnPcuj>Au;mRS9cn+3!+9FCAgKERHW6-Kywjyu1a
z9!K7|KmrWq4dk5}jUc^`kq5N5A8NKiHCU~fuKA|k#Th{uDK+baoEuIlODqF>nBRtz
zeU4YGWKmTa+APB;ZxcNZ)b);3lQN_%aeth8OnO3LL;B5?CYsunsee149s)vL2?+Q~
z(q&42&&`BeBiR(@!_fYQ#<ab}1YJ=lK|P8+a>LExCH>Yh`?&99I#^f;ac8x(O~a8?
z=P&x>(>+8uz`qZ~@K5An0}ANCc|M+gNpO}6TMSr^R(h0TOGZAZc!o2vH@4t7IDgI&
z$$ynli~~KN)OouvUz}D6Cd}~=x#-Zbxq>0O1T3ecmsOhL6Be&MUhhWzOQ*W8U_hFK
zX<xx7i5=-VaOO?w0v-pYRRE-R_a<e(Diqr7H_lVK>wUGt!4mO0(yuKMm-&r(T7cp}
zDP$3-phiSlo_*}GNa-M<7vD=wZGX<w0x42Yi78+2s66th6G9y$GpgFHuS4@#o>;wF
z7yd=TVKa(}pFRr$x8v@mhY|@Preupgr^;;Z)!j4{hX1q0<NK*HoF(iLpGR%7+-jcQ
zBy*CWD+}+>S%)t8#$lc4Hj47C<d;9v8Y`0G=AoD|fz2=z1_>&LNQU<f0h3+@97SdT
zHUKyPIRG>OVgNA!H~=jGGypgNFaS0HEdVqCIRG*MGyp9CVgNA!WB_CUEdXHvWB@b(
zW&kq)W&mUWIRH2SVgO;2zXhCsR4_cIr>^aV0s;rnfPw=!zYT&uYI>UNV#hY;bc0aS
zAi(Gs@c)czia)Yb&~0N<$)7l7CSOYi!#um7ZkTfrX+_stggJ=4wW4+KX-qaGjAN+p
zI>Tq%q48CLehqG8V!5Vfghv&KEo@nF&DCbe5iH_v2$<H<7XzKjy^7U;?=ai09qpgh
z(PgaG?4kkRH!c$Gn>=Mou)fWsLPd#LL0j(E&4knvzIP_K`zcnkF6X<x0|_I&+|{sX
zb>a`JUp?lB#wd38s6(J}WN*PdFCOm`k@4F$@d1isOib*wV4||T4W<rG=4!7!Vidnz
zhj&ElLp7kPN0;t-^pt*o4iYy_@sX>3O&OMs28v7GDOM8F@BSTMNZ7YQ$1Uq=Q+CN(
z({6M0&ocMt6KgTx{-tZ_&Cu154M761o-raVho3R+LjCcY$015&y&&xA%b@HB#H)(K
zJ0>vGUo|e*IBUX7Ekst_7moynWuMkt!Q>W`tQIutr9azl@{Y!TELWi2UNou{+fT>o
zg^&4QI-K7Sx6i=uThWXdZ@15cr9S_*&Wv0j$Fs|Ua3hHlB?0x+>gmaDRB{{+70(Eg
z`!&j|?Gl=+!!tO<`uhsx@m)7xj07(t{T5n9??eahzHlEs63+F#QYi%)3t!%kGIVOM
z7%Q6CJMn3n-ocN5{xi)R05$Sk`Fj%c(kBv~xAdaV)B%z6`A-0i>ihUEO&)~?UdUQm
zX3n_N%4tQ8fKzpQ*_>8F%q*^|6&+f?1lk;?<lT#Cx^8Vy0yazMi{3~mA70f453G7c
zQ}$?{X)C31dqM>A1ff%se2CX-Yo=hr0f^bdcG^!rQB!AsJUo+BuE?{Z$vG_i_eS78
z&EKatx}^nhu+tqJ4a=YWg5h(mogeiyhWWt`HPV=nIgFTW(AUwst|KNT=5O<q<m>A&
z$#gorFSC|J5Kt!{%-A*PT1Z%G^(gQ>s|^$F&X3Y<JdjVS_=9tj++LIjw+oX!6=2Vp
z^e~0zcuz=wz@5>@+1nLMm1*~q&=tIsWAa+adooLWCAVF`5^&G1IgChj?{;*WhM9mU
z4KciVN`+*>&X~?Cy0qS0FNTSsmJ>h7IEx#PO(Knwqbo2wFdr}n1_dh)0|FWZ6wpcI
vJg0v)g>Vn2aZR>4A{SlLS_BmBzKBp<Kgf^Wo9<@}#*y8f%q+Yj0s;rnX7x+0


From 2b84917581145eaad2ae45da384d7b2f4ea47efb Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:02:51 -0700
Subject: [PATCH 175/200] Remove stale comment on attached shadow example

---
 .../SamplePages/Shadows/AttachedShadowWin2DXaml.bind             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
index 717d8a31515..84897111675 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows/AttachedShadowWin2DXaml.bind
@@ -7,7 +7,6 @@
   xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
   mc:Ignorable="d">
 
-  <!-- TODO: Animation-->
   <Page.Resources>
     <media:AttachedCardShadow x:Key="CommonShadow" Offset="4"/>
 

From cf4122c37030b6eb5e845cf5be3245e20977d990 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 29 Aug 2021 23:34:16 -0700
Subject: [PATCH 176/200] break main RichSuggestBox.cs into smaller files

---
 .../RichSuggestBox/RichSuggestBox.Document.cs | 244 ++++++++
 .../RichSuggestBox.Suggestion.cs              | 292 ++++++++++
 .../RichSuggestBox/RichSuggestBox.cs          | 521 +-----------------
 3 files changed, 543 insertions(+), 514 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
new file mode 100644
index 00000000000..53b7b06c2fc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
@@ -0,0 +1,244 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using Windows.UI.Input;
+using Windows.UI.Text;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
+    public partial class RichSuggestBox
+    {
+        private void ExpandSelectionOnPartialTokenSelect(ITextSelection selection, ITextRange tokenRange)
+        {
+            switch (selection.Type)
+            {
+                case SelectionType.InsertionPoint:
+                    // Snap selection to token on click
+                    if (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition < tokenRange.EndPosition)
+                    {
+                        selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
+                    }
+
+                    break;
+
+                case SelectionType.Normal:
+                    // We do not want user to partially select a token since pasting to a partial token can break
+                    // the token tracking system, which can result in unwanted character formatting issues.
+                    if ((tokenRange.StartPosition <= selection.StartPosition && selection.EndPosition < tokenRange.EndPosition) ||
+                        (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition <= tokenRange.EndPosition))
+                    {
+                        // TODO: Figure out how to expand selection without breaking selection flow (with Shift select or pointer sweep select)
+                        selection.Expand(TextRangeUnit.Link);
+                        InvokeTokenSelected(selection);
+                    }
+
+                    break;
+            }
+        }
+
+        private void InvokeTokenSelected(ITextSelection selection)
+        {
+            if (TokenSelected == null || !TryGetTokenFromRange(selection, out var token) || token.RangeEnd != selection.EndPosition)
+            {
+                return;
+            }
+
+            TokenSelected.Invoke(this, new RichSuggestTokenSelectedEventArgs
+            {
+                Token = token,
+                Range = selection.GetClone()
+            });
+        }
+
+        private void InvokeTokenPointerOver(PointerPoint pointer)
+        {
+            var pointerPosition = TransformToVisual(_richEditBox).TransformPoint(pointer.Position);
+            var padding = _richEditBox.Padding;
+            pointerPosition.X += HorizontalOffset - padding.Left;
+            pointerPosition.Y += VerticalOffset - padding.Top;
+            var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
+            var linkRange = range.GetClone();
+            range.Expand(TextRangeUnit.Character);
+            range.GetRect(PointOptions.None, out var hitTestRect, out _);
+            hitTestRect.X -= hitTestRect.Width;
+            hitTestRect.Width *= 2;
+            if (hitTestRect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
+                TryGetTokenFromRange(linkRange, out var token))
+            {
+                this.TokenPointerOver.Invoke(this, new RichSuggestTokenPointerOverEventArgs
+                {
+                    Token = token,
+                    Range = linkRange,
+                    CurrentPoint = pointer
+                });
+            }
+        }
+
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, ITextCharacterFormat format, bool addTrailingSpace = true)
+        {
+            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
+            range.GetText(TextGetOptions.NoHidden, out var existingText);
+            if (existingText != displayText)
+            {
+                range.SetText(TextSetOptions.Unhide, displayText);
+            }
+
+            var formatBefore = range.CharacterFormat.GetClone();
+            range.CharacterFormat.SetClone(format);
+            PadRange(range, formatBefore);
+            range.Link = $"\"{id}\"";
+
+            // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
+            if (range.Link != $"\"{id}\"")
+            {
+                range.Delete(TextRangeUnit.Story, -1);
+                return false;
+            }
+
+            if (addTrailingSpace)
+            {
+                var clone = range.GetClone();
+                clone.Collapse(false);
+                clone.SetText(TextSetOptions.Unhide, " ");
+                clone.Collapse(false);
+                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
+            }
+
+            return true;
+        }
+
+        private void ValidateTokensInDocument()
+        {
+            lock (_tokensLock)
+            {
+                foreach (var (_, token) in _tokens)
+                {
+                    token.Active = false;
+                }
+            }
+
+            ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
+        }
+
+        private void ValidateTokenFromRange(ITextRange range)
+        {
+            if (range.Length == 0 || !TryGetTokenFromRange(range, out var token))
+            {
+                return;
+            }
+
+            // Check for duplicate tokens. This can happen if the user copies and pastes the token multiple times.
+            if (token.Active && token.RangeStart != range.StartPosition && token.RangeEnd != range.EndPosition)
+            {
+                lock (_tokensLock)
+                {
+                    var guid = Guid.NewGuid();
+                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
+                    {
+                        token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
+                        token.UpdateTextRange(range);
+                        _tokens.Add(range.Link, token);
+                    }
+
+                    return;
+                }
+            }
+
+            if (token.ToString() != range.Text)
+            {
+                range.Delete(TextRangeUnit.Story, 0);
+                token.Active = false;
+                return;
+            }
+
+            token.UpdateTextRange(range);
+            token.Active = true;
+        }
+
+        private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
+        {
+            prefix = string.Empty;
+            query = string.Empty;
+            range = null;
+            if (TextDocument.Selection.Type != SelectionType.InsertionPoint)
+            {
+                return false;
+            }
+
+            // Check if selection is on existing link (suggestion)
+            var expandCount = TextDocument.Selection.GetClone().Expand(TextRangeUnit.Link);
+            if (expandCount != 0)
+            {
+                return false;
+            }
+
+            var selection = TextDocument.Selection.GetClone();
+            selection.MoveStart(TextRangeUnit.Word, -1);
+            if (selection.Length == 0)
+            {
+                return false;
+            }
+
+            range = selection;
+            if (TryExtractQueryFromRange(selection, out prefix, out query))
+            {
+                return true;
+            }
+
+            selection.MoveStart(TextRangeUnit.Word, -1);
+            if (TryExtractQueryFromRange(selection, out prefix, out query))
+            {
+                return true;
+            }
+
+            range = null;
+            return false;
+        }
+
+        private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out string query)
+        {
+            prefix = string.Empty;
+            query = string.Empty;
+            range.GetText(TextGetOptions.NoHidden, out var possibleQuery);
+            if (possibleQuery.Length > 0 && Prefixes.Contains(possibleQuery[0]) &&
+                !possibleQuery.Any(char.IsWhiteSpace) && string.IsNullOrEmpty(range.Link))
+            {
+                if (possibleQuery.Length == 1)
+                {
+                    prefix = possibleQuery;
+                    return true;
+                }
+
+                prefix = possibleQuery[0].ToString();
+                query = possibleQuery.Substring(1);
+                return true;
+            }
+
+            return false;
+        }
+
+        private ITextCharacterFormat CreateTokenFormat(ITextRange range)
+        {
+            var format = range.CharacterFormat.GetClone();
+            if (this.TokenBackground != null)
+            {
+                format.BackgroundColor = this.TokenBackground.Color;
+            }
+
+            if (this.TokenForeground != null)
+            {
+                format.ForegroundColor = this.TokenForeground.Color;
+            }
+
+            return format;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs
new file mode 100644
index 00000000000..9574bfa7189
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs
@@ -0,0 +1,292 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Deferred;
+using Windows.Foundation.Metadata;
+using Windows.UI.Text;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// The RichSuggestBox control extends <see cref="RichEditBox"/> control that suggests and embeds custom data in a rich document.
+    /// </summary>
+    public partial class RichSuggestBox
+    {
+        private async Task RequestSuggestionsAsync(ITextRange range = null)
+        {
+            string prefix;
+            string query;
+            var currentQuery = _currentQuery;
+            var queryFound = range == null
+                ? TryExtractQueryFromSelection(out prefix, out query, out range)
+                : TryExtractQueryFromRange(range, out prefix, out query);
+
+            if (queryFound && prefix == currentQuery?.Prefix && query == currentQuery?.QueryText &&
+                range.EndPosition == currentQuery?.Range.EndPosition && _suggestionPopup.IsOpen)
+            {
+                return;
+            }
+
+            var previousTokenSource = currentQuery?.CancellationTokenSource;
+            if (!(previousTokenSource?.IsCancellationRequested ?? true))
+            {
+                previousTokenSource.Cancel();
+            }
+
+            if (queryFound)
+            {
+                using var tokenSource = new CancellationTokenSource();
+                _currentQuery = new RichSuggestQuery
+                {
+                    Prefix = prefix, QueryText = query, Range = range, CancellationTokenSource = tokenSource
+                };
+
+                var cancellationToken = tokenSource.Token;
+                var eventArgs = new SuggestionRequestedEventArgs { QueryText = query, Prefix = prefix };
+                if (SuggestionRequested != null)
+                {
+                    try
+                    {
+                        await SuggestionRequested.InvokeAsync(this, eventArgs, cancellationToken);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        return;
+                    }
+                }
+
+                if (!eventArgs.Cancel)
+                {
+                    _suggestionChoice = 0;
+                    ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
+                }
+
+                tokenSource.Cancel();
+            }
+            else
+            {
+                ShowSuggestionsPopup(false);
+            }
+        }
+
+        internal async Task CommitSuggestionAsync(object selectedItem)
+        {
+            var currentQuery = _currentQuery;
+            var range = currentQuery?.Range.GetClone();
+            var id = Guid.NewGuid();
+            var prefix = currentQuery?.Prefix;
+            var query = currentQuery?.QueryText;
+
+            // range has length of 0 at the end of the commit.
+            // Checking length == 0 to avoid committing twice.
+            if (prefix == null || query == null || range == null || range.Length == 0)
+            {
+                return;
+            }
+
+            var textBefore = range.Text;
+            var format = CreateTokenFormat(range);
+            var eventArgs = new SuggestionChosenEventArgs
+            {
+                Id = id,
+                Prefix = prefix,
+                QueryText = query,
+                SelectedItem = selectedItem,
+                DisplayText = query,
+                Format = format
+            };
+
+            if (SuggestionChosen != null)
+            {
+                await SuggestionChosen.InvokeAsync(this, eventArgs);
+            }
+
+            var text = eventArgs.DisplayText;
+
+            // Since this operation is async, the document may have changed at this point.
+            // Double check if the range still has the expected query.
+            if (string.IsNullOrEmpty(text) || textBefore != range.Text ||
+                !TryExtractQueryFromRange(range, out var testPrefix, out var testQuery) ||
+                testPrefix != prefix || testQuery != query)
+            {
+                return;
+            }
+
+            lock (_tokensLock)
+            {
+                var displayText = prefix + text;
+
+                _ignoreChange = true;
+                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format ?? format);
+                TextDocument.EndUndoGroup();
+                TextDocument.BeginUndoGroup();
+                _ignoreChange = false;
+
+                if (committed)
+                {
+                    var token = new RichSuggestToken(id, displayText) { Active = true, Item = selectedItem };
+                    token.UpdateTextRange(range);
+                    _tokens.TryAdd(range.Link, token);
+                }
+            }
+        }
+
+        private void UpdateSuggestionsListSelectedItem(int choice)
+        {
+            var itemsList = _suggestionsList.Items;
+            if (itemsList == null)
+            {
+                return;
+            }
+
+            _suggestionsList.SelectedItem = choice == 0 ? null : itemsList[choice - 1];
+            _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
+        }
+
+        private void ShowSuggestionsPopup(bool show)
+        {
+            if (_suggestionPopup == null)
+            {
+                return;
+            }
+
+            this._suggestionPopup.IsOpen = show;
+            if (!show)
+            {
+                this._suggestionChoice = 0;
+                this._suggestionPopup.VerticalOffset = 0;
+                this._suggestionPopup.HorizontalOffset = 0;
+                this._suggestionsList.SelectedItem = null;
+                this._suggestionsList.ScrollIntoView(this._suggestionsList.Items?.FirstOrDefault());
+                UpdateCornerRadii();
+            }
+        }
+
+        private void UpdatePopupWidth()
+        {
+            if (this._suggestionsContainer == null)
+            {
+                return;
+            }
+
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                this._suggestionsContainer.MaxWidth = double.PositiveInfinity;
+                this._suggestionsContainer.Width = this._richEditBox.ActualWidth;
+            }
+            else
+            {
+                this._suggestionsContainer.MaxWidth = this._richEditBox.ActualWidth;
+                this._suggestionsContainer.Width = double.NaN;
+            }
+        }
+
+        /// <summary>
+        /// Calculate whether to open the suggestion list up or down depends on how much screen space is available
+        /// </summary>
+        private void UpdatePopupOffset()
+        {
+            if (this._suggestionsContainer == null || this._suggestionPopup == null || this._richEditBox == null)
+            {
+                return;
+            }
+
+            this._richEditBox.TextDocument.Selection.GetRect(PointOptions.None, out var selectionRect, out _);
+            Thickness padding = this._richEditBox.Padding;
+            selectionRect.X -= HorizontalOffset;
+            selectionRect.Y -= VerticalOffset;
+
+            // Update horizontal offset
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                this._suggestionPopup.HorizontalOffset = 0;
+            }
+            else
+            {
+                double editBoxWidth = this._richEditBox.ActualWidth - padding.Left - padding.Right;
+                if (this._suggestionPopup.HorizontalOffset == 0 && editBoxWidth > 0)
+                {
+                    var normalizedX = selectionRect.X / editBoxWidth;
+                    this._suggestionPopup.HorizontalOffset =
+                        (this._richEditBox.ActualWidth - this._suggestionsContainer.ActualWidth) * normalizedX;
+                }
+            }
+
+            // Update vertical offset
+            double downOffset = this._richEditBox.ActualHeight;
+            double upOffset = -this._suggestionsContainer.ActualHeight;
+            if (this.PopupPlacement == SuggestionPopupPlacementMode.Floating)
+            {
+                downOffset = selectionRect.Bottom + padding.Top + padding.Bottom;
+                upOffset += selectionRect.Top;
+            }
+
+            if (this._suggestionPopup.VerticalOffset == 0)
+            {
+                if (IsElementOnScreen(this._suggestionsContainer, offsetY: downOffset) &&
+                    (IsElementInsideWindow(this._suggestionsContainer, offsetY: downOffset) ||
+                     !IsElementInsideWindow(this._suggestionsContainer, offsetY: upOffset) ||
+                     !IsElementOnScreen(this._suggestionsContainer, offsetY: upOffset)))
+                {
+                    this._suggestionPopup.VerticalOffset = downOffset;
+                    this._popupOpenDown = true;
+                }
+                else
+                {
+                    this._suggestionPopup.VerticalOffset = upOffset;
+                    this._popupOpenDown = false;
+                }
+
+                UpdateCornerRadii();
+            }
+            else
+            {
+                this._suggestionPopup.VerticalOffset = this._popupOpenDown ? downOffset : upOffset;
+            }
+        }
+
+        /// <summary>
+        /// Set corner radii so that inner corners, where suggestion list and text box connect, are square.
+        /// This only applies when <see cref="PopupPlacement"/> is set to <see cref="SuggestionPopupPlacementMode.Attached"/>.
+        /// </summary>
+        /// https://docs.microsoft.com/en-us/windows/apps/design/style/rounded-corner#when-not-to-round
+        private void UpdateCornerRadii()
+        {
+            if (this._richEditBox == null || this._suggestionsContainer == null ||
+                !ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                return;
+            }
+
+            this._richEditBox.CornerRadius = CornerRadius;
+            this._suggestionsContainer.CornerRadius = PopupCornerRadius;
+
+            if (this._suggestionPopup.IsOpen && PopupPlacement == SuggestionPopupPlacementMode.Attached)
+            {
+                if (this._popupOpenDown)
+                {
+                    var cornerRadius = new CornerRadius(CornerRadius.TopLeft, CornerRadius.TopRight, 0, 0);
+                    this._richEditBox.CornerRadius = cornerRadius;
+                    var popupCornerRadius =
+                        new CornerRadius(0, 0, PopupCornerRadius.BottomRight, PopupCornerRadius.BottomLeft);
+                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
+                }
+                else
+                {
+                    var cornerRadius = new CornerRadius(0, 0, CornerRadius.BottomRight, CornerRadius.BottomLeft);
+                    this._richEditBox.CornerRadius = cornerRadius;
+                    var popupCornerRadius =
+                        new CornerRadius(PopupCornerRadius.TopLeft, PopupCornerRadius.TopRight, 0, 0);
+                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index bb1e1ee00ec..8a1a2ae3b4d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -6,14 +6,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Deferred;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
-using Windows.Foundation.Metadata;
 using Windows.System;
-using Windows.UI.Input;
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -277,6 +272,12 @@ private void OnLostFocus(object sender, RoutedEventArgs e)
             ShowSuggestionsPopup(false);
         }
 
+        private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            var selectedItem = e.ClickedItem;
+            await CommitSuggestionAsync(selectedItem);
+        }
+
         private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this._suggestionPopup.IsOpen)
@@ -287,10 +288,7 @@ private void SuggestionsList_SizeChanged(object sender, SizeChangedEventArgs e)
 
         private void SuggestionList_GotFocus(object sender, RoutedEventArgs e)
         {
-            if (_richEditBox != null)
-            {
-                _richEditBox.Focus(FocusState.Programmatic);
-            }
+            _richEditBox?.Focus(FocusState.Programmatic);
         }
 
         private void RichEditBox_OnPointerMoved(object sender, PointerRoutedEventArgs e)
@@ -395,12 +393,6 @@ private async void RichEditBox_PreviewKeyDown(object sender, KeyRoutedEventArgs
             }
         }
 
-        private async void SuggestionsList_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            var selectedItem = e.ClickedItem;
-            await CommitSuggestionAsync(selectedItem);
-        }
-
         private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangingEventArgs args)
         {
             if (_ignoreChange || !args.IsContentChanging)
@@ -462,276 +454,6 @@ private async void RichEditBox_Paste(object sender, TextControlPasteEventArgs e)
             }
         }
 
-        private void ExpandSelectionOnPartialTokenSelect(ITextSelection selection, ITextRange tokenRange)
-        {
-            switch (selection.Type)
-            {
-                case SelectionType.InsertionPoint:
-                    // Snap selection to token on click
-                    if (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition < tokenRange.EndPosition)
-                    {
-                        selection.Expand(TextRangeUnit.Link);
-                        InvokeTokenSelected(selection);
-                    }
-
-                    break;
-
-                case SelectionType.Normal:
-                    // We do not want user to partially select a token since pasting to a partial token can break
-                    // the token tracking system, which can result in unwanted character formatting issues.
-                    if ((tokenRange.StartPosition <= selection.StartPosition && selection.EndPosition < tokenRange.EndPosition) ||
-                        (tokenRange.StartPosition < selection.StartPosition && selection.EndPosition <= tokenRange.EndPosition))
-                    {
-                        // TODO: Figure out how to expand selection without breaking selection flow (with Shift select or pointer sweep select)
-                        selection.Expand(TextRangeUnit.Link);
-                        InvokeTokenSelected(selection);
-                    }
-
-                    break;
-            }
-        }
-
-        private void InvokeTokenSelected(ITextSelection selection)
-        {
-            if (TokenSelected == null || !TryGetTokenFromRange(selection, out var token) || token.RangeEnd != selection.EndPosition)
-            {
-                return;
-            }
-
-            TokenSelected.Invoke(this, new RichSuggestTokenSelectedEventArgs
-            {
-                Token = token,
-                Range = selection.GetClone()
-            });
-        }
-
-        private void InvokeTokenPointerOver(PointerPoint pointer)
-        {
-            var pointerPosition = TransformToVisual(_richEditBox).TransformPoint(pointer.Position);
-            var padding = _richEditBox.Padding;
-            pointerPosition.X += HorizontalOffset - padding.Left;
-            pointerPosition.Y += VerticalOffset - padding.Top;
-            var range = TextDocument.GetRangeFromPoint(pointerPosition, PointOptions.ClientCoordinates);
-            var linkRange = range.GetClone();
-            range.Expand(TextRangeUnit.Character);
-            range.GetRect(PointOptions.None, out var hitTestRect, out _);
-            hitTestRect.X -= hitTestRect.Width;
-            hitTestRect.Width *= 2;
-            if (hitTestRect.Contains(pointerPosition) && linkRange.Expand(TextRangeUnit.Link) > 0 &&
-                TryGetTokenFromRange(linkRange, out var token))
-            {
-                this.TokenPointerOver.Invoke(this, new RichSuggestTokenPointerOverEventArgs
-                {
-                    Token = token,
-                    Range = linkRange,
-                    CurrentPoint = pointer
-                });
-            }
-        }
-
-        private async Task RequestSuggestionsAsync(ITextRange range = null)
-        {
-            string prefix;
-            string query;
-            var currentQuery = _currentQuery;
-            var queryFound = range == null
-                ? TryExtractQueryFromSelection(out prefix, out query, out range)
-                : TryExtractQueryFromRange(range, out prefix, out query);
-
-            if (queryFound && prefix == currentQuery?.Prefix && query == currentQuery?.QueryText &&
-                range.EndPosition == currentQuery?.Range.EndPosition && _suggestionPopup.IsOpen)
-            {
-                return;
-            }
-
-            var previousTokenSource = currentQuery?.CancellationTokenSource;
-            if (!(previousTokenSource?.IsCancellationRequested ?? true))
-            {
-                previousTokenSource.Cancel();
-            }
-
-            if (queryFound)
-            {
-                using var tokenSource = new CancellationTokenSource();
-                _currentQuery = new RichSuggestQuery
-                {
-                    Prefix = prefix,
-                    QueryText = query,
-                    Range = range,
-                    CancellationTokenSource = tokenSource
-                };
-
-                var cancellationToken = tokenSource.Token;
-                var eventArgs = new SuggestionRequestedEventArgs { QueryText = query, Prefix = prefix };
-                if (SuggestionRequested != null)
-                {
-                    try
-                    {
-                        await SuggestionRequested.InvokeAsync(this, eventArgs, cancellationToken);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        return;
-                    }
-                }
-
-                if (!eventArgs.Cancel)
-                {
-                    _suggestionChoice = 0;
-                    ShowSuggestionsPopup(_suggestionsList?.Items?.Count > 0);
-                }
-
-                tokenSource.Cancel();
-            }
-            else
-            {
-                ShowSuggestionsPopup(false);
-            }
-        }
-
-        internal async Task CommitSuggestionAsync(object selectedItem)
-        {
-            var currentQuery = _currentQuery;
-            var range = currentQuery?.Range.GetClone();
-            var id = Guid.NewGuid();
-            var prefix = currentQuery?.Prefix;
-            var query = currentQuery?.QueryText;
-
-            // range has length of 0 at the end of the commit.
-            // Checking length == 0 to avoid committing twice.
-            if (prefix == null || query == null || range == null || range.Length == 0)
-            {
-                return;
-            }
-
-            var textBefore = range.Text;
-            var format = CreateTokenFormat(range);
-            var eventArgs = new SuggestionChosenEventArgs
-            {
-                Id = id,
-                Prefix = prefix,
-                QueryText = query,
-                SelectedItem = selectedItem,
-                DisplayText = query,
-                Format = format
-            };
-
-            if (SuggestionChosen != null)
-            {
-                await SuggestionChosen.InvokeAsync(this, eventArgs);
-            }
-
-            var text = eventArgs.DisplayText;
-
-            // Since this operation is async, the document may have changed at this point.
-            // Double check if the range still has the expected query.
-            if (string.IsNullOrEmpty(text) || textBefore != range.Text ||
-                !TryExtractQueryFromRange(range, out var testPrefix, out var testQuery) ||
-                testPrefix != prefix || testQuery != query)
-            {
-                return;
-            }
-
-            lock (_tokensLock)
-            {
-                var displayText = prefix + text;
-
-                _ignoreChange = true;
-                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format ?? format);
-                TextDocument.EndUndoGroup();
-                TextDocument.BeginUndoGroup();
-                _ignoreChange = false;
-
-                if (committed)
-                {
-                    var token = new RichSuggestToken(id, displayText) { Active = true, Item = selectedItem };
-                    token.UpdateTextRange(range);
-                    _tokens.TryAdd(range.Link, token);
-                }
-            }
-        }
-
-        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, ITextCharacterFormat format, bool addTrailingSpace = true)
-        {
-            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
-            range.GetText(TextGetOptions.NoHidden, out var existingText);
-            if (existingText != displayText)
-            {
-                range.SetText(TextSetOptions.Unhide, displayText);
-            }
-
-            var formatBefore = range.CharacterFormat.GetClone();
-            range.CharacterFormat.SetClone(format);
-            PadRange(range, formatBefore);
-            range.Link = $"\"{id}\"";
-
-            // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
-            if (range.Link != $"\"{id}\"")
-            {
-                range.Delete(TextRangeUnit.Story, -1);
-                return false;
-            }
-
-            if (addTrailingSpace)
-            {
-                var clone = range.GetClone();
-                clone.Collapse(false);
-                clone.SetText(TextSetOptions.Unhide, " ");
-                clone.Collapse(false);
-                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
-            }
-
-            return true;
-        }
-
-        private void ValidateTokensInDocument()
-        {
-            lock (_tokensLock)
-            {
-                foreach (var (_, token) in _tokens)
-                {
-                    token.Active = false;
-                }
-            }
-
-            ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
-        }
-
-        private void ValidateTokenFromRange(ITextRange range)
-        {
-            if (range.Length == 0 || !TryGetTokenFromRange(range, out var token))
-            {
-                return;
-            }
-
-            // Check for duplicate tokens. This can happen if the user copies and pastes the token multiple times.
-            if (token.Active && token.RangeStart != range.StartPosition && token.RangeEnd != range.EndPosition)
-            {
-                lock (_tokensLock)
-                {
-                    var guid = Guid.NewGuid();
-                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
-                    {
-                        token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
-                        token.UpdateTextRange(range);
-                        _tokens.Add(range.Link, token);
-                    }
-
-                    return;
-                }
-            }
-
-            if (token.ToString() != range.Text)
-            {
-                range.Delete(TextRangeUnit.Story, 0);
-                token.Active = false;
-                return;
-            }
-
-            token.UpdateTextRange(range);
-            token.Active = true;
-        }
-
         private void ConditionallyLoadElement(object property, string elementName)
         {
             if (property != null && GetTemplateChild(elementName) is UIElement presenter)
@@ -740,235 +462,6 @@ private void ConditionallyLoadElement(object property, string elementName)
             }
         }
 
-        private void UpdateSuggestionsListSelectedItem(int choice)
-        {
-            var itemsList = _suggestionsList.Items;
-            if (itemsList == null)
-            {
-                return;
-            }
-
-            _suggestionsList.SelectedItem = choice == 0 ? null : itemsList[choice - 1];
-            _suggestionsList.ScrollIntoView(_suggestionsList.SelectedItem);
-        }
-
-        private void ShowSuggestionsPopup(bool show)
-        {
-            if (_suggestionPopup == null)
-            {
-                return;
-            }
-
-            this._suggestionPopup.IsOpen = show;
-            if (!show)
-            {
-                this._suggestionChoice = 0;
-                this._suggestionPopup.VerticalOffset = 0;
-                this._suggestionPopup.HorizontalOffset = 0;
-                this._suggestionsList.SelectedItem = null;
-                this._suggestionsList.ScrollIntoView(this._suggestionsList.Items?.FirstOrDefault());
-                UpdateCornerRadii();
-            }
-        }
-
-        private void UpdatePopupWidth()
-        {
-            if (this._suggestionsContainer == null)
-            {
-                return;
-            }
-
-            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
-            {
-                this._suggestionsContainer.MaxWidth = double.PositiveInfinity;
-                this._suggestionsContainer.Width = this._richEditBox.ActualWidth;
-            }
-            else
-            {
-                this._suggestionsContainer.MaxWidth = this._richEditBox.ActualWidth;
-                this._suggestionsContainer.Width = double.NaN;
-            }
-        }
-
-        /// <summary>
-        /// Calculate whether to open the suggestion list up or down depends on how much screen space is available
-        /// </summary>
-        private void UpdatePopupOffset()
-        {
-            if (this._suggestionsContainer == null || this._suggestionPopup == null || this._richEditBox == null)
-            {
-                return;
-            }
-
-            this._richEditBox.TextDocument.Selection.GetRect(PointOptions.None, out var selectionRect, out _);
-            Thickness padding = this._richEditBox.Padding;
-            selectionRect.X -= HorizontalOffset;
-            selectionRect.Y -= VerticalOffset;
-
-            // Update horizontal offset
-            if (this.PopupPlacement == SuggestionPopupPlacementMode.Attached)
-            {
-                this._suggestionPopup.HorizontalOffset = 0;
-            }
-            else
-            {
-                double editBoxWidth = this._richEditBox.ActualWidth - padding.Left - padding.Right;
-                if (this._suggestionPopup.HorizontalOffset == 0 && editBoxWidth > 0)
-                {
-                    var normalizedX = selectionRect.X / editBoxWidth;
-                    this._suggestionPopup.HorizontalOffset =
-                        (this._richEditBox.ActualWidth - this._suggestionsContainer.ActualWidth) * normalizedX;
-                }
-            }
-
-            // Update vertical offset
-            double downOffset = this._richEditBox.ActualHeight;
-            double upOffset = -this._suggestionsContainer.ActualHeight;
-            if (this.PopupPlacement == SuggestionPopupPlacementMode.Floating)
-            {
-                downOffset = selectionRect.Bottom + padding.Top + padding.Bottom;
-                upOffset += selectionRect.Top;
-            }
-
-            if (this._suggestionPopup.VerticalOffset == 0)
-            {
-                if (IsElementOnScreen(this._suggestionsContainer, offsetY: downOffset) &&
-                    (IsElementInsideWindow(this._suggestionsContainer, offsetY: downOffset) ||
-                     !IsElementInsideWindow(this._suggestionsContainer, offsetY: upOffset) ||
-                     !IsElementOnScreen(this._suggestionsContainer, offsetY: upOffset)))
-                {
-                    this._suggestionPopup.VerticalOffset = downOffset;
-                    this._popupOpenDown = true;
-                }
-                else
-                {
-                    this._suggestionPopup.VerticalOffset = upOffset;
-                    this._popupOpenDown = false;
-                }
-
-                UpdateCornerRadii();
-            }
-            else
-            {
-                this._suggestionPopup.VerticalOffset = this._popupOpenDown ? downOffset : upOffset;
-            }
-        }
-
-        /// <summary>
-        /// Set corner radii so that inner corners, where suggestion list and text box connect, are square.
-        /// This only applies when <see cref="PopupPlacement"/> is set to <see cref="SuggestionPopupPlacementMode.Attached"/>.
-        /// </summary>
-        /// https://docs.microsoft.com/en-us/windows/apps/design/style/rounded-corner#when-not-to-round
-        private void UpdateCornerRadii()
-        {
-            if (this._richEditBox == null || this._suggestionsContainer == null ||
-                !ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
-            {
-                return;
-            }
-
-            this._richEditBox.CornerRadius = CornerRadius;
-            this._suggestionsContainer.CornerRadius = PopupCornerRadius;
-
-            if (this._suggestionPopup.IsOpen && PopupPlacement == SuggestionPopupPlacementMode.Attached)
-            {
-                if (this._popupOpenDown)
-                {
-                    var cornerRadius = new CornerRadius(CornerRadius.TopLeft, CornerRadius.TopRight, 0, 0);
-                    this._richEditBox.CornerRadius = cornerRadius;
-                    var popupCornerRadius =
-                        new CornerRadius(0, 0, PopupCornerRadius.BottomRight, PopupCornerRadius.BottomLeft);
-                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
-                }
-                else
-                {
-                    var cornerRadius = new CornerRadius(0, 0, CornerRadius.BottomRight, CornerRadius.BottomLeft);
-                    this._richEditBox.CornerRadius = cornerRadius;
-                    var popupCornerRadius =
-                        new CornerRadius(PopupCornerRadius.TopLeft, PopupCornerRadius.TopRight, 0, 0);
-                    this._suggestionsContainer.CornerRadius = popupCornerRadius;
-                }
-            }
-        }
-
-        private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
-        {
-            prefix = string.Empty;
-            query = string.Empty;
-            range = null;
-            if (TextDocument.Selection.Type != SelectionType.InsertionPoint)
-            {
-                return false;
-            }
-
-            // Check if selection is on existing link (suggestion)
-            var expandCount = TextDocument.Selection.GetClone().Expand(TextRangeUnit.Link);
-            if (expandCount != 0)
-            {
-                return false;
-            }
-
-            var selection = TextDocument.Selection.GetClone();
-            selection.MoveStart(TextRangeUnit.Word, -1);
-            if (selection.Length == 0)
-            {
-                return false;
-            }
-
-            range = selection;
-            if (TryExtractQueryFromRange(selection, out prefix, out query))
-            {
-                return true;
-            }
-
-            selection.MoveStart(TextRangeUnit.Word, -1);
-            if (TryExtractQueryFromRange(selection, out prefix, out query))
-            {
-                return true;
-            }
-
-            range = null;
-            return false;
-        }
-
-        private bool TryExtractQueryFromRange(ITextRange range, out string prefix, out string query)
-        {
-            prefix = string.Empty;
-            query = string.Empty;
-            range.GetText(TextGetOptions.NoHidden, out var possibleQuery);
-            if (possibleQuery.Length > 0 && Prefixes.Contains(possibleQuery[0]) &&
-                !possibleQuery.Any(char.IsWhiteSpace) && string.IsNullOrEmpty(range.Link))
-            {
-                if (possibleQuery.Length == 1)
-                {
-                    prefix = possibleQuery;
-                    return true;
-                }
-
-                prefix = possibleQuery[0].ToString();
-                query = possibleQuery.Substring(1);
-                return true;
-            }
-
-            return false;
-        }
-
-        private ITextCharacterFormat CreateTokenFormat(ITextRange range)
-        {
-            var format = range.CharacterFormat.GetClone();
-            if (this.TokenBackground != null)
-            {
-                format.BackgroundColor = this.TokenBackground.Color;
-            }
-
-            if (this.TokenForeground != null)
-            {
-                format.ForegroundColor = this.TokenForeground.Color;
-            }
-
-            return format;
-        }
-
         private void UpdateVisibleTokenList()
         {
             lock (_tokensLock)

From ede46a3e4e5a9fcd39d6eeecc37d8a5c9c63cac7 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Mon, 30 Aug 2021 00:27:59 -0700
Subject: [PATCH 177/200] abstract internal document edit into CreateSingleEdit

---
 .../RichSuggestBox/RichSuggestBox.Document.cs | 99 ++++++++++---------
 .../RichSuggestBox/RichSuggestBox.Helpers.cs  |  1 -
 .../RichSuggestBox.Suggestion.cs              | 21 ++--
 .../RichSuggestBox/RichSuggestBox.cs          |  9 +-
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
index 53b7b06c2fc..944d4dae017 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Document.cs
@@ -15,6 +15,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class RichSuggestBox
     {
+        private void CreateSingleEdit(Action editAction)
+        {
+            _ignoreChange = true;
+            editAction.Invoke();
+            TextDocument.EndUndoGroup();
+            TextDocument.BeginUndoGroup();
+            _ignoreChange = false;
+        }
+
         private void ExpandSelectionOnPartialTokenSelect(ITextSelection selection, ITextRange tokenRange)
         {
             switch (selection.Type)
@@ -82,47 +91,11 @@ private void InvokeTokenPointerOver(PointerPoint pointer)
             }
         }
 
-        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, ITextCharacterFormat format, bool addTrailingSpace = true)
-        {
-            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
-            range.GetText(TextGetOptions.NoHidden, out var existingText);
-            if (existingText != displayText)
-            {
-                range.SetText(TextSetOptions.Unhide, displayText);
-            }
-
-            var formatBefore = range.CharacterFormat.GetClone();
-            range.CharacterFormat.SetClone(format);
-            PadRange(range, formatBefore);
-            range.Link = $"\"{id}\"";
-
-            // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
-            if (range.Link != $"\"{id}\"")
-            {
-                range.Delete(TextRangeUnit.Story, -1);
-                return false;
-            }
-
-            if (addTrailingSpace)
-            {
-                var clone = range.GetClone();
-                clone.Collapse(false);
-                clone.SetText(TextSetOptions.Unhide, " ");
-                clone.Collapse(false);
-                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
-            }
-
-            return true;
-        }
-
         private void ValidateTokensInDocument()
         {
-            lock (_tokensLock)
+            foreach (var (_, token) in _tokens)
             {
-                foreach (var (_, token) in _tokens)
-                {
-                    token.Active = false;
-                }
+                token.Active = false;
             }
 
             ForEachLinkInDocument(TextDocument, ValidateTokenFromRange);
@@ -138,18 +111,15 @@ private void ValidateTokenFromRange(ITextRange range)
             // Check for duplicate tokens. This can happen if the user copies and pastes the token multiple times.
             if (token.Active && token.RangeStart != range.StartPosition && token.RangeEnd != range.EndPosition)
             {
-                lock (_tokensLock)
+                var guid = Guid.NewGuid();
+                if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
                 {
-                    var guid = Guid.NewGuid();
-                    if (TryCommitSuggestionIntoDocument(range, token.DisplayText, guid, CreateTokenFormat(range), false))
-                    {
-                        token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
-                        token.UpdateTextRange(range);
-                        _tokens.Add(range.Link, token);
-                    }
-
-                    return;
+                    token = new RichSuggestToken(guid, token.DisplayText) { Active = true, Item = token.Item };
+                    token.UpdateTextRange(range);
+                    _tokens.Add(range.Link, token);
                 }
+
+                return;
             }
 
             if (token.ToString() != range.Text)
@@ -163,6 +133,39 @@ private void ValidateTokenFromRange(ITextRange range)
             token.Active = true;
         }
 
+        private bool TryCommitSuggestionIntoDocument(ITextRange range, string displayText, Guid id, ITextCharacterFormat format, bool addTrailingSpace)
+        {
+            // We don't want to set text when the display text doesn't change since it may lead to unexpected caret move.
+            range.GetText(TextGetOptions.NoHidden, out var existingText);
+            if (existingText != displayText)
+            {
+                range.SetText(TextSetOptions.Unhide, displayText);
+            }
+
+            var formatBefore = range.CharacterFormat.GetClone();
+            range.CharacterFormat.SetClone(format);
+            PadRange(range, formatBefore);
+            range.Link = $"\"{id}\"";
+
+            // In some rare case, setting Link can fail. Only observed when interacting with Undo/Redo feature.
+            if (range.Link != $"\"{id}\"")
+            {
+                range.Delete(TextRangeUnit.Story, -1);
+                return false;
+            }
+
+            if (addTrailingSpace)
+            {
+                var clone = range.GetClone();
+                clone.Collapse(false);
+                clone.SetText(TextSetOptions.Unhide, " ");
+                clone.Collapse(false);
+                TextDocument.Selection.SetRange(clone.EndPosition, clone.EndPosition);
+            }
+
+            return true;
+        }
+
         private bool TryExtractQueryFromSelection(out string prefix, out string query, out ITextRange range)
         {
             prefix = string.Empty;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
index 0357e261b4b..0be8e37615b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Linq;
-using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI.Core;
 using Windows.UI.Text;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs
index 9574bfa7189..d73f390d10a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Suggestion.cs
@@ -119,23 +119,22 @@ internal async Task CommitSuggestionAsync(object selectedItem)
                 return;
             }
 
-            lock (_tokensLock)
-            {
-                var displayText = prefix + text;
+            var displayText = prefix + text;
 
-                _ignoreChange = true;
-                var committed = TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format ?? format);
-                TextDocument.EndUndoGroup();
-                TextDocument.BeginUndoGroup();
-                _ignoreChange = false;
-
-                if (committed)
+            void RealizeToken()
+            {
+                if (TryCommitSuggestionIntoDocument(range, displayText, id, eventArgs.Format ?? format, true))
                 {
                     var token = new RichSuggestToken(id, displayText) { Active = true, Item = selectedItem };
                     token.UpdateTextRange(range);
-                    _tokens.TryAdd(range.Link, token);
+                    _tokens.Add(range.Link, token);
                 }
             }
+
+            lock (_tokensLock)
+            {
+                this.CreateSingleEdit(RealizeToken);
+            }
         }
 
         private void UpdateSuggestionsListSelectedItem(int choice)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
index 8a1a2ae3b4d..856216412ad 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs
@@ -400,11 +400,10 @@ private void RichEditBox_TextChanging(RichEditBox sender, RichEditBoxTextChangin
                 return;
             }
 
-            _ignoreChange = true;
-            ValidateTokensInDocument();
-            TextDocument.EndUndoGroup();
-            TextDocument.BeginUndoGroup();
-            _ignoreChange = false;
+            lock (_tokensLock)
+            {
+                this.CreateSingleEdit(ValidateTokensInDocument);
+            }
         }
 
         private void RichEditBox_TextChanged(object sender, RoutedEventArgs e)

From 8c9890bd23bb889b0ad93e9b5f2bddfee4debe69 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Mon, 30 Aug 2021 17:29:37 -0700
Subject: [PATCH 178/200] Apply WeakReference

---
 ...rameworkElementExtensions.RelativeAncestor.cs | 16 +---------------
 .../Test_FrameworkElementExtensions.cs           |  2 ++
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index e17fe1fb893..f981e75d6ca 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -25,10 +25,8 @@ public static object GetAncestor(DependencyObject obj)
         /// </summary>
         /// <param name="obj">Parent object</param>
         /// <param name="value">FrameworkElement</param>
-        //public static void SetAncestor(DependencyObject obj, WeakReference<object> value)
         public static void SetAncestor(DependencyObject obj, object value)
         {
-            //obj.SetValue(AncestorProperty, value);
             obj.SetValue(AncestorProperty, new WeakReference<object>(value));
         }
 
@@ -38,7 +36,6 @@ public static void SetAncestor(DependencyObject obj, object value)
         public static readonly DependencyProperty AncestorProperty =
             DependencyProperty.RegisterAttached("Ancestor",
                 typeof(WeakReference<object>), 
-                //typeof(object),
                 typeof(FrameworkElementExtensions), 
                 new PropertyMetadata(null));
 
@@ -73,13 +70,11 @@ private static void AncestorType_PropertyChanged(DependencyObject obj, Dependenc
             if (obj is FrameworkElement fe)
             {
                 fe.Loaded -= FrameworkElement_Loaded;
-                //fe.Unloaded -= FrameworkElement_Unloaded;
 
                 if (args.NewValue != null)
                 {
                     fe.Loaded += FrameworkElement_Loaded;
-                    //fe.Unloaded += FrameworkElement_Unloaded;
-
+                    
                     if (fe.Parent != null)
                     {
                         FrameworkElement_Loaded(fe, null);
@@ -92,17 +87,8 @@ private static void FrameworkElement_Loaded(object sender, RoutedEventArgs e)
         {
             if (sender is FrameworkElement fe)
             {
-                //SetAncestor(fe, new WeakReference<object>(fe.FindAscendant(GetAncestorType(fe))));
                 SetAncestor(fe, fe.FindAscendant(GetAncestorType(fe)));
             }
         }
-
-        private static void FrameworkElement_Unloaded(object sender, RoutedEventArgs e)
-        {
-            if(sender is FrameworkElement fe)
-            {
-                SetAncestor(fe, null);
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
index 52eadeb27c1..6c6ab6da263 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -39,6 +39,8 @@ public async Task Test_Ancestor_WeakReference()
 
                 var btn = treeRoot.FindChild("InnerButton") as Button;
 
+                Assert.IsNull(btn.Parent);
+
                 btn.SetValue(FrameworkElementExtensions.AncestorProperty, new object());
 
                 Assert.IsNull(btn.Parent);

From cefaeeb258b5f48f8a2b436802b71a28b306d599 Mon Sep 17 00:00:00 2001
From: brianboly <brianboly@gmail.com>
Date: Tue, 31 Aug 2021 16:39:15 -0400
Subject: [PATCH 179/200] Improving ComboBoxColumn behavior to prevent need to
 click a ComboBox 3 times for DropDown expansion

---
 .../DataGrid/DataGridComboBoxColumn.cs                    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
index 42f67a40b51..d18d106aa2f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
@@ -383,7 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u
         /// <returns>The unedited value. </returns>
         protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
         {
-            return (editingElement as ComboBox)?.SelectedItem;
+            var comboBox = editingElement as ComboBox;
+            if (comboBox != null)
+            {
+                comboBox.IsDropDownOpen = true;
+            }
+
+            return comboBox?.SelectedItem;
         }
 
         /// <summary>

From 81504cec0848bbbb5382dc188ffe07905bd9e589 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:13:47 -0700
Subject: [PATCH 180/200] Add extra requirements for controls to checklist

---
 .github/PULL_REQUEST_TEMPLATE.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 14fe6178110..ee7279502fa 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -38,7 +38,10 @@ What kind of change does this PR introduce?
 Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR -->
 
 - [ ] Tested code with current [supported SDKs](../#supported)
-- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
+- [ ] New component
+  - [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
+  - [ ] Added description of major feature to project description for NuGet package (4000 total character limit, so don't push entire description over that)
+  - [ ] If control, added to Visual Studio Design project
 - [ ] Sample in sample app has been added / updated (for bug fixes / features)
   - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
 - [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
@@ -51,4 +54,4 @@ Please note that breaking changes are likely to be rejected within minor release
 
 ## Other information
 
-<!-- Please add any other information that might be helpful to reviewers. -->
\ No newline at end of file
+<!-- Please add any other information that might be helpful to reviewers. -->

From 2f9a2668c9750c8cf21b0d098fdfe07dd08f33e9 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Tue, 31 Aug 2021 17:08:59 -0700
Subject: [PATCH 181/200] Added missing header

---
 .../Extensions/Test_FrameworkElementExtensions.cs             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
index 6c6ab6da263..4766eea9dd7 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

From 20c61f9393d8208fcaf692c2b8343c7c807f60a9 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Feb 2021 14:02:41 +0530
Subject: [PATCH 182/200] Convert Design projects to Sdk-style

- Update Solution to Use CPS for the Design projects.
- Move 'MetadataRegistration.cs' file into Common folder.
- Remove 'AssemblyInfo.cs' file as it's generated by .NET SDK.
---
 .../{readme.md => ReadMe.md}                  |   0
 .../{ => Common}/MetadataRegistration.cs      |  10 +-
 ...it.Uwp.UI.Controls.Core.DesignTools.csproj | 141 +---------
 .../Properties/AssemblyInfo.cs                |  32 ---
 ...wp.UI.Controls.DataGrid.DesignTools.csproj | 112 +-------
 .../Properties/AssemblyInfo.cs                |  32 ---
 ...t.Uwp.UI.Controls.Input.DesignTools.csproj | 117 +-------
 .../Properties/AssemblyInfo.cs                |  32 ---
 ....Uwp.UI.Controls.Layout.DesignTools.csproj | 127 +--------
 .../Properties/AssemblyInfo.cs                |  32 ---
 ...wp.UI.Controls.Markdown.DesignTools.csproj | 112 +-------
 .../Properties/AssemblyInfo.cs                |  32 ---
 ....UI.Controls.Primitives.DesignTools.csproj | 114 +-------
 .../Properties/AssemblyInfo.cs                |  32 ---
 Windows Community Toolkit.sln                 | 256 +++++++++---------
 .../Windows.Toolkit.VisualStudio.Design.props |  35 ++-
 ...indows.Toolkit.VisualStudio.Design.targets |  13 +
 17 files changed, 238 insertions(+), 991 deletions(-)
 rename Microsoft.Toolkit.Uwp.Notifications/{readme.md => ReadMe.md} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/{ => Common}/MetadataRegistration.cs (77%)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
 create mode 100644 build/Windows.Toolkit.VisualStudio.Design.targets

diff --git a/Microsoft.Toolkit.Uwp.Notifications/readme.md b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/readme.md
rename to Microsoft.Toolkit.Uwp.Notifications/ReadMe.md
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs
similarity index 77%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs
index 2b755e8893f..c6f6e697283 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs
@@ -20,9 +20,11 @@ public MetadataRegistration() : base()
             // Note:
             // The default constructor sets value of 'AssemblyFullName' and
             // 'XmlResourceName' used by 'MetadataRegistrationBase.AddDescriptions()'.
-            // The convention here is that the <RootNamespace> in '.DesignTools.csproj'
-            // (or Default namespace in Project -> Properties -> Application tab)
-            // must be the same as runtime assembly's main namespace plus ".Design".
+            // The convention here is that the root namespace plus the Controls category.
+            // Example:
+            //           <RootNamespace>           + "." + <ControlsCategory> + ".xml"
+            // "Microsoft.Toolkit.Uwp.UI.Controls" + "." +    "Primitives"    + ".xml"
+
             Type thisType = this.GetType();
             AssemblyName designLib = thisType.Assembly.GetName();
 
@@ -31,7 +33,7 @@ public MetadataRegistration() : base()
             string controlLibName = designLib.Name.Remove(annexStart, annexString.Length);
 
             AssemblyFullName = designLib.FullName;
-            XmlResourceName = $"{thisType.Namespace}{controlLibName}.xml";
+            XmlResourceName = $"{controlLibName}.xml";
         }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index 203fa4c3487..2db5364050f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -1,136 +1,15 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - Common Controls (DesignTools)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Common Controls</Description>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Common\Constants.cs" />
-    <Compile Include="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="Common\PlatformTypes.cs" />
-    <Compile Include="Controls\DropShadowPanel.Metadata.cs" />
-    <Compile Include="Controls\DropShadowPanel.Typedata.cs" />
-    <Compile Include="Controls\ImageEx.Metadata.cs" />
-    <Compile Include="Controls\ImageEx.Typedata.cs" />
-    <Compile Include="Controls\InAppNotification.Metadata.cs" />
-    <Compile Include="Controls\InAppNotification.Typedata.cs" />
-    <Compile Include="Controls\Loading.Metadata.cs" />
-    <Compile Include="Controls\Loading.Typedata.cs" />
-    <Compile Include="Controls\Menu.Metadata.cs" />
-    <Compile Include="Controls\Menu.Typedata.cs" />
-    <Compile Include="Controls\MenuItem.Metadata.cs" />
-    <Compile Include="Controls\MenuItem.Typedata.cs" />
-    <Compile Include="Controls\RadialProgressBar.Metadata.cs" />
-    <Compile Include="Controls\RadialProgressBar.Typedata.cs" />
-    <Compile Include="Controls\RotatorTile.Metadata.cs" />
-    <Compile Include="Controls\RotatorTile.Typedata.cs" />
-    <Compile Include="Controls\ScrollHeader.Metadata.cs" />
-    <Compile Include="Controls\ScrollHeader.Typedata.cs" />
-    <Compile Include="Controls\TabbedCommandBar.Metadata.cs" />
-    <Compile Include="Controls\TabbedCommandBar.Typedata.cs" />
-    <Compile Include="Controls\TabbedCommandBarItem.Metadata.cs" />
-    <Compile Include="Controls\TabbedCommandBarItem.Typedata.cs" />
-    <Compile Include="Controls\TextToolbar.Metadata.cs" />
-    <Compile Include="Controls\TextToolbar.Typedata.cs" />
-    <Compile Include="Controls\TileControl.Metadata.cs" />
-    <Compile Include="Controls\TileControl.Typedata.cs" />
-    <Compile Include="MetadataRegistration.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Core.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Core.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Icons\Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png" />
-    <EmbeddedResource Include="Icons\Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index f73fd4f9e89..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
index 2a21fa70bd4..e54f0629e60 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
@@ -1,107 +1,19 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - DataGrid Control (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit DataGrid Control</Description>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
-    <Compile Include="Controls\DataGrid.Metadata.cs" />
-    <Compile Include="Controls\DataGrid.Typedata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4307a45aee6..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls DataGrid (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls DataGrid")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
index 2d2510304dd..3d09eb7086b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
@@ -1,112 +1,19 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{3307BC1D-5D71-41C6-A1B3-B113B8242D08}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - Input Controls (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Input Controls</Description>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
-    <Compile Include="Controls\RadialGauge.Metadata.cs" />
-    <Compile Include="Controls\RadialGauge.Typedata.cs" />
-    <Compile Include="Controls\RangeSelector.Metadata.cs" />
-    <Compile Include="Controls\RangeSelector.Typedata.cs" />
-    <Compile Include="Controls\RichSuggestBox.Typedata.cs" />
-    <Compile Include="Controls\RichSuggestBox.Metadata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Input.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Input.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index f73fd4f9e89..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
index 8a2b8b57ae4..d394a24fab3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
@@ -1,122 +1,19 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - Layout Controls (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Layout Controls</Description>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
-    <Compile Include="Controls\BladeItem.Metadata.cs" />
-    <Compile Include="Controls\BladeItem.Typedata.cs" />
-    <Compile Include="Controls\BladeView.Metadata.cs" />
-    <Compile Include="Controls\BladeView.Typedata.cs" />
-    <Compile Include="Controls\Carousel.Metadata.cs" />
-    <Compile Include="Controls\Carousel.Typedata.cs" />
-    <Compile Include="Controls\Expander.Metadata.cs" />
-    <Compile Include="Controls\Expander.Typedata.cs" />
-    <Compile Include="Controls\GridSplitter.Metadata.cs" />
-    <Compile Include="Controls\GridSplitter.Typedata.cs" />
-    <Compile Include="Controls\LayoutTransitionControl.Metadata.cs" />
-    <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
-    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
-    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
-    <Compile Include="Controls\OrbitView.Metadata.cs" />
-    <Compile Include="Controls\OrbitView.Typedata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Layout.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Layout.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index f73fd4f9e89..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
index 1402810bf0b..01340cfae86 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
@@ -1,107 +1,19 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{67FE47A0-CA93-4680-B770-A0A48C1DBC40}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - Markdown Control (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Markdown Control</Description>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
-    <Compile Include="Controls\MarkdownTextBlock.Metadata.cs" />
-    <Compile Include="Controls\MarkdownTextBlock.Typedata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index 155da46d428..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls Markdown (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Markdown Controls")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
index 281073e59c6..51ff1a1233e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -1,109 +1,19 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\</OutputPath>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\</OutputPath>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
-    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+    <AssemblyTitle>Windows Community Toolkit - Basic Controls (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Basic Controls</Description>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Runtime.WindowsRuntime" />
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup Label="WinRT References">
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Aliases>WindowsRuntime</Aliases>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
-    <Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
-    <Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
-    <Compile Include="Controls\WrapPanel.Metadata.cs" />
-    <Compile Include="Controls\WrapPanel.Typedata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml</Link>
-      <Visible>False</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
deleted file mode 100644
index eefe23842bb..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Windows Community Toolkit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US English
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 1b9704c9604..56a778d4b97 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29230.61
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31521.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9AD30620-667D-433C-9961-8D885EE7B762}"
 EndProject
@@ -52,12 +52,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		settings.xamlstyler = settings.xamlstyler
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72}
 	EndProjectSection
@@ -105,7 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj", "{6FEDF199-B052-49DD-8F3E-2A9224998E0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {6FEDF199-B052-49DD-8F3E-2A9224998E0F}
 	EndProjectSection
@@ -138,19 +138,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design\Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj", "{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design\Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj", "{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99} = {CB444381-18BA-4A51-BB32-3A498BCC1E99}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input", "Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj", "{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}
 	EndProjectSection
@@ -492,46 +492,46 @@ Global
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|x64.Build.0 = Release|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.ActiveCfg = Release|Any CPU
 		{94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.Build.0 = Release|Any CPU
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.ActiveCfg = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.ActiveCfg = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.Build.0 = Debug|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.Build.0 = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.Build.0 = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.Build.0 = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|x86
-		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.ActiveCfg = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.ActiveCfg = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.ActiveCfg = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.ActiveCfg = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.Build.0 = Debug|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.Build.0 = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.Build.0 = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.Build.0 = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.Build.0 = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.ActiveCfg = Release|x86
-		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.Build.0 = Release|x86
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.Build.0 = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.Build.0 = Debug|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.Build.0 = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM64.Build.0 = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.ActiveCfg = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM.Build.0 = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|ARM64.Build.0 = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x64.Build.0 = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Release|x86.Build.0 = Release|Any CPU
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5BF75694-798A-43A0-8150-415DE195359C}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -804,26 +804,26 @@ Global
 		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU
 		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU
 		{6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.Build.0 = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86
-		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|Any CPU
+		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.Build.0 = Debug|Any CPU
@@ -1016,46 +1016,46 @@ Global
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.Build.0 = Release|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.ActiveCfg = Release|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.Build.0 = Release|Any CPU
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.Build.0 = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.ActiveCfg = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.Build.0 = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.ActiveCfg = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.Build.0 = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.ActiveCfg = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.Build.0 = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.ActiveCfg = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.Build.0 = Debug|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.ActiveCfg = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.Build.0 = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.ActiveCfg = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.Build.0 = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.Build.0 = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.Build.0 = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86
-		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.Build.0 = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.ActiveCfg = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.Build.0 = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.ActiveCfg = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.Build.0 = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.ActiveCfg = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.Build.0 = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.ActiveCfg = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.Build.0 = Debug|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.ActiveCfg = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.Build.0 = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.ActiveCfg = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.Build.0 = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.ActiveCfg = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.Build.0 = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.Build.0 = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86
-		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.Build.0 = Debug|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.Build.0 = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.Build.0 = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.Build.0 = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.Build.0 = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.Build.0 = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.Build.0 = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1076,26 +1076,26 @@ Global
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.Build.0 = Release|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.Build.0 = Release|Any CPU
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.Build.0 = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.Build.0 = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.Build.0 = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.Build.0 = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.Build.0 = Debug|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.ActiveCfg = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.Build.0 = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.Build.0 = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.Build.0 = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.Build.0 = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
-		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.Build.0 = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.Build.0 = Debug|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.Build.0 = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.Build.0 = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.Build.0 = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|Any CPU
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.ActiveCfg = Debug|Any CPU
diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props
index de91a09dfad..be20674e59f 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.props
+++ b/build/Windows.Toolkit.VisualStudio.Design.props
@@ -1,21 +1,28 @@
 <Project>
 
   <PropertyGroup>
-    <BaseIntermediateOutputPath>$([MSBuild]::EnsureTrailingSlash($([MSBuild]::ValueOrDefault('$(BaseIntermediateOutputPath)', 'obj'))))</BaseIntermediateOutputPath>
+    <UseWPF>True</UseWPF>
+    <IsPackable>False</IsPackable>
+    <NoWarn>CS0618;$(NoWarn)</NoWarn>
   </PropertyGroup>
 
-  <Choose>
-    <When Condition="$(MSBuildProjectName.EndsWith('.Design'))">
-      <PropertyGroup>
-        <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)Design\</MSBuildProjectExtensionsPath>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(MSBuildProjectName.EndsWith('.DesignTools'))">
-      <PropertyGroup>
-        <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)DesignTools\</MSBuildProjectExtensionsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise/>
-  </Choose>
+  <PropertyGroup>
+    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>False</AppendRuntimeIdentifierToOutputPath>
+    <EmbeddedResourceUseDependentUponConvention>True</EmbeddedResourceUseDependentUponConvention>
+    <ParentTargetFramework>uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision)</ParentTargetFramework>
+    <ParentProjectName>$(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.'))))</ParentProjectName>
+    <!-- Strip root namespace from strings like "Microsoft.Toolkit.Uwp.UI.Controls.Primitives" to just "Primitives" -->
+    <ParentProjectType>$(ParentProjectName.Remove(0, $([MSBuild]::Add($(ParentProjectName.LastIndexOf('.')), '1'))))</ParentProjectType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AppDesigner Include="Properties\"/>
+    <EmbeddedResource Include="Icons\$(ParentProjectName).*.icon.png"/>
+    <EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml">
+      <Link>$(ParentProjectType).xml</Link>
+      <Visible>False</Visible>
+    </EmbeddedResource>
+  </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets
new file mode 100644
index 00000000000..842a7ad3c30
--- /dev/null
+++ b/build/Windows.Toolkit.VisualStudio.Design.targets
@@ -0,0 +1,13 @@
+<Project>
+
+  <PropertyGroup>
+    <ParentProjectOutputPath>..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\</ParentProjectOutputPath>
+    <OutputPath>$(ParentProjectOutputPath)Design\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.DesignTools.Extensibility" Version="16.4.29519.181" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision).*" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file

From ea41b480b4f00fe6ddb2e87e910cc4625ee97a46 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Feb 2021 15:04:09 +0530
Subject: [PATCH 183/200] Build Design project's parent when not under solution
 build

The reason we build the Controls library first is that we have a dependency on the XML Doc file it generates.
The Doc file is embedded within the Design library and it uses it's type-info to populate metadata automatically.
---
 build/Windows.Toolkit.VisualStudio.Design.targets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets
index 842a7ad3c30..4c389fa9cd8 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.targets
+++ b/build/Windows.Toolkit.VisualStudio.Design.targets
@@ -5,6 +5,14 @@
     <OutputPath>$(ParentProjectOutputPath)Design\</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">
+    <ProjectReference Include="..\$(ParentProjectName)\$(ParentProjectName)$(MSBuildProjectExtension)">
+      <Private>False</Private>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+    </ProjectReference>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.DesignTools.Extensibility" Version="16.4.29519.181" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision).*" />

From 67f3906eea3b8d951025668d0fd1dc7420da536f Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Feb 2021 15:04:21 +0530
Subject: [PATCH 184/200] Add Design project for the UWP Media controls

Basic DesignTime support on-par with other controls in the toolkit.

Reverts the following commit
- Commit Message: `Media Controls does not have a "DesignTools" project`
- Commit Hash   : `1781e7f4291061c642fedfa5307aa80879838b56`
---
 ...t.Uwp.UI.Controls.Media.DesignTools.csproj |  19 +++
 .../Properties/Resources.Designer.cs          |  81 +++++++++++
 .../Properties/Resources.resx                 | 126 ++++++++++++++++++
 ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj |   4 +-
 Windows Community Toolkit.sln                 |  28 +++-
 5 files changed, 255 insertions(+), 3 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
new file mode 100644
index 00000000000..a2a931cea64
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AssemblyTitle>Windows Community Toolkit - Media Controls (Design)</AssemblyTitle>
+    <Description>Design time support for Windows Community Toolkit Media Controls</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
+  </ItemGroup>
+
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
+
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..35acb0b25a0
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    using System;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Common.
+        /// </summary>
+        internal static string CategoryCommon {
+            get {
+                return ResourceManager.GetString("CategoryCommon", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Layout.
+        /// </summary>
+        internal static string CategoryLayout {
+            get {
+                return ResourceManager.GetString("CategoryLayout", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx
new file mode 100644
index 00000000000..6d2e88846dd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CategoryCommon" xml:space="preserve">
+    <value>Common</value>
+  </data>
+  <data name="CategoryLayout" xml:space="preserve">
+    <value>Layout</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index df160b65ffe..e2a245b7046 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -25,7 +25,6 @@
 
   <ItemGroup>
     <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
-    <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,9 +32,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="Win2D.uwp" Version="1.25.0" />
   </ItemGroup>
 
+  <Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 56a778d4b97..4dae01f1765 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -136,6 +136,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Diagnosti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media", "Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj", "{43BD2A36-9E12-4788-80AE-2377E41E6D05}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Media.Design\Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj", "{B9940334-BD06-44E2-B9E9-A65DA791CE32}"
+	ProjectSection(ProjectDependencies) = postProject
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {43BD2A36-9E12-4788-80AE-2377E41E6D05}
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}"
@@ -161,7 +166,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm.Sour
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.SourceGenerators", "UnitTests\UnitTests.SourceGenerators\UnitTests.SourceGenerators.csproj", "{338C3BE4-2E71-4F21-AD30-03FDBB47A272}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.NetStandard", "UnitTests\UnitTests.NetStandard\UnitTests.NetStandard.csproj", "{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard", "UnitTests\UnitTests.NetStandard\UnitTests.NetStandard.csproj", "{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -996,6 +1001,26 @@ Global
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.Build.0 = Release|Any CPU
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.ActiveCfg = Release|Any CPU
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.Build.0 = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x86.Build.0 = Debug|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM.Build.0 = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM64.Build.0 = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x64.Build.0 = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x86.Build.0 = Release|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1219,6 +1244,7 @@ Global
 		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{B9940334-BD06-44E2-B9E9-A65DA791CE32} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}

From 8d0d47346363228874d8b038adbd97efc2ebc161 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 2 Sep 2021 12:30:39 +0200
Subject: [PATCH 185/200] Fixed [ObservableProperty] for fields named "value"

---
 .../ObservablePropertyGenerator.cs            | 20 +++++---
 .../Mvvm/Test_ObservablePropertyAttribute.cs  | 50 +++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
index e5b9402e042..037dc98fa78 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
@@ -240,6 +240,14 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                 }
             }
 
+            // In case the backing field is exactly named "value", we need to add the "this." prefix to ensure that comparisons and assignments
+            // with it in the generated setter body are executed correctly and without conflicts with the implicit value parameter.
+            ExpressionSyntax fieldExpression = fieldSymbol.Name switch
+            {
+                "value" => MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, ThisExpression(), IdentifierName("value")),
+                string name => IdentifierName(name)
+            };
+
             BlockSyntax setterBlock;
 
             if (validationAttributes.Count > 0)
@@ -263,10 +271,10 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
 
                     // Generate the inner setter block as follows:
                     //
-                    // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(<FIELD_NAME>, value))
+                    // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(this.<FIELD_NAME>, value))
                     // {
                     //     OnPropertyChanging(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangingEventArgs); // Optional
-                    //     <FIELD_NAME> = value;
+                    //     this.<FIELD_NAME> = value;
                     //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangedEventArgs);
                     //     ValidateProperty(value, <PROPERTY_NAME>);
                     //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property1PropertyChangedEventArgs); // Optional
@@ -291,7 +299,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                             IdentifierName("Default")),
                                         IdentifierName("Equals")))
                                 .AddArgumentListArguments(
-                                    Argument(IdentifierName(fieldSymbol.Name)),
+                                    Argument(fieldExpression),
                                     Argument(IdentifierName("value")))),
                             Block(
                                 ExpressionStatement(
@@ -303,7 +311,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                 ExpressionStatement(
                                     AssignmentExpression(
                                         SyntaxKind.SimpleAssignmentExpression,
-                                        IdentifierName(fieldSymbol.Name),
+                                        fieldExpression,
                                         IdentifierName("value"))),
                                 ExpressionStatement(
                                     InvocationExpression(IdentifierName("OnPropertyChanged"))
@@ -346,7 +354,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                     ExpressionStatement(
                         AssignmentExpression(
                             SyntaxKind.SimpleAssignmentExpression,
-                            IdentifierName(fieldSymbol.Name),
+                            fieldExpression,
                             IdentifierName("value"))),
                     ExpressionStatement(
                         InvocationExpression(IdentifierName("OnPropertyChanged"))
@@ -384,7 +392,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                         IdentifierName("Default")),
                                     IdentifierName("Equals")))
                             .AddArgumentListArguments(
-                                    Argument(IdentifierName(fieldSymbol.Name)),
+                                    Argument(fieldExpression),
                                     Argument(IdentifierName("value")))),
                         updateAndNotificationBlock));
             }
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
index 8b8005d15c9..f7c596ba438 100644
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
+++ b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
@@ -119,6 +119,42 @@ public void Test_ValidationAttributes()
             Assert.AreEqual(testAttribute.Animal, Animal.Llama);
         }
 
+        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4216
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservablePropertyWithValueNamedField()
+        {
+            var model = new ModelWithValueProperty();
+
+            List<string?> propertyNames = new();
+
+            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
+
+            model.Value = "Hello world";
+
+            Assert.AreEqual(model.Value, "Hello world");
+
+            CollectionAssert.AreEqual(new[] { nameof(model.Value) }, propertyNames);
+        }
+
+        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4216
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void Test_ObservablePropertyWithValueNamedField_WithValidationAttributes()
+        {
+            var model = new ModelWithValuePropertyWithValidation();
+
+            List<string?> propertyNames = new();
+
+            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
+
+            model.Value = "Hello world";
+
+            Assert.AreEqual(model.Value, "Hello world");
+
+            CollectionAssert.AreEqual(new[] { nameof(model.Value) }, propertyNames);
+        }
+
         public partial class SampleModel : ObservableObject
         {
             /// <summary>
@@ -195,5 +231,19 @@ public enum Animal
             Dog,
             Llama
         }
+
+        public partial class ModelWithValueProperty : ObservableObject
+        {
+            [ObservableProperty]
+            private string value;
+        }
+
+        public partial class ModelWithValuePropertyWithValidation : ObservableValidator
+        {
+            [ObservableProperty]
+            [Required]
+            [MinLength(5)]
+            private string value;
+        }
     }
 }

From 8273bca898fa4ae8e380d560fbaf7cea3eb955f5 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 2 Sep 2021 15:23:11 -0700
Subject: [PATCH 186/200] Update
 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs

Co-authored-by: Rosario Pulella <Rosariopulella@gmail.com>
---
 .../DataGrid/DataGridComboBoxColumn.cs                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
index d18d106aa2f..d70e56d0986 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
@@ -383,13 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u
         /// <returns>The unedited value. </returns>
         protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
         {
-            var comboBox = editingElement as ComboBox;
-            if (comboBox != null)
+            if(editingElement is ComboBox comboBox)
             {
                 comboBox.IsDropDownOpen = true;
+                return comboBox.SelectedItem;
             }
 
-            return comboBox?.SelectedItem;
+            return null;
         }
 
         /// <summary>

From cc2a51eaa963707e66fb01c7466764646c2b1783 Mon Sep 17 00:00:00 2001
From: Luke Blevins <lukeblevins15@outlook.com>
Date: Fri, 30 Jul 2021 14:26:33 -0400
Subject: [PATCH 187/200] fix: Prevent focus reset for DataGridTemplateColumn

---
 .../DataGrid/DataGrid.cs                            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
index 561e69e4182..35814fff6fb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -5729,6 +5729,7 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)
             {
                 bool focusLeftDataGrid = true;
                 bool dataGridWillReceiveRoutedEvent = true;
+                DataGridColumn editingColumn = null;
 
                 // Walk up the visual tree of the newly focused element
                 // to determine if focus is still within DataGrid.
@@ -5768,7 +5769,17 @@ private void DataGrid_LostFocus(object sender, RoutedEventArgs e)
                     focusedDependencyObject = parent;
                 }
 
-                if (focusLeftDataGrid)
+                if (this.EditingRow != null && this.EditingColumnIndex != -1)
+                {
+                    editingColumn = this.ColumnsItemsInternal[this.EditingColumnIndex];
+
+                    if (focusLeftDataGrid && editingColumn is DataGridTemplateColumn)
+                    {
+                        dataGridWillReceiveRoutedEvent = false;
+                    }
+                }
+
+                if (focusLeftDataGrid && !(editingColumn is DataGridTemplateColumn))
                 {
                     this.ContainsFocus = false;
                     if (this.EditingRow != null)

From 99d587f939226e3413009acf688486ebf0522d23 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 2 Sep 2021 15:55:09 -0700
Subject: [PATCH 188/200] Enhance DataGrid Sample

---
 .../Assets/mtns.csv                           | 234 +++++++++---------
 .../Data/DataGridDataItem.cs                  |   2 +-
 .../Data/DataGridDataSource.cs                |   4 +-
 .../SamplePages/DataGrid/DataGridCode.bind    |  16 +-
 .../SamplePages/DataGrid/DataGridPage.xaml    |  10 +-
 .../SamplePages/DataGrid/DataGridPage.xaml.cs |   2 +-
 .../SamplePages/XamlOnlyPage.xaml             |  10 +-
 7 files changed, 146 insertions(+), 132 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Assets/mtns.csv b/Microsoft.Toolkit.Uwp.SampleApp/Assets/mtns.csv
index 7b7568567d7..2f7eb6fee3d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Assets/mtns.csv
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Assets/mtns.csv
@@ -1,117 +1,117 @@
-1,Mount Everest,8848,Mahalangur Himalaya,27d59m17sN 86d55m31sE,8848,none,1953,>>145 (121)
-2,K2/Qogir,8611,Baltoro Karakoram,35d52m53sN 76d30m48sE,4017,Mount Everest,1954,45 (44)
-3,Kangchenjunga,8586,Kangchenjunga Himalaya,27d42m12sN 88d08m51sE *,3922,Mount Everest,1955,38 (24)
-4,Lhotse,8516,Mahalangur Himalaya,27d57m42sN 86d55m59sE,610,Mount Everest,1956,26 (26)
-5,Makalu,8485,Mahalangur Himalaya,27d53m23sN 87d5m20sE,2386,Mount Everest,1955,45 (52)
-6,Cho Oyu,8188,Mahalangur Himalaya,28d05m39sN 86d39m39sE,2340,Mount Everest,1954,79 (28)
-7,Dhaulagiri I,8167,Dhaulagiri Himalaya,28d41m48sN 83d29m35sE,3357,K2,1960,51 (39)
-8,Manaslu,8163,Manaslu Himalaya,28d33m00sN 84d33m35sE,3092,Cho Oyu,1956,49 (45)
-9,Nanga Parbat,8126,Nanga Parbat Himalaya,35d14m14sN 74d35m21sE,4608,Dhaulagiri,1953,52 (67)
-10,Annapurna I,8091,Annapurna Himalaya,28d35m44sN 83d49m13sE,2984,Cho Oyu,1950,36 (47)
-11,Gasherbrum I,8080,Baltoro Karakoram,35d43m28sN 76d41m47sE,2155,K2,1958,31 (16)
-12,Broad Peak/K3,8051,Baltoro Karakoram,35d48m38sN 76d34m06sE,1701,Gasherbrum I,1957,39 (19)
-13,Gasherbrum II/K4,8034,Baltoro Karakoram,35d45m28sN 76d39m12sE,1523,Gasherbrum I,1956,54 (12)
-14,Shishapangma,8027,Jugal Himalaya,28d21m12sN 85d46m43sE,2897,Cho Oyu,1964,43 (19)
-15,Gyachung Kang,7952,Mahalangur Himalaya,28d05m53sN 86d44m42sE,700,Cho Oyu,1964,5 (3)
-15,Gasherbrum III,7946,Baltoro Karakoram,35d45m33sN 76d38m30sE,355,Gasherbrum II,1975,2 (2)
-16,Annapurna II,7937,Annapurna Himalaya,28d32m05sN 84d07m19sE,2437,Annapurna I,1960,6 (19)
-17,Gasherbrum IV,7932,Baltoro Karakoram,35d45m38sN 76d36m58sE,715,Gasherbrum III,1958,4 (11)
-18,Himalchuli,7893,Manaslu Himalaya,28d26m12sN 84d38m23sE *,1633,Manaslu,1960,6 (12)
-19,Distaghil Sar,7884,Hispar Karakoram,36d19m33sN 75d11m16sE,2525,K2,1960,3 (5)
-20,Ngadi Chuli,7871,Manaslu Himalaya,28d30m12sN 84d34m00sE,1020,Manaslu,1970,2 (6)
-20,Nuptse,7864,Mahalangur Himalaya,27d58m03sN 86d53m13sE,319,Lhotse,1961,5 (12)
-21,Khunyang Chhish,7823,Hispar Karakoram,36d12m19sN 75d12m28sE *,1765,Distaghil Sar,1971,2 (6)
-22,Masherbrum/K1,7821,Masherbrum Karakoram,35d38m28sN 76d18m21sE,2457,Gasherbrum I,1960,4 (9)
-23,Nanda Devi,7816,Garhwal Himalaya,30d22m33sN 79d58m15sE,3139,Dhaulagiri,1936,14 (12)
-24,Chomo Lonzo,7804,Mahalangur Himalaya,27d55m50sN 87d06m28sE,590,Makalu,1954,3 (1)
-25,Batura Sar,7795,Batura Karakoram,36d30m37sN 74d31m21sE,3118,Distaghil Sar,1976,4 (6)
-26,Kanjut Sar,7790,Hispar Karakoram,36d12m20sN 75d25m01sE,1690,Khunyang Chhish,1959,2 (1)
-27,Rakaposhi,7788,Rakaposhi-Haramosh Karakoram,36d08m33sN 74d29m22sE,2818,Khunyang Chhish,1958,8 (13)
-28,Namcha Barwa,7782,Assam Himalaya,29d37m52sN 95d03m19sE,4106,Kangchenjunga,1992,1 (2)
-29,Kamet,7756,Garhwal Himalaya,30d55m12sN 79d35m30sE *,2825,Nanda Devi,1931,23 (14)
-30,Dhaulagiri II,7751,Dhaulagiri Himalaya,28d45m46sN 83d23m18sE,2396,Dhaulagiri,1971,4 (11)
-31,Saltoro Kangri/K10,7742,Saltoro Karakoram,35d23m57sN 76d50m53sE *,2160,Gasherbrum I,1962,2 (1)
-32,Jannu,7711,Kangchenjunga Himalaya,27d40m56sN 88d02m40sE *,1036,Kangchenjunga,1962,17 (12)
-33,Tirich Mir,7708,Hindu Kush,36d15m19sN 71d50m30sE *,3910,Batura Sar,1950,20 (11)
-33,Molamenqing,7703,Langtang Himalaya,28d21m18sN 85d48m35sE,430,Shishapangma,1981,1 (0)
-34,Gurla Mandhata,7694,Nalakankar Himalaya,30d26m19sN 81d17m48sE,2788,Dhaulagiri,1985,6 (4)
-35,Saser Kangri I/K22,7672,Saser Karakoram,34d52m00sN 77d45m09sE,2304,Gasherbrum I,1973,6 (4)
-36,Chogolisa,7665,Masherbrum Karakoram,35d36m47sN 76d34m29sE,1624,Masherbrum,1975,4 (2)
-36,Dhaulagiri IV,7661,Dhaulagiri Himalaya,28d44m09sN 83d18m55sE,469,Dhaulagiri II,1975,2 (10)
-37,Kongur Tagh,7649,Kongur Shan Kunlun,38d35m36sN 75d18m48sE,3585,Distaghil Sar,1981,2 (4)
-37,Dhaulagiri V,7618,Dhaulagiri Himalaya,28d44m02sN 83d21m41sE *,340,Dhaulagiri IV,1975,2 (3)
-38,Shispare,7611,Batura Karakoram,36d26m26sN 74d40m51sE,1240,Batura Sar,1974,3 (1)
-39,Trivor,7577,Hispar Karakoram,36d17m15sN 75d05m06sE *,980,Distaghil Sar,1960,2 (5)
-40,Gangkhar Puensum,7570,Kula Kangri Himalaya,28d02m50sN 90d27m19sE *,2995,Kangchenjunga,0,0 (3)
-41,Gongga Shan,7556,Daxue Shan,29d35m43sN 101d52m47sE,3642,Mount Everest,1932,6 (7)
-42,Annapurna III,7555,Annapurna Himalaya,28d35m06sN 83d59m24sE,703,Annapurna I,1961,10 (17)
-43,Muztagh Ata,7546,Muztagata Kunlun,38d16m33sN 75d06m58sE,2735,Kongur Tagh,1956,Many
-44,Skyang Kangri,7545,Baltoro Karakoram,35d55m35sN 76d34m03sE,1085,K2,1976,1 (2)
-45,Changtse,7543,Mahalangur Himalaya,28d01m29sN 86d54m51sE,520,Mount Everest,1982,9 (9)
-46,Kula Kangri,7538,Kula Kangri Himalaya,28d13m37sN 90d36m59sE,1650,Gangkhar Puensum,1986,3 (2)
-47,Kongur Tiube,7530,Kongur Shan Kunlun,38d36m57sN 75d11m45sE,840,Kongur Tagh,1956,2 (3)
-48,Mamostong Kangri,7516,Rimo Karakoram,35d08m31sN 77d34m39sE,1803,Gasherbrum I,1984,5 (0)
-49,Saser Kangri II E,7513,Saser Karakoram,34d48m17sN 77d48m24sE,1450,Saser Kangri I,2011,0 (0)[10]
-50,Ismoil Somoni Peak,7495,Pamir (Akademiya Nauk Range),38d56m35sN 72d00m57sE,3402,Muztagh Ata,1933,
-51,Saser Kangri III,7495,Saser Karakoram,34d50m44sN 77d47m06sE,850,Saser Kangri I,1986,1 (0)
-52,Noshaq,7492,Hindu Kush,36d25m56sN 71d49m43sE,2024,Tirich Mir,1960,33 (3)
-53,Pumari Chhish,7492,Hispar Karakoram,36d12m41sN 75d15m01sE,890,Khunyang Chhish,1979,1 (2)
-54,Pasu Sar,7476,Batura Karakoram,36d29m16sN 74d35m16sE,645,Batura Sar,1994,1 (0)
-55,Yukshin Gardan Sar,7469,Hispar Karakoram,36d15m04sN 75d22m29sE,1313,Pumari Chhish,1984,4 (1)
-56,Teram Kangri I,7462,Siachen Karakoram,35d34m48sN 77d04m42sE,1702,Gasherbrum I,1975,2 (0)
-57,Jongsong Peak,7462,Kangchenjunga Himalaya,27d52m54sN 88d08m09sE,1298,Kangchenjunga,1930,2 (3)
-58,Malubiting,7458,Rakaposhi-Haramosh Karakoram,36d00m12sN 74d52m31sE,2193,Rakaposhi,1971,2 (6)
-59,Gangapurna,7455,Annapurna Himalaya,28d36m18sN 83d57m49sE,563,Annapurna III,1965,8 (13)
-60,Jengish Chokusu,7439,Tian Shan,42d02m05sN 80d07m47sE,4148,Ismail Samani Peak,1938,
-61,K12,7428,Saltoro Karakoram,35d17m45sN 77d01m20sE,1978,Saltoro Kangri,1974,4 (2)
-62,Yangra,7422,Ganesh Himalaya,28d23m29sN 85d07m38sE,2352,Manaslu,1955,1 (6)
-63,Sia Kangri,7422,Siachen Karakoram,35d39m48sN 76d45m42sE,640,Gasherbrum I,1934,6 (0)
-64,Momhil Sar,7414,Hispar Karakoram,36d19m04sN 75d02m11sE *,980,Trivor,1964,2 (6)
-65,Kabru N,7412,Kangchenjunga Himalaya,27d38m02sN 88d07m00sE,780,Kangchenjunga,1994,1 (2)[11]
-66,Skil Brum,7410,Baltoro Karakoram,35d51m03sN 76d25m43sE,1152,K2,1957,2 (1)
-67,Haramosh,7409,Rakaposhi Karakoram,35d50m24sN 74d53m51sE,2277,Malubiting,1958,4 (3)
-68,Istor-o-Nal,7403,Hindu Kush,36d22m32sN 71d53m54sE,1040,Noshaq,1969,4 (5)
-69,Ghent Kangri,7401,Saltoro Karakoram,35d31m04sN 76d48m02sE,1493,Saltoro Kangri,1961,4 (0)
-70,Ultar Sar,7388,Batura Karakoram,36d23m27sN 74d43m00sE,700,Shispare,1996,2 (5)
-71,Rimo I,7385,Rimo Karakoram,35d21m18sN 77d22m08sE,1438,Teram Kangri I,1988,1 (3)
-72,Churen Himal,7385,Dhaulagiri Himalaya,28d44m05sN 83d13m03sE,600,Dhaulagiri IV,1970,3 (0)
-73,Teram Kangri III,7382,Siachen Karakoram,35d35m59sN 77d02m53sE,520,Teram Kangri I,1979,1 (0)
-74,Sherpi Kangri,7380,Saltoro Karakoram,35d27m58sN 76d46m53sE *,1000,Ghent Kangri,1976,1 (1)
-75,Labuche Kang,7367,Labuche Himalaya,28d18m15sN 86d21m03sE,1957,Cho Oyu,1987,1 (0)
-76,Kirat Chuli,7362,Kangchenjunga Himalaya,27d47m16sN 88d11m43sE,1168,Kangchenjunga,1939,1 (6)
-76,Abi Gamin,7355,Garhwal Himalaya,30d55m57sN 79d36m09sE,217,Kamet,1950,17 (2)
-77,Nangpai Gosum,7350,Mahalangur Himalaya,28d04m24sN 86d36m51sE,500,Cho Oyu,1996,3 (1)
-77,Gimmigela,7350,Kangchenjunga Himalaya,27d44m27sN 88d09m31sE,432,Kangchenjunga,1994,3 (1)
-78,Saraghrar,7349,Hindu Kush,36d32m51sN 72d06m54sE,1979,Noshaq,1959,2 (3)
-79,Jomolhari,7326,Jomolhari Himalaya,27d49m36sN 89d16m04sE *,2077,Gangkhar Puensum,1937,4 (0)
-80,Chamlang,7321,Mahalangur Himalaya,27d46m30sN 86d58m47sE,1240,Lhotse,1961,7 (1)
-81,Chongtar,7315,Baltoro Karakoram,35d54m55sN 76d25m45sE,1300,Skil Brum,1994,1 (1)
-82,Baltoro Kangri,7312,Masherbrum Karakoram,35d38m21sN 76d40m24sE,1200,Chogolisa,1976,1 (0)
-83,Siguang Ri,7309,Mahalangur Himalaya,28d08m50sN 86d41m06sE,650,Cho Oyu,1989,2 (1)
-84,The Crown,7295,Yengisogat Karakoram,36d06m24sN 76d12m21sE,1919,Skil Brum (K2),1993,1 (3)
-85,Gyala Peri,7294,Assam Himalaya,29d48m52sN 94d58m07sE,2942,Mount Everest,1986,1 (0)
-86,Porong Ri,7292,Langtang Himalaya,28d23m22sN 85d43m12sE,520,Shisha Pangma,1982,5 (0)
-87,Baintha Brakk,7285,Panmah Karakoram,35d56m51sN 75d45m12sE *,1891,Kanjut Sar,1977,3 (13)
-88,Yutmaru Sar,7283,Hispar Karakoram,36d13m35sN 75d22m02sE,620,Yukshin Gardan Sar,1980,1 (1)
-89,Baltistan Peak/K6,7282,Masherbrum Karakoram,35d25m06sN 76d33m06sE,1962,Chogolisa,1970,1 (3)
-90,Kangpenqing,7281,Baiku Himalaya,28d33m03sN 85d32m44sE,1340,Shisha Pangma,1982,1 (1)
-91,Muztagh Tower,7276,Baltoro Karakoram,35d49m40sN 76d21m40sE,1710,Skil Brum,1956,4 (2)
-92,Mana,7272,Garhwal Himalaya,30d52m50sN 79d36m55sE,730,Kamet,1937,7 (3)
-92,Dhaulagiri VI,7268,Dhaulagiri Himalaya,28d42m31sN 83d16m27sE,485,Dhaulagiri IV,1970,5 (0)
-93,Diran,7266,Rakaposhi-Haramosh Karakoram,36d07m13sN 74d39m42sE,1325,Malubiting,1968,12 (8)
-94,Labuche Kang III/East[12],7250,Labuche Himalaya,28d18m05sN 86d23m02sE,570,Labuche Kang,0,0 (0)
-95,Putha Hiunchuli,7246,Dhaulagiri Himalaya,28d44m52sN 83d08m46sE,1151,Churen Himal,1954,11 (5)
-96,Apsarasas Kangri,7245,Siachen Karakoram,35d32m19sN 77d08m55sE,635,Teram Kangri I,1976,2 (0)
-97,Mukut Parbat,7242,Garhwal Himalaya,30d56m57sN 79d34m12sE,840,Kamet,1951,2 (1)
-98,Rimo III,7233,Rimo Karakoram,35d22m31sN 77d21m42sE,615,Rimo I,1985,1 (0)
-99,Langtang Lirung,7227,Langtang Himalaya,28d15m22sN 85d31m01sE,1525,Shisha Pangma,1978,14 (13)
-100,Karjiang,7221,Kula Kangri Himalaya,28d15m27sN 90d38m49sE,880,Kula Kangri,0,0 (2)
-101,Annapurna Dakshin,7219,Annapurna Himalaya,28d31m06sN 83d48m22sE,775,Annapurna,1964,10 (16)
-102,Khartaphu,7213,Mahalangur Himalaya,28d03m49sN 86d58m39sE,712,Mount Everest,1935,1 (0)
-103,Tongshanjiabu,7207,Lunana Himalaya,28d11m12sN 89d57m27sE,1757,Gangkar Puensum,0,0 (0)
-104,Malangutti Sar,7207,Hispar Karakoram,36d21m47sN 75d08m57sE,515,Distaghil Sar,1985,1 (0)
-105,Noijin Kangsang,7206,Nagarze Himalaya,28d56m48sN 90d10m42sE,2160,Tongshanjiabu,1986,4 (1)
-106,Langtang Ri,7205,Langtang Himalaya,28d22m53sN 85d41m01sE,650,Porong Ri,1981,4 (0)
-107,Kangphu Kang,7204,Lunana Himalaya,28d09m20sN 90d03m48sE,1200,Tongshanjiabu,2002,1 (0)
-108,Singhi Kangri,7202,Siachen Karakoram,35d35m59sN 76d59m01sE,790,Teram Kangri III,1976,2 (0)
-109,Lupghar Sar,7200,Hispar Karakoram,36d21m01sN 75d02m13sE *,730,Momhil Sar,1979,1 (0)
+1,Mount Everest,8848,Mahalangur Himalaya,27d59m17sN 86d55m31sE,8848,none,05/29/1953,>>145 (121)
+2,K2/Qogir,8611,Baltoro Karakoram,35d52m53sN 76d30m48sE,4017,Mount Everest,07/31/1954,45 (44)
+3,Kangchenjunga,8586,Kangchenjunga Himalaya,27d42m12sN 88d08m51sE *,3922,Mount Everest,05/25/1955,38 (24)
+4,Lhotse,8516,Mahalangur Himalaya,27d57m42sN 86d55m59sE,610,Mount Everest,05/18/1956,26 (26)
+5,Makalu,8485,Mahalangur Himalaya,27d53m23sN 87d5m20sE,2386,Mount Everest,05/15/1955,45 (52)
+6,Cho Oyu,8188,Mahalangur Himalaya,28d05m39sN 86d39m39sE,2340,Mount Everest,10/19/1954,79 (28)
+7,Dhaulagiri I,8167,Dhaulagiri Himalaya,28d41m48sN 83d29m35sE,3357,K2,05/13/1960,51 (39)
+8,Manaslu,8163,Manaslu Himalaya,28d33m00sN 84d33m35sE,3092,Cho Oyu,05/9/1956,49 (45)
+9,Nanga Parbat,8126,Nanga Parbat Himalaya,35d14m14sN 74d35m21sE,4608,Dhaulagiri,07/03/1953,52 (67)
+10,Annapurna I,8091,Annapurna Himalaya,28d35m44sN 83d49m13sE,2984,Cho Oyu,06/03/1950,36 (47)
+11,Gasherbrum I,8080,Baltoro Karakoram,35d43m28sN 76d41m47sE,2155,K2,01/01/1958,31 (16)
+12,Broad Peak/K3,8051,Baltoro Karakoram,35d48m38sN 76d34m06sE,1701,Gasherbrum I,01/01/1957,39 (19)
+13,Gasherbrum II/K4,8034,Baltoro Karakoram,35d45m28sN 76d39m12sE,1523,Gasherbrum I,01/01/1956,54 (12)
+14,Shishapangma,8027,Jugal Himalaya,28d21m12sN 85d46m43sE,2897,Cho Oyu,01/01/1964,43 (19)
+15,Gyachung Kang,7952,Mahalangur Himalaya,28d05m53sN 86d44m42sE,700,Cho Oyu,01/01/1964,5 (3)
+15,Gasherbrum III,7946,Baltoro Karakoram,35d45m33sN 76d38m30sE,355,Gasherbrum II,01/01/1975,2 (2)
+16,Annapurna II,7937,Annapurna Himalaya,28d32m05sN 84d07m19sE,2437,Annapurna I,01/01/1960,6 (19)
+17,Gasherbrum IV,7932,Baltoro Karakoram,35d45m38sN 76d36m58sE,715,Gasherbrum III,01/01/1958,4 (11)
+18,Himalchuli,7893,Manaslu Himalaya,28d26m12sN 84d38m23sE *,1633,Manaslu,01/01/1960,6 (12)
+19,Distaghil Sar,7884,Hispar Karakoram,36d19m33sN 75d11m16sE,2525,K2,01/01/1960,3 (5)
+20,Ngadi Chuli,7871,Manaslu Himalaya,28d30m12sN 84d34m00sE,1020,Manaslu,01/01/1970,2 (6)
+20,Nuptse,7864,Mahalangur Himalaya,27d58m03sN 86d53m13sE,319,Lhotse,01/01/1961,5 (12)
+21,Khunyang Chhish,7823,Hispar Karakoram,36d12m19sN 75d12m28sE *,1765,Distaghil Sar,01/01/1971,2 (6)
+22,Masherbrum/K1,7821,Masherbrum Karakoram,35d38m28sN 76d18m21sE,2457,Gasherbrum I,01/01/1960,4 (9)
+23,Nanda Devi,7816,Garhwal Himalaya,30d22m33sN 79d58m15sE,3139,Dhaulagiri,01/01/1936,14 (12)
+24,Chomo Lonzo,7804,Mahalangur Himalaya,27d55m50sN 87d06m28sE,590,Makalu,01/01/1954,3 (1)
+25,Batura Sar,7795,Batura Karakoram,36d30m37sN 74d31m21sE,3118,Distaghil Sar,01/01/1976,4 (6)
+26,Kanjut Sar,7790,Hispar Karakoram,36d12m20sN 75d25m01sE,1690,Khunyang Chhish,01/01/1959,2 (1)
+27,Rakaposhi,7788,Rakaposhi-Haramosh Karakoram,36d08m33sN 74d29m22sE,2818,Khunyang Chhish,01/01/1958,8 (13)
+28,Namcha Barwa,7782,Assam Himalaya,29d37m52sN 95d03m19sE,4106,Kangchenjunga,01/01/1992,1 (2)
+29,Kamet,7756,Garhwal Himalaya,30d55m12sN 79d35m30sE *,2825,Nanda Devi,01/01/1931,23 (14)
+30,Dhaulagiri II,7751,Dhaulagiri Himalaya,28d45m46sN 83d23m18sE,2396,Dhaulagiri,01/01/1971,4 (11)
+31,Saltoro Kangri/K10,7742,Saltoro Karakoram,35d23m57sN 76d50m53sE *,2160,Gasherbrum I,01/01/1962,2 (1)
+32,Jannu,7711,Kangchenjunga Himalaya,27d40m56sN 88d02m40sE *,1036,Kangchenjunga,01/01/1962,17 (12)
+33,Tirich Mir,7708,Hindu Kush,36d15m19sN 71d50m30sE *,3910,Batura Sar,01/01/1950,20 (11)
+33,Molamenqing,7703,Langtang Himalaya,28d21m18sN 85d48m35sE,430,Shishapangma,01/01/1981,1 (0)
+34,Gurla Mandhata,7694,Nalakankar Himalaya,30d26m19sN 81d17m48sE,2788,Dhaulagiri,01/01/1985,6 (4)
+35,Saser Kangri I/K22,7672,Saser Karakoram,34d52m00sN 77d45m09sE,2304,Gasherbrum I,01/01/1973,6 (4)
+36,Chogolisa,7665,Masherbrum Karakoram,35d36m47sN 76d34m29sE,1624,Masherbrum,01/01/1975,4 (2)
+36,Dhaulagiri IV,7661,Dhaulagiri Himalaya,28d44m09sN 83d18m55sE,469,Dhaulagiri II,01/01/1975,2 (10)
+37,Kongur Tagh,7649,Kongur Shan Kunlun,38d35m36sN 75d18m48sE,3585,Distaghil Sar,01/01/1981,2 (4)
+37,Dhaulagiri V,7618,Dhaulagiri Himalaya,28d44m02sN 83d21m41sE *,340,Dhaulagiri IV,01/01/1975,2 (3)
+38,Shispare,7611,Batura Karakoram,36d26m26sN 74d40m51sE,1240,Batura Sar,01/01/1974,3 (1)
+39,Trivor,7577,Hispar Karakoram,36d17m15sN 75d05m06sE *,980,Distaghil Sar,01/01/1960,2 (5)
+40,Gangkhar Puensum,7570,Kula Kangri Himalaya,28d02m50sN 90d27m19sE *,2995,Kangchenjunga,01/01/1000,0 (3)
+41,Gongga Shan,7556,Daxue Shan,29d35m43sN 101d52m47sE,3642,Mount Everest,01/01/1932,6 (7)
+42,Annapurna III,7555,Annapurna Himalaya,28d35m06sN 83d59m24sE,703,Annapurna I,01/01/1961,10 (17)
+43,Muztagh Ata,7546,Muztagata Kunlun,38d16m33sN 75d06m58sE,2735,Kongur Tagh,01/01/1956,Many
+44,Skyang Kangri,7545,Baltoro Karakoram,35d55m35sN 76d34m03sE,1085,K2,01/01/1976,1 (2)
+45,Changtse,7543,Mahalangur Himalaya,28d01m29sN 86d54m51sE,520,Mount Everest,01/01/1982,9 (9)
+46,Kula Kangri,7538,Kula Kangri Himalaya,28d13m37sN 90d36m59sE,1650,Gangkhar Puensum,01/01/1986,3 (2)
+47,Kongur Tiube,7530,Kongur Shan Kunlun,38d36m57sN 75d11m45sE,840,Kongur Tagh,01/01/1956,2 (3)
+48,Mamostong Kangri,7516,Rimo Karakoram,35d08m31sN 77d34m39sE,1803,Gasherbrum I,01/01/1984,5 (0)
+49,Saser Kangri II E,7513,Saser Karakoram,34d48m17sN 77d48m24sE,1450,Saser Kangri I,01/01/2011,0 (0)[10]
+50,Ismoil Somoni Peak,7495,Pamir (Akademiya Nauk Range),38d56m35sN 72d00m57sE,3402,Muztagh Ata,01/01/1933,
+51,Saser Kangri III,7495,Saser Karakoram,34d50m44sN 77d47m06sE,850,Saser Kangri I,01/01/1986,1 (0)
+52,Noshaq,7492,Hindu Kush,36d25m56sN 71d49m43sE,2024,Tirich Mir,01/01/1960,33 (3)
+53,Pumari Chhish,7492,Hispar Karakoram,36d12m41sN 75d15m01sE,890,Khunyang Chhish,01/01/1979,1 (2)
+54,Pasu Sar,7476,Batura Karakoram,36d29m16sN 74d35m16sE,645,Batura Sar,01/01/1994,1 (0)
+55,Yukshin Gardan Sar,7469,Hispar Karakoram,36d15m04sN 75d22m29sE,1313,Pumari Chhish,01/01/1984,4 (1)
+56,Teram Kangri I,7462,Siachen Karakoram,35d34m48sN 77d04m42sE,1702,Gasherbrum I,01/01/1975,2 (0)
+57,Jongsong Peak,7462,Kangchenjunga Himalaya,27d52m54sN 88d08m09sE,1298,Kangchenjunga,01/01/1930,2 (3)
+58,Malubiting,7458,Rakaposhi-Haramosh Karakoram,36d00m12sN 74d52m31sE,2193,Rakaposhi,01/01/1971,2 (6)
+59,Gangapurna,7455,Annapurna Himalaya,28d36m18sN 83d57m49sE,563,Annapurna III,01/01/1965,8 (13)
+60,Jengish Chokusu,7439,Tian Shan,42d02m05sN 80d07m47sE,4148,Ismail Samani Peak,01/01/1938,
+61,K12,7428,Saltoro Karakoram,35d17m45sN 77d01m20sE,1978,Saltoro Kangri,01/01/1974,4 (2)
+62,Yangra,7422,Ganesh Himalaya,28d23m29sN 85d07m38sE,2352,Manaslu,01/01/1955,1 (6)
+63,Sia Kangri,7422,Siachen Karakoram,35d39m48sN 76d45m42sE,640,Gasherbrum I,01/01/1934,6 (0)
+64,Momhil Sar,7414,Hispar Karakoram,36d19m04sN 75d02m11sE *,980,Trivor,01/01/1964,2 (6)
+65,Kabru N,7412,Kangchenjunga Himalaya,27d38m02sN 88d07m00sE,780,Kangchenjunga,01/01/1994,1 (2)[11]
+66,Skil Brum,7410,Baltoro Karakoram,35d51m03sN 76d25m43sE,1152,K2,01/01/1957,2 (1)
+67,Haramosh,7409,Rakaposhi Karakoram,35d50m24sN 74d53m51sE,2277,Malubiting,01/01/1958,4 (3)
+68,Istor-o-Nal,7403,Hindu Kush,36d22m32sN 71d53m54sE,1040,Noshaq,01/01/1969,4 (5)
+69,Ghent Kangri,7401,Saltoro Karakoram,35d31m04sN 76d48m02sE,1493,Saltoro Kangri,01/01/1961,4 (0)
+70,Ultar Sar,7388,Batura Karakoram,36d23m27sN 74d43m00sE,700,Shispare,01/01/1996,2 (5)
+71,Rimo I,7385,Rimo Karakoram,35d21m18sN 77d22m08sE,1438,Teram Kangri I,01/01/1988,1 (3)
+72,Churen Himal,7385,Dhaulagiri Himalaya,28d44m05sN 83d13m03sE,600,Dhaulagiri IV,01/01/1970,3 (0)
+73,Teram Kangri III,7382,Siachen Karakoram,35d35m59sN 77d02m53sE,520,Teram Kangri I,01/01/1979,1 (0)
+74,Sherpi Kangri,7380,Saltoro Karakoram,35d27m58sN 76d46m53sE *,1000,Ghent Kangri,01/01/1976,1 (1)
+75,Labuche Kang,7367,Labuche Himalaya,28d18m15sN 86d21m03sE,1957,Cho Oyu,01/01/1987,1 (0)
+76,Kirat Chuli,7362,Kangchenjunga Himalaya,27d47m16sN 88d11m43sE,1168,Kangchenjunga,01/01/1939,1 (6)
+76,Abi Gamin,7355,Garhwal Himalaya,30d55m57sN 79d36m09sE,217,Kamet,01/01/1950,17 (2)
+77,Nangpai Gosum,7350,Mahalangur Himalaya,28d04m24sN 86d36m51sE,500,Cho Oyu,01/01/1996,3 (1)
+77,Gimmigela,7350,Kangchenjunga Himalaya,27d44m27sN 88d09m31sE,432,Kangchenjunga,01/01/1994,3 (1)
+78,Saraghrar,7349,Hindu Kush,36d32m51sN 72d06m54sE,1979,Noshaq,01/01/1959,2 (3)
+79,Jomolhari,7326,Jomolhari Himalaya,27d49m36sN 89d16m04sE *,2077,Gangkhar Puensum,01/01/1937,4 (0)
+80,Chamlang,7321,Mahalangur Himalaya,27d46m30sN 86d58m47sE,1240,Lhotse,01/01/1961,7 (1)
+81,Chongtar,7315,Baltoro Karakoram,35d54m55sN 76d25m45sE,1300,Skil Brum,01/01/1994,1 (1)
+82,Baltoro Kangri,7312,Masherbrum Karakoram,35d38m21sN 76d40m24sE,1200,Chogolisa,01/01/1976,1 (0)
+83,Siguang Ri,7309,Mahalangur Himalaya,28d08m50sN 86d41m06sE,650,Cho Oyu,01/01/1989,2 (1)
+84,The Crown,7295,Yengisogat Karakoram,36d06m24sN 76d12m21sE,1919,Skil Brum (K2),01/01/1993,1 (3)
+85,Gyala Peri,7294,Assam Himalaya,29d48m52sN 94d58m07sE,2942,Mount Everest,01/01/1986,1 (0)
+86,Porong Ri,7292,Langtang Himalaya,28d23m22sN 85d43m12sE,520,Shisha Pangma,01/01/1982,5 (0)
+87,Baintha Brakk,7285,Panmah Karakoram,35d56m51sN 75d45m12sE *,1891,Kanjut Sar,01/01/1977,3 (13)
+88,Yutmaru Sar,7283,Hispar Karakoram,36d13m35sN 75d22m02sE,620,Yukshin Gardan Sar,01/01/1980,1 (1)
+89,Baltistan Peak/K6,7282,Masherbrum Karakoram,35d25m06sN 76d33m06sE,1962,Chogolisa,01/01/1970,1 (3)
+90,Kangpenqing,7281,Baiku Himalaya,28d33m03sN 85d32m44sE,1340,Shisha Pangma,01/01/1982,1 (1)
+91,Muztagh Tower,7276,Baltoro Karakoram,35d49m40sN 76d21m40sE,1710,Skil Brum,01/01/1956,4 (2)
+92,Mana,7272,Garhwal Himalaya,30d52m50sN 79d36m55sE,730,Kamet,01/01/1937,7 (3)
+92,Dhaulagiri VI,7268,Dhaulagiri Himalaya,28d42m31sN 83d16m27sE,485,Dhaulagiri IV,01/01/1970,5 (0)
+93,Diran,7266,Rakaposhi-Haramosh Karakoram,36d07m13sN 74d39m42sE,1325,Malubiting,01/01/1968,12 (8)
+94,Labuche Kang III/East[12],7250,Labuche Himalaya,28d18m05sN 86d23m02sE,570,Labuche Kang,01/01/1000,0 (0)
+95,Putha Hiunchuli,7246,Dhaulagiri Himalaya,28d44m52sN 83d08m46sE,1151,Churen Himal,01/01/1954,11 (5)
+96,Apsarasas Kangri,7245,Siachen Karakoram,35d32m19sN 77d08m55sE,635,Teram Kangri I,01/01/1976,2 (0)
+97,Mukut Parbat,7242,Garhwal Himalaya,30d56m57sN 79d34m12sE,840,Kamet,01/01/1951,2 (1)
+98,Rimo III,7233,Rimo Karakoram,35d22m31sN 77d21m42sE,615,Rimo I,01/01/1985,1 (0)
+99,Langtang Lirung,7227,Langtang Himalaya,28d15m22sN 85d31m01sE,1525,Shisha Pangma,01/01/1978,14 (13)
+100,Karjiang,7221,Kula Kangri Himalaya,28d15m27sN 90d38m49sE,880,Kula Kangri,01/01/1000,0 (2)
+101,Annapurna Dakshin,7219,Annapurna Himalaya,28d31m06sN 83d48m22sE,775,Annapurna,01/01/1964,10 (16)
+102,Khartaphu,7213,Mahalangur Himalaya,28d03m49sN 86d58m39sE,712,Mount Everest,01/01/1935,1 (0)
+103,Tongshanjiabu,7207,Lunana Himalaya,28d11m12sN 89d57m27sE,1757,Gangkar Puensum,01/01/1000,0 (0)
+104,Malangutti Sar,7207,Hispar Karakoram,36d21m47sN 75d08m57sE,515,Distaghil Sar,01/01/1985,1 (0)
+105,Noijin Kangsang,7206,Nagarze Himalaya,28d56m48sN 90d10m42sE,2160,Tongshanjiabu,01/01/1986,4 (1)
+106,Langtang Ri,7205,Langtang Himalaya,28d22m53sN 85d41m01sE,650,Porong Ri,01/01/1981,4 (0)
+107,Kangphu Kang,7204,Lunana Himalaya,28d09m20sN 90d03m48sE,1200,Tongshanjiabu,01/01/2002,1 (0)
+108,Singhi Kangri,7202,Siachen Karakoram,35d35m59sN 76d59m01sE,790,Teram Kangri III,01/01/1976,2 (0)
+109,Lupghar Sar,7200,Hispar Karakoram,36d21m01sN 75d02m13sE *,730,Momhil Sar,01/01/1979,1 (0)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
index f942f1f1fe5..1ddf86ddb90 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
@@ -149,7 +149,7 @@ public string Parent_mountain
 
         public uint Prominence { get; set; }
 
-        public uint First_ascent { get; set; }
+        public DateTimeOffset First_ascent { get; set; }
 
         public string Ascents { get; set; }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataSource.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataSource.cs
index 01cc02cb71e..688b172925f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataSource.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataSource.cs
@@ -48,8 +48,8 @@ public async Task<IEnumerable<DataGridDataItem>> GetDataAsync()
                             Coordinates = values[4],
                             Prominence = uint.Parse(values[5]),
                             Parent_mountain = values[6],
-                            First_ascent = uint.Parse(values[7]),
-                            Ascents = values[8]
+                            First_ascent = DateTimeOffset.Parse(values[7]),
+                            Ascents = values[8],
                         });
                 }
             }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridCode.bind
index 588589bf48d..874762b3798 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridCode.bind
@@ -1,12 +1,14 @@
 <Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
   <Grid>
     <Grid.Resources>
+      <converters:StringFormatConverter x:Key="StringFormatConverter"/>
       <DataTemplate x:Key="RowDetailsTemplate">
         <StackPanel>
           <TextBlock Margin="20" Text="Here are the details for the selected mountain:" />
@@ -85,7 +87,19 @@
         <controls:DataGridTextColumn Header="Height (m)" Binding="{Binding Height_m}" Tag="Height_m" />
         <controls:DataGridTextColumn Header="Range" Binding="{Binding Range}" Tag="Range" />
         <controls:DataGridTextColumn Header="Parent Mountain" Binding="{Binding Parent_mountain}" Tag="Parent_mountain" />
+        <controls:DataGridTemplateColumn Header="First Ascent" Tag="First_ascent">
+          <controls:DataGridTemplateColumn.CellTemplate>
+            <DataTemplate>
+              <TextBlock Text="{Binding First_ascent, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:MM/dd/yyy}'}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+            </DataTemplate>
+          </controls:DataGridTemplateColumn.CellTemplate>
+          <controls:DataGridTemplateColumn.CellEditingTemplate>
+            <DataTemplate>
+              <CalendarDatePicker Margin="3,4,3,3" Date="{Binding First_ascent, Mode=TwoWay}"/>
+            </DataTemplate>
+          </controls:DataGridTemplateColumn.CellEditingTemplate>
+        </controls:DataGridTemplateColumn>
       </controls:DataGrid.Columns>
     </controls:DataGrid>
   </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml
index 807dd5214e6..486f886a39f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml
@@ -6,13 +6,5 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
-    <!-- Shallow Copy -->
-    <Grid Visibility="Collapsed">
-        <controls:DataGrid>
-            <controls:DataGrid.Columns>
-                <controls:DataGridTextColumn/>
-                <controls:DataGridComboBoxColumn/>
-            </controls:DataGrid.Columns>
-        </controls:DataGrid>
-    </Grid>
+    <!--  Shallow Copy in XamlOnlyPage.xaml  -->
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
index 5dfc2ff19d8..122526b478c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
@@ -42,7 +42,7 @@ public async void OnXamlRendered(FrameworkElement control)
                 dataGrid.LoadingRowGroup += DataGrid_LoadingRowGroup;
                 dataGrid.ItemsSource = await viewModel.GetDataAsync();
 
-                var comboBoxColumn = dataGrid.Columns.FirstOrDefault(x => x.Tag.Equals("Mountain")) as DataGridComboBoxColumn;
+                var comboBoxColumn = dataGrid.Columns.FirstOrDefault(x => x.Tag?.Equals("Mountain") == true) as DataGridComboBoxColumn;
                 if (comboBoxColumn != null)
                 {
                     comboBoxColumn.ItemsSource = await viewModel.GetMountains();
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 84cacab3aaa..a3a001645f7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -54,6 +54,14 @@
         <ui:AttachedDropShadow x:Key="AttachedDropShadow" />
         <controls:DropShadowPanel x:Key="DropShadowPanel"
                                   ui:Effects.Shadow="{StaticResource AttachedShadow}" />
+        <controls:DataGrid x:Key="DataGrid">
+            <controls:DataGrid.Columns>
+                <controls:DataGridCheckBoxColumn />
+                <controls:DataGridComboBoxColumn />
+                <controls:DataGridTemplateColumn />
+                <controls:DataGridTextColumn />
+            </controls:DataGrid.Columns>
+        </controls:DataGrid>
     </Page.Resources>
 
     <Grid>
@@ -90,4 +98,4 @@
             </interactions:EventTriggerBehavior>
         </interactivity:Interaction.Behaviors>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>

From e89cac670b11d8dbbabcadb83642b18c16315646 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 2 Sep 2021 16:27:14 -0700
Subject: [PATCH 189/200] Add PreparingCellForEdit example to open
 CalendarDropDown on 2nd click

---
 .../SamplePages/DataGrid/DataGridPage.xaml.cs          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
index 122526b478c..1b2c55a4829 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DataGrid/DataGridPage.xaml.cs
@@ -41,6 +41,7 @@ public async void OnXamlRendered(FrameworkElement control)
                 dataGrid.Sorting += DataGrid_Sorting;
                 dataGrid.LoadingRowGroup += DataGrid_LoadingRowGroup;
                 dataGrid.ItemsSource = await viewModel.GetDataAsync();
+                dataGrid.PreparingCellForEdit += DataGrid_PreparingCellForEdit;
 
                 var comboBoxColumn = dataGrid.Columns.FirstOrDefault(x => x.Tag?.Equals("Mountain") == true) as DataGridComboBoxColumn;
                 if (comboBoxColumn != null)
@@ -111,6 +112,15 @@ public async void OnXamlRendered(FrameworkElement control)
             }
         }
 
+        private void DataGrid_PreparingCellForEdit(object sender, DataGridPreparingCellForEditEventArgs e)
+        {
+            if (e.Column is DataGridTemplateColumn column && (string)column?.Tag == "First_ascent" &&
+                e.EditingElement is CalendarDatePicker calendar)
+            {
+                calendar.IsCalendarOpen = true;
+            }
+        }
+
         private void DataGrid_LoadingRowGroup(object sender, DataGridRowGroupHeaderEventArgs e)
         {
             ICollectionViewGroup group = e.RowGroupHeader.CollectionViewGroup;

From 9cf163043ee630db3b8f583e50ccb0e2dc8beddb Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 2 Sep 2021 17:00:03 -0700
Subject: [PATCH 190/200] Add comment about DateTimeOffset binding from #2493
 comment

https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/2493#issuecomment-424917060
---
 Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
index 1ddf86ddb90..f3d0bae93f2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Data/DataGridDataItem.cs
@@ -149,6 +149,7 @@ public string Parent_mountain
 
         public uint Prominence { get; set; }
 
+        // You need to use DateTimeOffset to get proper binding to the CalendarDatePicker control, DateTime won't work.
         public DateTimeOffset First_ascent { get; set; }
 
         public string Ascents { get; set; }

From c5b2bb75b99bb164faf9464212c0c4b509ea8c67 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Fri, 3 Sep 2021 11:28:24 -0700
Subject: [PATCH 191/200] Place DP props on one line

---
 .../FrameworkElementExtensions.RelativeAncestor.cs     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index f981e75d6ca..ed44ae0f777 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -34,10 +34,7 @@ public static void SetAncestor(DependencyObject obj, object value)
         /// Attached <see cref="DependencyProperty"/> for retrieving a parent <see cref="object"/> for the <see cref="AncestorProperty"/>
         /// </summary>
         public static readonly DependencyProperty AncestorProperty =
-            DependencyProperty.RegisterAttached("Ancestor",
-                typeof(WeakReference<object>), 
-                typeof(FrameworkElementExtensions), 
-                new PropertyMetadata(null));
+            DependencyProperty.RegisterAttached("Ancestor", typeof(WeakReference<object>), typeof(FrameworkElementExtensions), new PropertyMetadata(null));
 
         /// <summary>
         /// Gets the Type of Ancestor to look for from this element.
@@ -60,10 +57,7 @@ public static void SetAncestorType(DependencyObject obj, Type value)
         /// Attached <see cref="DependencyProperty"/> for retrieving a parent <see cref="object"/> for the <see cref="AncestorProperty"/> based on the provided <see cref="Type"/> in the <see cref="AncestorTypeProperty"/>.
         /// </summary>
         public static readonly DependencyProperty AncestorTypeProperty =
-            DependencyProperty.RegisterAttached("AncestorType", 
-                typeof(Type), 
-                typeof(FrameworkElementExtensions), 
-                new PropertyMetadata(null, AncestorType_PropertyChanged));
+            DependencyProperty.RegisterAttached("AncestorType", typeof(Type), typeof(FrameworkElementExtensions), new PropertyMetadata(null, AncestorType_PropertyChanged));
 
         private static void AncestorType_PropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {

From 9f8527c00421c8c99a66f029b79358ad34c094a8 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 3 Sep 2021 15:15:17 -0400
Subject: [PATCH 192/200] UITests: Remove ref to incorrect version of winui

---
 UITests/UITests.App/UITests.App.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 52c7d1b9801..696475fbbae 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -168,9 +168,6 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1</Version>
-    </PackageReference>
     <PackageReference Include="MUXAppTestHelpers">
       <Version>0.0.4</Version>
     </PackageReference>

From 55316d49ba36aee11ac9c94542a7046a2a889698 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Tue, 7 Sep 2021 11:05:23 -0700
Subject: [PATCH 193/200] Remove blank line

---
 .../FrameworkElementExtensions.RelativeAncestor.cs               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
index ed44ae0f777..3d06f444e59 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.RelativeAncestor.cs
@@ -68,7 +68,6 @@ private static void AncestorType_PropertyChanged(DependencyObject obj, Dependenc
                 if (args.NewValue != null)
                 {
                     fe.Loaded += FrameworkElement_Loaded;
-                    
                     if (fe.Parent != null)
                     {
                         FrameworkElement_Loaded(fe, null);

From 762818cf7ef94d14f8ec000e8f2fb2489226ea98 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Tue, 7 Sep 2021 17:30:00 -0700
Subject: [PATCH 194/200] Add test for grid unload

---
 .../Test_FrameworkElementExtensions.cs        | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
index 4766eea9dd7..57d0e2d4f04 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -11,6 +11,7 @@
 
 namespace UnitTests.Extensions
 {
+    [TestClass]
     public class Test_FrameworkElementExtensions : VisualUITestBase
     {
         [TestCategory("FrameworkElementExtensions")]
@@ -50,5 +51,45 @@ public async Task Test_Ancestor_WeakReference()
                 Assert.IsNull(btn.Parent);
             });
         }
+
+        [TestCategory("FrameworkElementExtensions")]
+        [TestMethod]
+        public async Task Test_Ancestor_WeakRef_UnloadGrid()
+        {
+            // Need to sim loading the control, and not just load the XAML via XamlReader
+            var view = App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
+           @"<Page
+                    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+                    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+                    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""
+                    xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
+
+                    <Grid x:Name=""OuterGrid"" Width=""200"" Background=""Khaki"">
+                        <Button x:Name=""InnerButton"" ui:FrameworkElementExtensions.AncestorType=""Grid"" />
+                    </Grid>
+
+                </Page>") as Page;
+
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                await SetTestContentAsync(treeRoot);
+
+                // Need to simulate loading the control (and not just rely upon XamlReader.Load)
+                var frame = new Frame();
+                frame.Navigate(treeRoot.GetType());
+                Assert.IsInstanceOfType(frame.Content, typeof(Page));
+
+                var grid = treeRoot.FindChild("OuterGrid") as Grid;
+                var button = treeRoot.FindChild("InnerButton") as Button;
+
+                button.SetValue(FrameworkElementExtensions.AncestorProperty, new object());
+
+                treeRoot.Unloaded += (sender, e) =>
+                {
+                    Assert.AreEqual(grid, null);
+                };
+            });
+        }
     }
 }

From fb5b405250333b088d5806d956191bc93fd59ff0 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 7 Sep 2021 17:27:21 -0700
Subject: [PATCH 195/200] Fix #4214 - Update AttachedDropShadow visual when
 element layout changes and visibility changes

---
 .../Shadows/AttachedDropShadow.cs             | 72 +++++++++++++++++--
 .../Shadows/AttachedShadowElementContext.cs   |  2 +
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
index 070603cb7d0..f6fe707a7cf 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedDropShadow.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
@@ -166,6 +167,16 @@ protected internal override void OnElementContextUninitialized(AttachedShadowEle
                 _container.Children.Remove(context.SpriteVisual);
             }
 
+            context.SpriteVisual?.StopAnimation("Size");
+
+            context.Element.LayoutUpdated -= Element_LayoutUpdated;
+
+            if (context.VisibilityToken != null)
+            {
+                context.Element.UnregisterPropertyChangedCallback(UIElement.VisibilityProperty, context.VisibilityToken.Value);
+                context.VisibilityToken = null;
+            }
+
             base.OnElementContextUninitialized(context);
         }
 
@@ -176,6 +187,50 @@ protected override void SetElementChildVisual(AttachedShadowElementContext conte
             {
                 _container.Children.InsertAtTop(context.SpriteVisual);
             }
+
+            // Handles size changing and other elements around it updating.
+            context.Element.LayoutUpdated -= Element_LayoutUpdated;
+            context.Element.LayoutUpdated += Element_LayoutUpdated;
+
+            if (context.VisibilityToken != null)
+            {
+                context.Element.UnregisterPropertyChangedCallback(UIElement.VisibilityProperty, context.VisibilityToken.Value);
+                context.VisibilityToken = null;
+            }
+
+            context.VisibilityToken = context.Element.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, Element_VisibilityChanged);
+        }
+
+        private void Element_LayoutUpdated(object sender, object e)
+        {
+            // Update other shadows to account for layout changes
+            CastToElement_SizeChanged(null, null);
+        }
+
+        private void Element_VisibilityChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            if (sender is FrameworkElement element)
+            {
+                var context = GetElementContext(element);
+
+                if (element.Visibility == Visibility.Collapsed)
+                {
+                    if (_container != null && _container.Children.Contains(context.SpriteVisual))
+                    {
+                        _container.Children.Remove(context.SpriteVisual);
+                    }
+                }
+                else
+                {
+                    if (_container != null && !_container.Children.Contains(context.SpriteVisual))
+                    {
+                        _container.Children.InsertAtTop(context.SpriteVisual);
+                    }
+                }
+            }
+
+            // Update other shadows to account for layout changes
+            CastToElement_SizeChanged(null, null);
         }
 
         /// <inheritdoc/>
@@ -255,12 +310,24 @@ protected override CompositionBrush GetShadowMask(AttachedShadowElementContext c
             }
 
             // Position our shadow in the correct spot to match the corresponding element.
-            context.SpriteVisual.Size = context.Element.RenderSize.ToVector2();
             context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
 
+            BindSizeAndScale(context.SpriteVisual, context.Element);
+
             return mask;
         }
 
+        private static void BindSizeAndScale(CompositionObject source, UIElement target)
+        {
+            var visual = ElementCompositionPreview.GetElementVisual(target);
+            var bindSizeAnimation = source.Compositor.CreateExpressionAnimation($"{nameof(visual)}.Size * {nameof(visual)}.Scale.XY");
+
+            bindSizeAnimation.SetReferenceParameter(nameof(visual), visual);
+
+            // Start the animation
+            source.StartAnimation("Size", bindSizeAnimation);
+        }
+
         private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
         {
             var context = GetElementContext(sender as FrameworkElement);
@@ -274,9 +341,6 @@ private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
         /// <inheritdoc/>
         protected internal override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
-            var sizeAsVec2 = newSize.ToVector2();
-
-            context.SpriteVisual.Size = sizeAsVec2;
             context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
 
             UpdateShadowClip(context);
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
index 1d8803d23af..63afa4581e3 100644
--- a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowElementContext.cs
@@ -20,6 +20,8 @@ public sealed class AttachedShadowElementContext
 
         private Dictionary<string, object> _resources;
 
+        internal long? VisibilityToken { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether or not this <see cref="AttachedShadowElementContext"/> has been initialized.
         /// </summary>

From 21e08252ef932228a373a4a2c8a9c5fc7046d16f Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Sep 2021 15:58:57 +0200
Subject: [PATCH 196/200] Added diagnostic for unsupported C# language version

---
 .../AnalyzerReleases.Unshipped.md             |  1 +
 .../ObservablePropertyGenerator.cs            |  9 +++++++++
 ...ValidatorValidateAllPropertiesGenerator.cs |  7 +++++++
 .../TransitiveMembersGenerator.cs             |  7 +++++++
 .../Diagnostics/DiagnosticDescriptors.cs      | 19 ++++++++++++++++++-
 .../Input/ICommandGenerator.cs                |  6 ++++++
 .../IMessengerRegisterAllGenerator.cs         |  7 +++++++
 7 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md b/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md
index b27b97bcbc6..09be8eafd5f 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md
@@ -17,3 +17,4 @@ MVVMTK0009 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator
 MVVMTK0010 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator | Error | See https://aka.ms/mvvmtoolkit/error
 MVVMTK0011 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator | Error | See https://aka.ms/mvvmtoolkit/error
 MVVMTK0012 | Microsoft.Toolkit.Mvvm.SourceGenerators.ICommandGenerator | Error | See https://aka.ms/mvvmtoolkit/error
+MVVMTK0013 | Microsoft.CodeAnalysis.CSharp.CSharpParseOptions | Error | See https://aka.ms/mvvmtoolkit/error
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
index 037dc98fa78..af3d2e43222 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
@@ -41,6 +41,15 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            // Validate the language version. Note that we're emitting this diagnostic in each generator (excluding the one
+            // only emitting the nullability annotation attributes if missing) so that the diagnostic is emitted only when
+            // users are using one of these generators, and not by default as soon as they add a reference to the MVVM Toolkit.
+            // This ensures that users not using any of the source generators won't be broken when upgrading to this new version.
+            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
+            }
+
             // Sets of discovered property names
             HashSet<string>
                 propertyChangedNames = new(),
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
index 45a6bb3d449..b1849b515bd 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators
 {
@@ -39,6 +40,12 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            // Validate the language version
+            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
+            }
+
             // Get the symbol for the ValidationAttribute type
             INamedTypeSymbol validationSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute")!;
 
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
index bd3f48e284c..6c848347727 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
@@ -18,6 +18,7 @@
 using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using static Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle;
+using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators
 {
@@ -67,6 +68,12 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            // Validate the language version
+            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
+            }
+
             // Load the syntax tree with the members to generate
             SyntaxTree sourceSyntaxTree = LoadSourceSyntaxTree();
 
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs
index 81fa09ee7ee..52ab2c33079 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs
@@ -4,6 +4,7 @@
 
 using System.ComponentModel;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics
 {
@@ -201,7 +202,23 @@ internal static class DiagnosticDescriptors
             category: typeof(ICommandGenerator).FullName,
             defaultSeverity: DiagnosticSeverity.Error,
             isEnabledByDefault: true,
-            description: $"Cannot apply [ICommand] to methods with a signature that doesn't match any of the existing relay command types.",
+            description: "Cannot apply [ICommand] to methods with a signature that doesn't match any of the existing relay command types.",
+            helpLinkUri: "https://aka.ms/mvvmtoolkit");
+
+        /// <summary>
+        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when an unsupported C# language version is being used.
+        /// <para>
+        /// Format: <c>"The method {0}.{1} cannot be used to generate a command property, as its signature isn't compatible with any of the existing relay command types"</c>.
+        /// </para>
+        /// </summary>
+        public static readonly DiagnosticDescriptor UnsupportedCSharpLanguageVersionError = new(
+            id: "MVVMTK0013",
+            title: "Unsupported C# language version",
+            messageFormat: "The source generator features from the MVVM Toolkit require consuming projects to set the C# language version to at least C# 9.0",
+            category: typeof(CSharpParseOptions).FullName,
+            defaultSeverity: DiagnosticSeverity.Error,
+            isEnabledByDefault: true,
+            description: "The source generator features from the MVVM Toolkit require consuming projects to set the C# language version to at least C# 9.0. Make sure to add <LangVersion>9.0</LangVersion> (or above) to your .csproj file.",
             helpLinkUri: "https://aka.ms/mvvmtoolkit");
     }
 }
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
index ffcca24f30a..9095f93f36c 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
@@ -43,6 +43,12 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            // Validate the language version
+            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
+            }
+
             foreach (var items in syntaxReceiver.GatheredInfo.GroupBy<SyntaxReceiver.Item, INamedTypeSymbol>(static item => item.MethodSymbol.ContainingType, SymbolEqualityComparer.Default))
             {
                 if (items.Key.DeclaringSyntaxReferences.Length > 0 &&
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
index 91e4925dd99..9faeecf3ac5 100644
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
+++ b/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators
 {
@@ -38,6 +39,12 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            // Validate the language version
+            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
+            }
+
             // Get the symbol for the IRecipient<T> interface type
             INamedTypeSymbol iRecipientSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Messaging.IRecipient`1")!;
 

From 15a26e481f91e226dcf87d6be565ad5988bafbd7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 8 Sep 2021 17:50:24 +0200
Subject: [PATCH 197/200] Added unit tests for new diagnostic

---
 .../Test_SourceGeneratorsDiagnostics.cs       | 156 +++++++++++++++++-
 1 file changed, 151 insertions(+), 5 deletions(-)

diff --git a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs b/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
index 36bdb455eb7..7cb6bad19e0 100644
--- a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
+++ b/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
@@ -241,31 +241,177 @@ public partial class SampleViewModel
             VerifyGeneratedDiagnostics<ICommandGenerator>(source, "MVVMTK0012");
         }
 
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromINotifyPropertyChangedGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+            namespace MyApp
+            {
+                [INotifyPropertyChanged]
+                public partial class SampleViewModel
+                {
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<INotifyPropertyChangedGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromObservableObjectGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+            namespace MyApp
+            {
+                [ObservableObject]
+                public partial class SampleViewModel
+                {
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromObservablePropertyGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+            namespace MyApp
+            {
+                [INotifyPropertyChanged]
+                public partial class SampleViewModel
+                {
+                    [ObservableProperty]
+                    private string name;
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<ObservablePropertyGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromObservableValidatorValidateAllPropertiesGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+            namespace MyApp
+            {
+                public partial class SampleViewModel : ObservableValidator
+                {
+                    [Required]
+                    public string Name { get; set; }
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<ObservableValidatorValidateAllPropertiesGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromICommandGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.Input;
+
+            namespace MyApp
+            {
+                public partial class SampleViewModel
+                {
+                    [ICommand]
+                    private void GreetUser(object value)
+                    {
+                    }
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<ICommandGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        public void UnsupportedCSharpLanguageVersion_FromIMessengerRegisterAllGenerator()
+        {
+            string source = @"
+            using Microsoft.Toolkit.Mvvm.Messaging;
+
+            namespace MyApp
+            {
+                public class MyMessage
+                {
+                }
+
+                public partial class SampleViewModel : IRecipient<MyMessage>
+                {
+                    public void Receive(MyMessage message)
+                    {
+                    }
+                }
+            }";
+
+            VerifyGeneratedDiagnostics<IMessengerRegisterAllGenerator>(
+                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
+                "MVVMTK0013");
+        }
+
         /// <summary>
         /// Verifies the output of a source generator.
         /// </summary>
         /// <typeparam name="TGenerator">The generator type to use.</typeparam>
         /// <param name="source">The input source to process.</param>
         /// <param name="diagnosticsIds">The diagnostic ids to expect for the input source code.</param>
-        private void VerifyGeneratedDiagnostics<TGenerator>(string source, params string[] diagnosticsIds)
+        private static void VerifyGeneratedDiagnostics<TGenerator>(string source, params string[] diagnosticsIds)
+            where TGenerator : class, ISourceGenerator, new()
+        {
+            VerifyGeneratedDiagnostics<TGenerator>(CSharpSyntaxTree.ParseText(source), diagnosticsIds);
+        }
+
+        /// <summary>
+        /// Verifies the output of a source generator.
+        /// </summary>
+        /// <typeparam name="TGenerator">The generator type to use.</typeparam>
+        /// <param name="syntaxTree">The input source tree to process.</param>
+        /// <param name="diagnosticsIds">The diagnostic ids to expect for the input source code.</param>
+        private static void VerifyGeneratedDiagnostics<TGenerator>(SyntaxTree syntaxTree, params string[] diagnosticsIds)
             where TGenerator : class, ISourceGenerator, new()
         {
             Type observableObjectType = typeof(ObservableObject);
             Type validationAttributeType = typeof(ValidationAttribute);
 
-            SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(source);
-
             IEnumerable<MetadataReference> references =
                 from assembly in AppDomain.CurrentDomain.GetAssemblies()
                 where !assembly.IsDynamic
                 let reference = MetadataReference.CreateFromFile(assembly.Location)
                 select reference;
 
-            CSharpCompilation compilation = CSharpCompilation.Create("original", new SyntaxTree[] { syntaxTree }, references, new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+            CSharpCompilation compilation = CSharpCompilation.Create(
+                "original",
+                new SyntaxTree[] { syntaxTree },
+                references,
+                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
             ISourceGenerator generator = new TGenerator();
 
-            CSharpGeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
+            CSharpGeneratorDriver driver = CSharpGeneratorDriver.Create(new[] { generator }, parseOptions: (CSharpParseOptions)syntaxTree.Options);
 
             driver.RunGeneratorsAndUpdateCompilation(compilation, out Compilation outputCompilation, out ImmutableArray<Diagnostic> diagnostics);
 

From cd475a36265b55fd8688e874a06e4ab665a5ae4f Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Wed, 8 Sep 2021 09:07:03 -0700
Subject: [PATCH 198/200] Apply Await

---
 .../Extensions/Test_FrameworkElementExtensions.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
index 57d0e2d4f04..b9752473d8f 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -19,7 +19,7 @@ public class Test_FrameworkElementExtensions : VisualUITestBase
         public async Task Test_Ancestor_WeakReference()
         {
             // Need to sim loading the control, and not just load the XAML via XamlReader
-            var view = App.DispatcherQueue.EnqueueAsync(async () =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 var treeRoot = XamlReader.Load(
            @"<Page
@@ -57,7 +57,7 @@ public async Task Test_Ancestor_WeakReference()
         public async Task Test_Ancestor_WeakRef_UnloadGrid()
         {
             // Need to sim loading the control, and not just load the XAML via XamlReader
-            var view = App.DispatcherQueue.EnqueueAsync(async () =>
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
                 var treeRoot = XamlReader.Load(
            @"<Page

From 27c302fdcd1726dad7b671a805275551575bab58 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Thu, 9 Sep 2021 10:23:51 -0700
Subject: [PATCH 199/200] Aid the unload effort

---
 .../Extensions/Test_FrameworkElementExtensions.cs              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
index b9752473d8f..f3211d7bb50 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -89,6 +89,9 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
                 {
                     Assert.AreEqual(grid, null);
                 };
+
+                // Allow treeRoot to Unload, before test ends
+                await SetTestContentAsync(null);
             });
         }
     }

From 1206930f10cbb43099448c8c708289cb0a513522 Mon Sep 17 00:00:00 2001
From: Darren Batchelor <v-dbatchelor@microsoft.com>
Date: Thu, 9 Sep 2021 12:07:49 -0700
Subject: [PATCH 200/200] Test added to proj

---
 .../Test_FrameworkElementExtensions.cs        | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs

diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
new file mode 100644
index 00000000000..f3211d7bb50
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FrameworkElementExtensions.cs
@@ -0,0 +1,98 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Toolkit.Uwp;
+using Microsoft.Toolkit.Uwp.UI;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_FrameworkElementExtensions : VisualUITestBase
+    {
+        [TestCategory("FrameworkElementExtensions")]
+        [TestMethod]
+        public async Task Test_Ancestor_WeakReference()
+        {
+            // Need to sim loading the control, and not just load the XAML via XamlReader
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
+           @"<Page
+                    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+                    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+                    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""
+                    xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
+
+                    <Grid x:Name=""OuterGrid"" Width=""200"" Background=""Khaki"">
+                        <Button x:Name=""InnerButton"" ui:FrameworkElementExtensions.AncestorType=""Grid"" />
+                    </Grid>
+
+                </Page>") as Page;
+
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                await SetTestContentAsync(treeRoot);
+
+                // Need to simulate loading the control (and not just rely upon XamlReader.Load)
+                var frame = new Frame();
+                frame.Navigate(treeRoot.GetType());
+                Assert.IsInstanceOfType(frame.Content, typeof(Page));
+
+                var btn = treeRoot.FindChild("InnerButton") as Button;
+
+                Assert.IsNull(btn.Parent);
+
+                btn.SetValue(FrameworkElementExtensions.AncestorProperty, new object());
+
+                Assert.IsNull(btn.Parent);
+            });
+        }
+
+        [TestCategory("FrameworkElementExtensions")]
+        [TestMethod]
+        public async Task Test_Ancestor_WeakRef_UnloadGrid()
+        {
+            // Need to sim loading the control, and not just load the XAML via XamlReader
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
+           @"<Page
+                    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+                    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+                    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""
+                    xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
+
+                    <Grid x:Name=""OuterGrid"" Width=""200"" Background=""Khaki"">
+                        <Button x:Name=""InnerButton"" ui:FrameworkElementExtensions.AncestorType=""Grid"" />
+                    </Grid>
+
+                </Page>") as Page;
+
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                await SetTestContentAsync(treeRoot);
+
+                // Need to simulate loading the control (and not just rely upon XamlReader.Load)
+                var frame = new Frame();
+                frame.Navigate(treeRoot.GetType());
+                Assert.IsInstanceOfType(frame.Content, typeof(Page));
+
+                var grid = treeRoot.FindChild("OuterGrid") as Grid;
+                var button = treeRoot.FindChild("InnerButton") as Button;
+
+                button.SetValue(FrameworkElementExtensions.AncestorProperty, new object());
+
+                treeRoot.Unloaded += (sender, e) =>
+                {
+                    Assert.AreEqual(grid, null);
+                };
+
+                // Allow treeRoot to Unload, before test ends
+                await SetTestContentAsync(null);
+            });
+        }
+    }
+}