💁

hlaueriksson · Jun 30, 2024 · c273a33 · c273a33
1 parent e9a8412
commit c273a33
Show file tree

Hide file tree

Showing 27 changed files with 85 additions and 43 deletions.
diff --git a/GEmojiSharp.sln b/GEmojiSharp.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.Blazor", "src\G
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.Sample.BlazorWebAssembly", "samples\GEmojiSharp.Sample.BlazorWebAssembly\GEmojiSharp.Sample.BlazorWebAssembly.csproj", "{1BF0F93F-AEEC-4F49-84C8-CD88FA7E8239}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.Sample.BlazorServer", "samples\GEmojiSharp.Sample.BlazorServer\GEmojiSharp.Sample.BlazorServer.csproj", "{BD90A65E-9F61-48BF-8885-3505B8C0D299}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.DotnetTool", "src\GEmojiSharp.DotnetTool\GEmojiSharp.DotnetTool.csproj", "{D6294653-E1A0-4F02-B97D-9E3149D7A462}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.PowerToysRun", "src\GEmojiSharp.PowerToysRun\GEmojiSharp.PowerToysRun.csproj", "{F587ED51-27F6-47EE-AF43-70B82BC8D3ED}"
@@ -31,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.PowerToysRun.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GEmojiSharp.Benchmark", "tests\GEmojiSharp.Benchmark\GEmojiSharp.Benchmark.csproj", "{FDED188E-B80B-475D-9ECA-09A8A2BE091F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GEmojiSharp.Sample.BlazorWeb", "samples\GEmojiSharp.Sample.BlazorWeb\GEmojiSharp.Sample.BlazorWeb.csproj", "{3389CA47-8F04-4666-84DD-FAE7A1E2A032}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,10 +61,6 @@ Global
 		{1BF0F93F-AEEC-4F49-84C8-CD88FA7E8239}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1BF0F93F-AEEC-4F49-84C8-CD88FA7E8239}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BF0F93F-AEEC-4F49-84C8-CD88FA7E8239}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD90A65E-9F61-48BF-8885-3505B8C0D299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD90A65E-9F61-48BF-8885-3505B8C0D299}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD90A65E-9F61-48BF-8885-3505B8C0D299}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD90A65E-9F61-48BF-8885-3505B8C0D299}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D6294653-E1A0-4F02-B97D-9E3149D7A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6294653-E1A0-4F02-B97D-9E3149D7A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6294653-E1A0-4F02-B97D-9E3149D7A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -81,6 +77,10 @@ Global
 		{FDED188E-B80B-475D-9ECA-09A8A2BE091F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDED188E-B80B-475D-9ECA-09A8A2BE091F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDED188E-B80B-475D-9ECA-09A8A2BE091F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3389CA47-8F04-4666-84DD-FAE7A1E2A032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3389CA47-8F04-4666-84DD-FAE7A1E2A032}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3389CA47-8F04-4666-84DD-FAE7A1E2A032}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3389CA47-8F04-4666-84DD-FAE7A1E2A032}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,11 +92,11 @@ Global
 		{FBC5D0FB-ECAE-471C-9447-91DB023D0B0E} = {6938AF53-C5C7-478A-9554-6E7A02509432}
 		{748078D9-2705-44E7-A6D9-30976F03D102} = {08210849-A04E-459A-907D-980E559710E6}
 		{1BF0F93F-AEEC-4F49-84C8-CD88FA7E8239} = {6938AF53-C5C7-478A-9554-6E7A02509432}
-		{BD90A65E-9F61-48BF-8885-3505B8C0D299} = {6938AF53-C5C7-478A-9554-6E7A02509432}
 		{D6294653-E1A0-4F02-B97D-9E3149D7A462} = {08210849-A04E-459A-907D-980E559710E6}
 		{F587ED51-27F6-47EE-AF43-70B82BC8D3ED} = {08210849-A04E-459A-907D-980E559710E6}
 		{F7B52BE0-D70B-4859-84C5-464E009C1799} = {01434E7A-C27D-4094-A3E9-0C322136EFF7}
 		{FDED188E-B80B-475D-9ECA-09A8A2BE091F} = {01434E7A-C27D-4094-A3E9-0C322136EFF7}
+		{3389CA47-8F04-4666-84DD-FAE7A1E2A032} = {6938AF53-C5C7-478A-9554-6E7A02509432}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4EE2F45B-9E7D-46BE-A6C1-A1ACC12A0DCA}

diff --git a/README.md b/README.md
@@ -262,6 +262,21 @@ Update the `_Imports.razor` file, to enable the component in all Razor views:
 @using GEmojiSharp.Blazor
 ```
 
+> [!NOTE]
+> In a Blazor Web App (.NET 8 or later), the component requires an interactive render mode applied either globally to the app or to the component definition.
+
+Set the global render mode in `App.razor`:
+
+```cshtml
+<Routes @rendermode="InteractiveServer" />
+```
+
+or per page/component:
+
+```cshtml
+@rendermode InteractiveServer
+```
+
 Use the `<Emoji>` component to render emojis:
 
 ```html
