From ee096dce512bd62569909f0a9dfa1118d16786be Mon Sep 17 00:00:00 2001
From: Kunal22shah <kunalshah606@gmail.com>
Date: Tue, 29 Oct 2024 15:16:37 -0400
Subject: [PATCH 1/4] fix: MaterialOutlinedPasswordBox content shift

---
 .../Styles/Controls/v2/PasswordBox.xaml       | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
index 792b28501..0999add20 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
@@ -471,24 +471,18 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="PasswordBox">
-					<Border x:Name="RootBorder"
-							BorderBrush="{TemplateBinding BorderBrush}"
-							BorderThickness="{TemplateBinding BorderThickness}"
-							CornerRadius="{TemplateBinding CornerRadius}"
-							Padding="{ThemeResource OutlinedPasswordBoxBorderPadding}">
-
+					<Grid>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
 
 								<VisualState x:Name="PointerOver">
 									<VisualState.Setters>
-										<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundPointerOver}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundPointerOver}" />
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundPointerOver}" />
-										<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessPointerOver}" />
-										<Setter Target="RootBorder.Padding" Value="{ThemeResource OutlinedPasswordBoxBorderPaddingPointerOver}" />
+										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 
@@ -496,7 +490,7 @@
 
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
 										<!-- In this case the opacity is not applied to the brush directly - known issue for ContentElement -->
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundDisabled}" />
 										<Setter Target="ContentElement.Opacity" Value="{ThemeResource OutlinedPasswordBoxForegroundOpacityDisabled}" />
@@ -508,12 +502,11 @@
 
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
-										<Setter Target="RootBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundFocused}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundFocused}" />
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundFocused}" />
-										<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessFocused}" />
-										<Setter Target="RootBorder.Padding" Value="{ThemeResource OutlinedPasswordBoxBorderPaddingFocused}" />
+										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessFocused}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -568,6 +561,7 @@
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
+						<!-- Content Grid -->
 						<Grid x:Name="Root"
 							  Padding="{TemplateBinding Padding}"
 							  Background="{TemplateBinding Background}">
@@ -577,7 +571,9 @@
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
 
+							<!-- IconPresenter -->
 							<ContentPresenter x:Name="IconPresenter"
+											  Grid.Column="0"
 											  MinWidth="25"
 											  MaxWidth="34"
 											  MaxHeight="34"
@@ -588,6 +584,7 @@
 											  Content="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}}"
 											  Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
 
+							<!-- ContentElement -->
 							<ScrollViewer x:Name="ContentElement"
 										  Grid.Column="1"
 										  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -606,6 +603,7 @@
 								</ScrollViewer.RenderTransform>
 							</ScrollViewer>
 
+							<!-- PlaceholderElement -->
 							<TextBlock x:Name="PlaceholderElement"
 									   Grid.Column="1"
 									   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -619,6 +617,7 @@
 								</TextBlock.RenderTransform>
 							</TextBlock>
 
+							<!-- RevealButton -->
 							<Button x:Name="RevealButton"
 									Grid.Column="2"
 									MinWidth="34"
@@ -629,7 +628,12 @@
 									Style="{StaticResource MaterialRevealButtonStyle}"
 									Visibility="Collapsed" />
 						</Grid>
-					</Border>
+
+						<Border x:Name="BorderBorder"
+								BorderBrush="{TemplateBinding BorderBrush}"
+								BorderThickness="{TemplateBinding BorderThickness}"
+								CornerRadius="{TemplateBinding CornerRadius}" />
+					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>

From 94e694ec1b945a773a1c78e9428c7e8f26f48206 Mon Sep 17 00:00:00 2001
From: Kunal22shah <kunalshah606@gmail.com>
Date: Wed, 30 Oct 2024 11:20:54 -0400
Subject: [PATCH 2/4] chore: updating markup and docs

---
 doc/styles/PasswordBox.md                       |  5 +----
 .../Styles/Controls/v2/PasswordBox.xaml         | 17 +++++++----------
 .../Theme/PasswordBox.cs                        | 12 ------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/doc/styles/PasswordBox.md b/doc/styles/PasswordBox.md
