Merge pull request #1526 from unoplatform/dev/erli/1525-fix-button-pointer-focused

fix: Wrap focus related states in a FocusStates vsg

Author: erikvilima

src/library/Uno.Material/Styles/Controls/v2/Button.xaml

@@ -460,7 +460,9 @@
 										<Setter Target="ElevatedView.Elevation" Value="{ThemeResource ElevatedButtonElevationDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
+							</VisualStateGroup>
 
+							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="Root.Background" Value="{ThemeResource ElevatedButtonBackgroundFocused}" />
@@ -480,6 +482,8 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource ElevatedButtonBorderBrushPointerFocused}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
@@ -596,6 +600,10 @@
 									</VisualState.Setters>
 								</VisualState>
 
+								
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="Root.Background" Value="{ThemeResource FilledButtonBackgroundFocused}" />
@@ -615,6 +623,8 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledButtonBorderBrushPointerFocused}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
@@ -730,7 +740,9 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledTonalButtonBorderBrushDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
+							</VisualStateGroup>
 
+							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="Root.Background" Value="{ThemeResource FilledTonalButtonBackgroundFocused}" />
@@ -750,6 +762,8 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledTonalButtonBorderBrushPointerFocused}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
@@ -867,7 +881,9 @@
 										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource OutlinedButtonForegroundDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
+							</VisualStateGroup>
 
+							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="Root.Background" Value="{ThemeResource OutlinedButtonBackgroundFocused}" />
@@ -887,6 +903,8 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource OutlinedButtonBorderBrushPointerFocused}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
@@ -995,7 +1013,9 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource TextButtonBorderBrushDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
+							</VisualStateGroup>
 
+							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="Root.Background" Value="{ThemeResource TextButtonBackgroundFocused}" />
@@ -1015,6 +1035,8 @@
 										<Setter Target="Root.BorderBrush" Value="{ThemeResource TextButtonBorderBrushPointerFocused}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
@@ -1096,16 +1118,23 @@
 										<Setter Target="PressedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
 									</VisualState.Setters>
 								</VisualState>
-								<VisualState x:Name="Focused">
+								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconButtonForegroundDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
-								<VisualState x:Name="Disabled">
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Focused">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconButtonForegroundDisabled}" />
+										<Setter Target="FocusedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
 									</VisualState.Setters>
 								</VisualState>
+
+								<VisualState x:Name="PointerFocused" />
+								
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>