@@ -679,9 +694,9 @@ Change action keyword:
 
 The [`samples`](/samples) folder contains...
 
-- `GEmojiSharp.Sample.BlazorServer`, a Blazor Server app
-- `GEmojiSharp.Sample.BlazorWebAssembly`, a Blazor WebAssembly app
-- `GEmojiSharp.Sample.Web`, a ASP.NET Core web site
+- `GEmojiSharp.Sample.BlazorWeb`, a Blazor Web App (InteractiveServer render mode)
+- `GEmojiSharp.Sample.BlazorWebAssembly`, a Blazor WebAssembly App
+- `GEmojiSharp.Sample.Web`, a ASP.NET Core Web App (Razor Pages)
 
 The Blazor WebAssembly app is showcased here:
 

diff --git a/samples/GEmojiSharp.Sample.BlazorServer/Components/Routes.razor b/samples/GEmojiSharp.Sample.BlazorServer/Components/Routes.razor
diff --git a/....Sample.BlazorServer/Components/App.razor → ...arp.Sample.BlazorWeb/Components/App.razor b/....Sample.BlazorServer/Components/App.razor → ...arp.Sample.BlazorWeb/Components/App.razor
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -7,7 +7,7 @@
     <base href="/" />
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="GEmojiSharp.Sample.BlazorServer.styles.css" />
+    <link rel="stylesheet" href="GEmojiSharp.Sample.BlazorWeb.styles.css" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <HeadOutlet />
 </head>

diff --git a/...Server/Components/Layout/MainLayout.razor → ...zorWeb/Components/Layout/MainLayout.razor b/...Server/Components/Layout/MainLayout.razor → ...zorWeb/Components/Layout/MainLayout.razor
diff --git a/...er/Components/Layout/MainLayout.razor.css → ...eb/Components/Layout/MainLayout.razor.css b/...er/Components/Layout/MainLayout.razor.css → ...eb/Components/Layout/MainLayout.razor.css
diff --git a/...zorServer/Components/Layout/NavMenu.razor → ...BlazorWeb/Components/Layout/NavMenu.razor b/...zorServer/Components/Layout/NavMenu.razor → ...BlazorWeb/Components/Layout/NavMenu.razor
diff --git a/...erver/Components/Layout/NavMenu.razor.css → ...orWeb/Components/Layout/NavMenu.razor.css b/...erver/Components/Layout/NavMenu.razor.css → ...orWeb/Components/Layout/NavMenu.razor.css
diff --git a/...e.BlazorServer/Components/Pages/All.razor → ...mple.BlazorWeb/Components/Pages/All.razor b/...e.BlazorServer/Components/Pages/All.razor → ...mple.BlazorWeb/Components/Pages/All.razor
@@ -1,4 +1,5 @@
 @page "/all"
+@rendermode InteractiveServer
 
 <PageTitle>All</PageTitle>
 

diff --git a/...BlazorServer/Components/Pages/Error.razor → ...le.BlazorWeb/Components/Pages/Error.razor b/...BlazorServer/Components/Pages/Error.razor → ...le.BlazorWeb/Components/Pages/Error.razor
diff --git a/....BlazorServer/Components/Pages/Home.razor → ...ple.BlazorWeb/Components/Pages/Home.razor b/....BlazorServer/Components/Pages/Home.razor → ...ple.BlazorWeb/Components/Pages/Home.razor
@@ -1,4 +1,5 @@
 @page "/"
+@rendermode InteractiveServer
 
 <PageTitle>Home</PageTitle>
 

diff --git a/samples/GEmojiSharp.Sample.BlazorWeb/Components/Routes.razor b/samples/GEmojiSharp.Sample.BlazorWeb/Components/Routes.razor
@@ -0,0 +1,6 @@
+<Router AppAssembly="typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+</Router>
diff --git a/...le.BlazorServer/Components/_Imports.razor → ...ample.BlazorWeb/Components/_Imports.razor b/...le.BlazorServer/Components/_Imports.razor → ...ample.BlazorWeb/Components/_Imports.razor
@@ -6,6 +6,6 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using GEmojiSharp.Sample.BlazorServer
-@using GEmojiSharp.Sample.BlazorServer.Components
+@using GEmojiSharp.Sample.BlazorWeb
+@using GEmojiSharp.Sample.BlazorWeb.Components
 @using GEmojiSharp.Blazor
