Skip to content

Commit

Permalink
fix(blazorui): resolve issues of update time in BitDatePicker #5422 (#…
Browse files Browse the repository at this point in the history 
…5450)
  • Loading branch information
@Cyrus-Sushiant
Cyrus-Sushiant authored Oct 2, 2023
1 parent 5456a28 commit d7c0c22
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 45 deletions.
93 changes: 48 additions & 45 deletions src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ private async Task SelectDate(int dayIndex, int weekIndex)
IsOpen = false;
_displayYear = _currentYear;
_currentMonth = selectedMonth;
CurrentValue = new DateTimeOffset(Culture.DateTimeFormat.Calendar.ToDateTime(_currentYear, _currentMonth, _currentDay, _timeHour, _timeMinute, 0, 0), DateTimeOffset.Now.Offset);
CurrentValue = new DateTimeOffset(Culture.Calendar.ToDateTime(_currentYear, _currentMonth, _currentDay, _timeHour, _timeMinute, 0, 0), DateTimeOffset.Now.Offset);
CreateMonthCalendar(_currentYear, _currentMonth);
await OnSelectDate.InvokeAsync(CurrentValue);
}
Expand Down Expand Up @@ -623,8 +623,8 @@ private void HandleGoToToday()

private void CreateMonthCalendar(DateTime dateTime)
{
_currentMonth = Culture.DateTimeFormat.Calendar.GetMonth(dateTime);
_currentYear = Culture.DateTimeFormat.Calendar.GetYear(dateTime);
_currentMonth = Culture.Calendar.GetMonth(dateTime);
_currentYear = Culture.Calendar.GetYear(dateTime);
_displayYear = _currentYear;
_yearRangeFrom = _currentYear - 1;
_yearRangeTo = _currentYear + 10;
Expand All @@ -634,8 +634,8 @@ private void CreateMonthCalendar(DateTime dateTime)
private void CreateMonthCalendar(int year, int month)
{
_monthTitle = $"{Culture.DateTimeFormat.GetMonthName(month)} {year}";
_monthLength = Culture.DateTimeFormat.Calendar.GetDaysInMonth(year, month);
var firstDay = Culture.DateTimeFormat.Calendar.ToDateTime(year, month, 1, 0, 0, 0, 0);
_monthLength = Culture.Calendar.GetDaysInMonth(year, month);
var firstDay = Culture.Calendar.ToDateTime(year, month, 1, 0, 0, 0, 0);
var currentDay = 1;
ResetCalendar();

Expand All @@ -653,12 +653,12 @@ private void CreateMonthCalendar(int year, int month)
if (month - 1 == 0)
{
previousMonth = 12;
previousMonthDaysCount = Culture.DateTimeFormat.Calendar.GetDaysInMonth(year - 1, previousMonth);
previousMonthDaysCount = Culture.Calendar.GetDaysInMonth(year - 1, previousMonth);
}
else
{
previousMonth = month - 1;
previousMonthDaysCount = Culture.DateTimeFormat.Calendar.GetDaysInMonth(year, previousMonth);
previousMonthDaysCount = Culture.Calendar.GetDaysInMonth(year, previousMonth);
}

var firstDayOfWeek = (int)(Culture.DateTimeFormat.FirstDayOfWeek);
Expand Down Expand Up @@ -699,14 +699,14 @@ 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);
var month = Culture.DateTimeFormat.Calendar.GetMonth(CurrentValue.Value.DateTime);
var year = Culture.Calendar.GetYear(CurrentValue.Value.DateTime);
var month = Culture.Calendar.GetMonth(CurrentValue.Value.DateTime);

if (year == _currentYear && month == _currentMonth)
{
var day = Culture.DateTimeFormat.Calendar.GetDayOfMonth(CurrentValue.Value.DateTime);
var day = Culture.Calendar.GetDayOfMonth(CurrentValue.Value.DateTime);
var firstDayOfWeek = (int)Culture.DateTimeFormat.FirstDayOfWeek;
var firstDayOfWeekInMonth = (int)Culture.DateTimeFormat.Calendar.ToDateTime(year, month, 1, 0, 0, 0, 0).DayOfWeek;
var firstDayOfWeekInMonth = (int)Culture.Calendar.ToDateTime(year, month, 1, 0, 0, 0, 0).DayOfWeek;
var firstDayOfWeekInMonthIndex = (firstDayOfWeekInMonth - firstDayOfWeek + DEFAULT_DAY_COUNT_PER_WEEK) % DEFAULT_DAY_COUNT_PER_WEEK;
_selectedDateDayOfWeek = ((int)CurrentValue.Value.DayOfWeek - firstDayOfWeek + DEFAULT_DAY_COUNT_PER_WEEK) % DEFAULT_DAY_COUNT_PER_WEEK;
var days = firstDayOfWeekInMonthIndex + day;
Expand Down Expand Up @@ -748,9 +748,9 @@ private async Task CloseCallout()
private string GetDateElClass(int day, int week)
{
StringBuilder className = new StringBuilder();
var todayYear = Culture.DateTimeFormat.Calendar.GetYear(DateTime.Now);
var todayMonth = Culture.DateTimeFormat.Calendar.GetMonth(DateTime.Now);
var todayDay = Culture.DateTimeFormat.Calendar.GetDayOfMonth(DateTime.Now);
var todayYear = Culture.Calendar.GetYear(DateTime.Now);
var todayMonth = Culture.Calendar.GetMonth(DateTime.Now);
var todayDay = Culture.Calendar.GetDayOfMonth(DateTime.Now);
var currentDay = _currentMonthCalendar[week, day];

if (IsInCurrentMonth(week, day) is false)
Expand Down Expand Up @@ -817,8 +817,8 @@ private string GetDateAriaLabel(int week, int day)

private bool IsGoTodayDisabled()
{
var todayMonth = Culture.DateTimeFormat.Calendar.GetMonth(DateTime.Now);
var todayYear = Culture.DateTimeFormat.Calendar.GetYear(DateTime.Now);
var todayMonth = Culture.Calendar.GetMonth(DateTime.Now);
var todayYear = Culture.Calendar.GetYear(DateTime.Now);

if (_showMonthPickerAsOverlayInternal)
{
Expand Down Expand Up @@ -854,8 +854,8 @@ private int GetWeekNumber(int weekIndex)
}

int day = _currentMonthCalendar[weekIndex, 0];
var date = Culture.DateTimeFormat.Calendar.ToDateTime(year, month, day, 0, 0, 0, 0);
return Culture.DateTimeFormat.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFullWeek, Culture.DateTimeFormat.FirstDayOfWeek);
var date = Culture.Calendar.ToDateTime(year, month, day, 0, 0, 0, 0);
return Culture.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFullWeek, Culture.DateTimeFormat.FirstDayOfWeek);
}

private void ToggleMonthPickerAsOverlay()
Expand All @@ -872,17 +872,17 @@ private bool CanMonthChange(ChangeDirection direction)
{
if (direction == ChangeDirection.Next && MaxDate.HasValue)
{
var MaxDateYear = Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MaxDate.Value.DateTime);
var MaxDateYear = Culture.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.Calendar.GetMonth(MaxDate.Value.DateTime);

if (MaxDateYear == _displayYear && MaxDateMonth == _currentMonth) return false;
}


if (direction == ChangeDirection.Previous && MinDate.HasValue)
{
var MinDateYear = Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MinDate.Value.DateTime);
var MinDateYear = Culture.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.Calendar.GetMonth(MinDate.Value.DateTime);

if (MinDateYear == _displayYear && MinDateMonth == _currentMonth) return false;
}
Expand All @@ -891,12 +891,12 @@ private bool CanMonthChange(ChangeDirection direction)
}

