Add dependency on Spectre.Console.Ansi

Author: patriksvensson

src/Directory.Packages.props

@@ -10,6 +10,7 @@
     <PackageVersion Include="Polyfill" Version="8.9.0" />
     <PackageVersion Include="Roslynator.Analyzers" PrivateAssets="All" Version="4.14.1" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
+    <PackageVersion Include="Spectre.Console.Ansi" Version="0.54.1-alpha.0.33" />
     <PackageVersion Include="Spectre.Verify.Extensions" Version="28.16.0" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="Verify.Xunit" Version="31.8.0" />

src/Sandbox/Program.cs

@@ -1,3 +1,5 @@
+using System.Text;
+using Spectre.Console;
 using Spectre.Tui;
 
 namespace Sandbox;
@@ -13,6 +15,7 @@ public static void Main(string[] args)
         renderer.SetTargetFps(60);
 
         Console.Title = "Spectre.Tui Sandbox";
+        Console.OutputEncoding = Encoding.Unicode;
 
         while (running)
         {
@@ -36,9 +39,10 @@ public static void Main(string[] args)
 
                 // Some text
                 ctx.Render(Text.FromMarkup(
-                    """
+                    $"""
                     नमस्ते [red]Happy Holidays[/] 🎅 Happy Holidays\n[u]Happy Holidays[/]
                     Happy Holidays [yellow bold]Happy Holidays[/] Happy Holidays Happy Holidays
+                    {ctx.Viewport.Width} x {ctx.Viewport.Height}
                     """, Color.Green),
                     inner.Inflate(-1, -1));
             });

src/Sandbox/Widgets/BoxWidget.cs

@@ -1,3 +1,4 @@
+using Spectre.Console;
 using Spectre.Tui;
 
 namespace Sandbox;

src/Sandbox/Widgets/ClearWidget.cs

@@ -1,3 +1,4 @@
+using Spectre.Console;
 using Spectre.Tui;
 
 namespace Sandbox;

src/Sandbox/Widgets/FpsWidget.cs

@@ -1,11 +1,12 @@
+using Spectre.Console;
 using Spectre.Tui;
 
 namespace Sandbox;
 
 public sealed class FpsWidget : IWidget
 {
     private readonly string _text;
-    private readonly Style _style;
+    private readonly Appearance _style;
 
     public FpsWidget(
         TimeSpan elapsed,
@@ -15,7 +16,7 @@ public FpsWidget(
         var fps = TimeSpan.FromSeconds(1) / elapsed;
 
         _text = $"[yellow]FPS:[/] {fps:0.000}";
-        _style = new Style
+        _style = new Appearance
         {
             Foreground = foreground ?? Color.Default,
             Background = background ?? Color.Default,
@@ -24,11 +25,14 @@ public FpsWidget(
 
     public void Render(RenderContext context)
     {
+        var text = Text.FromMarkup(_text, _style);
+        var width = text.GetWidth();
+
         context.Render(
-            Text.FromMarkup(_text, _style),
+            text,
             new Rectangle(
-                (context.Viewport.Width - _text.Length) / 2,
+                (context.Viewport.Width - width) / 2,
                 context.Viewport.Height / 2,
-                _text.Length, 1));
+                width, 1));
     }
 }

src/Spectre.Tui.Testing/AnsiTestTerminal.cs

@@ -1,3 +1,4 @@
+using Spectre.Console;
 using Spectre.Tui.Ansi;
 
 namespace Spectre.Tui.Testing;
@@ -6,11 +7,18 @@ public sealed class AnsiTestTerminal : AnsiTerminal, ITestTerminal
 {
     private readonly Size _size;
 
-
     public string Output { get; private set; } = "[Terminal buffer not flushed]";
 
-    public AnsiTestTerminal(ColorSystem colors, Size? size = null)
-        : base(colors)
+    public AnsiTestTerminal(
+        ColorSystem colors = ColorSystem.TrueColor,
+        Size? size = null)
+            : base(new AnsiCapabilities
+            {
+                Ansi = true,
+                ColorSystem = colors,
+                Links = true,
+                AlternateBuffer = true,
+            })
     {
         _size = size ?? new Size(80, 25);
     }

src/Spectre.Tui.Testing/TuiFixture.cs

@@ -19,21 +19,13 @@ public TuiFixture(ITestTerminal terminal)
 
     public string Render(IWidget widget)
     {
-        _renderer.Draw((frame, _) =>
-        {
-            frame.Render(widget);
-        });
-
+        _renderer.Draw((frame, _) => frame.Render(widget));
         return _terminal.Output;
     }
 
     public string Render(Action<RenderContext> action)
     {
-        _renderer.Draw((frame, _) =>
-        {
-            action(frame);
-        });
-
+        _renderer.Draw((frame, _) => action(frame));
         return _terminal.Output;
     }
 }

src/Spectre.Tui.Tests/CellTests.cs

@@ -1,3 +1,5 @@
+using Spectre.Console;
+
 namespace Spectre.Tui.Tests;
 
 public sealed class CellTests

src/Spectre.Tui.Tests/Text/TextLineTests.cs

@@ -1,3 +1,5 @@
+using Spectre.Console;
+
 namespace Spectre.Tui.Tests;
 
 public sealed class TextLineTests
@@ -22,7 +24,7 @@ public void Should_Set_Style()
             var line = TextLine.FromString("Hello\nWorld", Color.Red);
 
             // Then
-            line.Style.ShouldBe(new Style
+            line.Style.ShouldBe(new Appearance
             {
                 Foreground = Color.Red,
             });

src/Spectre.Tui.Tests/Text/TextSpanTests.cs

@@ -1,3 +1,5 @@
+using Spectre.Console;
+
 namespace Spectre.Tui.Tests;
 
 public sealed class TextSpanTests
@@ -21,7 +23,7 @@ public void Should_Set_Style()
             var span = new TextSpan("Hello World", Color.Red);
 
             // Then
-            span.Style.ShouldBe(new Style
+            span.Style.ShouldBe(new Appearance
             {
                 Foreground = Color.Red
             });