Skip to content

Commit 7133938

Browse files
authored
Merge pull request #34129 from dotnet/main
2 parents 78cd495 + 25df462 commit 7133938

File tree

25 files changed

+2863
-3567
lines changed

25 files changed

+2863
-3567
lines changed

.openpublishing.redirection.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@
11171117
},
11181118
{
11191119
"source_path": "aspnetcore/blazor/integrate-components.md",
1120-
"redirect_url": "/aspnet/core/blazor/components/prerendering-and-integration",
1120+
"redirect_url": "/aspnet/core/blazor/components/integration",
11211121
"redirect_document_id": false
11221122
},
11231123
{
@@ -1157,7 +1157,7 @@
11571157
},
11581158
{
11591159
"source_path": "aspnetcore/blazor/components/integrate-components-into-razor-pages-and-mvc-apps.md",
1160-
"redirect_url": "/aspnet/core/blazor/components/prerendering-and-integration",
1160+
"redirect_url": "/aspnet/core/blazor/components/integration",
11611161
"redirect_document_id": false
11621162
},
11631163
{
@@ -1317,6 +1317,11 @@
13171317
"source_path": "aspnetcore/blazor/images.md",
13181318
"redirect_url": "/aspnet/core/blazor/images-and-documents",
13191319
"redirect_document_id": false
1320+
},
1321+
{
1322+
"source_path": "aspnetcore/blazor/components/prerendering-and-integration.md",
1323+
"redirect_url": "/aspnet/core/blazor/components/integration",
1324+
"redirect_document_id": false
13201325
}
13211326
]
13221327
}

aspnetcore/blazor/components/data-binding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Razor attribute binding is case-sensitive:
158158

159159
:::moniker range=">= aspnetcore-7.0"
160160

161-
To execute asynchronous logic after binding, use `@bind:after="{EVENT}"` with a DOM event for the `{EVENT}` placeholder. An assigned C# method isn't executed until the bound value is assigned synchronously.
161+
To execute asynchronous logic after binding, use `@bind:after="{DELEGATE}"`, where the `{DELEGATE}` placeholder is a C# delegate (method). An assigned C# delegate isn't executed until the bound value is assigned synchronously.
162162

163163
Using an [event callback parameter (`EventCallback`/`EventCallback<T>`)](xref:blazor/components/event-handling#eventcallback) with `@bind:after` isn't supported. Instead, pass a method that returns an <xref:System.Action> or <xref:System.Threading.Tasks.Task> to `@bind:after`.
164164

aspnetcore/blazor/components/index.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,8 +1843,6 @@ In the preceding code, the CSS selector, `#app`, indicates that the `App` compon
18431843

18441844
MVC and Razor Pages apps can also use the [Component Tag Helper](xref:Microsoft.AspNetCore.Mvc.TagHelpers.ComponentTagHelper) to register statically-rendered Blazor WebAssembly root components:
18451845

1846-
:::moniker range=">= aspnetcore-6.0"
1847-
18481846
```cshtml
18491847
<component type="typeof(App)" render-mode="WebAssemblyPrerendered" />
18501848
```
@@ -1853,22 +1851,9 @@ Statically-rendered components can only be added to the app. They can't be remov
18531851

18541852
For more information, see the following resources:
18551853

1856-
:::moniker-end
1857-
1858-
:::moniker range=">= aspnetcore-8.0"
1859-
18601854
* <xref:mvc/views/tag-helpers/builtin-th/component-tag-helper>
18611855
* <xref:blazor/components/integration>
18621856

1863-
:::moniker-end
1864-
1865-
:::moniker range=">= aspnetcore-6.0 < aspnetcore-8.0"
1866-
1867-
* <xref:mvc/views/tag-helpers/builtin-th/component-tag-helper>
1868-
* <xref:blazor/components/prerendering-and-integration>
1869-
1870-
:::moniker-end
1871-
18721857
<!--Reference links in article-->
18731858
[1]: <xref:mvc/views/razor#code>
18741859
[2]: <xref:mvc/views/razor#using>

aspnetcore/blazor/components/integration.md

Lines changed: 2816 additions & 385 deletions
Large diffs are not rendered by default.

aspnetcore/blazor/components/layouts.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -385,18 +385,8 @@ The following rendered HTML markup is produced by the preceding nested layout. E
385385

386386
## Share a Razor Pages layout with integrated components
387387

388-
:::moniker range=">= aspnetcore-8.0"
389-
390388
When routable components are integrated into a Razor Pages app, the app's shared layout can be used with the components. For more information, see <xref:blazor/components/integration>.
391389

392-
:::moniker-end
393-
394-
:::moniker range="< aspnetcore-8.0"
395-
396-
When routable components are integrated into a Razor Pages app, the app's shared layout can be used with the components. For more information, see <xref:blazor/components/prerendering-and-integration>.
397-
398-
:::moniker-end
399-
400390
:::moniker range=">= aspnetcore-8.0"
401391

402392
## Sections

aspnetcore/blazor/components/lifecycle.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ To prevent developer code in <xref:Microsoft.AspNetCore.Components.ComponentBase
206206

207207
:::moniker range="< aspnetcore-8.0"
208208

209-
To prevent developer code in <xref:Microsoft.AspNetCore.Components.ComponentBase.OnInitializedAsync%2A> from running twice when prerendering, see the [Stateful reconnection after prerendering](#stateful-reconnection-after-prerendering) section. Although the content in the section focuses on Blazor Server and stateful SignalR *reconnection*, the scenario for prerendering in hosted Blazor WebAssembly solutions (<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode.WebAssemblyPrerendered>) involves similar conditions and approaches to prevent executing developer code twice. To preserve state during the execution of initialization code while prerendering, see <xref:blazor/components/prerendering-and-integration#persist-prerendered-state>.
209+
To prevent developer code in <xref:Microsoft.AspNetCore.Components.ComponentBase.OnInitializedAsync%2A> from running twice when prerendering, see the [Stateful reconnection after prerendering](#stateful-reconnection-after-prerendering) section. Although the content in the section focuses on Blazor Server and stateful SignalR *reconnection*, the scenario for prerendering in hosted Blazor WebAssembly solutions (<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode.WebAssemblyPrerendered>) involves similar conditions and approaches to prevent executing developer code twice. To preserve state during the execution of initialization code while prerendering, see <xref:blazor/components/integration#persist-prerendered-state>.
210210

211211
:::moniker-end
212212

@@ -612,7 +612,7 @@ The content in this section focuses on Blazor Web Apps and stateful SignalR *rec
612612

613613
:::moniker range="< aspnetcore-8.0"
614614

615-
Although the content in this section focuses on Blazor Server and stateful SignalR *reconnection*, the scenario for prerendering in hosted Blazor WebAssembly solutions (<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode.WebAssemblyPrerendered>) involves similar conditions and approaches to prevent executing developer code twice. To preserve state during the execution of initialization code while prerendering, see <xref:blazor/components/prerendering-and-integration#persist-prerendered-state>.
615+
Although the content in this section focuses on Blazor Server and stateful SignalR *reconnection*, the scenario for prerendering in hosted Blazor WebAssembly solutions (<xref:Microsoft.AspNetCore.Mvc.Rendering.RenderMode.WebAssemblyPrerendered>) involves similar conditions and approaches to prevent executing developer code twice. To preserve state during the execution of initialization code while prerendering, see <xref:blazor/components/integration#persist-prerendered-state>.
616616

617617
:::moniker-end
618618

0 commit comments

Comments
 (0)