From a3a1abe7c7bb52b1cdbf76fa6a16b81f6269ffd9 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Fri, 19 Mar 2021 10:16:42 +0000
Subject: [PATCH] Support ElementReference.Focus in WebView

---
 src/Components/WebView/WebView/src/PageContext.cs             | 2 +-
 .../WebView/WebView/src/Services/WebViewJSRuntime.cs          | 3 +++
 .../WebView/WebView/src/Services/WebViewRenderer.cs           | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Components/WebView/WebView/src/PageContext.cs b/src/Components/WebView/WebView/src/PageContext.cs
index 4ab64181c886..e2f88ce88225 100644
--- a/src/Components/WebView/WebView/src/PageContext.cs
+++ b/src/Components/WebView/WebView/src/PageContext.cs
@@ -42,7 +42,7 @@ public PageContext(
             JSRuntime.AttachToWebView(ipcSender);
 
             var loggerFactory = services.GetRequiredService<ILoggerFactory>();
-            Renderer = new WebViewRenderer(services, dispatcher, ipcSender, loggerFactory);
+            Renderer = new WebViewRenderer(services, dispatcher, ipcSender, loggerFactory, JSRuntime.ElementReferenceContext);
         }
 
         public void Dispose()
diff --git a/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs b/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
index d3a338310369..bb6b46ee6b6c 100644
--- a/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
+++ b/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
@@ -8,8 +8,11 @@ internal class WebViewJSRuntime : JSRuntime
     {
         private IpcSender _ipcSender;
 
+        public ElementReferenceContext ElementReferenceContext { get; }
+
         public WebViewJSRuntime()
         {
+            ElementReferenceContext = new WebElementReferenceContext(this);
             JsonSerializerOptions.Converters.Add(
                 new ElementReferenceJsonConverter(
                     new WebElementReferenceContext(this)));
diff --git a/src/Components/WebView/WebView/src/Services/WebViewRenderer.cs b/src/Components/WebView/WebView/src/Services/WebViewRenderer.cs
index b9fbf6bee594..80b0a1b0a6af 100644
--- a/src/Components/WebView/WebView/src/Services/WebViewRenderer.cs
+++ b/src/Components/WebView/WebView/src/Services/WebViewRenderer.cs
@@ -22,11 +22,13 @@ public WebViewRenderer(
             IServiceProvider serviceProvider,
             Dispatcher dispatcher,
             IpcSender ipcSender,
-            ILoggerFactory loggerFactory) :
+            ILoggerFactory loggerFactory,
+            ElementReferenceContext elementReferenceContext) :
             base(serviceProvider, loggerFactory)
         {
             _dispatcher = dispatcher;
             _ipcSender = ipcSender;
+            ElementReferenceContext = elementReferenceContext;
         }
 
         public override Dispatcher Dispatcher => _dispatcher;