From 6b6849d8d87eebe8ba0d78a315a206c884d436e5 Mon Sep 17 00:00:00 2001
From: Bernhard Straub <bsoft@mandel-straub.de>
Date: Mon, 1 Jul 2024 15:55:15 +0200
Subject: [PATCH] Improve DialogResult extension

Add null check
---
 .../Extensions/RxMudBlazorLightExtensionsExtern.cs           | 5 +++--
 RxMudBlazorLight/RxMudBlazorLight.csproj                     | 2 +-
 RxMudBlazorLightTestBase/CRUD/CRUDItemAddOrUpdate.razor      | 2 +-
 RxMudBlazorLightTestBase/Components/ButtonTest.razor         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RxMudBlazorLight/Extensions/RxMudBlazorLightExtensionsExtern.cs b/RxMudBlazorLight/Extensions/RxMudBlazorLightExtensionsExtern.cs
index a01f0a4..e588409 100644
--- a/RxMudBlazorLight/Extensions/RxMudBlazorLightExtensionsExtern.cs
+++ b/RxMudBlazorLight/Extensions/RxMudBlazorLightExtensionsExtern.cs
@@ -1,10 +1,11 @@
-using MudBlazor;
+using System.Diagnostics.CodeAnalysis;
+using MudBlazor;
 
 namespace RxMudBlazorLight.Extensions
 {
     public static class RxMudBlazorLightExtensionsExtern
     {
-        public static bool OK(this DialogResult? result)
+        public static bool OK([NotNullWhen(true)] this DialogResult? result)
         {
             return result is not null && !result.Canceled;
         }
diff --git a/RxMudBlazorLight/RxMudBlazorLight.csproj b/RxMudBlazorLight/RxMudBlazorLight.csproj
index 88e1c57..f43ffb4 100644
--- a/RxMudBlazorLight/RxMudBlazorLight.csproj
+++ b/RxMudBlazorLight/RxMudBlazorLight.csproj
@@ -25,7 +25,7 @@
         <PackageTags>Blazor,MudBlazor,Rx,Reactive</PackageTags>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageOutputPath>..\Nuget</PackageOutputPath>
-        <PackageVersion>0.9.3</PackageVersion>
+        <PackageVersion>0.9.4</PackageVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/RxMudBlazorLightTestBase/CRUD/CRUDItemAddOrUpdate.razor b/RxMudBlazorLightTestBase/CRUD/CRUDItemAddOrUpdate.razor
index cdee389..a138f2b 100644
--- a/RxMudBlazorLightTestBase/CRUD/CRUDItemAddOrUpdate.razor
+++ b/RxMudBlazorLightTestBase/CRUD/CRUDItemAddOrUpdate.razor
@@ -25,7 +25,7 @@ else
         var dialog = await DialogService.ShowAsync<CRUDItemDialog>(AddMode ? "Add ToDo" : "Edit ToDo", parameters);
         var result = await dialog.Result;
 
-        if (result is not null && !result.Canceled)
+        if (result.OK())
         {
             var scope = (CrudService.CrudItemInput?)result.Data;
             if (scope is not null)
diff --git a/RxMudBlazorLightTestBase/Components/ButtonTest.razor b/RxMudBlazorLightTestBase/Components/ButtonTest.razor
index f7c5c74..41667c1 100644
--- a/RxMudBlazorLightTestBase/Components/ButtonTest.razor
+++ b/RxMudBlazorLightTestBase/Components/ButtonTest.razor
@@ -131,7 +131,7 @@
 
         var res = await dialog.Result;
 
-        if (res is not null && !res.Canceled)
+        if (res.OK())
         {
             c.NotifyChanging();
             await Task.Delay(4000, c.CancellationToken);