From 9435ce163b4f2ff8dad7079204a3aaf850dfb0ee Mon Sep 17 00:00:00 2001
From: Mijail Todorovich <mijailtodorovich+git@gmail.com>
Date: Fri, 15 Mar 2024 11:30:08 -0300
Subject: [PATCH 1/3] Extract DefaultTextBoxScrollViewerStyle to it's own
 ResourceDictionary

---
 src/Wpf.Ui/Controls/TextBox/TextBox.xaml      | 23 +++----------------
 .../DefaultTextBoxScrollViewerStyle.xaml      | 21 +++++++++++++++++
 src/Wpf.Ui/Resources/Wpf.Ui.xaml              |  1 +
 3 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml

diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index bbfc4cca1..7161d1b74 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -22,23 +22,6 @@
     <Thickness x:Key="TextBoxClearButtonPadding">0,0,0,0</Thickness>
     <system:Double x:Key="TextBoxClearButtonHeight">24</system:Double>
 
-    <!--  TODO: Rework TextBox ScrollViewer  -->
-    <Style x:Key="DefaultTextBoxScrollViewerStyle" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <Grid>
-                        <ScrollContentPresenter Margin="0" CanContentScroll="{TemplateBinding CanContentScroll}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
         <!--  Universal WPF UI focus  -->
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
@@ -92,7 +75,7 @@
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                     IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                     IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                                    Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
+                                    Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
                                     TextElement.Foreground="{TemplateBinding Foreground}"
                                     VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                             </Grid>
@@ -176,7 +159,7 @@
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                             IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                            Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
+                            Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
                             TextElement.Foreground="{TemplateBinding Foreground}"
                             VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                         <TextBlock
@@ -314,7 +297,7 @@
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                             IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                            Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
+                            Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
                             TextElement.Foreground="{TemplateBinding Foreground}"
                             VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                     </Grid>
diff --git a/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
new file mode 100644
index 000000000..2b60f1b1b
--- /dev/null
+++ b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--  TODO: Rework TextBox ScrollViewer  -->
+    <Style x:Key="DefaultTextBoxScrollViewerStyle" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid>
+                        <ScrollContentPresenter Margin="0" CanContentScroll="{TemplateBinding CanContentScroll}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Resources/Wpf.Ui.xaml b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
index d46cbda1e..27b33731a 100644
--- a/src/Wpf.Ui/Resources/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
@@ -14,6 +14,7 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/Palette.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultContextMenu.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultFocusVisualStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Resources/DefaultTextBoxScrollViewerStyle.xaml" />
 
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Anchor/Anchor.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/AutoSuggestBox/AutoSuggestBox.xaml" />

From 93dc778a7eacd776fd7613913cc092bb5fe5bb98 Mon Sep 17 00:00:00 2001
From: Mijail Todorovich <mijailtodorovich+git@gmail.com>
Date: Fri, 15 Mar 2024 11:43:17 -0300
Subject: [PATCH 2/3] Avoid overflow in text input components

Closes #973, closes #497

Use PassiveScrollViewer as PART_ContentHost instead of Decorator, just like TextBox
---
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml    | 13 ++++++++----
 src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml  | 10 +++++++---
 .../Controls/PasswordBox/PasswordBox.xaml     | 20 +++++++++++++------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index 2e8e596c6..83c7c9125 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -44,12 +44,17 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Decorator
+                    <controls:PassiveScrollViewer
                         x:Name="PART_ContentHost"
-                        Margin="{TemplateBinding Padding}"
-                        HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                        HorizontalAlignment="Stretch"
+                        Margin="{TemplateBinding Padding}"
+                        CanContentScroll="False"
+                        HorizontalScrollBarVisibility="Hidden"
+                        IsDeferredScrollingEnabled="False"
+                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                        TextElement.Foreground="{TemplateBinding Foreground}"
+                        VerticalScrollBarVisibility="Hidden" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index b9788ab89..c5abd839a 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -85,11 +85,15 @@
                                     IsTabStop="False"
                                     Foreground="{TemplateBinding Foreground}" />
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                    <Decorator
+                                    <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
-                                        Margin="0"
                                         VerticalAlignment="Center"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        CanContentScroll="False"
+                                        HorizontalScrollBarVisibility="Hidden"
+                                        IsDeferredScrollingEnabled="False"
+                                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                        TextElement.Foreground="{TemplateBinding Foreground}"
+                                        VerticalScrollBarVisibility="Hidden" />
                                     <TextBlock
                                         x:Name="PlaceholderTextBox"
                                         Margin="0"
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 6d02f27e8..1c06704a5 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -69,11 +69,15 @@
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <Decorator
+                                <controls:PassiveScrollViewer
                                     x:Name="PART_ContentHost"
-                                    Margin="0"
                                     VerticalAlignment="Center"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    CanContentScroll="False"
