Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
role="img"
aria-label="SSL-Vision field"
@onwheel="OnFieldWheel"
@onwheel:preventDefault="true"
@onmousedown="OnFieldMouseDown"
@onmousemove="OnFieldMouseMove"
@onmouseup="OnFieldMouseUp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
role="img"
aria-label="@AriaLabel"
@onwheel="OnFieldWheel"
@onwheel:preventDefault="true"
@onmousedown="OnFieldMouseDown"
@onmousemove="OnFieldMouseMove"
@onmouseup="OnFieldMouseUp"
Expand Down
21 changes: 21 additions & 0 deletions Tracker/Tracker.Tests/VisionFieldRenderContractTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@ public void VisionFieldViewportState_AppliesDragWheelAndResetAsSingleState()
Assert.False(state.IsDragging);
}

/// <summary>
/// overlay field は split field と同じ wheel zoom / reset contract を持ち、wheel gesture を page scroll へ流さない。
/// </summary>
[Fact]
public void VisionFieldMarkup_OverlayAndSplitProvideDedicatedWheelZoom()
{
var splitMarkup = ReadRepositoryFile("Tracker/Tracker.DebugHost/Components/Vision/VisionFieldCanvas.razor");
var overlayMarkup = ReadRepositoryFile("Tracker/Tracker.DebugHost/Components/Vision/VisionFieldOverlayCanvas.razor");

AssertDedicatedWheelZoom(splitMarkup);
AssertDedicatedWheelZoom(overlayMarkup);
}

/// <summary>
/// split は split 用 component、overlay は overlay 用 component を別境界として使う。
/// </summary>
Expand Down Expand Up @@ -79,6 +92,14 @@ public void DiagnosticsFieldMarkup_IsNotGatedOnlyByRenderSnapshot()
Assert.DoesNotContain("@if (selectedRenderSnapshot is not null)", diagnosticsMarkup, StringComparison.Ordinal);
}

private static void AssertDedicatedWheelZoom(string markup)
{
Assert.Contains("@onwheel=\"OnFieldWheel\"", markup, StringComparison.Ordinal);
Assert.Contains("@onwheel:preventDefault=\"true\"", markup, StringComparison.Ordinal);
Assert.Contains("@onclick=\"ResetFieldView\"", markup, StringComparison.Ordinal);
Assert.Contains("scale({N(viewport.Zoom)})", markup, StringComparison.Ordinal);
}

private static string ExtractBetween(string text, string start, string end)
{
var startIndex = text.IndexOf(start, StringComparison.Ordinal);
Expand Down