- @foreach (var line in Lines)
+ @for (var lineIndex = 0; lineIndex < Lines.Count; lineIndex++)
{
+ var spans = SpansOf(Lines[lineIndex]);
@code {
+ // A line's spans depend only on the line (the display options are fixed), so each line is folded once
+ // rather than on every render of the scrollback.
+ private static readonly ConditionalWeakTable
- @foreach (var segment in line.Segments)
+ @for (var spanIndex = 0; spanIndex < spans.Count; spanIndex++)
{
- @if (segment.ImageUrl is not null && ShowImages)
+ var span = spans[spanIndex];
+ if (span.Point is not null)
{
- @* no-referrer: the image host learns nothing about where it was shown. *@
- @if (segment.Command is not null && OnSendCommand is not null)
+ // Bells, clears and the like: nothing to draw.
+ continue;
+ }
+
+ var style = span.Style;
+ var interaction = style.Interaction;
+ var command = interaction is { Kind: InteractionKind.Command } && OnSendCommand is not null ? interaction : null;
+ var url = interaction is { Kind: InteractionKind.Url } ? interaction : null;
+ var text = span.Text;
+
+ if (style.Picture is { } picture)
+ {
+ var src = ImageSource.Resolve(picture.Source);
+ if (src is null || picture.Row is { Row: > 0 })
{
-
+ // A source the client may not load shows nothing; a picture sized in cells is drawn
+ // once, on its first row.
+ continue;
}
- else
+
+ text = picture.Description ?? ImageSource.DisplayName(picture.Source);
+ if (ShowImages)
{
- 
+ @* no-referrer: the image host learns nothing about where it was shown. *@
+ if (command is not null)
+ {
+
+ }
+ else if (url is not null)
+ {
+ 
+ }
+ else
+ {
+
+ }
+
+ continue;
}
}
- else if (segment.Command is not null && OnSendCommand is not null)
+
+ var css = CssOf(style);
+ var classes = SpanRenderer.CssClasses(style);
+ if (command is not null)
+ {
+ var key = (lineIndex, spanIndex);
+
+ if (command.Choices is { Count: > 1 } choices)
+ {
+
+ }
+ }
+ else if (url is not null)
+ {
+ @text
+ }
+ else if (css.Length == 0 && classes.Length == 0)
{
-
+ @text
}
else
{
- @(segment.Text.Length == 0 ? " " : segment.Text)
+ @text
}
}
@@ -37,14 +104,45 @@
![](\"https://h.example/y.png\")
", new MxpParserState());
-
- await Assert.That(segments.Any(s => s.ImageUrl is not null)).IsFalse();
- }
-
- [Test]
- public async Task PuebloImgUsesSrcAndAlt()
- {
- var segments = AnsiParser.Parse("Look: ![\"a](\"https://h.example/cat.gif\")
!", Pueblo());
-
- await Assert.That(segments.Count).IsEqualTo(3);
- await Assert.That(segments[1].ImageUrl).IsEqualTo("https://h.example/cat.gif");
- await Assert.That(segments[1].Text).IsEqualTo("a cat");
- await Assert.That(segments[2].Text).IsEqualTo("!");
- }
-
- [Test]
- public async Task PuebloModeSwitchImgIsNotAPicture()
- {
- var segments = AnsiParser.Parse("two"); + + await Assert.That(lines.Select(l => l.Text)).IsEquivalentTo(["one", "two"]); + } + + [Test] + public async Task MxpImageOnSecureLineIsAPicture() + { + var spans = Mxp("\e[1z
");
+
+ await Assert.That(spans.Any(s => s.Style.Picture is not null)).IsFalse();
+ }
+
+ [Test]
+ public async Task CustomElementsExpand()
+ {
+ var decoder = new OutputDecoder();
+ decoder.EnableMxp();
+ decoder.Decode("\e[1z!");
+
+ await Assert.That(spans.Count).IsEqualTo(3);
+ await Assert.That(spans[1].Style.Picture!.Source).IsEqualTo("https://h.example/cat.gif");
+ await Assert.That(spans[1].Style.Picture!.Description).IsEqualTo("a cat");
+ await Assert.That(spans[2].Text).IsEqualTo("!");
+ }
+
+ [Test]
+ public async Task PuebloModeSwitchesAndPageClearShowNothing()
+ {
+ var spans = Pueblo(""); + + await Assert.That(lines.Select(l => l.Text)).IsEquivalentTo(["Hello"]); + } + + [Test] + public async Task ResetForgetsProtocolsAndStyle() + { + var decoder = new OutputDecoder(); + decoder.EnableMxp(); + decoder.Decode("\e[31m\e[6z"); + decoder.Reset(); + + var spans = Render(decoder, "
")));
var img = cut.Find("img.sc-image");
await Assert.That(img.GetAttribute("src")).IsEqualTo("https://h.example/cat.gif");
await Assert.That(img.GetAttribute("alt")).IsEqualTo("a cat");
+ await Assert.That(img.GetAttribute("width")).IsEqualTo("40");
await Assert.That(img.GetAttribute("referrerpolicy")).IsEqualTo("no-referrer");
await Assert.That(cut.FindAll("button").Count).IsEqualTo(0);
}
+ [Test]
+ public async Task MxpImageIsNamedAfterItsFile()
+ {
+ using var ctx = new BunitContext();
+ var cut = ctx.Render"))
.Add(c => c.ShowImages, false));
await Assert.That(cut.FindAll("img").Count).IsEqualTo(0);
await Assert.That(cut.Markup).Contains("a cat");
}
+
+ [Test]
+ [Arguments("javascript:alert(1)")]
+ [Arguments("file:///etc/passwd")]
+ [Arguments("/local/path.png")]
+ public async Task RefusedImageSourceShowsNothing(string src)
+ {
+ using var ctx = new BunitContext();
+ var cut = ctx.Render