From be9545ee6453f19c7313c6d9e7e3248afbe7537b Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Tue, 18 Apr 2023 21:57:57 -0700
Subject: [PATCH 1/9] re-enable OnItemsChanged OnDrag

---
 dev/TabView/TabView.cpp             |  9 +++------
 dev/TabView/TestUI/TabViewPage.xaml | 13 ++++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dev/TabView/TabView.cpp b/dev/TabView/TabView.cpp
index 36dd11d47a..7aba380aac 100755
--- a/dev/TabView/TabView.cpp
+++ b/dev/TabView/TabView.cpp
@@ -720,11 +720,6 @@ void TabView::BringSelectedTabIntoView()
 
 void TabView::OnItemsChanged(winrt::IInspectable const& item)
 {
-    if (m_isDragging)
-    {
-        return;
-    }
-
     if (auto args = item.as<winrt::IVectorChangedEventArgs>())
     {
         m_tabItemsChangedEventSource(*this, args);
@@ -863,11 +858,13 @@ void TabView::OnListViewDragItemsCompleted(const winrt::IInspectable& sender, co
 {
     m_isDragging = false;
 
-    // Selection change was disabled during drag, update SelectedIndex now
+    // Selection may have changed during drag if dragged outside, so we update SelectedIndex again.
     if (auto&& listView = m_listView.get())
     {
         SelectedIndex(listView.SelectedIndex());
         SelectedItem(listView.SelectedItem());
+
+        BringSelectedTabIntoView();
     }
 
     auto item = args.Items().GetAt(0);
diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
index 46c68433fa..5be9fdc92a 100644
--- a/dev/TabView/TestUI/TabViewPage.xaml
+++ b/dev/TabView/TestUI/TabViewPage.xaml
@@ -131,10 +131,8 @@
                 <controls:TabView
                     x:Name="Tabs"
                     TabWidthMode="Equal"
-                    CanDragTabs="True"
                     SelectionChanged="TabViewSelectionChanged"
                     TabCloseRequested="TabViewTabCloseRequested"
-                    TabDragStarting="OnTabDragStarting"
                     TabStripDragOver="OnTabStripDragOver"
                     TabStripDrop="OnTabStripDrop"
                     TabDroppedOutside="TabViewTabDroppedOutside"
@@ -238,7 +236,8 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <controls:TabView x:Name="DataBindingTabView" IsAddTabButtonVisible="false" Background="#66336699" SelectedIndex="2">
+                    <controls:TabView x:Name="DataBindingTabView" 
+                    CanDragTabs="True" IsAddTabButtonVisible="false" Background="#66336699" SelectedIndex="2">
                         <controls:TabView.Resources>
                             <ResourceDictionary>
                                 <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemAccentColor"/>
@@ -280,6 +279,14 @@
                                 <TextBlock Padding="16" Text="Content"/>
                             </controls:TabViewItem>
 
+                            <controls:TabViewItem x:Name="Tab2InSecondTabView" AutomationProperties.Name="Tab2InSecondTabView" Header="Hello">
+                                <controls:TabViewItem.IconSource>
+                                    <controls:SymbolIconSource Symbol="Placeholder"/>
+                                </controls:TabViewItem.IconSource>
+
+                                <TextBlock Padding="16" Text="Content"/>
+                            </controls:TabViewItem>
+
                         </controls:TabView.TabItems>
                     </controls:TabView>
                 </Grid>

From e30d3c051bfd739456a33d35a40b956edb3241d3 Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Wed, 19 Apr 2023 16:54:38 -0700
Subject: [PATCH 2/9] update testPage

---
 dev/TabView/InteractionTests/TabViewTests.cs | 60 ++++++++++++++++++++
 dev/TabView/TestUI/TabViewPage.xaml          | 18 +++---
 dev/TabView/TestUI/TabViewPage.xaml.cs       |  8 +++
 3 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 89681dad08..f5d28167aa 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -405,6 +405,66 @@ public void ReorderItemsTest()
             }
         }
 
+        [TestMethod]
+        public void DragTabOverflowTest()
+        {
+            if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5))
+            {
+                // TODO 19727004: Re-enable this on versions below RS5 after fixing the bug where mouse click-and-drag doesn't work.
+                Log.Warning("This test relies on touch input, the injection of which is only supported in RS5 and up. Test is disabled.");
+                return;
+            }
+
+            using (var setup = new TestSetupHelper("TabView Tests"))
+            {
+                // Navigate to TabView TabItemSource Page
+                Button tabItemsSourcePageButton = FindElement.ByName<Button>("TabViewTabItemsSourcePageButton");
+                tabItemsSourcePageButton.InvokeAndWait();
+
+                Button addButton = FindElement.ByName<Button>("Add New Tab");
+                Verify.IsNotNull(addButton);
+
+                Log.Comment("Add 10 tabs so scroll buttons appear.");
+
+                for (var i = 0; i < 9; i++)
+                {
+                    addButton.DoubleClick();
+                }
+
+                Verify.IsTrue(AreScrollButtonsVisible(), "Scroll buttons should appear");
+
+                UIObject sourceTab = null;
+                int attempts = 0;
+
+                do
+                {
+                    Wait.ForMilliseconds(100);
+                    ElementCache.Refresh();
+
+                    sourceTab = FindElement.ByName("tabViewItem0");
+                    attempts++;
+                }
+                while (sourceTab == null && attempts < 4);
+
+                Verify.IsNotNull(sourceTab);
+
+                UIObject dropTab = FindElement.ByName("tabViewItem10");
+                Verify.IsNotNull(dropTab);
+
+                Log.Comment("Reordering tabs with drag-drop operation...");
+                InputHelper.DragToTarget(sourceTab, dropTab, -10);
+                Wait.ForIdle();
+                ElementCache.Refresh();
+                Log.Comment("...reordering done. Expecting a TabView.TabItemsChanged event was raised with CollectionChange=ItemInserted and Index=1.");
+
+                TextBlock tblIVectorChangedEventArgsCollectionChange = FindElement.ByName<TextBlock>("tblIVectorChangedEventArgsCollectionChange");
+                Verify.AreEqual("ItemInserted", tblIVectorChangedEventArgsCollectionChange.DocumentText);
+
+                TextBlock tblIVectorChangedEventArgsIndex = FindElement.ByName<TextBlock>("tblIVectorChangedEventArgsIndex");
+                Verify.AreEqual("1", tblIVectorChangedEventArgsIndex.DocumentText);
+            }
+        }
+
         [TestMethod]
         public void AddButtonTest()
         {
diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
index 5be9fdc92a..11de606d8d 100644
--- a/dev/TabView/TestUI/TabViewPage.xaml
+++ b/dev/TabView/TestUI/TabViewPage.xaml
@@ -119,6 +119,11 @@
                         <Button x:Name="GetScrollIncreaseButtonToolTipButton" AutomationProperties.Name="GetScrollIncreaseButtonToolTipButton" Content="TooltipScrollIncreaseButton" Click="GetScrollIncreaseButtonToolTipButton_Click"/>
                         <TextBlock x:Name="ScrollIncreaseButtonToolTipTextBlock" AutomationProperties.Name="ScrollIncreaseButtonToolTipTextBlock" Margin="4,0,0,0" Text=""/>
                     </StackPanel>
+
+                    <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
+                        <TextBlock x:Name="TabsItemChangedEventArgsTextBlock" AutomationProperties.Name="TabsItemChangedEventArgsTextBlock" Margin="4,0,0,0" Text="" />
+                    <TextBlock x:Name="TabsItemChangedEventArgsIndexTextBlock" AutomationProperties.Name="TabsItemChangedEventArgsIndexTextBlock" Margin="4,0,0,0" Text="" />
+                    </StackPanel>
                 </StackPanel>
             </ScrollViewer>
             
@@ -131,8 +136,10 @@
                 <controls:TabView
                     x:Name="Tabs"
                     TabWidthMode="Equal"
+                    CanDragTabs="True"
                     SelectionChanged="TabViewSelectionChanged"
                     TabCloseRequested="TabViewTabCloseRequested"
+                    TabDragStarting="OnTabDragStarting"
                     TabStripDragOver="OnTabStripDragOver"
                     TabStripDrop="OnTabStripDrop"
                     TabDroppedOutside="TabViewTabDroppedOutside"
@@ -236,8 +243,7 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <controls:TabView x:Name="DataBindingTabView" 
-                    CanDragTabs="True" IsAddTabButtonVisible="false" Background="#66336699" SelectedIndex="2">
+                    <controls:TabView x:Name="DataBindingTabView" IsAddTabButtonVisible="false" Background="#66336699" SelectedIndex="2">
                         <controls:TabView.Resources>
                             <ResourceDictionary>
                                 <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemAccentColor"/>
@@ -279,14 +285,6 @@
                                 <TextBlock Padding="16" Text="Content"/>
                             </controls:TabViewItem>
 
-                            <controls:TabViewItem x:Name="Tab2InSecondTabView" AutomationProperties.Name="Tab2InSecondTabView" Header="Hello">
-                                <controls:TabViewItem.IconSource>
-                                    <controls:SymbolIconSource Symbol="Placeholder"/>
-                                </controls:TabViewItem.IconSource>
-
-                                <TextBlock Padding="16" Text="Content"/>
-                            </controls:TabViewItem>
-
                         </controls:TabView.TabItems>
                     </controls:TabView>
                 </Grid>
diff --git a/dev/TabView/TestUI/TabViewPage.xaml.cs b/dev/TabView/TestUI/TabViewPage.xaml.cs
index 88954993d6..07463045c4 100755
--- a/dev/TabView/TestUI/TabViewPage.xaml.cs
+++ b/dev/TabView/TestUI/TabViewPage.xaml.cs
@@ -47,6 +47,8 @@ public TabViewPage()
             _iconSource = new SymbolIconSource();
             _iconSource.Symbol = Symbol.Placeholder;
 
+            Tabs.TabItemsChanged += Tabs_TabItemsChanged;
+
             ObservableCollection<TabDataItem> itemSource = new ObservableCollection<TabDataItem>();
             for (int i = 0; i < 5; i++)
             {
@@ -63,6 +65,12 @@ public TabViewPage()
             CacheFirstTabSelectedBackgroundPathFill();
         }
 
+        private void Tabs_TabItemsChanged(TabView sender, Windows.Foundation.Collections.IVectorChangedEventArgs args)
+        {
+            TabsItemChangedEventArgsTextBlock.Text = args.CollectionChange.ToString();
+            TabsItemChangedEventArgsIndexTextBlock.Text = args.Index.ToString();
+        }
+
         private Brush backgroundColorCache;
         private Brush activeTabSelectedBackgroundPathBrushCache;
         private Brush activeTabContentBackgroundBrushCache;

From bff2325cd47690dee025cc7e4a6c6931b166b36b Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Thu, 20 Apr 2023 16:04:07 -0700
Subject: [PATCH 3/9] add test

---
 dev/TabView/InteractionTests/TabViewTests.cs | 46 ++++++--------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index f5d28167aa..42420ef901 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -392,7 +392,7 @@ public void ReorderItemsTest()
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Reordering tabs with drag-drop operation...");
-                InputHelper.DragToTarget(sourceTab, dropTab, -5);
+                InputHelper.DragToTarget(sourceTab, dropTab);
                 Wait.ForIdle();
                 ElementCache.Refresh();
                 Log.Comment("...reordering done. Expecting a TabView.TabItemsChanged event was raised with CollectionChange=ItemInserted and Index=1.");
@@ -406,7 +406,7 @@ public void ReorderItemsTest()
         }
 
         [TestMethod]
