Skip to content

Commit e512a11

Browse files
authored
Fix use of ReconnectModal in Blazor templates with auto mode and global interactivity (#60735)
* Fix reconnect UI in project template for auto & global interactive * Move <ReconnectModal> to App.razor, update _Imports.razor accordingly
1 parent f31188b commit e512a11

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@
9898
"exclude": [
9999
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor",
100100
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.css",
101-
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.js"
101+
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.js",
102+
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor",
103+
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.css",
104+
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.js"
102105
]
103106
},
104107
{

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
##else
4040
<Routes @rendermode="InteractiveWebAssembly" />
4141
##endif*@
42+
@*#if (UseServer) -->
43+
<ReconnectModal />
44+
##endif*@
4245
<script src="@Assets["_framework/blazor.web.js"]"></script>
4346
</body>
4447

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@
2828
<span class="dismiss">🗙</span>
2929
</div>
3030
##endif*@
31-
@*#if (UseServer) -->
32-
<ReconnectModal />
33-
##endif*@

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
1+
@*#if (UseWebAssembly && InteractiveAtRoot) -->
2+
<script type="module" src="@Assets["Layout/ReconnectModal.razor.js"]"></script>
3+
##else
4+
<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
5+
##endif*@
26

37
<dialog id="components-reconnect-modal" data-nosnippet>
48
<div class="components-reconnect-container">

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@
1313
@*#if (UseWebAssembly) -->
1414
@using BlazorWeb_CSharp.Client
1515
##endif*@
16+
@*#if (UseServer && UseWebAssembly && InteractiveAtRoot) -->
17+
@using BlazorWeb_CSharp.Client.Layout
18+
##endif*@
1619
@using BlazorWeb_CSharp.Components
20+
@*#if (UseServer && (!UseWebAssembly || !InteractiveAtRoot)) -->
21+
@using BlazorWeb_CSharp.Components.Layout
22+
##endif*@

0 commit comments

Comments
 (0)