RX State

Disabled with parameter
b-straub · Feb 19, 2024 · b31b42e · b31b42e
1 parent 531feab
commit b31b42e
Show file tree

Hide file tree

Showing 28 changed files with 110 additions and 69 deletions.
diff --git a/RxMudBlazorLight/Buttons/MudButtonPRx.razor b/RxMudBlazorLight/Buttons/MudButtonPRx.razor
@@ -17,15 +17,15 @@
     public Color? CancelColor { get; set; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonPRx<T>? _buttonPRx;
     private Color _buttonColor;
 
     protected override void OnInitialized()
     {
-        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.DEFAULT, ValueFactoryAsync, Color, ChildContent, CancelText, CancelColor, DisabledFactory);
+        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.DEFAULT, ValueFactoryAsync, Color, ChildContent, CancelText, CancelColor, Context);
         _buttonColor = Color;
 
         base.OnInitialized();

diff --git a/RxMudBlazorLight/Buttons/MudButtonRx.razor b/RxMudBlazorLight/Buttons/MudButtonRx.razor
@@ -17,15 +17,15 @@
     public Color? CancelColor { get; set; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonRx<T>? _buttonRx;
     private Color _buttonColor;
 
     protected override void OnInitialized()
     {
-        _buttonRx = ButtonRx<T>.Create(MBButtonType.DEFAULT, ConfirmExecutionAsync, Color, ChildContent, CancelText, CancelColor, DisabledFactory);
+        _buttonRx = ButtonRx<T>.Create(MBButtonType.DEFAULT, ConfirmExecutionAsync, Color, ChildContent, CancelText, CancelColor, Context);
         _buttonColor = Color;
 
         base.OnInitialized();

diff --git a/RxMudBlazorLight/Dialogs/DialogAsyncPRx.razor b/RxMudBlazorLight/Dialogs/DialogAsyncPRx.razor
@@ -11,7 +11,7 @@
             <MudButton Disabled=@CanNotCancel() Variant="Variant.Filled" Color=@(SuccessOnConfirm ? Color.Error : Color.Success) OnClick="Cancel">@CancelButton</MudButton>
             <MudButtonPRx @ref=_buttonRef Variant="Variant.Filled" Color=@(SuccessOnConfirm ? Color.Success : Color.Error)
                             T=@TParam StateTransformer=@StateTransformer ValueFactoryAsync=@ValueFactoryAsync
-                              CancelColor=@CancelColor CancelText=@CancelText DisabledFactory=@DisabledFactory>
+                              CancelColor=@CancelColor CancelText=@CancelText Context=@Context>
                 @ConfirmButton
             </MudButtonPRx>
         </DialogActions>

diff --git a/RxMudBlazorLight/Dialogs/DialogAsyncPRx.razor.cs b/RxMudBlazorLight/Dialogs/DialogAsyncPRx.razor.cs
@@ -35,7 +35,7 @@ public partial class DialogAsyncPRx<TService, TParam> : RxBLServiceChangeSubscri
         public Color? CancelColor { get; set; }
 
         [Parameter]
-        public Func<bool>? DisabledFactory { get; set; }
+        public TParam? Context { get; set; }
 
         private MudButtonPRx<TParam>? _buttonRef;
         private IDisposable? _buttonDisposable;
@@ -44,15 +44,15 @@ public partial class DialogAsyncPRx<TService, TParam> : RxBLServiceChangeSubscri
         public static async Task<bool> Show(IDialogService dialogService,
             IStateTransformer<TParam> stateTransformer, Func<IStateTransformer<TParam>, Task> valueFactoryAsync, string title,
             string message, string confirmButton, string cancelButton, bool successOnConfirm,
-            string? cancelText = null, Color? cancelColor = null, Func<bool> ? disabledFactory = null)
+            string? cancelText = null, Color? cancelColor = null, TParam? context = default)
         {
             var parameters = new DialogParameters
             {
                 ["StateTransformer"] = stateTransformer,
                 ["ValueFactoryAsync"] = valueFactoryAsync,
                 ["CancelText"] = cancelText,
                 ["CancelColor"] = cancelColor,
-                ["DisabledFactory"] = disabledFactory,
+                ["Context"] = context,
                 ["Message"] = message,
                 ["ConfirmButton"] = confirmButton,
                 ["CancelButton"] = cancelButton,

diff --git a/RxMudBlazorLight/Dialogs/DialogAsyncRx.razor b/RxMudBlazorLight/Dialogs/DialogAsyncRx.razor
@@ -10,7 +10,7 @@
         <DialogActions>
             <MudButton Disabled=@CanNotCancel() Variant="Variant.Filled" Color=@(SuccessOnConfirm ? Color.Error : Color.Success) OnClick="Cancel">Cancel</MudButton>
             <MudButtonRx @ref=_buttonRef Variant="Variant.Filled" Color=@(SuccessOnConfirm ? Color.Success : Color.Error)
-                         StateProvider=@StateProvider CancelColor=@CancelColor CancelText=@CancelText DisabledFactory=@DisabledFactory>
+                         T=@TParam StateProvider=@StateProvider CancelColor=@CancelColor CancelText=@CancelText Context=@Context>
                 @ConfirmButton
             </MudButtonRx>
         </DialogActions>

diff --git a/RxMudBlazorLight/Dialogs/DialogAsyncRx.razor.cs b/RxMudBlazorLight/Dialogs/DialogAsyncRx.razor.cs
@@ -32,7 +32,7 @@ public partial class DialogAsyncRx<TService, TParam> : RxBLServiceChangeSubscrib
         public Color? CancelColor { get; set; }
 
         [Parameter]
-        public Func<bool>? DisabledFactory { get; set; }
+        public TParam? Context { get; set; }
 
         private MudButtonRx<TParam>? _buttonRef;
         private IDisposable? _buttonDisposable;
@@ -41,14 +41,14 @@ public partial class DialogAsyncRx<TService, TParam> : RxBLServiceChangeSubscrib
         public static async Task<bool> Show(IDialogService dialogService,
            IStateProvider<TParam> stateProvider, string title,
            string message, string confirmButton, string cancelButton, bool successOnConfirm,
-           string? cancelText = null, Color? cancelColor = null, Func<bool>? disabledFactory = null)
+           string? cancelText = null, Color? cancelColor = null, TParam? context = default)
         {
             var parameters = new DialogParameters
             {
                 ["StateProvider"] = stateProvider,
                 ["CancelColor"] = cancelColor,
                 ["CancelText"] = cancelText,
-                ["DisabledFactory"] = disabledFactory,
+                ["Context"] = context,
                 ["Message"] = message,
                 ["ConfirmButton"] = confirmButton,
                 ["CancelButton"] = cancelButton,

diff --git a/RxMudBlazorLight/FabButtons/MudFabPRx.razor b/RxMudBlazorLight/FabButtons/MudFabPRx.razor
@@ -20,7 +20,7 @@
     public Color? CancelColor { get; set; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     [Parameter]
     public MBIconVariant? IconVariant { get; set; }
@@ -31,7 +31,7 @@
 
     protected override void OnInitialized()
     {
-        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.FAB, ValueFactoryAsync, Color, null, CancelText, CancelColor, DisabledFactory);
+        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.FAB, ValueFactoryAsync, Color, null, CancelText, CancelColor, Context);
 
         base.OnInitialized();
     }

diff --git a/RxMudBlazorLight/FabButtons/MudFabRx.razor b/RxMudBlazorLight/FabButtons/MudFabRx.razor
@@ -20,7 +20,7 @@
     public Color? CancelColor { get; set; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     [Parameter]
     public MBIconVariant? IconVariant { get; set; }
@@ -30,7 +30,7 @@
 
     protected override void OnInitialized()
     {
-        _buttonRx = ButtonRx<T>.Create(MBButtonType.FAB, ConfirmExecutionAsync, Color, null, CancelText, CancelColor, DisabledFactory);
+        _buttonRx = ButtonRx<T>.Create(MBButtonType.FAB, ConfirmExecutionAsync, Color, null, CancelText, CancelColor, Context);
 
         base.OnInitialized();
     }

diff --git a/RxMudBlazorLight/IconButtons/MudIconButtonPRx.razor b/RxMudBlazorLight/IconButtons/MudIconButtonPRx.razor
@@ -17,14 +17,14 @@
     public MBIconVariant? IconVariant { get; set; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonPRx<T>? _buttonPRx;
 
     protected override void OnInitialized()
     {
-        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.ICON, ValueFactoryAsync, Color, null, null, null, DisabledFactory);
+        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.ICON, ValueFactoryAsync, Color, null, null, null, Context);
 
         base.OnInitialized();
     }

diff --git a/RxMudBlazorLight/IconButtons/MudIconButtonRx.razor b/RxMudBlazorLight/IconButtons/MudIconButtonRx.razor
@@ -17,14 +17,14 @@
     public MBIconVariant? IconVariant { get; set; }
 
         [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonRx<T>? _buttonRx;
 
     protected override void OnInitialized()
     {
-        _buttonRx = ButtonRx<T>.Create(MBButtonType.ICON, ConfirmExecutionAsync, Color, null, null, null, DisabledFactory);
+        _buttonRx = ButtonRx<T>.Create(MBButtonType.ICON, ConfirmExecutionAsync, Color, null, null, null, Context);
 
         base.OnInitialized();
     }

diff --git a/RxMudBlazorLight/Inputs/MudAutocompleteRx.razor b/RxMudBlazorLight/Inputs/MudAutocompleteRx.razor
@@ -35,7 +35,7 @@
             Text = Value.ToString();
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLight/Inputs/MudCheckBoxRx.razor b/RxMudBlazorLight/Inputs/MudCheckBoxRx.razor
@@ -29,7 +29,7 @@
             Value = RxState.Value;
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLight/Inputs/MudNumericFieldRx.razor b/RxMudBlazorLight/Inputs/MudNumericFieldRx.razor
@@ -32,7 +32,7 @@
             Value = RxState.Value;
             Text = Value.ToString();
         }
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLight/Inputs/MudRatingRx.razor b/RxMudBlazorLight/Inputs/MudRatingRx.razor
@@ -31,7 +31,7 @@
             SelectedValue = RxState.Value;
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
         base.OnParametersSet();
     }
 }
diff --git a/RxMudBlazorLight/Inputs/MudSliderRx.razor b/RxMudBlazorLight/Inputs/MudSliderRx.razor
@@ -29,7 +29,7 @@
             Value = RxState.Value;
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
         base.OnParametersSet();
     }
 }