-        public void DragTabOverflowTest()
+        public void ItemChangedEventOnDragTest()
         {
             if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5))
             {
@@ -417,51 +417,33 @@ public void DragTabOverflowTest()
 
             using (var setup = new TestSetupHelper("TabView Tests"))
             {
-                // Navigate to TabView TabItemSource Page
-                Button tabItemsSourcePageButton = FindElement.ByName<Button>("TabViewTabItemsSourcePageButton");
-                tabItemsSourcePageButton.InvokeAndWait();
-
                 Button addButton = FindElement.ByName<Button>("Add New Tab");
                 Verify.IsNotNull(addButton);
 
-                Log.Comment("Add 10 tabs so scroll buttons appear.");
-
-                for (var i = 0; i < 9; i++)
-                {
-                    addButton.DoubleClick();
-                }
+                Log.Comment("Add tab so scroll buttons appear.");
+                addButton.InvokeAndWait();
 
                 Verify.IsTrue(AreScrollButtonsVisible(), "Scroll buttons should appear");
 
-                UIObject sourceTab = null;
-                int attempts = 0;
-
-                do
-                {
-                    Wait.ForMilliseconds(100);
-                    ElementCache.Refresh();
-
-                    sourceTab = FindElement.ByName("tabViewItem0");
-                    attempts++;
-                }
-                while (sourceTab == null && attempts < 4);
+                UIObject sourceTab =  FindElement.ByName("FirstTab");
 
                 Verify.IsNotNull(sourceTab);
 
-                UIObject dropTab = FindElement.ByName("tabViewItem10");
+                UIObject dropTab = FindElement.ByName("LastTab");
                 Verify.IsNotNull(dropTab);
 
-                Log.Comment("Reordering tabs with drag-drop operation...");
-                InputHelper.DragToTarget(sourceTab, dropTab, -10);
+                Log.Comment("Dragging tab to the last overflow tab...");
+                InputHelper.DragToTarget(sourceTab, dropTab);
                 Wait.ForIdle();
                 ElementCache.Refresh();
-                Log.Comment("...reordering done. Expecting a TabView.TabItemsChanged event was raised with CollectionChange=ItemInserted and Index=1.");
 
-                TextBlock tblIVectorChangedEventArgsCollectionChange = FindElement.ByName<TextBlock>("tblIVectorChangedEventArgsCollectionChange");
-                Verify.AreEqual("ItemInserted", tblIVectorChangedEventArgsCollectionChange.DocumentText);
+                Log.Comment("...reordering done. Expecting a TabView.TabItemsChanged event to be raised with CollectionChange=ItemInserted and Index=5.");
 
-                TextBlock tblIVectorChangedEventArgsIndex = FindElement.ByName<TextBlock>("tblIVectorChangedEventArgsIndex");
-                Verify.AreEqual("1", tblIVectorChangedEventArgsIndex.DocumentText);
+                TextBlock tabsItemChangedEventArgsTextBlock = FindElement.ByName<TextBlock>("TabsItemChangedEventArgsTextBlock");
+                Verify.AreEqual("ItemInserted", tabsItemChangedEventArgsTextBlock.DocumentText);
+
+                TextBlock tabsItemChangedEventArgsIndexTextBlock = FindElement.ByName<TextBlock>("TabsItemChangedEventArgsIndexTextBlock");
+                Verify.AreEqual("5", tabsItemChangedEventArgsIndexTextBlock.DocumentText);
             }
         }
 