index ebfed5cb5..036712c58 100644
--- a/doc/styles/PasswordBox.md
+++ b/doc/styles/PasswordBox.md
@@ -71,10 +71,7 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 | `OutlinedPasswordBoxCharacterSpacing`                 | `Int32`           | `BodyLargeCharacterSpacing`                                                                                                                                                                                                                                                                   |
 | `OutlinedPasswordBoxCornerRadius`                     | `CornerRadius`    | 4                                                                                                                                                                                                                                                                                             |
 | `OutlinedPasswordBoxMinHeight`                        | `Double`          | 58                                                                                                                                                                                                                                                                                            |
-| `OutlinedPasswordBoxBorderPadding`                    | `Thickness`       | 1                                                                                                                                                                                                                                                                                             |
-| `OutlinedPasswordBoxBorderPaddingPointerOver`         | `Thickness`       | 0                                                                                                                                                                                                                                                                                             |
-| `OutlinedPasswordBoxBorderPaddingFocused`             | `Thickness`       | 0                                                                                                                                                                                                                                                                                             |
 | `OutlinedPasswordBoxPadding`                          | `Thickness`       | 16,4,8,4                                                                                                                                                                                                                                                                                      |
 | `OutlinedPasswordBoxBorderThickness`                  | `Thickness`       | 1                                                                                                                                                                                                                                                                                             |
-| `OutlinedPasswordBoxBorderThicknessPointerOver`       | `Thickness`       | 2                                                                                                                                                                                                                                                                                             |
+| `OutlinedPasswordBoxBorderThicknessPointerOver`       | `Thickness`       | 1                                                                                                                                                                                                                                                                                             |
 | `OutlinedPasswordBoxBorderThicknessFocused`           | `Thickness`       | 2                                                                                                                                                                                                                                                                                             |
diff --git a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
index 0999add20..481bbf5bf 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/PasswordBox.xaml
@@ -89,13 +89,10 @@
 
 			<CornerRadius x:Key="OutlinedPasswordBoxCornerRadius">4</CornerRadius>
 			<x:Double x:Key="OutlinedPasswordBoxMinHeight">58</x:Double>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPadding">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThickness">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxPadding">16,4,8,4</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThicknessPointerOver">1</Thickness>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPaddingPointerOver">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThicknessFocused">2</Thickness>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPaddingFocused">1</Thickness>
 
 			<CornerRadius x:Key="FilledPasswordBoxCornerRadius">4,4,0,0</CornerRadius>
 			<x:Double x:Key="FilledPasswordBoxMinHeight">56</x:Double>
@@ -183,13 +180,10 @@
 
 			<CornerRadius x:Key="OutlinedPasswordBoxCornerRadius">4</CornerRadius>
 			<x:Double x:Key="OutlinedPasswordBoxMinHeight">58</x:Double>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPadding">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThickness">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxPadding">16,4,8,4</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThicknessPointerOver">1</Thickness>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPaddingPointerOver">1</Thickness>
 			<Thickness x:Key="OutlinedPasswordBoxBorderThicknessFocused">2</Thickness>
-			<Thickness x:Key="OutlinedPasswordBoxBorderPaddingFocused">1</Thickness>
 
 			<CornerRadius x:Key="FilledPasswordBoxCornerRadius">4,4,0,0</CornerRadius>
 			<x:Double x:Key="FilledPasswordBoxMinHeight">56</x:Double>
@@ -478,11 +472,11 @@
 
 								<VisualState x:Name="PointerOver">
 									<VisualState.Setters>
-										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundPointerOver}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundPointerOver}" />
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundPointerOver}" />
 										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessPointerOver}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 
