Skip to content

[DatePicker] Change OnSelectedDateAsync logic #2233

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

Merged
vnbaaij merged 6 commits into from
Jun 20, 2024
Merged

[DatePicker] Change OnSelectedDateAsync logic #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75db508
Fixes #2197
MarvinKlein1508 Jun 20, 2024
58f420d
Minify code
MarvinKlein1508 Jun 20, 2024
4bec595
Remove ??
MarvinKlein1508 Jun 20, 2024
7e4f939
Add UNIT-Test
MarvinKlein1508 Jun 20, 2024
af21b3e
Merge branch 'dev' into fix-2197
dvoituron Jun 20, 2024
0340fa0
Merge branch 'dev' into fix-2197
vnbaaij Jun 20, 2024
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
11 changes: 8 additions & 3 deletions src/Core/Components/DateTime/FluentDatePicker.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,15 @@ protected async Task OnSelectedDateAsync(DateTime? value)
{
Opened = false;

var updatedValue = Value?.TimeOfDay != TimeSpan.Zero
? (value ?? DateTime.MinValue).Date + Value?.TimeOfDay
: value;
DateTime? updatedValue = value;

if (Value is not null && value is not null)
{
updatedValue = Value?.TimeOfDay != TimeSpan.Zero
? value?.Date + Value?.TimeOfDay
: value;
}

await OnSelectedDateHandlerAsync(updatedValue);
}

Expand Down
23 changes: 23 additions & 0 deletions tests/Core/DateTime/FluentDatePickerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,27 @@ public void FluentCalendar_DisabledDate()
// Assert
calendar.Verify();
}

[Fact]
public void FluentDatePicker_ChangeValueWhenDefaultIsNull()
{
// Arrange
using var ctx = new TestContext();
ctx.JSInterop.Mode = JSRuntimeMode.Loose;
ctx.Services.AddSingleton(LibraryConfiguration);

// Act
var picker = ctx.RenderComponent<FluentDatePicker>(parameters =>
{
parameters.Add(p => p.Value, null);
});

var textField = picker.Find("fluent-text-field");

// Set a new date value
textField.Change("2022-03-12");

// Assert
Assert.Equal(System.DateTime.Parse("2022-03-12"), picker.Instance.Value);
}
}