Add Blazor support to Consolonia.

.github/workflows/editorconfig.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Restore
         run: dotnet restore

.github/workflows/general_build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

.gitignore

@@ -766,3 +766,4 @@ fabric.properties
 .idea/
 *.sln.iml
 
+/src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json

Directory.Build.props

@@ -1,11 +1,11 @@
 <Project>
     <PropertyGroup>
         <!--todo: add mono-->
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>disable</Nullable>
     </PropertyGroup>
     <PropertyGroup>
-        <VersionPrefix>11.0.9</VersionPrefix>
+        <VersionPrefix>11.2.1</VersionPrefix>
         <Authors>https://github.com/jinek/Consolonia/graphs/contributors</Authors>
         <Description>Text User Interface implementation of Avalonia UI (GUI Framework)</Description>
         <Copyright>Copyright © Evgeny Gorbovoy 2021 - 2022</Copyright>

src/Consolonia.Blazor/BuilderExtensions.cs

@@ -0,0 +1,54 @@
+using System;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using BlazorBindingsAvalonia;
+using Consolonia.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Consolonia.Blazor
+{
+    public static class BuilderExtensions
+    {
+        /// <summary>
+        ///     Use Consolonize in Blazor mode
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="configureServices"></param>
+        /// <returns></returns>
+        public static AppBuilder UseConsoloniaBlazor(this AppBuilder builder,
+            Action<IServiceCollection> configureServices = null)
+        {
+            return builder
+                .UseConsolonia()
+                .UseAvaloniaBlazorBindings(sc =>
+                {
+                    // Register services for injectoin
+                    sc.AddSingleton(_ =>
+                    {
+                        var lifetime =
+                            (IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime;
+                        ArgumentNullException.ThrowIfNull(lifetime);
+                        return lifetime;
+                    });
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.StorageProvider);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.Clipboard);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.InsetsManager);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.InputPane);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.Launcher);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.Screens);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.FocusManager);
+                    sc.AddTransient(sp =>
+                        sp.GetRequiredService<IClassicDesktopStyleApplicationLifetime>().MainWindow?.PlatformSettings);
+
+                    if (configureServices != null) configureServices(sc);
+                });
+        }
+    }
+}

src/Consolonia.Blazor/Consolonia.Blazor.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+    <ItemGroup>
+        <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="BlazorBindingsAvalonia" Version="0.1.2" />
+    </ItemGroup>
+</Project>

src/Consolonia.Blazor/ConsoloniaBlazorApplication.cs

@@ -0,0 +1,32 @@
+using Avalonia;
+using Avalonia.Input;
+using BlazorBindingsAvalonia;
+using Consolonia.Core.Helpers;
+using Consolonia.Core.Infrastructure;
+using Microsoft.AspNetCore.Components;
+
+namespace Consolonia.Blazor
+{
+    /// <summary>
+    ///     Use this application as your app base class to use Consolonia.Blazor Blazor engine.
+    /// </summary>
+    /// <typeparam name="TComponent">The root window for the application.</typeparam>
+    public class ConsoloniaBlazorApplication<TComponent> : BlazorBindingsApplication<TComponent>
+        where TComponent : IComponent
+    {
+        public override void RegisterServices()
+        {
+            base.RegisterServices();
+
+            AvaloniaLocator.CurrentMutable.Bind<IKeyboardNavigationHandler>()
+                .ToTransient<ArrowsAndKeyboardNavigationHandler>();
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            base.OnFrameworkInitializationCompleted();
+
+            this.AddConsoloniaDesignMode();
+        }
+    }
+}

src/Consolonia.Core/Helpers/Extensions.cs

@@ -2,7 +2,11 @@
 using System.Collections.Generic;
 using System.Text;
 using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Media;
 using Avalonia.Reactive;
+using Avalonia.Styling;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
 using Consolonia.Core.Infrastructure;
 using NeoSmart.Unicode;
@@ -19,6 +23,46 @@ public static void SubscribeAction<TValue>(
             observable.Subscribe(new AnonymousObserver<AvaloniaPropertyChangedEventArgs<TValue>>(action));
         }
 