diff --git a/RxMudBlazorLight/Inputs/MudSwitchRx.razor b/RxMudBlazorLight/Inputs/MudSwitchRx.razor
@@ -29,7 +29,7 @@
             Value = RxState.Value;
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLight/Inputs/MudTextFieldRx.razor b/RxMudBlazorLight/Inputs/MudTextFieldRx.razor
@@ -35,7 +35,7 @@
             Text = Value.ToString();
         }
 
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLight/Inputs/Radio/MudRadioGroupBaseRx.cs b/RxMudBlazorLight/Inputs/Radio/MudRadioGroupBaseRx.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.VisualBasic;
 using MudBlazor;
 using RxBlazorLightCore;
 
@@ -51,7 +52,7 @@ protected override void OnParametersSet()
                 Value = RxStateGroupBase.Value;
                 ValueChanged = EventCallback.Factory.Create<T>(this, RxStateGroupBase.Transform);
             }
-            Disabled = !RxStateGroupBase.CanRun || RxStateGroupBase.Phase is StateChangePhase.CHANGING;
+            Disabled = !RxStateGroupBase.CanTransform(RxStateGroupBase.Value) || RxStateGroupBase.Phase is StateChangePhase.CHANGING;
 
             base.OnParametersSet();
         }

diff --git a/RxMudBlazorLight/Inputs/Select/MudSelectBaseRx.cs b/RxMudBlazorLight/Inputs/Select/MudSelectBaseRx.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.VisualBasic;
 using MudBlazor;
 using RxBlazorLightCore;
 
