Skip to content

Added logic so that the error message and text box outline updates are displayed based on ErrorsVisibility #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fcjoe-gis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added logic so that the error message and text box outline updates are displayed based on ErrorsVisibility #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,17 @@ protected override void OnApplyTemplate()
{
content.ContentTemplate = new FieldTemplateSelector(this);
}

// JH: If UpdateErrorMessages is called before the FieldFormElementView is Loaded it fails
Loaded += OnLoaded;
UpdateErrorMessages();
}

private void OnLoaded(object? sender, EventArgs e)
{
UpdateErrorMessages();
Loaded -= OnLoaded;
}
}
}
#endif
3 changes: 3 additions & 0 deletions src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ private void UpdateErrorMessages()
}
if (GetTemplateChild("ErrorLabel") is TextBlock tb)
{
// JH: If the control is not loaded yet, updating error message will fail.
if ( !IsLoaded ) return;

tb.Text = errMessage ?? string.Empty;
bool showError = false;
if (!string.IsNullOrEmpty(errMessage) && (_hadFocus || FeatureFormView.GetFeatureFormViewParent(this)?.ShouldShowError() == true))
Expand Down
8 changes: 8 additions & 0 deletions src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ protected override void OnApplyTemplate()
button.Clicked += BarcodeButton_Clicked;
}
ConfigureTextBox();

//JH: Same issue as in FieldFormElement, the first time UpdateValidationState is called Element is null
Loaded += OnLoaded;
UpdateValidationState();
}

private void OnLoaded(object? sender, EventArgs e)
{
UpdateValidationState();
}

Expand Down
8 changes: 6 additions & 2 deletions src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,15 @@ private void Element_PropertyChanged(object? sender, System.ComponentModel.Prope
this.Dispatch(UpdateValidationState);
}
}

private void UpdateValidationState()
{
var err = Element?.ValidationErrors;
if (err != null && err.Any() && Element?.IsEditable == true && _hadFocus)

//JH: Add a check to see if the ErrorsVisibility is set to true, not only if _hadFocus is true
bool shouldShowError = (FeatureFormView.GetFeatureFormViewParent(this)?.ShouldShowError() ?? false) || _hadFocus;

if (err != null && err.Any() && Element?.IsEditable == true && shouldShowError)
{
#if MAUI
if (GetTemplateChild("ErrorBorder") is Border border)
Expand Down