Revert "✨Fixes issue #233: Add selectedDate control to MonthView for external date management"

This reverts commit d702bca

Author: lavigarg-simform

CHANGELOG.md

@@ -4,8 +4,6 @@
 - Added `DividerSettings` to customize the dividers in `WeekView` and `MultiDayView`. [#374](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/374), [#430](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/430), [#498](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/498)
 - Added `timeSlotColorBuilder` in `DayView` and `WeekView` to customize background color. [#470](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/470)
 - Added `pageDate` parameter for timeline label customization with current timestamp fallback. [#527](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/527)
-- Added `selectedDate` control to `MonthView` for external date management. [#233](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/233)
-- [BREAKING] Added `isSelected` parameter to `CellBuilder` typedef in `MonthView`. Custom cell builders must be updated to accept this new parameter.
 - Added `showMidnightHour` parameter in `DayView` and `WeekView` to control whether the `00:00` label is shown on the timeline. Default is `false`. [#492](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/492)
 - Added `onDateLongPressMoveUpdate` callback to `MonthView`, along with `MonthView.multiDateSelectionRange`, `MonthView.multiDateSelectionColor`, and `FilledCell.multipleDateSelectionColor` for multi-date selection customization.  [#401](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/401)
 - Updated documentation for `DayView`, `WeekView`, `MonthView` and `MultiDayView` to add more details about the parameters and their usage. [#448](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/pull/448)

doc/documentation.md

@@ -172,7 +172,6 @@ This guide covers more advanced features and customization options for the calen
 MonthView(
     controller: EventController(),
     width: 400, // Width of month view (if null, uses MediaQuery width)
-    selectedDate: DateTime(2021, 8, 10), // Controls selected date in month grid
     // Set of dates that are selected via long press and drag
     multiDateSelectionRange: {DateTime(2021, 8, 12), DateTime(2021, 8, 13)},
     multiDateSelectionColor: Colors.blue.withOpacity(0.3), // Color of selected date cells
@@ -185,7 +184,6 @@ MonthView(
       onPageChange: (date, pageIndex) => print("$date, $pageIndex"),
       onCellTap: (events, date) {
         // Implement callback when user taps on a cell.
-        // Update selectedDate here if you want controlled selection.
         print(events);
       },
       // Event callbacks
@@ -1028,7 +1026,7 @@ MonthView(
   ```dart
   MonthView(
     monthViewBuilders: MonthViewBuilders(
-      cellBuilder: (date, events, isToday, isInMonth, isSelected, hideDaysNotInMonth) {
+      cellBuilder: (date, events, isToday, isInMonth, hideDaysNotInMonth) {
         return Container(
           decoration: BoxDecoration(
             color: isInMonth ? Colors.white : Colors.grey[200],
@@ -1038,8 +1036,8 @@ MonthView(
             child: Text(
               date.day.toString(),
               style: TextStyle(
-                color: isSelected ? Colors.white : (isToday ? Colors.red : Colors.black),
-                fontWeight: (isToday || isSelected) ? FontWeight.bold : FontWeight.normal,
+                color: isToday ? Colors.red : Colors.black,
+                fontWeight: isToday ? FontWeight.bold : FontWeight.normal,
               ),
             ),
           ),
@@ -1136,29 +1134,6 @@ dependencies:
         ),
       });
    ```
-### 3. Migrate `CellBuilder`
-
-   ```dart
-  //  **Previous Signature (2.0.0):**
-   typedef CellBuilder<T extends Object?> = Widget Function(
-     DateTime date,
-     List<CalendarEventData<T>> event,
-     bool isToday,
-     bool isInMonth,
-     bool hideDaysNotInMonth,
-   );
-   ```
-   ```dart
-   // **New Signature (Latest):**
-   typedef CellBuilder<T extends Object?> = Widget Function(
-     DateTime date,
-     List<CalendarEventData<T>> event,
-     bool isToday,
-     bool isInMonth,
-     bool isSelected,        // New parameter added
-     bool hideDaysNotInMonth,
-   );
-   ```
 
 # Contributors
 

example/lib/widgets/month_view_widget.dart

@@ -16,16 +16,9 @@ class MonthViewWidget extends StatefulWidget {
 }
 
 class _MonthViewWidgetState extends State<MonthViewWidget> {
-  late DateTime _selectedDate;
   DateTime? _multiSelectionStartDate;
   Set<DateTime> _multiSelectedDateRange = <DateTime>{};
 
-  @override
-  void initState() {
-    super.initState();
-    _selectedDate = DateTime.now().withoutTime;
-  }
-
   @override
   Widget build(BuildContext context) {
     final translate = context.translate;
@@ -34,14 +27,10 @@ class _MonthViewWidgetState extends State<MonthViewWidget> {
         MonthView(
           key: widget.state,
           width: widget.width,
-          selectedDate: _selectedDate,
           multiDateSelectionRange: _multiSelectedDateRange,
           multiDateSelectionColor: Colors.blue.withValues(alpha: 0.1),
           monthViewThemeSettings: MonthViewThemeSettings(
             cellsInMonthHighlightColor: Colors.blue,
-            selectedHighlightColor: Colors.deepOrange,
-            selectedTitleColor: Colors.white,
-            selectedHighlightRadius: 12,
           ),
           monthViewStyle: MonthViewStyle(
             startDay: WeekDays.friday,
@@ -78,7 +67,6 @@ class _MonthViewWidgetState extends State<MonthViewWidget> {
               _setSelectedRange(startDate, _normalizeDate(date));
             },
             onCellTap: (events, date) {
-              setState(() => _selectedDate = date.withoutTime);
               final normalizedDate = _normalizeDate(date);
               if (_multiSelectedDateRange.isNotEmpty) {
                 if (_multiSelectedDateRange.contains(normalizedDate)) {

lib/src/month_view/month_view.dart

@@ -16,7 +16,6 @@ class MonthView<T extends Object?> extends StatefulWidget {
     this.monthViewThemeSettings = const MonthViewThemeSettings(),
     this.controller,
     this.width,
-    this.selectedDate,
     this.multiDateSelectionRange = const {},
     this.multiDateSelectionColor,
   }) : super(key: key);
@@ -45,13 +44,6 @@ class MonthView<T extends Object?> extends StatefulWidget {
   /// If null is provided then It will take width of closest [MediaQuery].
   final double? width;
 
-  /// Controls the selected date in the month grid.
-  ///
-  /// When null, the view manages selection internally and updates it when a
-  /// visible cell is tapped. When non-null, selection is controlled by the
-  /// caller and taps only trigger [MonthViewBuilders.onCellTap].
-  final DateTime? selectedDate;
-
   /// Set of dates that are selected via [MonthViewBuilders.onDateLongPressMoveUpdate]
   final Set<DateTime> multiDateSelectionRange;
 
@@ -101,9 +93,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
   /// Height of each cell in the month grid. Calculated based on cellAspectRatio.
   late double _cellHeight;
 
-  /// Current selected date (single date).
-  DateTime? _selectedDate;
-
   /// Builder function for rendering individual calendar cells.
   late CellBuilder<T> _cellBuilder;
 
@@ -141,8 +130,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
 
     _regulateCurrentDate();
 
-    _selectedDate = widget.selectedDate?.withoutTime;
-
     // Initialize page controller to control page actions.
     _pageController = PageController(initialPage: _currentIndex);
 
@@ -200,12 +187,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
     // Update builders and callbacks
     _assignBuilders();
 
-    if (widget.selectedDate != null) {
-      _selectedDate = widget.selectedDate?.withoutTime;
-    } else if (oldWidget.selectedDate != null) {
-      _selectedDate = oldWidget.selectedDate?.withoutTime;
-    }
-
     updateViewDimensions();
   }
 
@@ -335,7 +316,7 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
                               width: _width,
                               child: _MonthPageBuilder<T>(
                                 key: ValueKey(date.toIso8601String()),
-                                onCellTap: _handleCellTap,
+                                onCellTap: _monthViewBuilders.onCellTap,
                                 onDateLongPress:
                                     _monthViewBuilders.onDateLongPress,
                                 onDateLongPressMoveUpdate: _monthViewBuilders
@@ -348,7 +329,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
                                 borderColor: _monthViewStyle.borderColor,
                                 borderSize: _monthViewStyle.borderSize,
                                 cellBuilder: _cellBuilder,
-                                selectedDate: _selectedDate,
                                 cellRatio: _cellAspectRatio,
                                 date: date,
                                 showBorder: _monthViewStyle.showBorder,
@@ -405,14 +385,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
     return _controller!;
   }
 
-  bool _isSameDate(DateTime? first, DateTime? second) {
-    if (first == null || second == null) {
-      return first == second;
-    }
-
-    return first.withoutTime.compareWithoutTime(second.withoutTime);
-  }
-
   void _reload() {
     if (mounted) {
       setState(() {});
@@ -579,7 +551,6 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
     List<CalendarEventData<T>> events,
     bool isToday,
     bool isInMonth,
-    bool isSelected,
     bool hideDaysNotInMonth,
   ) {
     // Normalize both the input date and selected dates to date-only (midnight)
@@ -590,27 +561,11 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
     );
     final color = isMultiSelected ? widget.multiDateSelectionColor : null;
     final themeColor = context.monthViewColors;
-    final shouldHighlight = isSelected || isToday;
-    final highlightedTitleColor = isSelected
-        ? _monthViewThemeSettings.selectedTitleColor
-        : hideDaysNotInMonth
-            ? _monthViewThemeSettings.cellsNotInMonthHighlightedTitleColor
-            : _monthViewThemeSettings.cellsInMonthHighlightedTitleColor;
-    final highlightColor = isSelected
-        ? _monthViewThemeSettings.selectedHighlightColor
-        : hideDaysNotInMonth
-            ? themeColor.cellHighlightColor
-            : _monthViewThemeSettings.cellsInMonthHighlightColor;
-    final highlightRadius = isSelected
-        ? _monthViewThemeSettings.selectedHighlightRadius
-        : hideDaysNotInMonth
-            ? _monthViewThemeSettings.cellsNotInMonthHighlightRadius
-            : _monthViewThemeSettings.cellsInMonthHighlightRadius;
 
     if (hideDaysNotInMonth) {
       return FilledCell<T>(
         date: date,
-        shouldHighlight: shouldHighlight,
+        shouldHighlight: isToday,
         backgroundColor: isInMonth
             ? themeColor.cellInMonthColor
             : themeColor.cellNotInMonthColor,
@@ -625,16 +580,17 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
         dateStringBuilder: _monthViewBuilders.dateStringBuilder,
         hideDaysNotInMonth: hideDaysNotInMonth,
         titleColor: themeColor.cellTextColor,
-        highlightColor: highlightColor,
+        highlightColor: themeColor.cellHighlightColor,
         tileColor: themeColor.weekDayTileColor,
-        highlightRadius: highlightRadius,
-        highlightedTitleColor: highlightedTitleColor,
+        highlightRadius: _monthViewThemeSettings.cellsNotInMonthHighlightRadius,
+        highlightedTitleColor:
+            _monthViewThemeSettings.cellsNotInMonthHighlightedTitleColor,
         multipleDateSelectionColor: color,
       );
     }
     return FilledCell<T>(
       date: date,
-      shouldHighlight: shouldHighlight,
+      shouldHighlight: isToday,
       backgroundColor: isInMonth
           ? themeColor.cellInMonthColor
           : themeColor.cellNotInMonthColor,
@@ -650,28 +606,15 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
       titleColor: isInMonth
           ? themeColor.cellTextColor
           : themeColor.cellTextColor.withAlpha(150),
-      highlightedTitleColor: highlightedTitleColor,
-      highlightRadius: highlightRadius,
+      highlightedTitleColor:
+          _monthViewThemeSettings.cellsInMonthHighlightedTitleColor,
+      highlightRadius: _monthViewThemeSettings.cellsInMonthHighlightRadius,
       tileColor: _monthViewThemeSettings.cellsInMonthTileColor,
-      highlightColor: highlightColor,
+      highlightColor: _monthViewThemeSettings.cellsInMonthHighlightColor,
       multipleDateSelectionColor: color,
     );
   }
 
-  /// Handles cell tap event. Updates selected date if [widget.selectedDate]
-  /// is null and calls [MonthViewBuilders.onCellTap] callback.
-  void _handleCellTap(List<CalendarEventData<T>> events, DateTime date) {
-    if (widget.selectedDate == null &&
-        !_isSameDate(_selectedDate, date.withoutTime) &&
-        mounted) {
-      setState(() {
-        _selectedDate = date.withoutTime;
-      });
-    }
-
-    _monthViewBuilders.onCellTap?.call(events, date);
-  }
-
   /// Animate to next page (next month).
   ///
   /// Arguments [duration] and [curve] will override default values provided
@@ -785,7 +728,6 @@ class _MonthPageBuilder<T> extends StatefulWidget {
     required this.showBorder,
     required this.borderSize,
     required this.cellBuilder,
-    required this.selectedDate,
     required this.date,
     required this.controller,
     required this.width,
@@ -819,7 +761,6 @@ class _MonthPageBuilder<T> extends StatefulWidget {
   final ScrollPhysics physics;
   final bool hideDaysNotInMonth;
   final int weekDays;
-  final DateTime? selectedDate;
 
   @override
   State<_MonthPageBuilder<T>> createState() => _MonthPageBuilderState<T>();
@@ -863,9 +804,7 @@ class _MonthPageBuilderState<T> extends State<_MonthPageBuilder<T>> {
                   (monthDays[index].month != widget.date.month)
               ? <CalendarEventData<T>>[]
               : widget.controller.getEventsOnDay(monthDays[index]);
-          final isSelected =
-              widget.selectedDate?.compareWithoutTime(monthDays[index]) ??
-                  false;
+
           return GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () => widget.onCellTap?.call(events, monthDays[index]),
@@ -884,7 +823,6 @@ class _MonthPageBuilderState<T> extends State<_MonthPageBuilder<T>> {
                 events,
                 monthDays[index].compareWithoutTime(DateTime.now()),
                 monthDays[index].month == widget.date.month,
-                isSelected,
                 widget.hideDaysNotInMonth,
               ),
             ),

lib/src/month_view/month_view_theme_settings.dart

@@ -19,9 +19,6 @@ class MonthViewThemeSettings {
     this.cellsInMonthHighlightRadius = 11,
     this.cellsInMonthTileColor = Colors.blue,
     this.cellsInMonthHighlightColor = Colors.blue,
-    this.selectedHighlightColor = Colors.blue,
-    this.selectedTitleColor = Constants.white,
-    this.selectedHighlightRadius = 11,
   });
 
   /// Default border color for week day cells.
@@ -57,15 +54,6 @@ class MonthViewThemeSettings {
   /// Highlight color for cells in the current month.
   final Color cellsInMonthHighlightColor;
 
-  /// Highlight color for the selected date.
-  final Color selectedHighlightColor;
-
-  /// Title color for the selected date.
-  final Color selectedTitleColor;
-
-  /// Highlight radius for the selected date.
-  final double selectedHighlightRadius;
-
   /// Creates a copy of this theme settings with the given fields replaced.
   MonthViewThemeSettings copyWith({
     Color? weekDayBorderColor,
@@ -79,9 +67,6 @@ class MonthViewThemeSettings {
     double? cellsInMonthHighlightRadius,
     Color? cellsInMonthTileColor,
     Color? cellsInMonthHighlightColor,
-    Color? selectedHighlightColor,
-    Color? selectedTitleColor,
-    double? selectedHighlightRadius,
   }) {
     return MonthViewThemeSettings(
       weekDayBorderColor: weekDayBorderColor ?? this.weekDayBorderColor,
@@ -103,11 +88,6 @@ class MonthViewThemeSettings {
           cellsInMonthTileColor ?? this.cellsInMonthTileColor,
       cellsInMonthHighlightColor:
           cellsInMonthHighlightColor ?? this.cellsInMonthHighlightColor,
-      selectedHighlightColor:
-          selectedHighlightColor ?? this.selectedHighlightColor,
-      selectedTitleColor: selectedTitleColor ?? this.selectedTitleColor,
-      selectedHighlightRadius:
-          selectedHighlightRadius ?? this.selectedHighlightRadius,
     );
   }
 
@@ -128,9 +108,6 @@ class MonthViewThemeSettings {
       cellsInMonthHighlightRadius: other.cellsInMonthHighlightRadius,
       cellsInMonthTileColor: other.cellsInMonthTileColor,
       cellsInMonthHighlightColor: other.cellsInMonthHighlightColor,
-      selectedHighlightColor: other.selectedHighlightColor,
-      selectedTitleColor: other.selectedTitleColor,
-      selectedHighlightRadius: other.selectedHighlightRadius,
     );
   }
 }

lib/src/typedefs.dart

@@ -11,7 +11,6 @@ typedef CellBuilder<T extends Object?> = Widget Function(
   List<CalendarEventData<T>> event,
   bool isToday,
   bool isInMonth,
-  bool isSelected,
   bool hideDaysNotInMonth,
 );