Support ElementReference.Focus in WebView (#31050)

dotnet · Mar 19, 2021 · 6167a22 · 6167a22
1 parent 8cc970c
commit 6167a22
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;