@@ -490,23 +484,23 @@
 
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
 										<!-- In this case the opacity is not applied to the brush directly - known issue for ContentElement -->
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundDisabled}" />
 										<Setter Target="ContentElement.Opacity" Value="{ThemeResource OutlinedPasswordBoxForegroundOpacityDisabled}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundDisabled}" />
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundDisabled}" />
 										<Setter Target="IconPresenter.Foreground" Value="{ThemeResource PasswordBoxLeadingIconForegroundDisabled}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
 
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
-										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxForegroundFocused}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedPasswordBoxPlaceholderForegroundFocused}" />
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedPasswordBoxBackgroundFocused}" />
 										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedPasswordBoxBorderThicknessFocused}" />
+										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedPasswordBoxBorderBrushFocused}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -628,7 +622,10 @@
 									Style="{StaticResource MaterialRevealButtonStyle}"
 									Visibility="Collapsed" />
 						</Grid>
-
+						<!--
+							In Figma design, border thickness doesn't push its inner content like on xaml.
+							So we are putting the border as an overlay here. To keep the rest of the measurements/values identical to Figma.
+						-->
 						<Border x:Name="BorderBorder"
 								BorderBrush="{TemplateBinding BorderBrush}"
 								BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
index d8deda060..a8f62d781 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs
@@ -155,18 +155,6 @@ public static partial class BorderBrush
 					public static ThemeResourceKey<Brush> Focused => new("OutlinedPasswordBoxBorderBrushFocused");
 				}
 