@@ -24,7 +25,7 @@ protected override void OnParametersSet()
             }
 
             ValueChanged = EventCallback.Factory.Create<T>(this, RxStateGroupBase.Transform);
-            Disabled = !RxStateGroupBase.CanRun;
+            Disabled = !RxStateGroupBase.CanTransform(RxStateGroupBase.Value);
 
             if (ChildContent is null)
             {
@@ -48,7 +49,7 @@ protected override void OnParametersSet()
                 };
             }
 
-            Disabled = !RxStateGroupBase.CanRun || RxStateGroupBase.Phase is StateChangePhase.CHANGING;
+            Disabled = !RxStateGroupBase.CanTransform(RxStateGroupBase.Value) || RxStateGroupBase.Phase is StateChangePhase.CHANGING;
 
             base.OnParametersSet();
         }

diff --git a/RxMudBlazorLight/Menus/MudMenuItemPRx.razor b/RxMudBlazorLight/Menus/MudMenuItemPRx.razor
@@ -11,14 +11,14 @@
     public required Func<IStateTransformer<T>, Task> ValueFactoryAsync { get; init; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonPRx<T>? _buttonPRx;
 
     protected override void OnInitialized()
     {
-        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.DEFAULT, ValueFactoryAsync, Color.Default, null, null, null, DisabledFactory);
+        _buttonPRx = ButtonPRx<T>.Create(MBButtonType.DEFAULT, ValueFactoryAsync, Color.Default, null, null, null, Context);
 
         base.OnInitialized();
     }

diff --git a/RxMudBlazorLight/Menus/MudMenuItemRx.razor b/RxMudBlazorLight/Menus/MudMenuItemRx.razor
@@ -11,14 +11,14 @@
     public Func<Task<bool>>? ConfirmExecutionAsync { get; init; }
 
     [Parameter]
