From 094ecbe31a4109e53e2f13b90ad331513e241885 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 01:09:45 -0700
Subject: [PATCH 1/8] add button orientation size change

---
 .../InteractionTests/PipsPagerTests.cs        |  47 ++++++++
 dev/PipsPager/PipsPager.cpp                   | 113 ++++++++++++++----
 dev/PipsPager/PipsPager.h                     |   5 +-
 dev/PipsPager/PipsPager.xaml                  |  15 ++-
 .../PipsPagerSelectedIndexChangedEventArgs.h  |  13 +-
 dev/PipsPager/PipsPager_themeresources.xaml   |  25 +++-
 dev/PipsPager/TestUI/PipsPagerPage.xaml       |  45 ++++++-
 dev/PipsPager/TestUI/PipsPagerPage.xaml.cs    |  20 +++-
 8 files changed, 233 insertions(+), 50 deletions(-)
 mode change 100644 => 100755 dev/PipsPager/PipsPager_themeresources.xaml

diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index 91779db175..da5bf2f95f 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -4,6 +4,7 @@
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
 using Common;
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
 #if USING_TAEF
 using WEX.TestExecution;
 using WEX.TestExecution.Markup;
@@ -315,5 +316,51 @@ public void KeyboardPageSelectTest()
                 VerifySelectedPageIndex(2);
             }
         }
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipSizeWithDifferentOrientationsTest()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                Button getButtonSizesButton = FindElement.ByName<Button>("GetPipsPagersButtonSizes");
+                getButtonSizesButton.InvokeAndWait();
+
+                TextBlock horizontalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonWidth");
+                TextBlock horizontalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonHeight");
+
+                TextBlock verticalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("VerticalOrientationPipsPagerButtonWidth");
+                TextBlock verticalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("VerticalOrientationPipsPagerButtonHeight");
+
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+                Verify.AreEqual("20", verticalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("12", verticalOrientationPipsPagerButtonHeight.DocumentText);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipSizeAfterOrientationChangeTest()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                Button getButtonSizesButton = FindElement.ByName<Button>("GetPipsPagersButtonSizes");
+                getButtonSizesButton.InvokeAndWait();
+
+                TextBlock horizontalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonWidth");
+                TextBlock horizontalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonHeight");
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+
+                elements = new PipsPagerElements();
+                SetOrientation(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
+                VerifyOrientationChanged(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
+
+                getButtonSizesButton.InvokeAndWait();
+
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+            }
+        }
     }
 }
diff --git a/dev/PipsPager/PipsPager.cpp b/dev/PipsPager/PipsPager.cpp
index d12c8fbb3c..e62ee01823 100755
--- a/dev/PipsPager/PipsPager.cpp
+++ b/dev/PipsPager/PipsPager.cpp
@@ -35,12 +35,19 @@ constexpr auto c_nextPageButtonName = L"NextPageButton"sv;
 constexpr auto c_pipsPagerRepeaterName = L"PipsPagerItemsRepeater"sv;
 constexpr auto c_pipsPagerScrollViewerName = L"PipsPagerScrollViewer"sv;
 
-constexpr auto c_pipsPagerButtonWidthPropertyName = L"PipsPagerButtonWidth"sv;
-constexpr auto c_pipsPagerButtonHeightPropertyName = L"PipsPagerButtonHeight"sv;
+constexpr auto c_pipsPagerVerticalOrientationButtonWidthPropertyName = L"PipsPagerVerticalOrientationButtonWidth"sv;
+constexpr auto c_pipsPagerVerticalOrientationButtonHeightPropertyName = L"PipsPagerVerticalOrientationButtonHeight"sv;
+
+constexpr auto c_pipsPagerHorizontalOrientationButtonWidthPropertyName = L"PipsPagerHorizontalOrientationButtonWidth"sv;
+constexpr auto c_pipsPagerHorizontalOrientationButtonHeightPropertyName = L"PipsPagerHorizontalOrientationButtonHeight"sv;
 
 constexpr auto c_pipsPagerHorizontalOrientationVisualState = L"HorizontalOrientationView"sv;
 constexpr auto c_pipsPagerVerticalOrientationVisualState = L"VerticalOrientationView"sv;
 
+constexpr auto c_pipsPagerButtonVerticalOrientationVisualState = L"VerticalOrientation"sv;
+constexpr auto c_pipsPagerButtonHorizontalOrientationVisualState = L"HorizontalOrientation"sv;
+
+
 PipsPager::PipsPager()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_PipsPager);
@@ -116,7 +123,7 @@ void PipsPager::OnApplyTemplate()
 
 void PipsPager::RaiseSelectedIndexChanged()
 {
-    const auto args = winrt::make_self<PipsPagerSelectedIndexChangedEventArgs>(m_lastSelectedPageIndex, SelectedPageIndex());
+    const auto args = winrt::make_self<PipsPagerSelectedIndexChangedEventArgs>();
     m_selectedIndexChangedEventSource(*this, *args);
 }
 
@@ -127,15 +134,24 @@ winrt::Size PipsPager::GetDesiredPipSize(const winrt::Style& style) {
         {
             if (auto const element = itemTemplate.LoadContent().try_as<winrt::FrameworkElement>())
             {
-                element.Style(style);
+                ApplyStyleToPipAndUpdateOrientation(element, style);
                 element.Measure({ std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity() });
                 return element.DesiredSize();
             }
         }
     }