private bool CanYearChange(ChangeDirection direction) =>
((direction == ChangeDirection.Next && MaxDate.HasValue && Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime) == _displayYear) ||
(direction == ChangeDirection.Previous && MinDate.HasValue && Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime) == _displayYear)) is false;
((direction == ChangeDirection.Next && MaxDate.HasValue && Culture.Calendar.GetYear(MaxDate.Value.DateTime) == _displayYear) ||
(direction == ChangeDirection.Previous && MinDate.HasValue && Culture.Calendar.GetYear(MinDate.Value.DateTime) == _displayYear)) is false;

private bool CanYearRangeChange(ChangeDirection direction) =>
((direction == ChangeDirection.Next && MaxDate.HasValue && Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime) < _yearRangeFrom + 12) ||
(direction == ChangeDirection.Previous && MinDate.HasValue && Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime) >= _yearRangeFrom)) is false;
((direction == ChangeDirection.Next && MaxDate.HasValue && Culture.Calendar.GetYear(MaxDate.Value.DateTime) < _yearRangeFrom + 12) ||
(direction == ChangeDirection.Previous && MinDate.HasValue && Culture.Calendar.GetYear(MinDate.Value.DateTime) >= _yearRangeFrom)) is false;

private bool IsWeekDayOutOfMinAndMaxDate(int dayIndex, int weekIndex)
{
Expand All @@ -905,9 +905,9 @@ private bool IsWeekDayOutOfMinAndMaxDate(int dayIndex, int weekIndex)

if (MaxDate.HasValue)
{
var MaxDateYear = Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MaxDate.Value.DateTime);
var MaxDateDay = Culture.DateTimeFormat.Calendar.GetDayOfMonth(MaxDate.Value.DateTime);
var MaxDateYear = Culture.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.Calendar.GetMonth(MaxDate.Value.DateTime);
var MaxDateDay = Culture.Calendar.GetDayOfMonth(MaxDate.Value.DateTime);

if (_displayYear > MaxDateYear ||
(_displayYear == MaxDateYear && month > MaxDateMonth) ||
Expand All @@ -916,9 +916,9 @@ private bool IsWeekDayOutOfMinAndMaxDate(int dayIndex, int weekIndex)

if (MinDate.HasValue)
{
var MinDateYear = Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MinDate.Value.DateTime);
var MinDateDay = Culture.DateTimeFormat.Calendar.GetDayOfMonth(MinDate.Value.DateTime);
var MinDateYear = Culture.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.Calendar.GetMonth(MinDate.Value.DateTime);
var MinDateDay = Culture.Calendar.GetDayOfMonth(MinDate.Value.DateTime);

if (_displayYear < MinDateYear ||
(_displayYear == MinDateYear && month < MinDateMonth) ||
Expand All @@ -932,16 +932,16 @@ private bool IsMonthOutOfMinAndMaxDate(int month)
{
if (MaxDate.HasValue)
{
var MaxDateYear = Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MaxDate.Value.DateTime);
var MaxDateYear = Culture.Calendar.GetYear(MaxDate.Value.DateTime);
var MaxDateMonth = Culture.Calendar.GetMonth(MaxDate.Value.DateTime);

if (_displayYear > MaxDateYear || (_displayYear == MaxDateYear && month > MaxDateMonth)) return true;
}

if (MinDate.HasValue)
{
var MinDateYear = Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.DateTimeFormat.Calendar.GetMonth(MinDate.Value.DateTime);
var MinDateYear = Culture.Calendar.GetYear(MinDate.Value.DateTime);
var MinDateMonth = Culture.Calendar.GetMonth(MinDate.Value.DateTime);

if (_displayYear < MinDateYear || (_displayYear == MinDateYear && month < MinDateMonth)) return true;
}
Expand All @@ -950,15 +950,15 @@ private bool IsMonthOutOfMinAndMaxDate(int month)
}

private bool IsYearOutOfMinAndMaxDate(int year) =>
(MaxDate.HasValue && year > Culture.DateTimeFormat.Calendar.GetYear(MaxDate.Value.DateTime)) ||
(MinDate.HasValue && year < Culture.DateTimeFormat.Calendar.GetYear(MinDate.Value.DateTime));
(MaxDate.HasValue && year > Culture.Calendar.GetYear(MaxDate.Value.DateTime)) ||
(MinDate.HasValue && year < Culture.Calendar.GetYear(MinDate.Value.DateTime));

private void CheckCurrentCalendarMatchesCurrentValue()
{
var currentValue = CurrentValue.GetValueOrDefault(DateTimeOffset.Now);
var currentValueYear = Culture.DateTimeFormat.Calendar.GetYear(currentValue.DateTime);
var currentValueMonth = Culture.DateTimeFormat.Calendar.GetMonth(currentValue.DateTime);
var currentValueDay = Culture.DateTimeFormat.Calendar.GetDayOfMonth(currentValue.DateTime);
var currentValueYear = Culture.Calendar.GetYear(currentValue.DateTime);
var currentValueMonth = Culture.Calendar.GetMonth(currentValue.DateTime);
var currentValueDay = Culture.Calendar.GetDayOfMonth(currentValue.DateTime);

if (currentValueYear != _currentYear || currentValueMonth != _currentMonth || (AllowTextInput && currentValueDay != _currentDay))
{
Expand All @@ -973,7 +973,7 @@ private string GetMonthCellClassName(int monthIndex)
var className = new StringBuilder();
if (HighlightCurrentMonth)
{
var todayMonth = Culture.DateTimeFormat.Calendar.GetMonth(DateTime.Now);
var todayMonth = Culture.Calendar.GetMonth(DateTime.Now);
if (todayMonth == monthIndex)
{
className.Append(RootElementClass).Append("-crtm");
Expand Down Expand Up @@ -1007,17 +1007,20 @@ private DateTimeOffset GetDayCellDate(int dayIndex, int weekIndex)
currentYear--;
}

return new DateTimeOffset(Culture.DateTimeFormat.Calendar.ToDateTime(currentYear, selectedMonth, currentDay, 0, 0, 0, 0), DateTimeOffset.Now.Offset);
return new DateTimeOffset(Culture.Calendar.ToDateTime(currentYear, selectedMonth, currentDay, 0, 0, 0, 0), DateTimeOffset.Now.Offset);
}

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

private void UpdateTime()
{
if (CurrentValue.HasValue is false) return;

CurrentValue = new DateTimeOffset(Culture.DateTimeFormat.Calendar.ToDateTime(CurrentValue.Value.Year, CurrentValue.Value.Month, CurrentValue.Value.Day, _timeHour, _timeMinute, 0, 0), DateTimeOffset.Now.Offset);
var currentValueYear = Culture.Calendar.GetYear(CurrentValue.Value.LocalDateTime);
var currentValueMonth = Culture.Calendar.GetMonth(CurrentValue.Value.LocalDateTime);
var currentValueDay = Culture.Calendar.GetDayOfMonth(CurrentValue.Value.LocalDateTime);
CurrentValue = new DateTimeOffset(Culture.Calendar.ToDateTime(currentValueYear, currentValueMonth, currentValueDay, _timeHour, _timeMinute, 0, 0), DateTimeOffset.Now.Offset);
}
private async Task HandleOnTimeHourFocus()
{
Expand Down
4 changes: 4 additions & 0 deletions src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,4 +731,8 @@
text-align: right;
padding: 0 spacing(1.25) 0 spacing(0.5);
}

.bit-dtp-time-wrp {
flex-direction: row-reverse;
}
}

0 comments on commit d7c0c22

Please sign in to comment.