From f1e7f68647b341e51d17b7d2778258738a32b451 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 19:17:26 +0000 Subject: [PATCH 1/5] Initial plan From 61b659a8d48c15b2b89aa8b0961bbe7a64102748 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 19:27:26 +0000 Subject: [PATCH 2/5] Update webapp to mirror MAUI app features and structure Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com> --- .../Components/Controls/CounterView.razor | 54 +++++++++++++++++++ .../Components/Pages/Home.razor | 41 ++++++-------- .../Components/_Imports.razor | 3 ++ .../DeviceTestingKitApp.WebApp.csproj | 4 ++ .../Features/BlazorSemanticAnnouncer.cs | 31 +++++++++++ .../src/DeviceTestingKitApp.WebApp/Program.cs | 10 ++++ 6 files changed, 117 insertions(+), 26 deletions(-) create mode 100644 sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor create mode 100644 sample/src/DeviceTestingKitApp.WebApp/Features/BlazorSemanticAnnouncer.cs diff --git a/sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor b/sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor new file mode 100644 index 00000000..d03392a4 --- /dev/null +++ b/sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor @@ -0,0 +1,54 @@ +@using DeviceTestingKitApp.ViewModels +@implements IDisposable + + + +@code { + [Parameter] public CounterViewModel? ViewModel { get; set; } + + protected override void OnParametersSet() + { + if (ViewModel != null) + { + ViewModel.PropertyChanged += OnViewModelPropertyChanged; + } + } + + private void OnViewModelPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e) + { + if (e.PropertyName == nameof(CounterViewModel.Count)) + { + InvokeAsync(StateHasChanged); + } + } + + private void HandleIncrement() + { + ViewModel?.IncrementCommand.Execute(null); + } + + private string GetCounterText() + { + if (ViewModel == null) return "Click me!"; + + return ViewModel.Count switch + { + 0 => "Click me!", + 1 => $"Clicked {ViewModel.Count} time", + _ => $"Clicked {ViewModel.Count} times" + }; + } + + public void Dispose() + { + if (ViewModel != null) + { + ViewModel.PropertyChanged -= OnViewModelPropertyChanged; + } + } +} \ No newline at end of file diff --git a/sample/src/DeviceTestingKitApp.WebApp/Components/Pages/Home.razor b/sample/src/DeviceTestingKitApp.WebApp/Components/Pages/Home.razor index be076708..eaf61041 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/Components/Pages/Home.razor +++ b/sample/src/DeviceTestingKitApp.WebApp/Components/Pages/Home.razor @@ -1,34 +1,23 @@ @page "/" @rendermode InteractiveServer +@inject MainViewModel MainViewModel -Home +DeviceTestingKitApp -

Home

+
+
+ + dot net bot in a race car number eight -dot net bot in a race car number eight +

Hello, World!

-

Hello, World

+

+ Welcome to
.NET Multi-platform App UI +

-

Welcome to
.NET Blazor

