From e3b9b762f3d5828f84cc82b05903a8a3fdb42155 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 16 Jun 2020 14:49:17 -0300
Subject: [PATCH] restore template focus target.

---
 src/Avalonia.Themes.Default/ToggleSwitch.xaml | 1 +
 src/Avalonia.Themes.Fluent/ToggleSwitch.xaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Avalonia.Themes.Default/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
index b4c4e7b429..ed172b52ab 100644
--- a/src/Avalonia.Themes.Default/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
@@ -78,6 +78,7 @@
             <Grid x:Name="SwitchAreaGrid"
               Grid.RowSpan="3"
               Grid.ColumnSpan="3"
+              TemplatedControl.IsTemplateFocusTarget="True"
               Margin="0,5" />
 
             <ContentPresenter x:Name="PART_OffContentPresenter"
diff --git a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
index b4c4e7b429..ed172b52ab 100644
--- a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
@@ -78,6 +78,7 @@
             <Grid x:Name="SwitchAreaGrid"
               Grid.RowSpan="3"
               Grid.ColumnSpan="3"
+              TemplatedControl.IsTemplateFocusTarget="True"
               Margin="0,5" />
 
             <ContentPresenter x:Name="PART_OffContentPresenter"