improve rendering

Author: stsrki

Source/Blazorise/Components/Validation/Validation.razor.cs

@@ -81,6 +81,16 @@ public partial class Validation : ComponentBase, IValidation, IDisposable
     /// </summary>
     private BaseValidationResult validationMessageComponent;
 
+    /// <summary>
+    /// Holds the current warning validation message component.
+    /// </summary>
+    private BaseValidationResult validationWarningMessageComponent;
+
+    /// <summary>
+    /// Holds the current error validation message component.
+    /// </summary>
+    private BaseValidationResult validationErrorMessageComponent;
+
     /// <summary>
     /// Define the cancellation token.
     /// </summary>
@@ -431,10 +441,28 @@ internal void NotifyValidationMessageInitialized( BaseValidationResult validatio
         if ( validationMessage is null )
             return;
 
-        if ( ReferenceEquals( validationMessageComponent, validationMessage ) )
-            return;
+        if ( validationMessage is ValidationWarning )
+        {
+            if ( ReferenceEquals( validationWarningMessageComponent, validationMessage ) )
+                return;
+
+            validationWarningMessageComponent = validationMessage;
+        }
+        else if ( validationMessage is ValidationError )
+        {
+            if ( ReferenceEquals( validationErrorMessageComponent, validationMessage ) )
+                return;
+
+            validationErrorMessageComponent = validationMessage;
+        }
+        else
+        {
+            if ( ReferenceEquals( validationMessageComponent, validationMessage ) )
+                return;
+
+            validationMessageComponent = validationMessage;
+        }
 
-        validationMessageComponent = validationMessage;
         ValidationMessageChanged?.Invoke();
     }
 
@@ -444,11 +472,28 @@ internal void NotifyValidationMessageInitialized( BaseValidationResult validatio
     /// <param name="validationMessage">Validation message component.</param>
     internal void NotifyValidationMessageRemoved( BaseValidationResult validationMessage )
     {
-        if ( !ReferenceEquals( validationMessageComponent, validationMessage ) )
-            return;
+        var changed = false;
 
-        validationMessageComponent = null;
-        ValidationMessageChanged?.Invoke();
+        if ( ReferenceEquals( validationWarningMessageComponent, validationMessage ) )
+        {
+            validationWarningMessageComponent = null;
+            changed = true;
+        }
+
+        if ( ReferenceEquals( validationErrorMessageComponent, validationMessage ) )
+        {
+            validationErrorMessageComponent = null;
+            changed = true;
+        }
+
+        if ( ReferenceEquals( validationMessageComponent, validationMessage ) )
+        {
+            validationMessageComponent = null;
+            changed = true;
+        }
+
+        if ( changed )
+            ValidationMessageChanged?.Invoke();
     }
 
     #endregion
@@ -471,7 +516,12 @@ internal void NotifyValidationMessageRemoved( BaseValidationResult validationMes
     /// <summary>
     /// Gets the element id of the validation message container.
     /// </summary>
-    internal string ValidationMessageElementId => validationMessageComponent?.ElementId;
+    internal string ValidationMessageElementId => Status switch
+    {
+        ValidationStatus.Warning => validationWarningMessageComponent?.ElementId ?? validationMessageComponent?.ElementId,
+        ValidationStatus.Error => validationErrorMessageComponent?.ElementId ?? validationMessageComponent?.ElementId,
+        _ => validationMessageComponent?.ElementId,
+    };
 
     /// <inheritdoc/>
     public FieldIdentifier FieldIdentifier => fieldIdentifier;

Source/Blazorise/Components/Validation/ValidationFeedback.razor

@@ -1,43 +1,34 @@
 @namespace Blazorise
 @inherits BaseValidationResult
-@if ( ParentValidation?.Status == ValidationStatus.Success )
+@if ( None is not null )
 {
-    @if ( Success is not null )
-    {
-        <ValidationSuccess Tooltip="@Tooltip">
-            @Success
-        </ValidationSuccess>
-    }
+    <ValidationNone>
+        @None
+    </ValidationNone>
 }
-else if ( ParentValidation?.Status == ValidationStatus.Warning )
+@if ( Success is not null )
 {
-    @if ( Warning is not null )
-    {
-        <ValidationWarning Multiline="@Multiline" Tooltip="@Tooltip">
-            @Warning
-        </ValidationWarning>
-    }
-    else
-    {
-        <ValidationWarning Multiline="@Multiline" Tooltip="@Tooltip" />
-    }
+    <ValidationSuccess Tooltip="@Tooltip">
+        @Success
+    </ValidationSuccess>
 }
-else if ( ParentValidation?.Status == ValidationStatus.Error )
+@if ( Warning is not null )
 {
-    @if ( Error is not null )
-    {
-        <ValidationError Multiline="@Multiline" Tooltip="@Tooltip">
-            @Error
-        </ValidationError>
-    }
-    else
-    {
-        <ValidationError Multiline="@Multiline" Tooltip="@Tooltip" />
-    }
+    <ValidationWarning Multiline="@Multiline" Tooltip="@Tooltip">
+        @Warning
+    </ValidationWarning>
 }
-else if ( None is not null )
+else
 {
-    <ValidationNone>
-        @None
-    </ValidationNone>
+    <ValidationWarning Multiline="@Multiline" Tooltip="@Tooltip" />
+}
+@if ( Error is not null )
+{
+    <ValidationError Multiline="@Multiline" Tooltip="@Tooltip">
+        @Error
+    </ValidationError>
+}
+else
+{
+    <ValidationError Multiline="@Multiline" Tooltip="@Tooltip" />
 }