-				public static partial class BorderPadding
-				{
-					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPadding")]
-					public static ThemeResourceKey<Thickness> Default => new("OutlinedPasswordBoxBorderPadding");
-
-					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingPointerOver")]
-					public static ThemeResourceKey<Thickness> PointerOver => new("OutlinedPasswordBoxBorderPaddingPointerOver");
-
-					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderPaddingFocused")]
-					public static ThemeResourceKey<Thickness> Focused => new("OutlinedPasswordBoxBorderPaddingFocused");
-				}
-
 				public static partial class BorderThickness
 				{
 					[ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxBorderThickness")]

From bcf0c103efe397495d126f6705ee28534704d9f1 Mon Sep 17 00:00:00 2001
From: Kunal22shah <kunalshah606@gmail.com>
Date: Thu, 31 Oct 2024 10:46:37 -0400
Subject: [PATCH 3/4] chore: updating migration docs

---
 doc/material-migration.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/material-migration.md b/doc/material-migration.md
index 020a65f29..1d7f84d34 100644
--- a/doc/material-migration.md
+++ b/doc/material-migration.md
@@ -29,6 +29,17 @@ We have standardized the naming of styles and resource keys. This change aims to
 | MaterialOutlinedTextBoxBorderThicknessFocused | OutlinedTextBoxBorderThicknessFocused |
 | MaterialOutlinedTextBoxBorderThicknessPointerOver | OutlinedTextBoxBorderThicknessPointerOver |
 
+#### Removal of PasswordBox Border Padding Resources
+
+The following resource keys related to `PasswordBox` border padding have been removed:
+
+| Old Resource Key | New Resource Key | Value |
+| ---- | ---- |---- |
+| OutlinedPasswordBoxBorderPadding | ***REMOVED*** | 1 |
+| OutlinedPasswordBoxBorderPaddingPointerOver | ***REMOVED*** | 0 |
+| OutlinedPasswordBoxBorderPaddingFocused | ***REMOVED*** | 0 |
+| OutlinedPasswordBoxBorderThicknessPointerOver | OutlinedPasswordBoxBorderThicknessPointerOver | 1 |
+
 ### Upgrading to Uno Themes 5.1
 
 #### TextBox `PlaceholderText` and `Header`

From c03d69ea3ce21b30d00f57f6d51eb25f1b7472cf Mon Sep 17 00:00:00 2001
From: Kunal22shah <kunalshah606@gmail.com>
Date: Thu, 31 Oct 2024 11:57:13 -0400
Subject: [PATCH 4/4] chore: resolving PR comments

---
 doc/material-migration.md | 42 ++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/doc/material-migration.md b/doc/material-migration.md
index 1d7f84d34..48aedddcc 100644
--- a/doc/material-migration.md
+++ b/doc/material-migration.md
@@ -14,31 +14,23 @@ We have standardized the naming of styles and resource keys. This change aims to
 
 #### Changes to Resource Keys
 
-| Old Resource Key | New Resource Key |
-| ---- | ---- |
-| MaterialTextBoxClearGlyphWidth | TextBoxClearGlyphWidth |
-| MaterialTextBoxClearGlyphHeight | TextBoxClearGlyphHeight |
-| MaterialFilledTextBoxCornerRadius | FilledTextBoxCornerRadius |
-| MaterialFilledTextBoxPadding | FilledTextBoxPadding |
-| MaterialFilledTextBoxMinHeight | FilledTextBoxMinHeight |
-| MaterialFilledTextBoxBorderHeightFocused | FilledTextBoxBorderHeightFocused |
-| MaterialOutlinedTextBoxBorderThickness | OutlinedTextBoxBorderThickness |
-| MaterialOutlinedTextBoxCornerRadius | OutlinedTextBoxCornerRadius |
-| MaterialOutlinedTextBoxPadding | OutlinedTextBoxPadding |
-| MaterialOutlinedTextBoxMinHeight | OutlinedTextBoxMinHeight |
-| MaterialOutlinedTextBoxBorderThicknessFocused | OutlinedTextBoxBorderThicknessFocused |
-| MaterialOutlinedTextBoxBorderThicknessPointerOver | OutlinedTextBoxBorderThicknessPointerOver |
-
-#### Removal of PasswordBox Border Padding Resources
-
-The following resource keys related to `PasswordBox` border padding have been removed:
-
-| Old Resource Key | New Resource Key | Value |
-| ---- | ---- |---- |
-| OutlinedPasswordBoxBorderPadding | ***REMOVED*** | 1 |
-| OutlinedPasswordBoxBorderPaddingPointerOver | ***REMOVED*** | 0 |
-| OutlinedPasswordBoxBorderPaddingFocused | ***REMOVED*** | 0 |
-| OutlinedPasswordBoxBorderThicknessPointerOver | OutlinedPasswordBoxBorderThicknessPointerOver | 1 |
+| Old Resource Key                                  | New Resource Key                                |
+|---------------------------------------------------|-------------------------------------------------|
+| MaterialTextBoxClearGlyphWidth                    | TextBoxClearGlyphWidth                          |
+| MaterialTextBoxClearGlyphHeight                   | TextBoxClearGlyphHeight                         |
+| MaterialFilledTextBoxCornerRadius                 | FilledTextBoxCornerRadius                       |
+| MaterialFilledTextBoxPadding                      | FilledTextBoxPadding                            |
+| MaterialFilledTextBoxMinHeight                    | FilledTextBoxMinHeight                          |
+| MaterialFilledTextBoxBorderHeightFocused          | FilledTextBoxBorderHeightFocused                |
+| MaterialOutlinedTextBoxBorderThickness            | OutlinedTextBoxBorderThickness                  |
+| MaterialOutlinedTextBoxCornerRadius               | OutlinedTextBoxCornerRadius                     |
+| MaterialOutlinedTextBoxPadding                    | OutlinedTextBoxPadding                          |
+| MaterialOutlinedTextBoxMinHeight                  | OutlinedTextBoxMinHeight                        |
+| MaterialOutlinedTextBoxBorderThicknessFocused     | OutlinedTextBoxBorderThicknessFocused           |
+| MaterialOutlinedTextBoxBorderThicknessPointerOver | OutlinedTextBoxBorderThicknessPointerOver       |
+| OutlinedPasswordBoxBorderPadding                  | ***REMOVED***                                   |
+| OutlinedPasswordBoxBorderPaddingPointerOver       | ***REMOVED***                                   |
+| OutlinedPasswordBoxBorderPaddingFocused           | ***REMOVED***                                   |
 
 ### Upgrading to Uno Themes 5.1