♻ refactor(Input): active color no longer distinguishes themes, defau…

…lts to primary
masastack · Aug 9, 2024 · 22471af · 22471af
1 parent 8ffc818
commit 22471af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/Masa.Blazor/Components/Input/MInput.razor.cs b/src/Masa.Blazor/Components/Input/MInput.razor.cs
@@ -11,7 +11,7 @@ public partial class MInput<TValue> : MasaComponentBase, IThemeable, IFilterInpu
 
     [CascadingParameter(Name = "AppIsDark")] protected bool AppIsDark { get; set; }
 
-    [Parameter] public virtual string? Color { get; set; }
+    [Parameter][MasaApiParameter("primary")] public string? Color { get; set; } = "primary";
 
     [Parameter] public string? BackgroundColor { get; set; }
 
@@ -224,7 +224,7 @@ public void StateHasChangedForJsInvokable()
 
     #endregion
 
-    public virtual string? ComputedColor => IsDisabled ? null : Color ?? (IsDark && !AppIsDark ? "white" : "black");
+    public virtual string? ComputedColor => IsDisabled ? null : Color;
 
     public virtual bool HasColor => false;
 

diff --git a/src/Masa.Blazor/Components/Slider/MSliderBase.razor.cs b/src/Masa.Blazor/Components/Slider/MSliderBase.razor.cs
@@ -28,8 +28,6 @@ public partial class MSliderBase<TValue, TNumeric> : MInput<TValue>, IOutsideCli
 
     [Parameter] [MasaApiParameter(false)] public StringBoolean Ticks { get; set; } = false;
 
-    [Parameter] [MasaApiParameter("primary")] public override string? Color { get; set; } = "primary";
-
     [Parameter] public string? TrackColor { get; set; }
 
     [Parameter] public string? TrackFillColor { get; set; }

diff --git a/src/Masa.Blazor/Components/TextField/MTextField.razor.cs b/src/Masa.Blazor/Components/TextField/MTextField.razor.cs
@@ -181,18 +181,7 @@ public virtual bool Outlined
 
     public bool HasCounter => Counter != false && Counter != null;
 
-    public override string? ComputedColor
-    {
-        get
-        {
-            if (!SoloInverted || !IsFocused)
-            {
-                return base.ComputedColor;
-            }
-
-            return Color ?? "primary";
-        }
-    }
+    public override string? ComputedColor => !SoloInverted || !IsFocused ? base.ComputedColor : Color;
 
     public override bool HasColor => IsFocused;