From 4bab3245ac61814b1295a7f36e8005b6185b0bc8 Mon Sep 17 00:00:00 2001
From: Dilip Ojha <dilip.ojha@microsoft.com>
Date: Mon, 14 Feb 2022 13:59:48 -0800
Subject: [PATCH] fixed right bottom border (#6693)

---
 dev/TabView/TabViewListView.cpp | 24 +++++++++++++++---------
 dev/TabView/TabViewListView.h   |  1 +
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev/TabView/TabViewListView.cpp b/dev/TabView/TabViewListView.cpp
index ecc67ccd5f..e89c75b2c8 100644
--- a/dev/TabView/TabViewListView.cpp
+++ b/dev/TabView/TabViewListView.cpp
@@ -23,15 +23,7 @@ TabViewListView::TabViewListView()
 
 void TabViewListView::OnSelectedIndexPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args)
 {
-    winrt::VisualStateManager::GoToState(
-        *this,
-        (SelectedIndex() == 0) ? L"LeftBottomBorderLineShort" : L"LeftBottomBorderLineNormal",
-        false /*useTransitions*/);
-
-    winrt::VisualStateManager::GoToState(
-        *this,
-        (SelectedIndex() == (int)(Items().Size() - 1)) ? L"RightBottomBorderLineShort" : L"RightBottomBorderLineNormal",
-        false /*useTransitions*/);
+    UpdateBottomBorderVisualState();
 }
 
 // IItemsControlOverrides
@@ -60,6 +52,7 @@ void TabViewListView::OnItemsChanged(winrt::IInspectable const& item)
         const auto internalTabView = winrt::get_self<TabView>(tabView);
         internalTabView->OnItemsChanged(item);
     }
+    UpdateBottomBorderVisualState();
 }
 
 void TabViewListView::PrepareContainerForItemOverride(const winrt::DependencyObject& element, const winrt::IInspectable& item)
@@ -92,3 +85,16 @@ void TabViewListView::OnContainerContentChanging(const winrt::IInspectable& send
         internalTabView->UpdateTabContent();
     }
 }
+
+void TabViewListView::UpdateBottomBorderVisualState()
+{
+    winrt::VisualStateManager::GoToState(
+        *this,
+        (SelectedIndex() == 0) ? L"LeftBottomBorderLineShort" : L"LeftBottomBorderLineNormal",
+        false /*useTransitions*/);
+
+    winrt::VisualStateManager::GoToState(
+        *this,
+        (SelectedIndex() == (int)(Items().Size() - 1)) ? L"RightBottomBorderLineShort" : L"RightBottomBorderLineNormal",
+        false /*useTransitions*/);
+}
diff --git a/dev/TabView/TabViewListView.h b/dev/TabView/TabViewListView.h
index b152297a2f..9b89cfec52 100644
--- a/dev/TabView/TabViewListView.h
+++ b/dev/TabView/TabViewListView.h
@@ -19,5 +19,6 @@ class TabViewListView :
 private:
     void OnContainerContentChanging(const winrt::IInspectable& sender, const winrt::ContainerContentChangingEventArgs& args);
     void OnSelectedIndexPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args);
+    void UpdateBottomBorderVisualState();
 };