RX State all new State handing

Fix a bunch of issues
b-straub · Apr 19, 2024 · 904e4f5 · 904e4f5
1 parent 16c61b5
commit 904e4f5
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 33 deletions.
diff --git a/RxMudBlazorLight/ButtonBase/ButtonBaseRx.cs b/RxMudBlazorLight/ButtonBase/ButtonBaseRx.cs
@@ -2,6 +2,7 @@
 using MudBlazor;
 using RxBlazorLightCore;
 using RxMudBlazorLight.Extensions;
+using System.Reflection.Emit;
 
 namespace RxMudBlazorLight.ButtonBase
 {
@@ -107,7 +108,7 @@ public RenderFragment RenderProgress() => builder =>
             }
         };
 
-        public (string? StartIcon, string? EndIcon, string? Label) GetFabParameters(IStateCommandAsync stateCommand, string? startIcon, string? endIcon, string? label, MBIconVariant? iconVariant, bool canCancel)
+        public (string? StartIcon, string? EndIcon, string? Label) GetFabParameters(IStateCommandAsync stateCommand, string? startIcon, string? endIcon, string? label, MBIconVariant? iconVariant)
         {
             if (_iconForState is IconForState.None)
             {
@@ -161,7 +162,7 @@ public RenderFragment RenderProgress() => builder =>
                     }
                 }
 
-                if (_cancelText is not null && canCancel)
+                if (_cancelText is not null && stateCommand.CanCancel)
                 {
                     label = _cancelText;
                 }