+                                    HorizontalScrollBarVisibility="Hidden"
+                                    IsDeferredScrollingEnabled="False"
+                                    Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                    TextElement.Foreground="{TemplateBinding Foreground}"
+                                    VerticalScrollBarVisibility="Hidden" />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
@@ -174,11 +178,15 @@
                                     TextElement.Foreground="{TemplateBinding Foreground}" />
 
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                    <Decorator
+                                    <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
-                                        Margin="0"
                                         VerticalAlignment="Center"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        CanContentScroll="False"
+                                        HorizontalScrollBarVisibility="Hidden"
+                                        IsDeferredScrollingEnabled="False"
+                                        Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
+                                        TextElement.Foreground="{TemplateBinding Foreground}"
+                                        VerticalScrollBarVisibility="Hidden" />
                                     <TextBlock
                                         x:Name="PlaceholderTextBox"
                                         Margin="0"

From d5ee505af768a0523c65772a28e1ec75d0d5ee43 Mon Sep 17 00:00:00 2001
From: Mijail Todorovich <mijailtodorovich+git@gmail.com>
Date: Fri, 15 Mar 2024 11:55:05 -0300
Subject: [PATCH 3/3] Simplify PassiveScrollViewer usage by adding properties
 to style

---
 src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml         |  6 +-----
 src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml       |  7 +------
 src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml   | 14 ++------------
 src/Wpf.Ui/Controls/TextBox/TextBox.xaml           |  3 ---
 .../Resources/DefaultTextBoxScrollViewerStyle.xaml |  5 +++++
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
index 83c7c9125..c33cebc9b 100644
--- a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
+++ b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -49,12 +49,8 @@
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         Margin="{TemplateBinding Padding}"
-                        CanContentScroll="False"
-                        HorizontalScrollBarVisibility="Hidden"
-                        IsDeferredScrollingEnabled="False"
                         Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                        TextElement.Foreground="{TemplateBinding Foreground}"
-                        VerticalScrollBarVisibility="Hidden" />
+                        TextElement.Foreground="{TemplateBinding Foreground}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index c5abd839a..361a9bb5b 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -87,13 +87,8 @@
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
-                                        VerticalAlignment="Center"
-                                        CanContentScroll="False"
-                                        HorizontalScrollBarVisibility="Hidden"
-                                        IsDeferredScrollingEnabled="False"
                                         Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}"
-                                        VerticalScrollBarVisibility="Hidden" />
+                                        TextElement.Foreground="{TemplateBinding Foreground}" />
                                     <TextBlock
                                         x:Name="PlaceholderTextBox"
                                         Margin="0"
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 1c06704a5..871698bba 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -71,13 +71,8 @@
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <controls:PassiveScrollViewer
                                     x:Name="PART_ContentHost"
-                                    VerticalAlignment="Center"
-                                    CanContentScroll="False"
-                                    HorizontalScrollBarVisibility="Hidden"
-                                    IsDeferredScrollingEnabled="False"
                                     Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}"
-                                    VerticalScrollBarVisibility="Hidden" />
+                                    TextElement.Foreground="{TemplateBinding Foreground}" />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
@@ -180,13 +175,8 @@
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
-                                        VerticalAlignment="Center"
-                                        CanContentScroll="False"
-                                        HorizontalScrollBarVisibility="Hidden"
-                                        IsDeferredScrollingEnabled="False"
                                         Style="{DynamicResource DefaultTextBoxScrollViewerStyle}"
-                                        TextElement.Foreground="{TemplateBinding Foreground}"
-                                        VerticalScrollBarVisibility="Hidden" />
+                                        TextElement.Foreground="{TemplateBinding Foreground}" />
                                     <TextBlock
                                         x:Name="PlaceholderTextBox"
                                         Margin="0"
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index 7161d1b74..ac4f671fc 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -70,7 +70,6 @@
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <controls:PassiveScrollViewer
                                     x:Name="PART_ContentHost"
-                                    VerticalAlignment="Center"
                                     CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                     IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
@@ -154,7 +153,6 @@
                     <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                         <controls:PassiveScrollViewer
                             x:Name="PART_ContentHost"
-                            VerticalAlignment="Center"
                             CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
@@ -292,7 +290,6 @@
                     <Grid Margin="{TemplateBinding Padding}">
                         <controls:PassiveScrollViewer
                             x:Name="PART_ContentHost"
-                            VerticalAlignment="Center"
                             CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
diff --git a/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
index 2b60f1b1b..dd90726b2 100644
--- a/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
+++ b/src/Wpf.Ui/Resources/DefaultTextBoxScrollViewerStyle.xaml
@@ -7,6 +7,11 @@
         <Setter Property="Padding" Value="0" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="CanContentScroll" Value="False" />
+        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Hidden" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">