-    public Func<bool>? DisabledFactory { get; set; }
+    public T? Context { get; set; }
 
     private RenderFragment RenderBase() => builder => base.BuildRenderTree(builder);
     private ButtonRx<T>? _buttonRx;
 
     protected override void OnInitialized()
     {
-        _buttonRx = ButtonRx<T>.Create(MBButtonType.DEFAULT, ConfirmExecutionAsync, Color.Default, null, null, null, DisabledFactory);
+        _buttonRx = ButtonRx<T>.Create(MBButtonType.DEFAULT, ConfirmExecutionAsync, Color.Default, null, null, null, Context);
         base.OnInitialized();
     }
 

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.9.0</PackageVersion>
+		<PackageVersion>0.9.1</PackageVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RxMudBlazorLight/ToggleIconButtons/MudToggleIconButtonRx.razor b/RxMudBlazorLight/ToggleIconButtons/MudToggleIconButtonRx.razor
@@ -21,7 +21,7 @@
     {
         Toggled = RxState.Value;
         ToggledChanged = EventCallback.Factory.Create<bool>(this, v => RxState.Transform(v));
-        Disabled = !RxState.CanRun || RxState.Phase is StateChangePhase.CHANGING;
+        Disabled = !RxState.CanTransform(RxState.Value) || RxState.Phase is StateChangePhase.CHANGING;
 
         base.OnParametersSet();
     }

diff --git a/RxMudBlazorLightTestBase/Components/ButtonTest.razor b/RxMudBlazorLightTestBase/Components/ButtonTest.razor
@@ -14,7 +14,7 @@
     <MudStack Row=@true AlignItems=@AlignItems.Center>
         <MudButtonRx Color="Color.Primary" Variant="Variant.Filled" StateProvider=@Service.Increment ConfirmExecutionAsync=@ConfirmIncrement>Increment</MudButtonRx>
         <MudButtonPRx Color="Color.Primary" Variant="Variant.Filled" ValueFactoryAsync=@DVFA.Factory(5) StateTransformer=@Service.Add>Add 5</MudButtonPRx>
-            <MudButtonRx Color="Color.Secondary" Variant="Variant.Filled" StateProvider=@Service.IncrementAsync DisabledFactory=@(() => Service.IncrementAsync.CanProvide(4))>IncrementAsync</MudButtonRx>
+            <MudButtonRx Color="Color.Secondary" Variant="Variant.Filled" StateProvider=@Service.IncrementAsync Context=@(4)>IncrementAsync</MudButtonRx>
         <MudButtonPRx Color="Color.Secondary" Variant="Variant.Filled" StateTransformer=@Service.AddAsync ValueFactoryAsync=@DoPrepareAddAsync CancelColor=Color.Error CancelText="Cancel Add">
             AddAsync 2
         </MudButtonPRx>
@@ -37,7 +37,7 @@
         <MudFabPRx Color="Color.Secondary" EndIcon="@Icons.Material.Filled.Add" StateTransformer=@Service.AddAsync ValueFactoryAsync=@DoPrepareAddAsync Label="AddAsync 10" />
     </MudStack>
 
-    <RxBLServiceScope TScope=@TestService.SubScope TService=@TestService>
+    <RxBLServiceScope TScope=@TestService.Scope TService=@TestService>
         <IconButtons />
     </RxBLServiceScope>
 
@@ -127,11 +127,11 @@
         if (parameter is null)
         {
             return await DialogAsyncRx<TestService, int>.Show(DialogService, Service.IncrementAsync,
-                "Increment", "Increment counter.", "Increment", "Cancel", false, null, null, () => Service.CountState.Value > 2);
+                "Increment", "Increment counter.", "Increment", "Cancel", false, null, null, 2);
         }
 
         return await DialogAsyncPRx<TestService, int>.Show(DialogService, Service.AddAsync, DVFA.Factory((int)parameter),
-            $"Add {parameter}", $"Add {parameter} to counter?", $"Add {parameter}", "Cancel", true, "Cancel adding!", Color.Error, () => Service.CountState.Value > 3);
+            $"Add {parameter}", $"Add {parameter} to counter?", $"Add {parameter}", "Cancel", true, "Cancel adding!", Color.Error, 3);
     }
 
     private async Task DoPrepareAddRemoveAsync(IStateTransformer<int> st)

diff --git a/RxMudBlazorLightTestBase/Components/IconButtons.razor b/RxMudBlazorLightTestBase/Components/IconButtons.razor
@@ -11,5 +11,5 @@
     public required TestService Service { get; init; }
 
     [CascadingParameter]
-    public required TestService.SubScope Scope { get; init; }
+    public required TestService.Scope Scope { get; init; }
 }