@@ -172,19 +173,17 @@ public RenderFragment RenderProgress() => builder =>
 
         public string GetIconButtonParameters(IStateCommandAsync stateCommand, string icon, MBIconVariant? iconVariant)
         {
+            if (_iconForState is IconForState.None)
+            {
+                _iconForState = IconForState.Start;
+                _buttonIcon = icon;
+            }
+
             if (!stateCommand.Changing() || stateCommand.ChangeCallerID != _id)
             {
-                if (_iconForState is IconForState.None)
-                {
-                    _buttonIcon = icon;
-                    _iconForState = IconForState.Start;
-                }
-                else
-                {
-                    ArgumentNullException.ThrowIfNull(_buttonIcon);
-                    icon = _buttonIcon;
-                    _iconForState = IconForState.None;
-                }
+                ArgumentNullException.ThrowIfNull(_buttonIcon);
+                icon = _buttonIcon;
+                _iconForState = IconForState.None;
             }
             else
             {
@@ -197,9 +196,9 @@ public string GetIconButtonParameters(IStateCommandAsync stateCommand, string ic
             return icon;
         }
 
-        public string GetBadgeIcon(IStateCommandAsync stateCommand, MBIconVariant? iconVariant, bool canCancel)
+        public string GetBadgeIcon(IStateCommandAsync stateCommand, MBIconVariant? iconVariant)
         {
-            if (canCancel && stateCommand.Changing() && stateCommand.ChangeCallerID == _id)
+            if (stateCommand.CanCancel && stateCommand.Changing() && stateCommand.ChangeCallerID == _id)
             {
                 return iconVariant.GetCancelIcon();
             }

diff --git a/RxMudBlazorLight/ButtonBase/ButtonRx.cs b/RxMudBlazorLight/ButtonBase/ButtonRx.cs
@@ -37,12 +37,20 @@ public void SetParameter(IStateCommand stateCommand, Action executeCallback, Fun
                 ChildContent = stateCommand.Changing() && _hasProgress ? RenderProgress() : _buttonChildContent;
             }
 
-            OnClick = EventCallback.Factory.Create<MouseEventArgs>(this, () => stateCommand.Execute(executeCallback));
-            OnTouch = EventCallback.Factory.Create<TouchEventArgs>(this, () => stateCommand.Execute(executeCallback));
+            OnClick = EventCallback.Factory.Create<MouseEventArgs>(this, () => ExecuteStateCommand(stateCommand, executeCallback));
+            OnTouch = EventCallback.Factory.Create<TouchEventArgs>(this, () => ExecuteStateCommand(stateCommand, executeCallback));
 
             Disabled = stateCommand.Changing() || (canChangeCallback is not null && !canChangeCallback());
         }
 
+        private async Task ExecuteStateCommand(IStateCommand stateCommand, Action executeCallback)
+        {
+            if (_confirmExecutionAsync is null || await _confirmExecutionAsync())
+            {
+                stateCommand.Execute(executeCallback);
+            }
+        }
+
         [MemberNotNull(nameof(OnClick))]
         [MemberNotNull(nameof(OnTouch))]
         public void SetParameter(IStateCommandAsync stateCommand, Func<IStateCommandAsync, Task> executeAsyncCallback, Func<bool>? canChangeCallback, bool deferredNotification)

diff --git a/RxMudBlazorLight/FabButtons/MudFabAsyncRx.razor b/RxMudBlazorLight/FabButtons/MudFabAsyncRx.razor
@@ -1,7 +1,7 @@
 @inherits MudFab
 
-<MudBadge Visible=@(_buttonRx is not null && _buttonRx.GetBadgeIcon(StateCommand, IconVariant, CancelText is null) != string.Empty)
-          Icon=@_buttonRx!.GetBadgeIcon(StateCommand, IconVariant, CancelText is null) Color=@Color Overlap="true" OnClick=@OnClick>
+<MudBadge Visible=@(_buttonRx is not null && _buttonRx.GetBadgeIcon(StateCommand, IconVariant) != string.Empty)
+          Icon=@_buttonRx!.GetBadgeIcon(StateCommand, IconVariant) Color=@Color Overlap="true" OnClick=@OnClick>
     @RenderBase()
 </MudBadge>
 
@@ -47,7 +47,7 @@
         ArgumentNullException.ThrowIfNull(_buttonRx);
         _buttonRx.SetParameter(StateCommand, ExecuteAsyncCallback, CanChangeCallback, DeferredNotification);
 
-        var parameters = _buttonRx.GetFabParameters(StateCommand, StartIcon, EndIcon, Label, IconVariant, StateCommand.CanCancel);
+        var parameters = _buttonRx.GetFabParameters(StateCommand, StartIcon, EndIcon, Label, IconVariant);
 
         StartIcon = parameters.StartIcon;
         EndIcon = parameters.EndIcon;

diff --git a/RxMudBlazorLight/IconButtons/MudIconButtonAsyncRx.razor b/RxMudBlazorLight/IconButtons/MudIconButtonAsyncRx.razor
@@ -1,7 +1,7 @@
 @inherits MudIconButton
 
-<MudBadge Visible=@(_buttonRx is not null && _buttonRx.GetBadgeIcon(StateCommand, IconVariant, true) != string.Empty)
-          Icon=@_buttonRx!.GetBadgeIcon(StateCommand, IconVariant, true) Color=@Color Overlap="true" OnClick=@OnClick>
+<MudBadge Visible=@(_buttonRx is not null && _buttonRx.GetBadgeIcon(StateCommand, IconVariant) != string.Empty)
+          Icon=@_buttonRx!.GetBadgeIcon(StateCommand, IconVariant) Color=@Color Overlap="true" OnClick=@OnClick>
     @RenderBase()
 </MudBadge>
 

diff --git a/RxMudBlazorLight/Inputs/Radio/MudRadioGroupAsyncRx.razor b/RxMudBlazorLight/Inputs/Radio/MudRadioGroupAsyncRx.razor
@@ -14,7 +14,7 @@
     public Func<T, T, Task>? ChangingAsyncCallback { get; init; }
 
     [Parameter]
-    public Func<T, bool>? CanChangeCallback { get; init; }
+    public Func<bool>? CanChangeCallback { get; init; }
 
     [Parameter]
     public Func<int, bool> ItemDisabledCallback { get; set; } = _ => false;
@@ -74,7 +74,7 @@
     {
         if (StateGroupAsync.HasValue())
         {
-            Disabled = (CanChangeCallback is not null && !CanChangeCallback(StateGroupAsync.Value)) || StateGroupAsync.Changing();
+            Disabled = (CanChangeCallback is not null && !CanChangeCallback()) || StateGroupAsync.Changing();
 
             if (StateGroupAsync.Done())
             {

diff --git a/RxMudBlazorLight/Inputs/Radio/MudRadioGroupRx.razor b/RxMudBlazorLight/Inputs/Radio/MudRadioGroupRx.razor
@@ -14,7 +14,7 @@
     public Action<T, T>? ChangingCallback { get; init; }
 
     [Parameter]
-    public Func<T, bool>? CanChangeCallback { get; init; }
+    public Func<bool>? CanChangeCallback { get; init; }
 
     [Parameter]
     public Func<int, bool> ItemDisabledCallback { get; set; } = _ => false;
@@ -74,7 +74,7 @@
     {
         if (StateGroup.HasValue())
         {
-            Disabled = (CanChangeCallback is not null && !CanChangeCallback(StateGroup.Value));
+            Disabled = (CanChangeCallback is not null && !CanChangeCallback());
             Value = StateGroup.Value;
 
             if (Validation is Func<T, StateValidation> validate)

diff --git a/RxMudBlazorLight/Inputs/Select/MudSelectAsyncRx.razor b/RxMudBlazorLight/Inputs/Select/MudSelectAsyncRx.razor
@@ -14,7 +14,7 @@
     public Func<T, T, Task>? ChangingAsyncCallback { get; init; }
 
     [Parameter]
-    public Func<T, bool>? CanChangeCallback { get; init; }
+    public Func<bool>? CanChangeCallback { get; init; }
 
     [Parameter]
     public Func<int, bool> ItemDisabledCallback { get; set; } = _ => false;
@@ -65,7 +65,7 @@
     {
         if (StateGroupAsync.HasValue())
         {
-            Disabled = (CanChangeCallback is not null && !CanChangeCallback(StateGroupAsync.Value)) || StateGroupAsync.Changing();
+            Disabled = (CanChangeCallback is not null && !CanChangeCallback()) || StateGroupAsync.Changing();
 
             if (StateGroupAsync.Done())
             {

diff --git a/RxMudBlazorLight/Inputs/Select/MudSelectRx.razor b/RxMudBlazorLight/Inputs/Select/MudSelectRx.razor
@@ -14,7 +14,7 @@
     public Action<T, T>? ChangingCallback { get; init; }
 
     [Parameter]
-    public Func<T, bool>? CanChangeCallback { get; init; }
+    public Func<bool>? CanChangeCallback { get; init; }
 
     [Parameter]
     public Func<int, bool> ItemDisabledCallback { get; set; } = _ => false;
@@ -65,7 +65,7 @@
     {
         if (StateGroup.HasValue())
         {
-            Disabled = (CanChangeCallback is not null && !CanChangeCallback(StateGroup.Value));
+            Disabled = (CanChangeCallback is not null && !CanChangeCallback());
             Value = StateGroup.Value;
             Text = Value?.ToString();
 

diff --git a/RxMudBlazorLight/RxMudBlazorLight.csproj b/RxMudBlazorLight/RxMudBlazorLight.csproj
@@ -20,7 +20,7 @@
 		<PackageTags>Blazor,MudBlazor,Rx,Reactive</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageOutputPath>..\Nuget</PackageOutputPath>
-		<PackageVersion>0.8.0</PackageVersion>
+		<PackageVersion>0.8.4</PackageVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RxMudBlazorLightTestBase/Components/ButtonTest.razor b/RxMudBlazorLightTestBase/Components/ButtonTest.razor
@@ -43,6 +43,8 @@
     </MudStack>
 
     <RxBLStateScope TScope=@TestService.Scope TService=@TestService ScopeFactory=@Service.CreateScope>
+        <MudIconButtonAsyncRx Color="Color.Secondary" StateCommand=@Service.CancellableCommandAsync ExecuteAsyncCallback=@DoPrepareAddRemoveAsync
+                        Icon=@(Service.AddMode.Value ? @Icons.Material.Filled.Add : Icons.Material.Filled.Remove) CancelColor=@Color.Error />
         <IconButtons />
     </RxBLStateScope>
 

diff --git a/RxMudBlazorLightTestBase/Service/CrudService.cs b/RxMudBlazorLightTestBase/Service/CrudService.cs
@@ -139,7 +139,7 @@ public CrudItemInput CreateItemInput(CRUDToDoItem? item = null)
             return new CrudItemInput(this, item);
         }
 
-        public static Func<DBRole, bool> CanChangeRole => _ => true;
+        public static Func<bool> CanChangeRole => () => true;
 
         public Func<bool> CanAdd => () => CRUDDBRoleGroup.CanAdd();
         public Func<bool> CanUpdate(CRUDToDoItem? item) => () => (CanUpdateText || CanUpdateDueDate) && !(item is not null && item.Completed);

diff --git a/RxMudBlazorLightTestBase/Service/TestService.cs b/RxMudBlazorLightTestBase/Service/TestService.cs
@@ -118,7 +118,7 @@ public Func<TestColor, Task> ChangeTestColorAsync(int context)
                 };
             }
 
-            public static Func<TestColor, bool> CanChangeTestColor(int context) => c =>
+            public static Func<bool> CanChangeTestColor(int context) => () =>
             {
                 return context != 1;
             };
-Original file line number
+Diff line change
@@ Expand Up @@
                     };
                 }
-                public static Func<TestColor, bool> CanChangeTestColor(int context) => c =>
+                public static Func<bool> CanChangeTestColor(int context) => () =>
                 {
                     return context != 1;
                 };
@@ Expand Down @@