Remove IComponentContext

src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs

@@ -91,7 +91,6 @@ private void CreateServiceProvider()
             services.AddSingleton(_BrowserHostBuilderContext);
             services.AddSingleton<IWebAssemblyHost, WebAssemblyHost>();
             services.AddSingleton<IJSRuntime>(WebAssemblyJSRuntime.Instance);
-            services.AddSingleton<IComponentContext, WebAssemblyComponentContext>();
             services.AddSingleton<NavigationManager>(WebAssemblyNavigationManager.Instance);
             services.AddSingleton<INavigationInterception>(WebAssemblyNavigationInterception.Instance);
             services.AddSingleton<ILoggerFactory, WebAssemblyLoggerFactory>();

src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs

@@ -196,10 +196,6 @@ public partial interface IComponent
         void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
         System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters);
     }
-    public partial interface IComponentContext
-    {
-        bool IsConnected { get; }
-    }
     public partial interface IHandleAfterRender
     {
         System.Threading.Tasks.Task OnAfterRenderAsync();

src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs

@@ -196,10 +196,6 @@ public partial interface IComponent
         void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
         System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters);
     }
-    public partial interface IComponentContext
-    {
-        bool IsConnected { get; }
-    }
     public partial interface IHandleAfterRender
     {
         System.Threading.Tasks.Task OnAfterRenderAsync();

src/Components/Components/src/Routing/Router.cs

@@ -30,8 +30,6 @@ static readonly ReadOnlyDictionary<string, object> _emptyParametersDictionary
 
         [Inject] private INavigationInterception NavigationInterception { get; set; }
 
-        [Inject] private IComponentContext ComponentContext { get; set; }
-
         [Inject] private ILoggerFactory LoggerFactory { get; set; }
 
         /// <summary>
@@ -152,7 +150,7 @@ private void OnLocationChanged(object sender, LocationChangedEventArgs args)
 
         Task IHandleAfterRender.OnAfterRenderAsync()
         {
-            if (!_navigationInterceptionEnabled && ComponentContext.IsConnected)
+            if (!_navigationInterceptionEnabled)
             {
                 _navigationInterceptionEnabled = true;
                 return NavigationInterception.EnableNavigationInterceptionAsync();

src/Components/Server/src/Circuits/DefaultCircuitFactory.cs

@@ -51,9 +51,7 @@ public override CircuitHost CreateCircuitHost(
 
             var scope = _scopeFactory.CreateScope();
             var jsRuntime = (RemoteJSRuntime)scope.ServiceProvider.GetRequiredService<IJSRuntime>();
-            var componentContext = (RemoteComponentContext)scope.ServiceProvider.GetRequiredService<IComponentContext>();
             jsRuntime.Initialize(client);
-            componentContext.Initialize(client);
 
             var navigationManager = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
             var navigationInterception = (RemoteNavigationInterception)scope.ServiceProvider.GetRequiredService<INavigationInterception>();

src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs

@@ -70,7 +70,6 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
             services.AddScoped<NavigationManager, RemoteNavigationManager>();
             services.AddScoped<IJSRuntime, RemoteJSRuntime>();
             services.AddScoped<INavigationInterception, RemoteNavigationInterception>();
-            services.AddScoped<IComponentContext, RemoteComponentContext>();
             services.AddScoped<AuthenticationStateProvider, ServerAuthenticationStateProvider>();
 
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<CircuitOptions>, CircuitOptionsJSInteropDetailedErrorsConfiguration>());

src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor

@@ -1,7 +1,6 @@
 @page "/prerendered-interop"
 @using Microsoft.AspNetCore.Components
 @using Microsoft.JSInterop
-@inject IComponentContext ComponentContext
 @inject IJSRuntime JSRuntime
 
 <p>

src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor

@@ -1,7 +1,6 @@
 @page "/prerendered-transition"
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Authorization
-@inject IComponentContext ComponentContext
 
 <CascadingAuthenticationState>
     <AuthorizeView>
@@ -11,7 +10,7 @@
 
     <p>
         Current state:
-        <strong id="connected-state">@(ComponentContext.IsConnected ? "connected" : "not connected")</strong>
+        <strong id="connected-state">@(hasRenderedInConnectedMode ? "connected" : "not connected")</strong>
     </p>
 
     <p>
@@ -22,11 +21,13 @@
 </CascadingAuthenticationState>
 
 @code {
+    bool hasRenderedInConnectedMode;
     int count;
     protected override Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
+            hasRenderedInConnectedMode = true;
             // We need to queue another render when we connect, otherwise the
             // browser won't see anything.
             StateHasChanged();

src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs

@@ -208,7 +208,6 @@ internal static void AddViewServices(IServiceCollection services)
             services.TryAddScoped<StaticComponentRenderer>();
             services.TryAddScoped<NavigationManager, HttpNavigationManager>();
             services.TryAddScoped<IJSRuntime, UnsupportedJavaScriptRuntime>();
-            services.TryAddScoped<IComponentContext, UnsupportedComponentContext>();
             services.TryAddScoped<INavigationInterception, UnsupportedNavigationInterception>();
 
             services.TryAddTransient<ControllerSaveTempDataPropertyFilter>();