Ensure BringIntoView request is not skipped for direct content of ScrollView (#6889)

* Ensure BringIntoView request is not skipped for direct content of ScrollView

* Test for BringIntoView for direct content

* Move test to correct location and rename

Author: MartinZikmund

dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs

@@ -30,6 +30,7 @@
 using ScrollingBringingIntoViewEventArgs = Microsoft.UI.Xaml.Controls.ScrollingBringingIntoViewEventArgs;
 using ScrollPresenterTestHooks = Microsoft.UI.Private.Controls.ScrollPresenterTestHooks;
 using ScrollPresenterViewChangeResult = Microsoft.UI.Private.Controls.ScrollPresenterViewChangeResult;
+using Windows.UI.Xaml.Shapes;
 
 namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
 {
@@ -743,6 +744,43 @@ public void BringNestedElementIntoVerticalScrollViewerViewWithOffset()
                 options);
         }
 
+        [TestMethod]
+        [TestProperty("Description", "ScrollPresenter should handle BringIntoView for its direct content.")]
+        public void BringContentWithMarginIntoView()
+        {
+            ScrollPresenter scrollPresenter = null;
+            Rectangle rectangleScrollPresenterContent = null;
+            AutoResetEvent scrollPresenterViewChangedEvent = new AutoResetEvent(false);
+            AutoResetEvent scrollPresenterLoadedEvent = new AutoResetEvent(false);
+
+            RunOnUIThread.Execute(() =>
+            {
+                rectangleScrollPresenterContent = new Rectangle() { Margin = new Thickness(0, 500, 0, 0) };
+                scrollPresenter = new ScrollPresenter();
+
+                SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent);
+            });
+
+            WaitForEvent("Waiting for Loaded event", scrollPresenterLoadedEvent);
+
+            RunOnUIThread.Execute(() =>
+            {
+                scrollPresenter.ViewChanged += (s, e) =>
+                {
+                    scrollPresenterViewChangedEvent.Set();
+                };
+
+                rectangleScrollPresenterContent.StartBringIntoView(new BringIntoViewOptions() { AnimationDesired = false });
+            });
+
+            WaitForEvent("Waiting for ViewChanged event", scrollPresenterViewChangedEvent);
+
+            RunOnUIThread.Execute(() =>
+            {
+                Verify.AreEqual(500.0, scrollPresenter.VerticalOffset);
+            });
+        }
+
         private void BringElementIntoViewWithAlignment(
             Orientation orientation,
             double alignmentRatio,

dev/ScrollPresenter/ScrollPresenter.cpp

@@ -4472,7 +4472,7 @@ void ScrollPresenter::OnBringIntoViewRequestedHandler(
         args.Handled() ||
         args.TargetElement() == static_cast<winrt::UIElement>(*this) ||
         (args.TargetElement() == content && content.Visibility() == winrt::Visibility::Collapsed) ||
-        !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/))
+        (args.TargetElement() != content && !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/)))
     {
         // Ignore the request when:
         // - There is no InteractionTracker to fulfill it.
@@ -4525,7 +4525,7 @@ void ScrollPresenter::OnBringIntoViewRequestedHandler(
             args.Handled() ||
             args.TargetElement() == static_cast<winrt::UIElement>(*this) ||
             (args.TargetElement() == content && content.Visibility() == winrt::Visibility::Collapsed) ||
-            !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/))
+            (args.TargetElement() != content && !SharedHelpers::IsAncestor(args.TargetElement(), content, true /*checkVisibility*/)))
         {
             // Again, ignore the request when:
             // - There is no Content anymore.