diff --git a/...er/GEmojiSharp.Sample.BlazorServer.csproj → ...orWeb/GEmojiSharp.Sample.BlazorWeb.csproj b/...er/GEmojiSharp.Sample.BlazorServer.csproj → ...orWeb/GEmojiSharp.Sample.BlazorWeb.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...EmojiSharp.Sample.BlazorServer/Program.cs → ...s/GEmojiSharp.Sample.BlazorWeb/Program.cs b/...EmojiSharp.Sample.BlazorServer/Program.cs → ...s/GEmojiSharp.Sample.BlazorWeb/Program.cs
@@ -1,4 +1,4 @@
-using GEmojiSharp.Sample.BlazorServer.Components;
+using GEmojiSharp.Sample.BlazorWeb.Components;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/...azorServer/Properties/launchSettings.json → ....BlazorWeb/Properties/launchSettings.json b/...azorServer/Properties/launchSettings.json → ....BlazorWeb/Properties/launchSettings.json
@@ -1,18 +1,28 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:59657",
-      "sslPort": 44368
+      "applicationUrl": "http://localhost:12000",
+      "sslPort": 44343
     }
   },
   "profiles": {
-    "GEmojiSharp.Sample.BlazorServer": {
+    "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "http://localhost:5084",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7225;http://localhost:5084",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/...BlazorServer/appsettings.Development.json → ...le.BlazorWeb/appsettings.Development.json b/...BlazorServer/appsettings.Development.json → ...le.BlazorWeb/appsettings.Development.json
diff --git a/...harp.Sample.BlazorServer/appsettings.json → ...jiSharp.Sample.BlazorWeb/appsettings.json b/...harp.Sample.BlazorServer/appsettings.json → ...jiSharp.Sample.BlazorWeb/appsettings.json
diff --git a/...Sharp.Sample.BlazorServer/wwwroot/app.css → ...ojiSharp.Sample.BlazorWeb/wwwroot/app.css b/...Sharp.Sample.BlazorServer/wwwroot/app.css → ...ojiSharp.Sample.BlazorWeb/wwwroot/app.css
diff --git a/...erver/wwwroot/bootstrap/bootstrap.min.css → ...orWeb/wwwroot/bootstrap/bootstrap.min.css b/...erver/wwwroot/bootstrap/bootstrap.min.css → ...orWeb/wwwroot/bootstrap/bootstrap.min.css
diff --git a/...r/wwwroot/bootstrap/bootstrap.min.css.map → ...b/wwwroot/bootstrap/bootstrap.min.css.map b/...r/wwwroot/bootstrap/bootstrap.min.css.map → ...b/wwwroot/bootstrap/bootstrap.min.css.map
diff --git a/...p.Sample.BlazorServer/wwwroot/favicon.png → ...harp.Sample.BlazorWeb/wwwroot/favicon.png b/...p.Sample.BlazorServer/wwwroot/favicon.png → ...harp.Sample.BlazorWeb/wwwroot/favicon.png
diff --git a/samples/GEmojiSharp.Sample.BlazorWebAssembly/GEmojiSharp.Sample.BlazorWebAssembly.csproj b/samples/GEmojiSharp.Sample.BlazorWebAssembly/GEmojiSharp.Sample.BlazorWebAssembly.csproj
@@ -2,15 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GEmojiSharp.Blazor" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/GEmojiSharp.Sample.BlazorWebAssembly/Properties/launchSettings.json b/samples/GEmojiSharp.Sample.BlazorWebAssembly/Properties/launchSettings.json
@@ -1,19 +1,30 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:57516",
-      "sslPort": 44322
+      "applicationUrl": "http://localhost:36558",
+      "sslPort": 44320
     }
   },
   "profiles": {
-    "GEmojiSharp.Sample.BlazorWebAssembly": {
+    "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "http://localhost:5127",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:7220;http://localhost:5127",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/samples/GEmojiSharp.Sample.Web/GEmojiSharp.Sample.Web.csproj b/samples/GEmojiSharp.Sample.Web/GEmojiSharp.Sample.Web.csproj
@@ -2,14 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GEmojiSharp.AspNetCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.3.3">
+    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/samples/GEmojiSharp.Sample.Web/Pages/Error.cshtml.cs b/samples/GEmojiSharp.Sample.Web/Pages/Error.cshtml.cs
@@ -1,6 +1,6 @@
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Diagnostics;
 
 namespace GEmojiSharp.Sample.Web.Pages
 {

diff --git a/samples/GEmojiSharp.Sample.Web/Properties/launchSettings.json b/samples/GEmojiSharp.Sample.Web/Properties/launchSettings.json
@@ -1,18 +1,28 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:57240",
-      "sslPort": 44351
+      "applicationUrl": "http://localhost:43525",
+      "sslPort": 44345
     }
   },
   "profiles": {
-    "GEmojiSharp.Sample.Web": {
+    "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "http://localhost:5141",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7068;http://localhost:5141",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }