Fix failing build

forus-labs · Jul 26, 2024 · ede149c · ede149c
1 parent 63b69e6
commit ede149c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/docs/pages/docs/calendar.mdx b/docs/pages/docs/calendar.mdx
@@ -87,6 +87,7 @@ FCalendar(
     <Tabs.Tab>
         <Widget name='calendar' variant='unselectable' query={{}} height={500}/>
     </Tabs.Tab>
+    <Tabs.Tab>
       ```dart
       FCalendar(
         controller: FCalendarMultiValueController(

diff --git a/forui/CHANGELOG.md b/forui/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 ### Changes
 * Change number of years displayed per page in `FCalendar` from 12 to 15.
-* **Breaking:** Move `FCalendar.enabled` to `FCalendarController.canSelect(...)`.
+* **Breaking:** Move `FCalendar.enabled` to `FCalendarController.selectable(...)`.
 
 * **Breaking:** Rename `FCalendarController.contains(...)` to `FCalendarController.selected(...)`.
 * **Breaking:** Rename `FCalendarController.onPress(...)` to `FCalendarController.select(...)`.

diff --git a/forui/lib/src/widgets/calendar/calendar_controller.dart b/forui/lib/src/widgets/calendar/calendar_controller.dart
@@ -78,9 +78,9 @@ class FCalendarMultiValueController extends FCalendarController<Set<DateTime>> {
   /// Throws [AssertionError] if the dates in [initialSelections] are not in UTC timezone.
   FCalendarMultiValueController({
     Set<DateTime> initialSelections = const {},
-    Predicate<DateTime>? canSelect,
+    Predicate<DateTime>? selectable,
   })  : assert(initialSelections.every((d) => d.isUtc), 'dates must be in UTC timezone'),
-        _selectable = canSelect ?? _true,
+        _selectable = selectable ?? _true,
         super(initialSelections);
 
   @override
@@ -111,7 +111,7 @@ class FCalendarRangeController extends FCalendarController<(DateTime, DateTime)?
   /// * the end date is less than start date.
   FCalendarRangeController({
     (DateTime, DateTime)? initialSelection,
-    Predicate<DateTime>? canSelect,
+    Predicate<DateTime>? selectable,
   })  : assert(
           initialSelection == null || (initialSelection.$1.isUtc && initialSelection.$2.isUtc),
           'value must be in UTC timezone',
@@ -122,7 +122,7 @@ class FCalendarRangeController extends FCalendarController<(DateTime, DateTime)?
                   initialSelection.$1.isAtSameMomentAs(initialSelection.$2)),
           'end date must be greater than or equal to start date',
         ),
-        _selectable = canSelect ?? _true,
+        _selectable = selectable ?? _true,
         super(initialSelection);
 
   @override

diff --git a/forui/test/src/widgets/calendar/calendar_controller_test.dart b/forui/test/src/widgets/calendar/calendar_controller_test.dart
@@ -13,7 +13,7 @@ void main() {
       (DateTime.utc(2024, 5, 4), true),
       (DateTime.utc(2024, 5, 5), false),
     ]) {
-      test('contains(...) contains date', () {
+      test('selected(...) contains date', () {
         final controller = FCalendarValueController(initialSelection: DateTime.utc(2024, 5, 4));
         expect(controller.selected(date), expected);
       });
@@ -37,7 +37,7 @@ void main() {
       (DateTime.utc(2024), true),
       (DateTime.utc(2025), false),
     ]) {
-      test('contains(...)', () {
+      test('selected(...)', () {
         final controller = FCalendarMultiValueController(initialSelections: {DateTime.utc(2024)});
         expect(controller.selected(date), expected);
       });

diff --git a/forui/test/src/widgets/calendar/calendar_golden_test.dart b/forui/test/src/widgets/calendar/calendar_golden_test.dart
@@ -31,7 +31,7 @@ void main() {
                 child: FCalendar(
                   controller: FCalendarMultiValueController(
                     initialSelections: selected,
-                    canSelect: (date) => date != DateTime.utc(2024, 7, 2),
+                    selectable: (date) => date != DateTime.utc(2024, 7, 2),
                   ),
                   start: DateTime(1900, 1, 8),
                   end: DateTime(2024, 7, 10),

diff --git a/forui/test/src/widgets/calendar/calendar_test.dart b/forui/test/src/widgets/calendar/calendar_test.dart
@@ -11,7 +11,7 @@ void main() {
           TestScaffold(
             data: FThemes.zinc.light,
             child: FCalendar(
-              controller: FCalendarMultiValueController(canSelect: (date) => date != DateTime.utc(2024, 7, 2)),
+              controller: FCalendarMultiValueController(selectable: (date) => date != DateTime.utc(2024, 7, 2)),
               start: DateTime(1900, 1, 8),
               end: DateTime(2024, 7, 10),
               today: DateTime(2024, 7, 14),
@@ -32,7 +32,7 @@ void main() {
           TestScaffold(
             data: FThemes.zinc.light,
             child: FCalendar(
-              controller: FCalendarMultiValueController(canSelect: (date) => date != DateTime.utc(2024, 7, 2)),
+              controller: FCalendarMultiValueController(selectable: (date) => date != DateTime.utc(2024, 7, 2)),
               start: DateTime(2024, 7),
               end: DateTime(2024, 7, 10),
               today: DateTime(2024, 7, 14),
@@ -55,7 +55,7 @@ void main() {
           TestScaffold(
             data: FThemes.zinc.light,
             child: FCalendar(
-              controller: FCalendarMultiValueController(canSelect: (date) => date != DateTime.utc(2024, 7, 2)),
+              controller: FCalendarMultiValueController(selectable: (date) => date != DateTime.utc(2024, 7, 2)),
               start: DateTime(1900, 1, 8),
               end: DateTime(2024, 8, 10),
               today: DateTime(2024, 7, 14),
@@ -76,7 +76,7 @@ void main() {
           TestScaffold(
             data: FThemes.zinc.light,
             child: FCalendar(
-              controller: FCalendarMultiValueController(canSelect: (date) => date != DateTime.utc(2024, 7, 2)),
+              controller: FCalendarMultiValueController(selectable: (date) => date != DateTime.utc(2024, 7, 2)),
               start: DateTime(2024),
               end: DateTime(2024, 7, 10),
               today: DateTime(2024, 7, 14),

diff --git a/samples/lib/widgets/calendar.dart b/samples/lib/widgets/calendar.dart
@@ -57,7 +57,7 @@ class UnselectableCalendarPage extends SampleScaffold {
   Widget child(BuildContext context) => FCalendar(
         controller: FCalendarMultiValueController(
           initialSelections: {DateTime.utc(2024, 7, 17), DateTime.utc(2024, 7, 20)},
-          canSelect: (date) => !{DateTime.utc(2024, 7, 18), DateTime.utc(2024, 7, 19)}.contains(date),
+          selectable: (date) => !{DateTime.utc(2024, 7, 18), DateTime.utc(2024, 7, 19)}.contains(date),
         ),
         start: DateTime.utc(2000),
         today: DateTime.utc(2024, 7, 15),