From 514d6e0d2c70e208d7d240ef6a6b4ad11870a8dd Mon Sep 17 00:00:00 2001 From: HadayaRahman-SF4673 Date: Mon, 20 Oct 2025 16:06:29 +0530 Subject: [PATCH] 984058-Moving-Internal-Changes-to-Public-Repository --- maui/src/Picker/SfDateTimePicker.cs | 33 +++++------------------------ 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/maui/src/Picker/SfDateTimePicker.cs b/maui/src/Picker/SfDateTimePicker.cs index 67dc238b..abe77db4 100644 --- a/maui/src/Picker/SfDateTimePicker.cs +++ b/maui/src/Picker/SfDateTimePicker.cs @@ -63,11 +63,6 @@ public class SfDateTimePicker : PickerBase, IParentThemeElement, IThemeElement /// int _selectedIndex; - /// - /// Holds the header changed or not - /// - bool _isCurrentPickerViewChanged = false; - #endregion #region Bindable Properties @@ -1048,20 +1043,10 @@ void OnPickerSelectionIndexChanged(object? sender, PickerSelectionChangedEventAr { if (_selectedIndex == 0) { - if (IsScrollSelectionAllowed()) - { - ResetDateTimeOnViewChange(); - } - OnDatePickerSelectionIndexChanged(e); } else { - if (IsScrollSelectionAllowed()) - { - ResetDateTimeOnViewChange(); - } - OnTimePickerSelectionIndexChanged(e); } } @@ -1868,18 +1853,6 @@ void UpdateColumnsSelectedItem() _meridiemColumn.SelectedItem = PickerHelper.GetSelectedItemDefaultValue(_meridiemColumn); } - /// - /// Need to reset the current selected date or time value without okay button click. - /// - void ResetDateTimeOnViewChange() - { - if (_internalSelectedDateTime != null && _isCurrentPickerViewChanged) - { - _internalSelectedDateTime = null; - _isCurrentPickerViewChanged = false; - } - } - /// /// Method to generate the day column with items source and selected index based on format. /// @@ -2293,7 +2266,6 @@ protected override void OnHeaderButtonClicked(int index) } _selectedIndex = index; - _isCurrentPickerViewChanged = true; if (_selectedIndex == 0) { ResetDateColumns(); @@ -2425,6 +2397,11 @@ protected override void OnCancelButtonClicked(EventArgs e) if (SelectedDate != null) { // Update the selected index in the UI to reflect the selected date + if (_internalSelectedDateTime != null) + { + _internalSelectedDateTime = null; + } + UpdateSelectedIndex(SelectedDate); } else