+        public static void AddConsoloniaDesignMode(this Application application)
+        {
+            if (Design.IsDesignMode)
+            {
+                // For previewing in Visual Studio designer without Design.PreviewWith tag we need to set default font and colors
+                // get anything to render. This is not perfect, but nicer than getting a big error screen.
+                IBrush foregroundBrush = Brushes.White;
+                if (application.Styles.TryGetResource("ThemeForegroundBrush", null, out object brush))
+                    foregroundBrush = (IBrush)brush;
+
+                IBrush backgroundBrush = Brushes.Black;
+                if (application.Styles.TryGetResource("ThemeBackgroundBrush", null, out brush))
+                    backgroundBrush = (IBrush)brush;
+
+                application.Styles.Add(new Style(x => x.Is<TemplatedControl>())
+                {
+                    Setters =
+                    {
+                        new Setter(TemplatedControl.FontSizeProperty, 16.0),
+                        new Setter(TemplatedControl.FontFamilyProperty, new FontFamily("Cascadia Mono")),
+                        new Setter(TemplatedControl.ForegroundProperty, foregroundBrush),
+                        new Setter(TemplatedControl.BackgroundProperty, backgroundBrush)
+                    }
+                });
+
+                // EXPERIMENTAL
+                // If you do RenderTRansform="scale(10.0,10.0) you can actually sort of see the UI get bigger
+                // but this doesn' seem to work when using these style setters. <sigh>
+                //this.Styles.Add(new Style(x => x.Is<Visual>())
+                //{
+                //    Setters =
+                //    {
+                //        //new Setter(Visual.RenderTransformOriginProperty, RelativePoint.TopLeft),
+                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
+                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
+                //    }
+                //});
+            }
+        }
+
         public static void Print(this IConsole console, PixelBufferCoordinate point, Pixel pixel)
         {
             console.Print(point,

src/Consolonia.Core/Infrastructure/ConsoloniaApplication.cs

@@ -1,9 +1,6 @@
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Media;
-using Avalonia.Styling;
+using Consolonia.Core.Helpers;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -21,42 +18,7 @@ public override void OnFrameworkInitializationCompleted()
         {
             base.OnFrameworkInitializationCompleted();
 
-            if (Design.IsDesignMode)
-            {
-                // For previewing in Visual Studio designer without Design.PreviewWith tag we need to set default font and colors
-                // get anything to render. This is not perfect, but nicer than getting a big error screen.
-                IBrush foregroundBrush = Brushes.White;
-                if (Styles.TryGetResource("ThemeForegroundBrush", null, out object brush))
-                    foregroundBrush = (IBrush)brush;
-
-                IBrush backgroundBrush = Brushes.Black;
-                if (Styles.TryGetResource("ThemeBackgroundBrush", null, out brush))
-                    backgroundBrush = (IBrush)brush;
-
-                Styles.Add(new Style(x => x.Is<TemplatedControl>())
-                {
-                    Setters =
-                    {
-                        new Setter(TemplatedControl.FontSizeProperty, 16.0),
-                        new Setter(TemplatedControl.FontFamilyProperty, new FontFamily("Cascadia Mono")),
-                        new Setter(TemplatedControl.ForegroundProperty, foregroundBrush),
-                        new Setter(TemplatedControl.BackgroundProperty, backgroundBrush)
-                    }
-                });
-
-                // EXPERIMENTAL
-                // If you do RenderTRansform="scale(10.0,10.0) you can actually sort of see the UI get bigger
-                // but this doesn' seem to work when using these style setters. <sigh>
-                //this.Styles.Add(new Style(x => x.Is<Visual>())
-                //{
-                //    Setters =
-                //    {
-                //        //new Setter(Visual.RenderTransformOriginProperty, RelativePoint.TopLeft),
-                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
-                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
-                //    }
-                //});
-            }
+            this.AddConsoloniaDesignMode();
         }
     }
 }

src/Consolonia.Core/Infrastructure/ConsoloniaException.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.Serialization;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -12,10 +10,6 @@ public ConsoloniaException()
         {
         }
 
-        protected ConsoloniaException([NotNull] SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
-
         public ConsoloniaException(string message) : base(message)
         {
         }

src/Consolonia.Core/Infrastructure/ConsoloniaNotSupportedException.cs

@@ -1,22 +1,14 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace Consolonia.Core.Infrastructure
 {
-    [Serializable]
     public class ConsoloniaNotSupportedException : Exception
     {
         internal ConsoloniaNotSupportedException(NotSupportedRequest request)
         {
             Request = request;
         }
 
-        protected ConsoloniaNotSupportedException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-        }
-
         public NotSupportedRequest Request { get; }
     }
 }

src/Consolonia.Designer/ConsolePreview.cs

@@ -2,7 +2,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-#if DEBUG
 using Consolonia.PreviewHost;
 using System;
 using System.Diagnostics;
@@ -15,7 +14,6 @@
 using Avalonia.Threading;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
 using Newtonsoft.Json;
-#endif
 
 namespace Consolonia.Designer
 {
@@ -45,7 +43,6 @@ public class ConsolePreview : UserControl
 
         public ConsolePreview()
         {
-#if DEBUG
             _process = null;
             FontFamily = FontFamily.Parse("Cascadia Mono");
             Initialized += (_, _) => LoadXaml();
@@ -54,7 +51,6 @@ public ConsolePreview()
             {
                 if (e.Property == FileNameProperty) LoadXaml();
             };
-#endif
         }
 
 
@@ -102,7 +98,6 @@ protected void Dispose(bool disposing)
                 if (disposing)
                 {
                     // TODO: dispose managed state (managed objects)
-#if DEBUG
 #pragma warning disable CA1416 // Validate platform compatibility
                     if (_process != null)
                     {
@@ -111,7 +106,6 @@ protected void Dispose(bool disposing)
                         _process = null;
                     }
 #pragma warning restore CA1416 // Validate platform compatibility
-#endif
                 }
 
                 _disposedValue = true;
@@ -125,14 +119,10 @@ public void Dispose()
             Dispose(true);
         }
 
-#if DEBUG
         private Process? _process;
         private readonly Typeface _typeface = new("Cascadia Mono");
         private double _charWidth;
         private double _charHeight;
-#endif
-
-#if DEBUG
 
         private void LoadXaml()
         {
@@ -451,6 +441,5 @@ public void Flush()
                 _textRunCharWidth = 0;
             }
         }
-#endif
     }
 }

src/Consolonia.Designer/Consolonia.Designer.csproj

@@ -5,14 +5,14 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
-      <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
+      <ProjectReference Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 
 </Project>