From bdfa2f66a7db07f2ddf8a76a5f345fd91ea68aa4 Mon Sep 17 00:00:00 2001
From: RSOrokin <r.sorokin@sports.ru>
Date: Mon, 3 Nov 2025 11:40:53 +0300
Subject: [PATCH] fix some issues

---
 Exmaple2.0/Exmaple2.0.csproj                  |   2 +-
 .../Controls/MsBoxCustomView.axaml.cs         |  17 ++
 .../Controls/MsBoxStandardView.axaml.cs       |  17 ++
 MsBox.Avalonia/MsBox.Avalonia.csproj          |   2 +-
 README.md                                     | 151 ++++++++++++------
 5 files changed, 138 insertions(+), 51 deletions(-)

diff --git a/Exmaple2.0/Exmaple2.0.csproj b/Exmaple2.0/Exmaple2.0.csproj
index 70965ff..c83ce64 100644
--- a/Exmaple2.0/Exmaple2.0.csproj
+++ b/Exmaple2.0/Exmaple2.0.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs b/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
index 1d8817e..7438c88 100644
--- a/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
+++ b/MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Threading;
 
 using MsBox.Avalonia.Base;
 using MsBox.Avalonia.ViewModels;
@@ -13,6 +15,21 @@ public partial class MsBoxCustomView : UserControl, IFullApi<string>, ISetCloseA
     public MsBoxCustomView()
     {
         InitializeComponent();
+
+        this.AttachedToVisualTree += (s, e) =>
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                var defaultButton = this.GetLogicalDescendants()
+                    .OfType<Button>()
+                    .FirstOrDefault(b => b.IsDefault && b.IsVisible);
+
+                if (defaultButton != null)
+                {
+                    defaultButton.Focus();
+                }
+            }, DispatcherPriority.Loaded);
+        };
     }
 
     public void SetButtonResult(string bdName)
diff --git a/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs b/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
index f076a51..7c1bb33 100644
--- a/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
+++ b/MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
@@ -1,6 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.LogicalTree;
+using Avalonia.Threading;
 
 using MsBox.Avalonia.Base;
 using MsBox.Avalonia.Enums;
@@ -25,6 +27,21 @@ public MsBoxStandardView()
                 embeddedView.DataTemplates.Add(viewLocator);
             }
         }
+
+        this.AttachedToVisualTree += (s, e) =>
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                var defaultButton = this.GetLogicalDescendants()
+                    .OfType<Button>()
+                    .FirstOrDefault(b => b.IsDefault && b.IsVisible);
+
+                if (defaultButton != null)
+                {
+                    defaultButton.Focus();
+                }
+            }, DispatcherPriority.Loaded);
+        };
     }
 
     public void SetButtonResult(ButtonResult bdName)
diff --git a/MsBox.Avalonia/MsBox.Avalonia.csproj b/MsBox.Avalonia/MsBox.Avalonia.csproj
index d322d47..36c5df8 100644
--- a/MsBox.Avalonia/MsBox.Avalonia.csproj
+++ b/MsBox.Avalonia/MsBox.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <PackageVersion>3.2.0.0</PackageVersion>
+        <PackageVersion>3.3.0.0</PackageVersion>
         <Title>MessageBox.Avalonia</Title>
         <Authors>Lary</Authors>
         <Description>Messagebox for AvaloniaUI</Description>
diff --git a/README.md b/README.md
index c79c7c6..df4f757 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,15 @@ The easiest way to get started is this:
 
 ![](Images/standart-messagebox.png)
 
-```cs 
-  var box = MessageBoxManager
-            .GetMessageBoxStandard("Caption", "Are you sure you would like to delete appender_replace_page_1?",
-                ButtonEnum.YesNo);
+```cs
+using MsBox.Avalonia;
+using MsBox.Avalonia.Enums;
+
+var box = MessageBoxManager
+    .GetMessageBoxStandard("Caption", "Are you sure you would like to delete appender_replace_page_1?",
+        ButtonEnum.YesNo);
 