From d377bd9ff70e33f62e703a690a02633851f92410 Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Thu, 20 Apr 2023 16:28:54 -0700
Subject: [PATCH 4/9] undo accidental change

---
 dev/TabView/InteractionTests/TabViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 42420ef901..1b1b8c0afd 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -392,7 +392,7 @@ public void ReorderItemsTest()
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Reordering tabs with drag-drop operation...");
-                InputHelper.DragToTarget(sourceTab, dropTab);
+                InputHelper.DragToTarget(sourceTab, dropTab, -5);
                 Wait.ForIdle();
                 ElementCache.Refresh();
                 Log.Comment("...reordering done. Expecting a TabView.TabItemsChanged event was raised with CollectionChange=ItemInserted and Index=1.");

From ccfff7559a6e918603db6108e916990f6bdf7dfc Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Fri, 21 Apr 2023 17:26:13 -0700
Subject: [PATCH 5/9] fix test

---
 dev/TabView/InteractionTests/TabViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 1b1b8c0afd..727cda4643 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -429,7 +429,7 @@ public void ItemChangedEventOnDragTest()
 
                 Verify.IsNotNull(sourceTab);
 
-                UIObject dropTab = FindElement.ByName("LastTab");
+                UIObject dropTab = FindElement.ByName("New Tab 1");
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Dragging tab to the last overflow tab...");

