Skip to content

Commit 40f1b67

Browse files
NeoCoderMatrix86NeoCoderMatrix86
committed
fix browser issues
1 parent 8130f2a commit 40f1b67

8 files changed

Lines changed: 21 additions & 27 deletions

File tree

‎AudioCuesheetEditor.End2EndTests/Models/AppBar.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,23 @@
1818

1919
namespace AudioCuesheetEditor.End2EndTests.Models
2020
{
21-
partial class AppBar
21+
partial class AppBar(IPage page)
2222
{
2323
[GeneratedRegex("^Open$")]
2424
private static partial Regex OpenRegex();
2525

26-
private readonly IPage _page;
27-
private readonly ILocator _menuButton;
26+
private readonly IPage _page = page;
27+
internal ILocator MenuButton => _page.GetByRole(AriaRole.Toolbar).GetByRole(AriaRole.Button, new() { Name = "More" });
2828

2929
internal ILocator UndoButton => _page.GetByRole(AriaRole.Button, new() { Name = "undo" });
3030

3131
internal ILocator RedoButton => _page.GetByRole(AriaRole.Button, new() { Name = "redo" });
3232

3333
internal ILocator HomeButton => _page.Locator(".mud-button-root").First;
3434

35-
internal AppBar(IPage page)
36-
{
37-
_page = page;
38-
_menuButton = _page.GetByRole(AriaRole.Button, new() { Name = "More" });
39-
}
40-
4135
internal async Task OpenSettingsAsync()
4236
{
43-
await _menuButton.ClickAsync();
37+
await MenuButton.ClickAsync();
4438
await _page.GetByText("Settings").ClickAsync();
4539
}
4640

@@ -83,7 +77,7 @@ internal async Task OpenExportDialogAsync(string exportType, string fileMenuName
8377

8478
internal async Task OpenDisplayHotkeysAsync()
8579
{
86-
await _page.GetByRole(AriaRole.Button, new() { Name = "More" }).ClickAsync();
80+
await MenuButton.ClickAsync();
8781
await _page.GetByText("Hotkeys").ClickAsync();
8882
}
8983
}

‎AudioCuesheetEditor.End2EndTests/Tests/Desktop/ExportTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8383
await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
8484
await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
8585
await bar.OpenExportDialogAsync("Textfile");
86-
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
86+
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
8787
var downloadTask = TestPage.WaitForDownloadAsync();
8888
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
8989
var download = await downloadTask;

‎AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ExportTestSmartphone.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8383
await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
8484
await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
8585
await bar.OpenExportDialogAsync("Textfile");
86-
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
86+
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
8787
var downloadTask = TestPage.WaitForDownloadAsync();
8888
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
8989
var download = await downloadTask;

‎AudioCuesheetEditor/Shared/AppBar.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ along with Foobar. If not, see
2727
@inject ImportManager _importManager
2828

2929
<MudAppBar Elevation="1" Color="Color.Dark" Fixed>
30-
<MudButton StartIcon="@Icons.Material.Outlined.Home" Color="Color.Inherit" OnClick="() => _navigationManager.NavigateTo(_navigationManager.BaseUri)">
30+
<MudButton StartIcon="@Icons.Material.Outlined.Home" Color="Color.Inherit" OnClick="() => _navigationManager.NavigateTo(_navigationManager.BaseUri)" aria-label="Home">
3131
<MudHidden Breakpoint="Breakpoint.Xs">
3232
<MudText Typo="Typo.h6">AudioCuesheetEditor</MudText>
3333
</MudHidden>

‎AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ along with Foobar. If not, see
3838
{
3939
<MudText>@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
4040
}
41-
<MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.PlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel>
41+
<MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.PlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel aria-label="Playback slider">
4242
<ValueLabelContent>
4343
@GetSliderTimeValue()
4444
</ValueLabelContent>
@@ -54,17 +54,17 @@ along with Foobar. If not, see
5454
</MudStack>
5555
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center">
5656
<MudTooltip Text="@_localizer["Play or pause the current audio"]">
57-
<MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.PlaybackPossible" OnClick="OnPlayOrPauseClicked" />
57+
<MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.PlaybackPossible" OnClick="OnPlayOrPauseClicked" aria-label="Play" />
5858
</MudTooltip>
5959
<MudButtonGroup OverrideStyles="false">
6060
<MudTooltip Text="@_localizer["Jump to previous track"]">
61-
<MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.PreviousPossible" OnClick="PlayPreviousTrackAsync" />
61+
<MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.PreviousPossible" OnClick="PlayPreviousTrackAsync" aria-label="@_localizer["Jump to previous track"]" />
6262
</MudTooltip>
6363
<MudTooltip Text="@_localizer["Stop the current playback"]">
64-
<MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.PlaybackPossible" />
64+
<MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.PlaybackPossible" aria-label="@_localizer["Stop the current playback"]" />
6565
</MudTooltip>
6666
<MudTooltip Text="@_localizer["Jump to next track"]">
67-
<MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.NextPossible" OnClick="PlayNextTrackAsync" />
67+
<MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.NextPossible" OnClick="PlayNextTrackAsync" aria-label="@_localizer["Jump to next track"]" />
6868
</MudTooltip>
6969
</MudButtonGroup>
7070
</MudStack>

‎AudioCuesheetEditor/Shared/Cuesheet/EditSections.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ along with Foobar. If not, see
2626

2727
<MudButtonGroup OverrideStyles="false">
2828
<MudTooltip Text="@_localizer["Add new section"]">
29-
<MudIconButton Color="Color.Primary" Variant="Variant.Filled" OnClick="AddSectionClicked" Icon="@Icons.Material.Outlined.Add" />
29+
<MudIconButton Color="Color.Primary" Variant="Variant.Filled" OnClick="AddSectionClicked" Icon="@Icons.Material.Outlined.Add" aria-label="@_localizer["Add new section"]" />
3030
</MudTooltip>
3131
<MudTooltip Text="@_localizer["Delete selected sections"]">
3232
<MudHidden Breakpoint="Breakpoint.LgAndUp" Invert>

‎AudioCuesheetEditor/Shared/Dialogs/ConfirmationDialog.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ along with Foobar. If not, see
2424
<MudText>@ConfirmText</MudText>
2525
</DialogContent>
2626
<DialogActions>
27-
<MudButton Color="Color.Success" Variant="Variant.Filled" OnClick="() => MudDialog?.Close()">@_localizer["Yes"]</MudButton>
28-
<MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="() => MudDialog?.Cancel()">@_localizer["No"]</MudButton>
27+
<MudButton Color="Color.Success" Variant="Variant.Filled" OnClick="() => MudDialog?.Close()" aria-label="@_localizer["Yes"]">@_localizer["Yes"]</MudButton>
28+
<MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="() => MudDialog?.Cancel()" aria-label="@_localizer["No"]">@_localizer["No"]</MudButton>
2929
</DialogActions>
3030
</MudDialog>
3131

‎AudioCuesheetEditor/Shared/Inputs/FileInput.razor‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ along with Foobar. If not, see
2121

2222
<MudStack Row StretchItems="StretchItems.Start">
2323
<MudFileUpload identifier="@Id" T="IBrowserFile" @ref="fileUpload" Files="selectedFile" FilesChanged="SetSelectedFileAsync" Hidden="false" InputStyle="opacity:0" InputClass="absolute mud-width-full mud-height-full overflow-hidden z-10"
24-
Accept="@Filter">
24+
Accept="@Filter" aria-label="Upload file">
2525
<ActivatorContent>
2626
<MudTextField Value="TextFieldValue" Label="@Label" ReadOnly Variant="Variant.Outlined" FullWidth Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Outlined.AttachFile" />
2727
</ActivatorContent>
2828
</MudFileUpload>
2929
<MudHidden Breakpoint="Breakpoint.Xs">
30-
<MudButton Variant="Variant.Filled" Color="Color.Primary" Class="mt-2" Style="height: 56px;" StartIcon="@Icons.Material.Outlined.Search" OnClick="PickFilesClickedAsync">@_localizer["Search"]</MudButton>
30+
<MudButton Variant="Variant.Filled" Color="Color.Primary" Class="mt-2" Style="height: 56px;" StartIcon="@Icons.Material.Outlined.Search" OnClick="PickFilesClickedAsync" aria-label="@_localizer["Search"]">@_localizer["Search"]</MudButton>
3131
</MudHidden>
32-
<MudIconButton Variant="Variant.Filled" Color="Color.Error" Class="mt-2" Style="height: 56px;" Icon="@Icons.Material.Outlined.Clear" OnClick="ClearClickedAsync" Disabled="String.IsNullOrEmpty(FileName)" />
32+
<MudIconButton Variant="Variant.Filled" Color="Color.Error" Class="mt-2" Style="height: 56px;" Icon="@Icons.Material.Outlined.Clear" OnClick="ClearClickedAsync" Disabled="String.IsNullOrEmpty(FileName)" aria-label="Clear file" />
3333
@if (DisplayMenu)
3434
{
35-
<MudMenu Icon="@Icons.Material.Outlined.MoreVert" Color="Color.Inherit" Class="mt-1" Style="height: 56px;" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight" Variant="Variant.Filled">
36-
<MudMenuItem Icon="@Icons.Material.Outlined.EditAttributes" Disabled="FileRenameDisabled" OnClick="() => OnFileRenameClicked.InvokeAsync(selectedFile)">@_localizer["Rename file"]</MudMenuItem>
35+
<MudMenu Icon="@Icons.Material.Outlined.MoreVert" Color="Color.Inherit" Class="mt-1" Style="height: 56px;" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight" Variant="Variant.Filled" AriaLabel="More">
36+
<MudMenuItem Icon="@Icons.Material.Outlined.EditAttributes" Disabled="FileRenameDisabled" OnClick="() => OnFileRenameClicked.InvokeAsync(selectedFile)" aria-label="@_localizer["Rename file"]">@_localizer["Rename file"]</MudMenuItem>
3737
</MudMenu>
3838
}
3939
</MudStack>

0 commit comments

Comments
 (0)