+ - - -@code { - private int currentCount = 0; - private string message = "Click me!"; - - private void IncrementCount() - { - currentCount++; - message = currentCount switch - { - 0 => "Click me!", - 1 => $"Clicked {currentCount} time", - _ => $"Clicked {currentCount} times" - }; - } -} +
+
diff --git a/sample/src/DeviceTestingKitApp.WebApp/Components/_Imports.razor b/sample/src/DeviceTestingKitApp.WebApp/Components/_Imports.razor index 9ef27147..3348f6b6 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/Components/_Imports.razor +++ b/sample/src/DeviceTestingKitApp.WebApp/Components/_Imports.razor @@ -8,3 +8,6 @@ @using Microsoft.JSInterop @using DeviceTestingKitApp.WebApp @using DeviceTestingKitApp.WebApp.Components +@using DeviceTestingKitApp.WebApp.Components.Controls +@using DeviceTestingKitApp.ViewModels +@using DeviceTestingKitApp.Features diff --git a/sample/src/DeviceTestingKitApp.WebApp/DeviceTestingKitApp.WebApp.csproj b/sample/src/DeviceTestingKitApp.WebApp/DeviceTestingKitApp.WebApp.csproj index 6568b3dc..b1097937 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/DeviceTestingKitApp.WebApp.csproj +++ b/sample/src/DeviceTestingKitApp.WebApp/DeviceTestingKitApp.WebApp.csproj @@ -6,4 +6,8 @@ enable + + + + diff --git a/sample/src/DeviceTestingKitApp.WebApp/Features/BlazorSemanticAnnouncer.cs b/sample/src/DeviceTestingKitApp.WebApp/Features/BlazorSemanticAnnouncer.cs new file mode 100644 index 00000000..05c47da6 --- /dev/null +++ b/sample/src/DeviceTestingKitApp.WebApp/Features/BlazorSemanticAnnouncer.cs @@ -0,0 +1,31 @@ +using DeviceTestingKitApp.Features; +using Microsoft.JSInterop; + +namespace DeviceTestingKitApp.WebApp.Features; + +public class BlazorSemanticAnnouncer : ISemanticAnnouncer +{ + private readonly IJSRuntime _jsRuntime; + + public BlazorSemanticAnnouncer(IJSRuntime jsRuntime) + { + _jsRuntime = jsRuntime; + } + + public void Announce(string message) + { + // In a web context, we can use ARIA live regions or console for accessibility + // For simplicity, we'll use console.log, but in a real app you might want to use ARIA live regions + _ = Task.Run(async () => + { + try + { + await _jsRuntime.InvokeVoidAsync("console.log", $"Accessibility announcement: {message}"); + } + catch + { + // Ignore JS interop errors in case JS is not available + } + }); + } +} \ No newline at end of file diff --git a/sample/src/DeviceTestingKitApp.WebApp/Program.cs b/sample/src/DeviceTestingKitApp.WebApp/Program.cs index 05818f3c..4535c823 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/Program.cs +++ b/sample/src/DeviceTestingKitApp.WebApp/Program.cs @@ -1,4 +1,7 @@ using DeviceTestingKitApp.WebApp.Components; +using DeviceTestingKitApp.WebApp.Features; +using DeviceTestingKitApp.Features; +using DeviceTestingKitApp.ViewModels; var builder = WebApplication.CreateBuilder(args); @@ -6,6 +9,13 @@ builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); +// Register view models from the library project (same as MAUI app) +builder.Services.AddTransient(); +builder.Services.AddTransient(); + +// Register Blazor-specific semantic announcer +builder.Services.AddTransient(); + var app = builder.Build(); // Configure the HTTP request pipeline. From 96f4a3c34634f9c68817cd4fee33b8888f0e0048 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:04:26 +0000 Subject: [PATCH 3/5] Create BlazorLibrary to mirror MAUI library structure Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com> --- DeviceRunners.sln | 7 ++++++ Directory.Packages.props | 2 ++ .../Controls/CounterView.razor | 10 +++----- .../Converters/CounterTextConverter.cs | 14 +++++++++++ .../DeviceTestingKitApp.BlazorLibrary.csproj | 23 +++++++++++++++++++ .../Features/BlazorSemanticAnnouncer.cs | 2 +- .../_Imports.razor | 1 + .../Components/_Imports.razor | 2 +- .../DeviceTestingKitApp.WebApp.csproj | 1 + .../src/DeviceTestingKitApp.WebApp/Program.cs | 1 - 10 files changed, 53 insertions(+), 10 deletions(-) rename sample/src/{DeviceTestingKitApp.WebApp/Components => DeviceTestingKitApp.BlazorLibrary}/Controls/CounterView.razor (81%) create mode 100644 sample/src/DeviceTestingKitApp.BlazorLibrary/Converters/CounterTextConverter.cs create mode 100644 sample/src/DeviceTestingKitApp.BlazorLibrary/DeviceTestingKitApp.BlazorLibrary.csproj rename sample/src/{DeviceTestingKitApp.WebApp => DeviceTestingKitApp.BlazorLibrary}/Features/BlazorSemanticAnnouncer.cs (93%) create mode 100644 sample/src/DeviceTestingKitApp.BlazorLibrary/_Imports.razor diff --git a/DeviceRunners.sln b/DeviceRunners.sln index 6f5fb8a8..ec369104 100644 --- a/DeviceRunners.sln +++ b/DeviceRunners.sln @@ -53,6 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EE37724C-5 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeviceTestingKitApp.WebApp", "sample\src\DeviceTestingKitApp.WebApp\DeviceTestingKitApp.WebApp.csproj", "{2A387F0F-3DBE-4A6C-BEB5-60CA6CE6F4B4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeviceTestingKitApp.BlazorLibrary", "sample\src\DeviceTestingKitApp.BlazorLibrary\DeviceTestingKitApp.BlazorLibrary.csproj", "{8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceRunners.Cli", "src\DeviceRunners.Cli\DeviceRunners.Cli.csproj", "{E0CEF24B-9991-4BE0-8FD6-4BC464A8D59B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceRunners.Cli.Tests", "test\DeviceRunners.Cli.Tests\DeviceRunners.Cli.Tests.csproj", "{CADA0B60-3175-4471-814F-635D701BBD44}" @@ -147,6 +149,10 @@ Global {2A387F0F-3DBE-4A6C-BEB5-60CA6CE6F4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A387F0F-3DBE-4A6C-BEB5-60CA6CE6F4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU {2A387F0F-3DBE-4A6C-BEB5-60CA6CE6F4B4}.Release|Any CPU.Build.0 = Release|Any CPU + {8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F}.Release|Any CPU.Build.0 = Release|Any CPU {E0CEF24B-9991-4BE0-8FD6-4BC464A8D59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0CEF24B-9991-4BE0-8FD6-4BC464A8D59B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0CEF24B-9991-4BE0-8FD6-4BC464A8D59B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -182,6 +188,7 @@ Global {7FD9E644-B760-47D7-A4FC-61199AFE9D62} = {46348E44-C1A8-4923-B3E9-7B9217BA5792} {EE37724C-5FEF-46BB-AD80-CD002CC7FF54} = {46348E44-C1A8-4923-B3E9-7B9217BA5792} {2A387F0F-3DBE-4A6C-BEB5-60CA6CE6F4B4} = {7FD9E644-B760-47D7-A4FC-61199AFE9D62} + {8C3A7E82-0F4D-4B9C-A5E6-1A2B3C4D5E6F} = {7FD9E644-B760-47D7-A4FC-61199AFE9D62} {E0CEF24B-9991-4BE0-8FD6-4BC464A8D59B} = {DBF1C119-C96C-4DD3-810B-52451603475C} {CADA0B60-3175-4471-814F-635D701BBD44} = {5073EAFD-FF7B-4C4E-84D2-3AA38A91DE73} EndGlobalSection diff --git a/Directory.Packages.props b/Directory.Packages.props index 72cb661f..ce1b43c0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,6 +3,8 @@ + + diff --git a/sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor b/sample/src/DeviceTestingKitApp.BlazorLibrary/Controls/CounterView.razor similarity index 81% rename from sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor rename to sample/src/DeviceTestingKitApp.BlazorLibrary/Controls/CounterView.razor index d03392a4..a5f082ff 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/Components/Controls/CounterView.razor +++ b/sample/src/DeviceTestingKitApp.BlazorLibrary/Controls/CounterView.razor @@ -1,4 +1,5 @@ @using DeviceTestingKitApp.ViewModels +@using DeviceTestingKitApp.Converters @implements IDisposable @code { @@ -33,13 +33,6 @@ ViewModel?.IncrementCommand.Execute(null); } - private string GetCounterText() - { - if (ViewModel == null) return CounterTextConverter.ConvertCountToText(0); - - return CounterTextConverter.ConvertCountToText(ViewModel.Count); - } - public void Dispose() { if (ViewModel != null) diff --git a/sample/src/DeviceTestingKitApp.BlazorLibrary/Features/BlazorSemanticAnnouncer.cs b/sample/src/DeviceTestingKitApp.BlazorLibrary/Features/BlazorSemanticAnnouncer.cs index 3d25f633..06eea635 100644 --- a/sample/src/DeviceTestingKitApp.BlazorLibrary/Features/BlazorSemanticAnnouncer.cs +++ b/sample/src/DeviceTestingKitApp.BlazorLibrary/Features/BlazorSemanticAnnouncer.cs @@ -3,9 +3,10 @@ namespace DeviceTestingKitApp.Features; -public class BlazorSemanticAnnouncer : ISemanticAnnouncer +public class BlazorSemanticAnnouncer : ISemanticAnnouncer, IAsyncDisposable { private readonly IJSRuntime _jsRuntime; + private IJSObjectReference? _module; public BlazorSemanticAnnouncer(IJSRuntime jsRuntime) { @@ -19,7 +20,11 @@ public void Announce(string message) { try { - await _jsRuntime.InvokeVoidAsync("announceToScreenReader", message); + await EnsureModuleLoadedAsync(); + if (_module != null) + { + await _module.InvokeVoidAsync("announceToScreenReader", message); + } } catch { @@ -27,4 +32,20 @@ public void Announce(string message) } }); } + + private async Task EnsureModuleLoadedAsync() + { + if (_module == null) + { + _module = await _jsRuntime.InvokeAsync("import", "./_content/DeviceTestingKitApp.BlazorLibrary/js/accessibility.js"); + } + } + + public async ValueTask DisposeAsync() + { + if (_module != null) + { + await _module.DisposeAsync(); + } + } } \ No newline at end of file diff --git a/sample/src/DeviceTestingKitApp.WebApp/wwwroot/js/accessibility.js b/sample/src/DeviceTestingKitApp.BlazorLibrary/wwwroot/js/accessibility.js similarity index 89% rename from sample/src/DeviceTestingKitApp.WebApp/wwwroot/js/accessibility.js rename to sample/src/DeviceTestingKitApp.BlazorLibrary/wwwroot/js/accessibility.js index 10f5f923..7f77fe96 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/wwwroot/js/accessibility.js +++ b/sample/src/DeviceTestingKitApp.BlazorLibrary/wwwroot/js/accessibility.js @@ -1,6 +1,6 @@ -// Accessibility support functions +// Accessibility support functions module -window.announceToScreenReader = function (message) { +export function announceToScreenReader(message) { // Create or get the live region element let liveRegion = document.getElementById('sr-live-region'); if (!liveRegion) { @@ -21,4 +21,4 @@ window.announceToScreenReader = function (message) { setTimeout(() => { liveRegion.textContent = message; }, 100); -}; \ No newline at end of file +} \ No newline at end of file diff --git a/sample/src/DeviceTestingKitApp.WebApp/Components/App.razor b/sample/src/DeviceTestingKitApp.WebApp/Components/App.razor index 778b91f6..5482ad98 100644 --- a/sample/src/DeviceTestingKitApp.WebApp/Components/App.razor +++ b/sample/src/DeviceTestingKitApp.WebApp/Components/App.razor @@ -16,7 +16,6 @@ -