-    /* Extract default sizes and return in case the code above fails */
-    auto pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerButtonHeightPropertyName)));
-    auto pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerButtonWidthPropertyName)));
+    double pipHeight;
+    double pipWidth;
+    if (Orientation() == winrt::Orientation::Horizontal)
+    {
+        pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerVerticalOrientationButtonHeightPropertyName)));
+        pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerVerticalOrientationButtonWidthPropertyName)));
+    }
+    else
+    {
+        pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerHorizontalOrientationButtonHeightPropertyName)));
+        pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerHorizontalOrientationButtonWidthPropertyName)));
+    }
     return { static_cast<float>(pipWidth), static_cast<float>(pipHeight) };
 }
 
@@ -259,14 +275,14 @@ void PipsPager::UpdateSelectedPip(const int index) {
         if (const auto repeater = m_pipsPagerRepeater.get())
         {
             repeater.UpdateLayout();
-            if (const auto element = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::Button>())
+            if (const auto pip = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::Button>())
             {
-                element.Style(NormalPipStyle());
+                ApplyStyleToPipAndUpdateOrientation(pip, NormalPipStyle());
             }
-            if (const auto element = repeater.GetOrCreateElement(index).try_as<winrt::Button>())
+            if (const auto pip = repeater.GetOrCreateElement(index).try_as<winrt::Button>())
             {
-                element.Style(SelectedPipStyle());
-                ScrollToCenterOfViewport(element, index);
+                ApplyStyleToPipAndUpdateOrientation(pip, SelectedPipStyle());
+                ScrollToCenterOfViewport(pip, index);
             }
         }
     }
@@ -348,21 +364,18 @@ void PipsPager::UpdatePipsItems(const int numberOfPages, int maxVisualIndicators
 
 void PipsPager::OnElementPrepared(winrt::ItemsRepeater sender, winrt::ItemsRepeaterElementPreparedEventArgs args)
 {
-    if (auto const element = args.Element())
+    if (auto const element = args.Element().try_as<winrt::FrameworkElement>())
     {
-        if (const auto pip = element.try_as<winrt::Button>())
-        {
-            auto const index = args.Index();
-            if (index != SelectedPageIndex())
-            {
-                pip.Style(NormalPipStyle());
-            }
+        auto const index = args.Index();
+        auto const style = index == SelectedPageIndex() ? SelectedPipStyle() : NormalPipStyle();
+        ApplyStyleToPipAndUpdateOrientation(element, style);
 
-            // Narrator says: Page 5, Button 5 of 30. Is it expected behavior?
-            winrt::AutomationProperties::SetName(pip, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerPageText) + L" " + winrt::to_hstring(index + 1));
-            winrt::AutomationProperties::SetPositionInSet(pip, index + 1);
-            winrt::AutomationProperties::SetSizeOfSet(pip, NumberOfPages());
+        winrt::AutomationProperties::SetName(element, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerPageText) + L" " + winrt::to_hstring(index + 1));
+        winrt::AutomationProperties::SetPositionInSet(element, index + 1);
+        winrt::AutomationProperties::SetSizeOfSet(element, NumberOfPages());
 
+        if (const auto pip = element.try_as<winrt::Button>())
+        {
             auto pciRevokers = winrt::make_self<PipsPagerViewItemRevokers>();
             pciRevokers->clickRevoker = pip.Click(winrt::auto_revoke,
                 [this, index](auto const& sender, auto const& args)
@@ -460,9 +473,49 @@ void PipsPager::OnOrientationChanged()
     {
         winrt::VisualStateManager::GoToState(*this, c_pipsPagerVerticalOrientationVisualState, false);
     }
+    if (const auto repeater = m_pipsPagerRepeater.get())
+    {
+        if (const auto itemsSourceView = repeater.ItemsSourceView())
+        {
+            const auto itemCount = itemsSourceView.Count();
+            for (int i = 0; i < itemCount; i++)
+            {
+                if (const auto pip = repeater.TryGetElement(i).try_as<winrt::Control>())
+                {
+                    UpdatePipOrientation(pip);
+                }
+            }
+        }
+    }
+    m_defaultPipSize = GetDesiredPipSize(NormalPipStyle());
+    m_selectedPipSize = GetDesiredPipSize(SelectedPipStyle());
     SetScrollViewerMaxSize();
-    UpdateSelectedPip(SelectedPageIndex());
+    if (const auto selectedPip = GetSelectedItem())
+    {
+        ScrollToCenterOfViewport(selectedPip, SelectedPageIndex());
+    }
+}
 
+void PipsPager::ApplyStyleToPipAndUpdateOrientation(const winrt::FrameworkElement& pip, const winrt::Style& style)
+{
+    pip.Style(style);
+    if (const auto control = pip.try_as<winrt::Control>())
+    {
+        control.ApplyTemplate();
+        UpdatePipOrientation(control);
+    }
+}
+
+void PipsPager::UpdatePipOrientation(const winrt::Control& pip)
+{
+    if (Orientation() == winrt::Orientation::Horizontal)
+    {
+        winrt::VisualStateManager::GoToState(pip, c_pipsPagerButtonHorizontalOrientationVisualState, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(pip, c_pipsPagerButtonVerticalOrientationVisualState, false);
+    }
 }
 
 void PipsPager::OnNavigationButtonVisibilityChanged(const ButtonVisibility visibility, const wstring_view& collapsedStateName, const wstring_view& disabledStateName) {
@@ -621,7 +674,7 @@ void PipsPager::OnPipsAreaBringIntoViewRequested(const IInspectable& sender, con
     if (
         (Orientation() == winrt::Orientation::Vertical && isnan(args.VerticalAlignmentRatio())) ||
         (Orientation() == winrt::Orientation::Horizontal && isnan(args.HorizontalAlignmentRatio()))
-       )
+        )
     {
         args.Handled(true);
     }
@@ -670,6 +723,14 @@ void PipsPager::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArg
     }
 }
 
+winrt::UIElement PipsPager::GetSelectedItem() {
+    if (auto const repeater = m_pipsPagerRepeater.get())
+    {
+        return repeater.TryGetElement(SelectedPageIndex());
+    }
+    return nullptr;
+}
+
 winrt::AutomationPeer PipsPager::OnCreateAutomationPeer()
 {
     return winrt::make<PipsPagerAutomationPeer>(*this);
diff --git a/dev/PipsPager/PipsPager.h b/dev/PipsPager/PipsPager.h
index 4318f66177..c6a660e7b0 100755
--- a/dev/PipsPager/PipsPager.h
+++ b/dev/PipsPager/PipsPager.h
@@ -47,6 +47,8 @@ class PipsPager :
         const wstring_view& disabledStateName);
     void OnOrientationChanged();
 
+    winrt::UIElement GetSelectedItem();
+
     /* Dependency property for pip buttons revokers */
     GlobalDependencyProperty s_pipButtonHandlersProperty;
 
@@ -66,7 +68,8 @@ class PipsPager :
     void ScrollToCenterOfViewport(const winrt::UIElement sender, const int index);
     double CalculateScrollViewerSize(const double defaultPipSize, const double selectedPipSize, const int numberOfPages, int maxVisualIndicators);
     void UpdateSelectedPip(const int index);
-
+    void UpdatePipOrientation(const winrt::Control& pip);
+    void ApplyStyleToPipAndUpdateOrientation(const winrt::FrameworkElement& pip, const winrt::Style& style);
     /* Eventing */
     void RaiseSelectedIndexChanged();
 
diff --git a/dev/PipsPager/PipsPager.xaml b/dev/PipsPager/PipsPager.xaml
index f81c440e4a..6ba2039880 100755
--- a/dev/PipsPager/PipsPager.xaml
+++ b/dev/PipsPager/PipsPager.xaml
@@ -88,13 +88,20 @@
 
                         <Button x:Name="PreviousPageButton"
                                 ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}"
-                                Style="{TemplateBinding PreviousButtonStyle}"/>
+                                Style="{TemplateBinding PreviousButtonStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center" />
 
                         <ScrollViewer x:Name="PipsPagerScrollViewer"
                                       VerticalScrollBarVisibility="Hidden"
                                       VerticalScrollMode="Disabled"
                                       HorizontalScrollBarVisibility="Hidden"
-                                      HorizontalScrollMode="Disabled">
+                                      HorizontalScrollMode="Disabled"
+                                      IsHorizontalScrollChainingEnabled="False"
+                                      IsVerticalScrollChainingEnabled="False"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      >
                             <muxc:ItemsRepeater x:Name="PipsPagerItemsRepeater"
                                 ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
                                 <muxc:ItemsRepeater.Layout>
@@ -110,7 +117,9 @@
 
                         <Button x:Name="NextPageButton"
                                 ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}"
-                                Style="{TemplateBinding NextButtonStyle}"/>
+                                Style="{TemplateBinding NextButtonStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"/>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h b/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
index 89a9126b0c..b2716092e2 100755
--- a/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
+++ b/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
@@ -7,15 +7,4 @@
 
 class PipsPagerSelectedIndexChangedEventArgs :
     public winrt::implementation::PipsPagerSelectedIndexChangedEventArgsT<PipsPagerSelectedIndexChangedEventArgs>
-{
-public:
-    PipsPagerSelectedIndexChangedEventArgs(const int previousIndex, const int newIndex) :
-        m_previousPageIndex(previousIndex), m_newPageIndex(newIndex) {};
-
-    int NewPageIndex() { return m_newPageIndex; };
-    int PreviousPageIndex() { return m_previousPageIndex; };
-
-private:
-    int m_newPageIndex = -1;
-    int m_previousPageIndex = -1;
-};
+{};
diff --git a/dev/PipsPager/PipsPager_themeresources.xaml b/dev/PipsPager/PipsPager_themeresources.xaml
old mode 100644
new mode 100755
index ed1ee2ab33..d95cdb0faf
--- a/dev/PipsPager/PipsPager_themeresources.xaml
+++ b/dev/PipsPager/PipsPager_themeresources.xaml
@@ -96,8 +96,18 @@
     </ResourceDictionary.ThemeDictionaries>
 
     <!-- PipsPager Resources -->
+
+    <!-- Deprecated Resources: might be removed later -->
     <x:Double x:Key="PipsPagerButtonWidth">20</x:Double>
     <x:Double x:Key="PipsPagerButtonHeight">12</x:Double>
+    <!-- Deprecated Resources: might be removed later -->
+
+    <x:Double x:Key="PipsPagerHorizontalOrientationButtonWidth">12</x:Double>
+    <x:Double x:Key="PipsPagerHorizontalOrientationButtonHeight">20</x:Double>
+
+    <x:Double x:Key="PipsPagerVerticalOrientationButtonWidth">20</x:Double>
+    <x:Double x:Key="PipsPagerVerticalOrientationButtonHeight">12</x:Double>
+
 
     <Thickness x:Key="PipsPagerButtonBorderThickness">1</Thickness>
     <Thickness x:Key="PipsPagerNavigationButtonBorderThickness">1</Thickness>
@@ -216,8 +226,6 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="FocusVisualMargin" Value="0" />
-        <Setter Property="Width" Value="{StaticResource PipsPagerButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource PipsPagerButtonHeight}" />
         <Setter Property="Content" Value="{StaticResource PipsPagerNormalGlyph}" />
         <Setter Property="FontSize" Value="{StaticResource PipsPagerNormalGlyphFontSize}" />
         <Setter Property="Template">
@@ -227,7 +235,9 @@
                         x:Name="RootGrid" 
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Width="{StaticResource PipsPagerHorizontalOrientationButtonWidth}"
+                        Height="{StaticResource PipsPagerHorizontalOrientationButtonHeight}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -277,6 +287,15 @@
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
+                            <VisualStateGroup x:Name="OrientationStates">
+                                <VisualState x:Name="HorizontalOrientation"/>
+                                <VisualState x:Name="VerticalOrientation">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Width" Value="{ThemeResource PipsPagerVerticalOrientationButtonWidth}"/>
+                                        <Setter Target="RootGrid.Height" Value="{ThemeResource PipsPagerVerticalOrientationButtonHeight}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup> 
                         </VisualStateManager.VisualStateGroups>
                         <FontIcon
                             x:Name="Content"
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml b/dev/PipsPager/TestUI/PipsPagerPage.xaml
index 6c800d0b9f..a9106458d2 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml
@@ -9,10 +9,10 @@
     xmlns:local="using:MUXControlsTestApp"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
-    
+
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="300"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -25,7 +25,7 @@
                             AutomationProperties.Name="TestPipsPager"
                             SelectedIndexChanged="OnSelectedIndexChanged"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Center"                        
+                            VerticalAlignment="Center"
                             Margin="0,0,100,0"/>
 
         <StackPanel Orientation="Vertical" Grid.Column="1" >
@@ -82,10 +82,47 @@
             <TextBlock x:Name="FocusedPageIndexTextBlock" Text="Current focused page index: "/>
             <TextBlock x:Name="CurrentOrientationTextBlock"/>
         </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
+            <StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Horizontal Orientation PipsPager ButtonWidth:"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonWidth" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonWidth" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Horizontal Orientation PipsPager ButtonHeight:"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonHeight" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonHeight" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Vertical Orientation PipsPager ButtonWidth:"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonWidth" AutomationProperties.Name="VerticalOrientationPipsPagerButtonWidth" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Vertical Orientation PipsPager ButtonHeight:"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonHeight" AutomationProperties.Name="VerticalOrientationPipsPagerButtonHeight" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+            </StackPanel>
+            <Button x:Name="GetPipsPagersButtonSizes"
+                    AutomationProperties.Name="GetPipsPagersButtonSizes"
+                    Content="Get Sizes"
+                    Click="OnGetPipsPagerButtonSizesClicked"
+                    Height="50"
+                    Width="150"
+                    HorizontalAlignment="Left"
+                    Margin="0,20,0,0"/>
+        </StackPanel> 
+        
+        <muxc:PipsPager x:Name="TestPipsPagerVerticalOrientation"
+                            AutomationProperties.Name="TestPipsPagerVerticalOrientation"
+                            Orientation="Vertical"
+                            HorizontalAlignment="Left"
+                            Margin="0,0,100,0"
+                            Grid.Row="1"/>
+        
         <Button x:Name="GoToExamplesPageButton"
                 Content="Open PipsPager Examples"
                 Grid.Row="1" Grid.Column="1"
-                Margin="0, 150, 0, 0"
+                Margin="0, 200, 0, 0"
                 Click="GoToExamplesPage"/>
     </Grid>
 </local:TestPage>
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
index fb07278ecc..433298d13f 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
@@ -20,6 +20,7 @@ public sealed partial class PipsPagerPage : TestPage
         Button previousPageButton;
         Button nextPageButton;
         ItemsRepeater repeater;
+        ItemsRepeater verticalOrientationPipsPagerRepeater;
 
         public List<string> Pictures = new List<string>()
         {
@@ -38,13 +39,16 @@ public PipsPagerPage()
             this.InitializeComponent();
             this.Loaded += OnLoad;
         }
-
+        
         private void OnLoad(object sender, RoutedEventArgs args)
         {
             var rootPanel = VisualTreeHelper.GetChild(TestPipsPager, 0);
             previousPageButton = VisualTreeHelper.GetChild(rootPanel, 0) as Button;
             nextPageButton = VisualTreeHelper.GetChild(rootPanel, 2) as Button;
             repeater = rootPanel.FindVisualChildByType<ItemsRepeater>();
+            var rootPanelVerticalPipsPager = VisualTreeHelper.GetChild(TestPipsPagerVerticalOrientation, 0);
+            verticalOrientationPipsPagerRepeater = rootPanelVerticalPipsPager.FindVisualChildByType<ItemsRepeater>();
+
 
             PreviousPageButtonVisibilityComboBox.SelectionChanged += OnPreviousPageButtonVisibilityChanged;
             NextPageButtonVisibilityComboBox.SelectionChanged += OnNextPageButtonVisibilityChanged;
@@ -72,6 +76,20 @@ private void OnLoad(object sender, RoutedEventArgs args)
             CurrentOrientationTextBlock.Text = GetCurrentOrientation();
         }
 
+        private void OnGetPipsPagerButtonSizesClicked(object sender, RoutedEventArgs args)
+        {
+            if (repeater.TryGetElement(1) is var horizontalOrientationButton && horizontalOrientationButton != null)
+            {
+                HorizontalOrientationPipsPagerButtonWidth.Text = $"{ horizontalOrientationButton.ActualSize.X}";
+                HorizontalOrientationPipsPagerButtonHeight.Text = $"{horizontalOrientationButton.ActualSize.Y}";
+            }
+            if (verticalOrientationPipsPagerRepeater.TryGetElement(1) is var verticalOrientationButton && verticalOrientationButton != null)
+            {
+                VerticalOrientationPipsPagerButtonWidth.Text = $"{verticalOrientationButton.ActualSize.X}";
+                VerticalOrientationPipsPagerButtonHeight.Text = $"{verticalOrientationButton.ActualSize.Y}";
+            }
+        }
+
         private void OnRepeaterGotFocus(object sender, RoutedEventArgs e)
         {
             FocusedPageIndexTextBlock.Text = $"Current focused page index: {repeater.GetElementIndex((UIElement)e.OriginalSource).ToString()}";

From 919a583c8fd577c4723765f3d3a3e391390bcdeb Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 01:10:31 -0700
Subject: [PATCH 2/8] update automation peer

---
 dev/PipsPager/PipsPagerAutomationPeer.cpp | 10 ++++++++--
 dev/PipsPager/PipsPagerAutomationPeer.h   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev/PipsPager/PipsPagerAutomationPeer.cpp b/dev/PipsPager/PipsPagerAutomationPeer.cpp
index a0bf413715..2545ccadaf 100755
--- a/dev/PipsPager/PipsPagerAutomationPeer.cpp
+++ b/dev/PipsPager/PipsPagerAutomationPeer.cpp
@@ -63,11 +63,17 @@ com_ptr<PipsPager> PipsPagerAutomationPeer::GetImpl()
     return impl;
 }
 
-winrt::com_array<winrt::IInspectable> PipsPagerAutomationPeer::GetSelection()
+winrt::com_array<winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple> PipsPagerAutomationPeer::GetSelection()
 {
     if (const auto pager = GetImpl())
     {
-        return { winrt::box_value(pager->SelectedPageIndex()) };
+        if (auto pip = pager->GetSelectedItem())
+        {
+            if (auto peer = winrt::FrameworkElementAutomationPeer::CreatePeerForElement(pip))
+            {
+                return { ProviderFromPeer(peer) };
+            }
+        }
     }
     return {};
 }
diff --git a/dev/PipsPager/PipsPagerAutomationPeer.h b/dev/PipsPager/PipsPagerAutomationPeer.h
index f380ba0ab6..04f204055a 100755
--- a/dev/PipsPager/PipsPagerAutomationPeer.h
+++ b/dev/PipsPager/PipsPagerAutomationPeer.h
@@ -22,7 +22,7 @@ class PipsPagerAutomationPeer :
     // ISelectionProvider
     bool CanSelectMultiple() { return false; };
     bool IsSelectionRequired() { return true; };
-    winrt::com_array<winrt::IInspectable> GetSelection();
+    winrt::com_array<winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple> GetSelection();
 
     void RaiseSelectionChanged(double oldIndex, double newIndex);
 

From 0205c775989bd2efd85dda2690f0c9e36ff2a902 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 01:19:47 -0700
Subject: [PATCH 3/8] remove one space

---
 dev/PipsPager/PipsPager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/PipsPager/PipsPager.cpp b/dev/PipsPager/PipsPager.cpp
index e62ee01823..c55e09c7bb 100755
--- a/dev/PipsPager/PipsPager.cpp
+++ b/dev/PipsPager/PipsPager.cpp
@@ -674,7 +674,7 @@ void PipsPager::OnPipsAreaBringIntoViewRequested(const IInspectable& sender, con
     if (
         (Orientation() == winrt::Orientation::Vertical && isnan(args.VerticalAlignmentRatio())) ||
         (Orientation() == winrt::Orientation::Horizontal && isnan(args.HorizontalAlignmentRatio()))
-        )
+       )
     {
         args.Handled(true);
     }

From a27cc4324dfe7e69f1b938ca4d2d2d4bfd4e811a Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 13:24:48 -0700
Subject: [PATCH 4/8] update tests

---
 .../InteractionTests/PipsPagerElements.cs     | 28 ++++++++++++++++++-
 .../InteractionTests/PipsPagerTests.cs        | 19 +++++++------
 dev/PipsPager/TestUI/PipsPagerPage.xaml       | 12 ++++----
 dev/PipsPager/TestUI/PipsPagerPage.xaml.cs    |  8 +++---
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/dev/PipsPager/InteractionTests/PipsPagerElements.cs b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
index 7535fc76f2..94c663a6a9 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerElements.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
@@ -19,6 +19,7 @@ public class PipsPagerElements
         private UIObject PipsPager;
         private UIObject NextPageButton;
         private UIObject PreviousPageButton;
+        private Button RetrievePipsPagerButtonSizesButton;
         private ComboBox PreviousPageButtonVisibilityComboBox;
         private ComboBox NextPageButtonVisibilityComboBox;
         private ComboBox NumberOfPagesComboBox;
@@ -33,7 +34,10 @@ public class PipsPagerElements
         private TextBlock CurrentNumberOfPagesTextBlock;
         private TextBlock CurrentMaxVisualIndicatorsTextBlock;
         private TextBlock CurrentOrientationTextBlock;
-
+        private TextBlock HorizontalOrientationPipsPagerButtonWidthTextBlock;
+        private TextBlock HorizontalOrientationPipsPagerButtonHeightTextBlock;
+        private TextBlock VerticalOrientationPipsPagerButtonWidthTextBlock;
+        private TextBlock VerticalOrientationPipsPagerButtonHeightTextBlock;
         public UIObject GetPipsPager()
         {
             return GetElement(ref PipsPager, "TestPipsPager");
@@ -113,6 +117,28 @@ public TextBlock GetCurrentOrientationTextBlock()
             return GetElement(ref CurrentOrientationTextBlock, "CurrentOrientationTextBlock");
         }
 
+        public TextBlock GetHorizontalOrientationPipsPagerButtonWidthTextBlock()
+        {
+            return GetElement(ref HorizontalOrientationPipsPagerButtonWidthTextBlock, "HorizontalOrientationPipsPagerButtonWidthTextBlock");
+        }
+        public TextBlock GetHorizontalOrientationPipsPagerButtonHeightTextBlock()
+        {
+            return GetElement(ref HorizontalOrientationPipsPagerButtonHeightTextBlock, "HorizontalOrientationPipsPagerButtonHeightTextBlock");
+        }
+        public TextBlock GetVerticalOrientationPipsPagerButtonWidthTextBlock()
+        {
+            return GetElement(ref VerticalOrientationPipsPagerButtonWidthTextBlock, "VerticalOrientationPipsPagerButtonWidthTextBlock");
+        }
+        public TextBlock GetVerticalOrientationPipsPagerButtonHeightTextBlock()
+        {
+            return GetElement(ref VerticalOrientationPipsPagerButtonHeightTextBlock, "VerticalOrientationPipsPagerButtonHeightTextBlock");
+        }
+
+        public Button GetPipsPagerButtonSizesButton()
+        {
+            return GetElement(ref RetrievePipsPagerButtonSizesButton, "GetPipsPagersButtonSizesButton");
+        }
+
         public UIObject GetPipWithPageNumber(string elementName)
         {
             foreach (var element in GetPipsPager().Children)
diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index da5bf2f95f..f184b5882c 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -322,14 +322,15 @@ public void PipSizeWithDifferentOrientationsTest()
         {
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
-                Button getButtonSizesButton = FindElement.ByName<Button>("GetPipsPagersButtonSizes");
+                elements = new PipsPagerElements();
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
                 getButtonSizesButton.InvokeAndWait();
 
-                TextBlock horizontalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonWidth");
-                TextBlock horizontalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonHeight");
+                TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
 
-                TextBlock verticalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("VerticalOrientationPipsPagerButtonWidth");
-                TextBlock verticalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("VerticalOrientationPipsPagerButtonHeight");
+                TextBlock verticalOrientationPipsPagerButtonWidth = elements.GetVerticalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock verticalOrientationPipsPagerButtonHeight = elements.GetVerticalOrientationPipsPagerButtonHeightTextBlock();
 
                 Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
                 Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
@@ -344,15 +345,15 @@ public void PipSizeAfterOrientationChangeTest()
         {
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
-                Button getButtonSizesButton = FindElement.ByName<Button>("GetPipsPagersButtonSizes");
+                elements = new PipsPagerElements();
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
                 getButtonSizesButton.InvokeAndWait();
 
-                TextBlock horizontalOrientationPipsPagerButtonWidth = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonWidth");
-                TextBlock horizontalOrientationPipsPagerButtonHeight = FindElement.ByName<TextBlock>("HorizontalOrientationPipsPagerButtonHeight");
+                TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
                 Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
                 Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
 
-                elements = new PipsPagerElements();
                 SetOrientation(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
                 VerifyOrientationChanged(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
 
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml b/dev/PipsPager/TestUI/PipsPagerPage.xaml
index a9106458d2..c50c291ec8 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml
@@ -87,23 +87,23 @@
             <StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Horizontal Orientation PipsPager ButtonWidth:"/>
-                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonWidth" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonWidth" Text="0" Margin="10,0,0,0"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonWidthTextBlock" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonWidthTextBlock" Text="0" Margin="10,0,0,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Horizontal Orientation PipsPager ButtonHeight:"/>
-                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonHeight" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonHeight" Text="0" Margin="10,0,0,0"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonHeightTextBlock" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonHeightTextBlock" Text="0" Margin="10,0,0,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Vertical Orientation PipsPager ButtonWidth:"/>
-                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonWidth" AutomationProperties.Name="VerticalOrientationPipsPagerButtonWidth" Text="0" Margin="10,0,0,0"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonWidthTextBlock" AutomationProperties.Name="VerticalOrientationPipsPagerButtonWidthTextBlock" Text="0" Margin="10,0,0,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Vertical Orientation PipsPager ButtonHeight:"/>
-                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonHeight" AutomationProperties.Name="VerticalOrientationPipsPagerButtonHeight" Text="0" Margin="10,0,0,0"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonHeightTextBlock" AutomationProperties.Name="VerticalOrientationPipsPagerButtonHeightTextBlock" Text="0" Margin="10,0,0,0"/>
                 </StackPanel>
             </StackPanel>
-            <Button x:Name="GetPipsPagersButtonSizes"
-                    AutomationProperties.Name="GetPipsPagersButtonSizes"
+            <Button x:Name="GetPipsPagersButtonSizesButton"
+                    AutomationProperties.Name="GetPipsPagersButtonSizesButton"
                     Content="Get Sizes"
                     Click="OnGetPipsPagerButtonSizesClicked"
                     Height="50"
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
index 433298d13f..d9ded8a1f7 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
@@ -80,13 +80,13 @@ private void OnGetPipsPagerButtonSizesClicked(object sender, RoutedEventArgs arg
         {
             if (repeater.TryGetElement(1) is var horizontalOrientationButton && horizontalOrientationButton != null)
             {
-                HorizontalOrientationPipsPagerButtonWidth.Text = $"{ horizontalOrientationButton.ActualSize.X}";
-                HorizontalOrientationPipsPagerButtonHeight.Text = $"{horizontalOrientationButton.ActualSize.Y}";
+                HorizontalOrientationPipsPagerButtonWidthTextBlock.Text = $"{ horizontalOrientationButton.ActualSize.X}";
+                HorizontalOrientationPipsPagerButtonHeightTextBlock.Text = $"{horizontalOrientationButton.ActualSize.Y}";
             }
             if (verticalOrientationPipsPagerRepeater.TryGetElement(1) is var verticalOrientationButton && verticalOrientationButton != null)
             {
-                VerticalOrientationPipsPagerButtonWidth.Text = $"{verticalOrientationButton.ActualSize.X}";
-                VerticalOrientationPipsPagerButtonHeight.Text = $"{verticalOrientationButton.ActualSize.Y}";
+                VerticalOrientationPipsPagerButtonWidthTextBlock.Text = $"{verticalOrientationButton.ActualSize.X}";
+                VerticalOrientationPipsPagerButtonHeightTextBlock.Text = $"{verticalOrientationButton.ActualSize.Y}";
             }
         }
 

From ff5fba3874bef9f49450dda36cb6554fbf541507 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 14:52:14 -0700
Subject: [PATCH 5/8] try to fix tests

---
 dev/PipsPager/InteractionTests/PipsPagerTests.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index f184b5882c..5774933ec8 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -347,7 +347,8 @@ public void PipSizeAfterOrientationChangeTest()
             {
                 elements = new PipsPagerElements();
                 Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
-                getButtonSizesButton.InvokeAndWait();
+                InputHelper.LeftClick(getButtonSizesButton);
+                Wait.ForIdle();
 
                 TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
                 TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
@@ -357,6 +358,9 @@ public void PipSizeAfterOrientationChangeTest()
                 SetOrientation(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
                 VerifyOrientationChanged(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
 
+                InputHelper.LeftClick(getButtonSizesButton);
+                Wait.ForIdle();
+
                 getButtonSizesButton.InvokeAndWait();
 
                 Verify.AreEqual("20", horizontalOrientationPipsPagerButtonWidth.DocumentText);

From cc01b03a71547542427357575c04e0c1ba399e6e Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 14:56:48 -0700
Subject: [PATCH 6/8] try to fix tests 2

---
 dev/PipsPager/InteractionTests/PipsPagerTests.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index 5774933ec8..8c3f1d8b5a 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -324,7 +324,8 @@ public void PipSizeWithDifferentOrientationsTest()
             {
                 elements = new PipsPagerElements();
                 Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
-                getButtonSizesButton.InvokeAndWait();
+                InputHelper.LeftClick(getButtonSizesButton);
+                Wait.ForIdle();
 
                 TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
                 TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
@@ -361,8 +362,6 @@ public void PipSizeAfterOrientationChangeTest()
                 InputHelper.LeftClick(getButtonSizesButton);
                 Wait.ForIdle();
 
-                getButtonSizesButton.InvokeAndWait();
-
                 Verify.AreEqual("20", horizontalOrientationPipsPagerButtonWidth.DocumentText);
                 Verify.AreEqual("12", horizontalOrientationPipsPagerButtonHeight.DocumentText);
             }

From 7891cd2fad7aef69bcaecccd365affd0d15e4509 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Mon, 22 Mar 2021 19:17:03 -0700
Subject: [PATCH 7/8] attempt to fix tests

---
 dev/PipsPager/InteractionTests/PipsPagerElements.cs | 4 ++--
 dev/PipsPager/InteractionTests/PipsPagerTests.cs    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/PipsPager/InteractionTests/PipsPagerElements.cs b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
index 94c663a6a9..28e7b51a59 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerElements.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
@@ -19,7 +19,7 @@ public class PipsPagerElements
         private UIObject PipsPager;
         private UIObject NextPageButton;
         private UIObject PreviousPageButton;
-        private Button RetrievePipsPagerButtonSizesButton;
+        private UIObject RetrievePipsPagerButtonSizesButton;
         private ComboBox PreviousPageButtonVisibilityComboBox;
         private ComboBox NextPageButtonVisibilityComboBox;
         private ComboBox NumberOfPagesComboBox;
@@ -134,7 +134,7 @@ public TextBlock GetVerticalOrientationPipsPagerButtonHeightTextBlock()
             return GetElement(ref VerticalOrientationPipsPagerButtonHeightTextBlock, "VerticalOrientationPipsPagerButtonHeightTextBlock");
         }
 
-        public Button GetPipsPagerButtonSizesButton()
+        public UIObject GetPipsPagerButtonSizesButton()
         {
             return GetElement(ref RetrievePipsPagerButtonSizesButton, "GetPipsPagersButtonSizesButton");
         }
diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index 8c3f1d8b5a..071fe15228 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -5,6 +5,7 @@
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
 using Common;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Microsoft.Windows.Apps.Test.Foundation;
 #if USING_TAEF
 using WEX.TestExecution;
 using WEX.TestExecution.Markup;
@@ -323,7 +324,7 @@ public void PipSizeWithDifferentOrientationsTest()
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
                 elements = new PipsPagerElements();
-                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                UIObject getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
                 InputHelper.LeftClick(getButtonSizesButton);
                 Wait.ForIdle();
 
@@ -347,7 +348,7 @@ public void PipSizeAfterOrientationChangeTest()
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
                 elements = new PipsPagerElements();
-                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                UIObject getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
                 InputHelper.LeftClick(getButtonSizesButton);
                 Wait.ForIdle();
 

From b7285b2998c297b207b06cb88c9943add1bc757a Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Tue, 23 Mar 2021 21:03:16 -0700
Subject: [PATCH 8/8] Update tests and address PR comments

---
 .../InteractionTests/PipsPagerElements.cs     |  4 ++--
 .../InteractionTests/PipsPagerTests.cs        | 15 ++++++---------
 dev/PipsPager/PipsPager.cpp                   | 19 ++++---------------
 dev/PipsPager/TestUI/PipsPagerPage.xaml.cs    | 13 +++++++------
 4 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/dev/PipsPager/InteractionTests/PipsPagerElements.cs b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
index 28e7b51a59..94c663a6a9 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerElements.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
@@ -19,7 +19,7 @@ public class PipsPagerElements
         private UIObject PipsPager;
         private UIObject NextPageButton;
         private UIObject PreviousPageButton;
-        private UIObject RetrievePipsPagerButtonSizesButton;
+        private Button RetrievePipsPagerButtonSizesButton;
         private ComboBox PreviousPageButtonVisibilityComboBox;
         private ComboBox NextPageButtonVisibilityComboBox;
         private ComboBox NumberOfPagesComboBox;
@@ -134,7 +134,7 @@ public TextBlock GetVerticalOrientationPipsPagerButtonHeightTextBlock()
             return GetElement(ref VerticalOrientationPipsPagerButtonHeightTextBlock, "VerticalOrientationPipsPagerButtonHeightTextBlock");
         }
 
-        public UIObject GetPipsPagerButtonSizesButton()
+        public Button GetPipsPagerButtonSizesButton()
         {
             return GetElement(ref RetrievePipsPagerButtonSizesButton, "GetPipsPagersButtonSizesButton");
         }
diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index 071fe15228..7fb218abfa 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -324,10 +324,9 @@ public void PipSizeWithDifferentOrientationsTest()
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
                 elements = new PipsPagerElements();
-                UIObject getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
-                InputHelper.LeftClick(getButtonSizesButton);
-                Wait.ForIdle();
-
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                getButtonSizesButton.InvokeAndWait();
+                
                 TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
                 TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
 
@@ -348,9 +347,8 @@ public void PipSizeAfterOrientationChangeTest()
             using (var setup = new TestSetupHelper("PipsPager Tests"))
             {
                 elements = new PipsPagerElements();
-                UIObject getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
-                InputHelper.LeftClick(getButtonSizesButton);
-                Wait.ForIdle();
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                getButtonSizesButton.InvokeAndWait();
 
                 TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
                 TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
@@ -360,8 +358,7 @@ public void PipSizeAfterOrientationChangeTest()
                 SetOrientation(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
                 VerifyOrientationChanged(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
 
-                InputHelper.LeftClick(getButtonSizesButton);
-                Wait.ForIdle();
+                getButtonSizesButton.InvokeAndWait();
 
                 Verify.AreEqual("20", horizontalOrientationPipsPagerButtonWidth.DocumentText);
                 Verify.AreEqual("12", horizontalOrientationPipsPagerButtonHeight.DocumentText);
diff --git a/dev/PipsPager/PipsPager.cpp b/dev/PipsPager/PipsPager.cpp
index c55e09c7bb..075d14781b 100755
--- a/dev/PipsPager/PipsPager.cpp
+++ b/dev/PipsPager/PipsPager.cpp
@@ -140,19 +140,8 @@ winrt::Size PipsPager::GetDesiredPipSize(const winrt::Style& style) {
             }
         }
     }
-    double pipHeight;
-    double pipWidth;
-    if (Orientation() == winrt::Orientation::Horizontal)
-    {
-        pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerVerticalOrientationButtonHeightPropertyName)));
-        pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerVerticalOrientationButtonWidthPropertyName)));
-    }
-    else
-    {
-        pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerHorizontalOrientationButtonHeightPropertyName)));
-        pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerHorizontalOrientationButtonWidthPropertyName)));
-    }
-    return { static_cast<float>(pipWidth), static_cast<float>(pipHeight) };
+   
+    return { 0.0, 0.0 };
 }
 
 void PipsPager::OnKeyDown(const winrt::KeyRoutedEventArgs& args) {
@@ -275,11 +264,11 @@ void PipsPager::UpdateSelectedPip(const int index) {
         if (const auto repeater = m_pipsPagerRepeater.get())
         {
             repeater.UpdateLayout();
-            if (const auto pip = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::Button>())
+            if (const auto pip = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::FrameworkElement>())
             {
                 ApplyStyleToPipAndUpdateOrientation(pip, NormalPipStyle());
             }
-            if (const auto pip = repeater.GetOrCreateElement(index).try_as<winrt::Button>())
+            if (const auto pip = repeater.GetOrCreateElement(index).try_as<winrt::FrameworkElement>())
             {
                 ApplyStyleToPipAndUpdateOrientation(pip, SelectedPipStyle());
                 ScrollToCenterOfViewport(pip, index);
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
index d9ded8a1f7..b334f19d03 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
@@ -78,15 +78,16 @@ private void OnLoad(object sender, RoutedEventArgs args)
 
         private void OnGetPipsPagerButtonSizesClicked(object sender, RoutedEventArgs args)
         {
-            if (repeater.TryGetElement(1) is var horizontalOrientationButton && horizontalOrientationButton != null)
+            //Button horizontalOrientationButton;
+            if (repeater.TryGetElement(0) as FrameworkElement is var horizontalOrientationPip && horizontalOrientationPip != null)
             {
-                HorizontalOrientationPipsPagerButtonWidthTextBlock.Text = $"{ horizontalOrientationButton.ActualSize.X}";
-                HorizontalOrientationPipsPagerButtonHeightTextBlock.Text = $"{horizontalOrientationButton.ActualSize.Y}";
+                HorizontalOrientationPipsPagerButtonWidthTextBlock.Text = $"{ horizontalOrientationPip.ActualWidth}";
+                HorizontalOrientationPipsPagerButtonHeightTextBlock.Text = $"{horizontalOrientationPip.ActualHeight}";
             }
-            if (verticalOrientationPipsPagerRepeater.TryGetElement(1) is var verticalOrientationButton && verticalOrientationButton != null)
+            if (verticalOrientationPipsPagerRepeater.TryGetElement(1) as FrameworkElement is var verticalOrientationPip && verticalOrientationPip != null)
             {
-                VerticalOrientationPipsPagerButtonWidthTextBlock.Text = $"{verticalOrientationButton.ActualSize.X}";
-                VerticalOrientationPipsPagerButtonHeightTextBlock.Text = $"{verticalOrientationButton.ActualSize.Y}";
+                VerticalOrientationPipsPagerButtonWidthTextBlock.Text = $"{verticalOrientationPip.ActualWidth}";
+                VerticalOrientationPipsPagerButtonHeightTextBlock.Text = $"{verticalOrientationPip.ActualHeight}";
             }
         }