Skip to content

Commit 9d7bf76

Browse files
authored
Merge pull request #311 from enisn/4.1-validation-state-fix
FormView - Validation state sync fix
2 parents fd79c35 + 7a773ef commit 9d7bf76

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

sandbox/SandboxMAUI/ViewModels/AdvancedEntryPageViewModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ async void Submit()
2323
{
2424
if (!IsValidated)
2525
{
26-
await Application.Current.MainPage.DisplayAlert("", "You must fill all areas correctly!", "OK");
26+
await Application.Current.MainPage.DisplayAlert("", "You successfully submitted the form", "OK");
2727
}
2828

2929
//DO SOME STUFFS HERE
3030
}
31-
}
32-
31+
}

src/InputKit.Maui/InputKit.Maui.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<SingleProject>true</SingleProject>
99
<MauiVersion>6.0.486</MauiVersion>
1010
<PackageId>InputKit.Maui</PackageId>
11-
<Version>4.1.1</Version>
11+
<Version>4.1.2</Version>
1212
<DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);UWP</DefineConstants>
1313

1414
<!-- NuGet Package Info -->

src/InputKit.Maui/Shared/Controls/CheckBox.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ public void DisplayValidation()
286286

287287
this.Add(iconValidation.Value);
288288
}
289+
290+
OnPropertyChanged(nameof(IsValid));
289291
}
290292

291293
#endregion

src/InputKit.Maui/Shared/Controls/FormView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void UnregisterEvent(BindableObject view)
8888

8989
private void SubmitButtonClicked(object sender, EventArgs e)
9090
{
91-
if (IsValidated)
91+
if (CheckValidation(this))
9292
{
9393
SubmitCommand?.Execute(IsValidated);
9494
}

src/InputKit.Maui/Shared/Controls/RadioButtonGroupView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ void UpdateSelected(object selected, EventArgs e)
195195

196196
SelectedItemChanged?.Invoke(this, new EventArgs());
197197
SelectedItemChangedCommand?.Execute(CommandParameter);
198+
OnPropertyChanged(nameof(IsValid));
198199
}
199200
}
200201

src/Xamarin.Forms.InputKit/Shared/Controls/CheckBox.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ public void DisplayValidation()
283283

284284
this.Children.Add(iconValidation.Value);
285285
}
286+
287+
OnPropertyChanged(nameof(IsValid));
286288
}
287289

288290
#endregion

src/Xamarin.Forms.InputKit/Shared/Controls/FormView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void UnregisterEvent(BindableObject view)
9292

9393
private void SubmitButtonClicked(object sender, EventArgs e)
9494
{
95-
if (IsValidated)
95+
if (CheckValidation(this))
9696
{
9797
SubmitCommand?.Execute(IsValidated);
9898
}

src/Xamarin.Forms.InputKit/Shared/Controls/RadioButtonGroupView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ void UpdateSelected(object selected, EventArgs e)
194194

195195
SelectedItemChanged?.Invoke(this, new EventArgs());
196196
SelectedItemChangedCommand?.Execute(CommandParameter);
197+
OnPropertyChanged(nameof(IsValid));
197198
}
198199
}
199200
private IEnumerable<RadioButton> GetChildRadioButtons(Layout<View> layout)

src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>Plugin.InputKit</RootNamespace>
99
<PackageId>Xamarin.Forms.InputKit</PackageId>
1010
<Product>$(AssemblyName) ($(TargetFramework))</Product>
11-
<Version>4.1.1</Version>
11+
<Version>4.1.2</Version>
1212
<PackOnBuild>false</PackOnBuild>
1313
<NeutralLanguage>en-US</NeutralLanguage>
1414
<DefineConstants>$(DefineConstants);</DefineConstants>

test/InputKit.Maui.Test/TestClasses/AnimationReadyHandler.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using Microsoft.Maui.Animations;
22
using Microsoft.Maui.Handlers;
3-
using System;
4-
using System.Collections.Generic;
5-
using System.Linq;
6-
using System.Text;
7-
using System.Threading.Tasks;
83

94
namespace InputKit.Maui.Test.TestClasses;
105

0 commit comments

Comments
 (0)