Skip to content

Improvement BitDatePicker #4035 #4054

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
msynk merged 1 commit into from
Mar 7, 2023
Merged

Improvement BitDatePicker #4035 #4054

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
45 changes: 11 additions & 34 deletions src/BlazorUI/Bit.BlazorUI/Components/DatePicker/BitDatePicker.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,7 @@ protected override bool TryParseValueFromString(string? value, [MaybeNullWhen(fa
protected override string? FormatValueAsString(DateTimeOffset? value) =>
value.HasValue ? value.Value.ToString(DateFormat ?? Culture.DateTimeFormat.ShortDatePattern, Culture) : null;

public async Task OpenCallout()
{
await HandleOnClick();
}
public Task OpenCallout() => HandleOnClick();

private async Task HandleOnClick()
{
Expand All @@ -372,7 +369,7 @@ private async Task HandleOnClick()

IsOpen = !IsOpen;

if (IsOpen && CurrentValue != null)
if (IsOpen && CurrentValue.HasValue)
{
CheckCurrentCalendarMatchesCurrentValue();
}
Expand Down Expand Up @@ -430,9 +427,7 @@ private async Task HandleOnChange(ChangeEventArgs e)
private async Task SelectDate(int dayIndex, int weekIndex)
{
if (IsEnabled is false) return;

if (ValueHasBeenSet && ValueChanged.HasDelegate is false) return;

if (IsWeekDayOutOfMinAndMaxDate(dayIndex, weekIndex)) return;

_currentDay = _currentMonthCalendar[weekIndex, dayIndex];
Expand Down Expand Up @@ -511,7 +506,6 @@ private void SelectYear(int year)
_currentYear = _displayYear = year;
ChangeYearRanges(_currentYear - 1);
CreateMonthCalendar(_currentYear, _currentMonth);

ToggleBetweenMonthAndYearPicker();
}

Expand Down Expand Up @@ -551,10 +545,9 @@ private void HandleOnYearRangeChange(ChangeDirection direction)

private void HandleGoToToday()
{
if (IsEnabled)
{
CreateMonthCalendar(DateTime.Now);
}
if (IsEnabled is false) return;

CreateMonthCalendar(DateTime.Now);
}

private void CreateMonthCalendar(DateTime dateTime)
Expand Down Expand Up @@ -633,7 +626,6 @@ private void CreateMonthCalendar(int year, int month)
private void SetSelectedDateInMonthCalendar()
{
if (Culture is null) return;

if (CurrentValue.HasValue is false || (_selectedDateWeek.HasValue && _selectedDateDayOfWeek.HasValue)) return;

var year = Culture.DateTimeFormat.Calendar.GetYear(CurrentValue.Value.DateTime);
Expand Down Expand Up @@ -748,15 +740,9 @@ private string GetDateAriaLabel(int week, int day)
return $"{_currentMonthCalendar[week, day]}, {Culture.DateTimeFormat.GetMonthName(month)}, {year}";
}

private bool IsMonthSelected(int month)
{
return month == _currentMonth;
}
private bool IsMonthSelected(int month) => month == _currentMonth;

private bool IsYearSelected(int year)
{
return year == _currentYear;
}
private bool IsYearSelected(int year) => year == _currentYear;

private bool IsGoTodayDisabled()
{
Expand Down Expand Up @@ -802,9 +788,7 @@ private int GetWeekNumber(int weekIndex)
}

private void ToggleMonthPickerAsOverlay()
{
_isMonthPickerOverlayOnTop = !_isMonthPickerOverlayOnTop;
}
=> _isMonthPickerOverlayOnTop = _isMonthPickerOverlayOnTop is false;

private int GetValueForComparison(int firstDay)
{
Expand Down Expand Up @@ -904,6 +888,7 @@ private void CheckCurrentCalendarMatchesCurrentValue()
var currentValueYear = Culture.DateTimeFormat.Calendar.GetYear(currentValue.DateTime);
var currentValueMonth = Culture.DateTimeFormat.Calendar.GetMonth(currentValue.DateTime);
var currentValueDay = Culture.DateTimeFormat.Calendar.GetDayOfMonth(currentValue.DateTime);

if (currentValueYear != _currentYear || currentValueMonth != _currentMonth || (AllowTextInput && currentValueDay != _currentDay))
{
_currentYear = currentValueYear;
Expand Down Expand Up @@ -949,18 +934,10 @@ private DateTimeOffset GetDayCellDate(int dayIndex, int weekIndex)
}

private DateTimeOffset GetMonthCellDate(int monthIndex)
{
var currentDate = new DateTimeOffset(Culture.DateTimeFormat.Calendar.ToDateTime(_currentYear, monthIndex, 1, 0, 0, 0, 0), DateTimeOffset.Now.Offset);
return currentDate;
}

=> new DateTimeOffset(Culture.DateTimeFormat.Calendar.ToDateTime(_currentYear, monthIndex, 1, 0, 0, 0, 0), DateTimeOffset.Now.Offset);

[JSInvokable("CloseCallout")]
public void CloseCalloutBeforeAnotherCalloutIsOpened()
{
IsOpen = false;
}

public void CloseCalloutBeforeAnotherCalloutIsOpened() => IsOpen = false;

protected override void Dispose(bool disposing)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Bit.BlazorUI/Components/DatePicker/BitDatePicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@

.divider {
top: 0;
border-right: $shape-border-width $shape-border-style $Grey30;
border-right: $shape-border-width $shape-border-style $color-neutrals-gray30;
}

.month-picker-wrapper {
Expand Down