From 4d5db10f645ae599e171077ebb120f423f810615 Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Mon, 24 Apr 2023 17:45:49 -0700
Subject: [PATCH 6/9] add test

---
 dev/TabView/InteractionTests/TabViewTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 727cda4643..896c3c141d 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -429,11 +429,11 @@ public void ItemChangedEventOnDragTest()
 
                 Verify.IsNotNull(sourceTab);
 
-                UIObject dropTab = FindElement.ByName("New Tab 1");
+                UIObject dropTab = FindElement.ByName("LastTab");
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Dragging tab to the last overflow tab...");
-                InputHelper.DragToTarget(sourceTab, dropTab);
+                InputHelper.DragToTarget(sourceTab, dropTab, 25);
                 Wait.ForIdle();
                 ElementCache.Refresh();
 

From 98a467a3f83d757d7c4ddbb8b753c82f81cef77f Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Mon, 24 Apr 2023 17:47:19 -0700
Subject: [PATCH 7/9] remove outdated check

---
 dev/TabView/InteractionTests/TabViewTests.cs | 21 --------------------
 1 file changed, 21 deletions(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 896c3c141d..2df4fbbca1 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -327,13 +327,6 @@ public void HandleItemCloseRequestedTest()
         [TestMethod]
         public void DragBetweenTabViewsTest()
         {
-            if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5))
-            {
-                // TODO 19727004: Re-enable this on versions below RS5 after fixing the bug where mouse click-and-drag doesn't work.
-                Log.Warning("This test relies on touch input, the injection of which is only supported in RS5 and up. Test is disabled.");
-                return;
-            }
-
             using (var setup = new TestSetupHelper("TabView Tests"))
             {
                 UIObject firstTab = FindElement.ByName("FirstTab");
@@ -361,13 +354,6 @@ public void DragBetweenTabViewsTest()
         [TestMethod]
         public void ReorderItemsTest()
         {
-            if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5))
-            {
-                // TODO 19727004: Re-enable this on versions below RS5 after fixing the bug where mouse click-and-drag doesn't work.
-                Log.Warning("This test relies on touch input, the injection of which is only supported in RS5 and up. Test is disabled.");
-                return;
-            }
-
             using (var setup = new TestSetupHelper("TabView Tests"))
             {
                 Button tabItemsSourcePageButton = FindElement.ByName<Button>("TabViewTabItemsSourcePageButton");
@@ -408,13 +394,6 @@ public void ReorderItemsTest()
         [TestMethod]
         public void ItemChangedEventOnDragTest()
         {
-            if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5))
-            {
-                // TODO 19727004: Re-enable this on versions below RS5 after fixing the bug where mouse click-and-drag doesn't work.
-                Log.Warning("This test relies on touch input, the injection of which is only supported in RS5 and up. Test is disabled.");
-                return;
-            }
-
             using (var setup = new TestSetupHelper("TabView Tests"))
             {
                 Button addButton = FindElement.ByName<Button>("Add New Tab");

From b9a4b000055e6cf5cdc89003607d0bf18dd57c65 Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Mon, 24 Apr 2023 20:53:13 -0700
Subject: [PATCH 8/9] fix test

---
 dev/TabView/InteractionTests/TabViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 2df4fbbca1..45fb591f69 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -412,7 +412,7 @@ public void ItemChangedEventOnDragTest()
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Dragging tab to the last overflow tab...");
-                InputHelper.DragToTarget(sourceTab, dropTab, 25);
+                InputHelper.DragToTarget(sourceTab, dropTab, 50);
                 Wait.ForIdle();
                 ElementCache.Refresh();
 

From 3ce73037b48b5c5ae2a1f32997ad4c55b5838857 Mon Sep 17 00:00:00 2001
From: Karen Lai <biilai@microsoft.com>
Date: Mon, 24 Apr 2023 23:33:42 -0700
Subject: [PATCH 9/9] fix test

---
 dev/TabView/InteractionTests/TabViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TabView/InteractionTests/TabViewTests.cs b/dev/TabView/InteractionTests/TabViewTests.cs
index 45fb591f69..68a7eb5ae5 100755
--- a/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/dev/TabView/InteractionTests/TabViewTests.cs
@@ -412,7 +412,7 @@ public void ItemChangedEventOnDragTest()
                 Verify.IsNotNull(dropTab);
 
                 Log.Comment("Dragging tab to the last overflow tab...");
-                InputHelper.DragToTarget(sourceTab, dropTab, 50);
+                InputHelper.DragToTarget(sourceTab, dropTab, 40);
                 Wait.ForIdle();
                 ElementCache.Refresh();