-        var result = await box.ShowAsync();
+var result = await box.ShowAsync();
 ```
 You have a lot of options how to show your messagebox:
 
@@ -49,57 +52,107 @@ You have a lot of options how to show your messagebox:
 HyperLink with powerfull options:
 
 ```cs
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using MsBox.Avalonia;
+using MsBox.Avalonia.Dto;
+using MsBox.Avalonia.Models;
+
 MessageBoxManager.GetMessageBoxCustom(
-            new MessageBoxCustomParams
+    new MessageBoxCustomParams
+    {
+        ButtonDefinitions = new List<ButtonDefinition>
+        {
+            new ButtonDefinition { Name = "Yes", },
+            new ButtonDefinition { Name = "No", },
+            new ButtonDefinition { Name = "Cancel", }
+        },
+        ContentTitle = "title",
+        ContentMessage = "Informative note:" +
+                         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ut pulvinar est, eget porttitor magna. Maecenas nunc elit, pretium nec mauris vel, cursus faucibus leo. Mauris consequat magna vel mi malesuada semper. Donec nunc justo, rhoncus vel viverra a, ultrices vel nibh. Praesent ut libero a nunc placerat vulputate. Morbi ullamcorper pharetra lectus, ut lobortis ex consequat sit amet. Vestibulum pellentesque quam at justo hendrerit, et tincidunt nisl mattis. Curabitur eu nibh enim.\n",
+        Icon = MsBox.Avalonia.Enums.Icon.Question,
+        WindowStartupLocation = WindowStartupLocation.CenterOwner,
+        CanResize = false,
+        MaxWidth = 500,
+        MaxHeight = 800,
+        SizeToContent = SizeToContent.WidthAndHeight,
+        ShowInCenter = true,
+        Topmost = false,
+        HyperLinkParams = new HyperLinkParams
+        {
+            Text = "https://docs.avaloniaui.net/",
+            Action = new Action(() =>
             {
-                ButtonDefinitions = new List<ButtonDefinition>
+                var desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+                var url = "https://docs.avaloniaui.net/";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    new ButtonDefinition { Name = "Yes", },
-                    new ButtonDefinition { Name = "No", },
-                    new ButtonDefinition { Name = "Cancel", }
-                },
-                ContentTitle = "title",
-                ContentMessage = "Informative note:" +
-                                 "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ut pulvinar est, eget porttitor magna. Maecenas nunc elit, pretium nec mauris vel, cursus faucibus leo. Mauris consequat magna vel mi malesuada semper. Donec nunc justo, rhoncus vel viverra a, ultrices vel nibh. Praesent ut libero a nunc placerat vulputate. Morbi ullamcorper pharetra lectus, ut lobortis ex consequat sit amet. Vestibulum pellentesque quam at justo hendrerit, et tincidunt nisl mattis. Curabitur eu nibh enim.\n",
-                Icon = MsBox.Avalonia.Enums.Icon.Question,
-                WindowStartupLocation = WindowStartupLocation.CenterOwner,
-                CanResize = false,
-                MaxWidth = 500,
-                MaxHeight = 800,
-                SizeToContent = SizeToContent.WidthAndHeight,
-                ShowInCenter = true,
-                Topmost = false,
-                HyperLinkParams = new HyperLinkParams
+                    //https://stackoverflow.com/a/2796367/241446
+                    using var proc = new Process { StartInfo = { UseShellExecute = true, FileName = url } };
+                    proc.Start();
+
+                    return;
+                }
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
-                    Text = "https://docs.avaloniaui.net/",
-                    Action = new Action(() =>
-                    {
-                        var desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-                        var url = "https://docs.avaloniaui.net/";
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                        {
-                            //https://stackoverflow.com/a/2796367/241446
-                            using var proc = new Process { StartInfo = { UseShellExecute = true, FileName = url } };
-                            proc.Start();
-
-                            return;
-                        }
-
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                        {
-                            Process.Start("x-www-browser", url);
-                            return;
-                        }
-
-                        if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                            throw new Exception("invalid url: " + url);
-                        Process.Start("open", url);
-                        return;
-                    })
+                    Process.Start("x-www-browser", url);
+                    return;
                 }
-            });
+
+                if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                    throw new Exception("invalid url: " + url);
+                Process.Start("open", url);
+                return;
+            })
+        }
+    });
+```
+
+---
+
+**Important: Async/Await Usage**
+
+Always use `await` when calling MessageBox methods. **Never** use `.Result` or `.Wait()` on the Task, as this will cause a deadlock and freeze your UI.
+
+**❌ Wrong (will freeze your application):**
+```cs
+private void ShowMessage()
+{
+    var box = MessageBoxManager.GetMessageBoxStandard("Title", "Message", ButtonEnum.Ok);
+    var result = box.ShowAsync().Result; // DON'T DO THIS!
+}
+```
+
+**✅ Correct:**
+```cs
+private async void ShowMessage()
+{
+    var box = MessageBoxManager.GetMessageBoxStandard("Title", "Message", ButtonEnum.Ok);
+    var result = await box.ShowAsync(); // Use await
+}
 ```
 
+If you need to return the result to the caller, make sure the entire call chain is async:
+```cs
+private async Task<ButtonResult> ShowConfirmation()
+{
+    var box = MessageBoxManager.GetMessageBoxStandard("Confirm", "Are you sure?", ButtonEnum.YesNo);
+    return await box.ShowAsync();
+}
+
+// Usage:
+var result = await ShowConfirmation();
+if (result == ButtonResult.Yes)
+{
+    // Handle confirmation
+}
+```
+
+---
+
 **Markdown support**
 
 Do enable markdown support users need to: