Adding attribute page to onPageSizeChanged method.

edufolly · Sep 22, 2024 · 6a8d7b4 · 6a8d7b4
1 parent f775503
commit 6a8d7b4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/example/lib/basic_table/example_basic_table.dart b/example/lib/basic_table/example_basic_table.dart
@@ -3,6 +3,7 @@ import 'package:folly_fields/basic_table/basic_table.dart';
 import 'package:folly_fields/basic_table/basic_table_column_builder.dart';
 import 'package:folly_fields/basic_table/cells/basic_table_cell_header.dart';
 import 'package:folly_fields/basic_table/cells/basic_table_cell_text.dart';
+import 'package:folly_fields/util/folly_num_extension.dart';
 
 ///
 ///
@@ -40,7 +41,7 @@ class _ExampleBasicTableState extends State<ExampleBasicTable> {
       body: Padding(
         padding: const EdgeInsets.all(32),
         child: BasicTable(
-          rowsCount: _size,
+          rowsCount: _size.min(_count - ((_page - 1) * _size)),
           headerHeight: 32,
           rowHeight: 32,
           columnBuilders: <BasicTableColumnBuilder>[
@@ -85,16 +86,12 @@ class _ExampleBasicTableState extends State<ExampleBasicTable> {
             ),
           ],
           initialPageSize: _size,
-          onPageSizeChanged: (int pageSize) {
-            setState(() {
-              _size = pageSize;
-              _page = 0;
-            });
-          },
+          onPageSizeChanged: (int size, int page) => setState(() {
+            _size = size;
+            _page = page;
+          }),
           totalPages: (_count / _size).ceil(),
-          onPageChanged: (int page) {
-            setState(() => _page = page);
-          },
+          onPageChanged: (int page) => setState(() => _page = page),
         ),
       ),
     );

diff --git a/lib/basic_table/basic_table.dart b/lib/basic_table/basic_table.dart
@@ -38,7 +38,7 @@ class BasicTable extends StatefulWidget {
   final EdgeInsetsGeometry paginationPadding;
   final List<int> pageSizes;
   final int? initialPageSize;
-  final Function(int size)? onPageSizeChanged;
+  final Function(int size, int page)? onPageSizeChanged;
   final double paginationIconSize;
   final int totalPages;
   final Function(int page)? onPageChanged;
@@ -95,10 +95,10 @@ class _BasicTableState extends State<BasicTable> {
   @override
   Widget build(BuildContext context) {
     final Color rowBackgroundOdd = widget.rowBackgroundOdd ??
-        Theme.of(context).colorScheme.surfaceContainerLow;
+        Theme.of(context).colorScheme.surfaceContainerHighest;
 
     final Color rowBackgroundEven = widget.rowBackgroundEven ??
-        Theme.of(context).colorScheme.surfaceContainerHighest;
+        Theme.of(context).colorScheme.surfaceContainerLow;
 
     final TextStyle headerTextStyle = widget.headerTextStyle ??
         (Theme.of(context).textTheme.bodyLarge ?? const TextStyle()).copyWith(
@@ -289,7 +289,7 @@ class _BasicTableState extends State<BasicTable> {
                             controller: _pageController,
                             pageSizes: widget.pageSizes,
                             initialPageSize: widget.initialPageSize,
-                            onPageSizeChanged: widget.onPageSizeChanged,
+                            onPageSizeChanged: widget.onPageSizeChanged!,
                           )
                         else
                           const SizedBox.shrink(),
@@ -300,7 +300,7 @@ class _BasicTableState extends State<BasicTable> {
                             controller: _pageController,
                             paginationIconSize: widget.paginationIconSize,
                             totalPages: widget.totalPages,
-                            onPageChanged: widget.onPageChanged,
+                            onPageChanged: widget.onPageChanged!,
                           ),
                       ],
                     ),

diff --git a/lib/basic_table/basic_table_column_builder.dart b/lib/basic_table/basic_table_column_builder.dart
@@ -7,7 +7,7 @@ import 'package:folly_fields/basic_table/cells/basic_table_cell_header.dart';
 ///
 class BasicTableColumnBuilder {
   final double width;
-  final BasicTableAbstractCell Function(BuildContext context, int row) builder;
+  final BasicTableAbstractCell? Function(BuildContext context, int row) builder;
   final BasicTableCellHeader? Function(BuildContext context)? header;
   final bool flexible;
 

diff --git a/lib/basic_table/pagination/basic_table_pagination_controller.dart b/lib/basic_table/pagination/basic_table_pagination_controller.dart
@@ -27,6 +27,11 @@ class BasicTablePaginationController {
   ///
   set currentPage(int value) => _controller.text = value.toString();
 
+  ///
+  ///
+  ///
+  void reset() => _controller.text = '1';
+
   ///
   ///
   ///

diff --git a/lib/basic_table/pagination/basic_table_pagination_size_widget.dart b/lib/basic_table/pagination/basic_table_pagination_size_widget.dart
@@ -8,7 +8,7 @@ class BasicTablePaginationSizeWidget extends StatefulWidget {
   final BasicTablePaginationController controller;
   final List<int> pageSizes;
   final int? initialPageSize;
-  final Function(int size)? onPageSizeChanged;
+  final Function(int size, int page) onPageSizeChanged;
 
   ///
   ///
@@ -68,8 +68,11 @@ class _BasicTablePaginationSizeWidgetState
             if (size != null && _currentPageSize != size) {
               setState(() {
                 _currentPageSize = size;
-                widget.controller.currentPage = 1;
-                widget.onPageSizeChanged?.call(_currentPageSize);
+                widget.controller.reset();
+                widget.onPageSizeChanged.call(
+                  _currentPageSize,
+                  widget.controller.currentPage,
+                );
               });
             }
           },

diff --git a/lib/basic_table/pagination/basic_table_pagination_widget.dart b/lib/basic_table/pagination/basic_table_pagination_widget.dart
@@ -11,7 +11,7 @@ class BasicTablePaginationWidget extends StatefulWidget {
   final BasicTablePaginationController controller;
   final double paginationIconSize;
   final int totalPages;
-  final Function(int page)? onPageChanged;
+  final Function(int page) onPageChanged;
 
   ///
   ///
@@ -51,7 +51,7 @@ class _BasicTablePaginationWidgetState
           onPressed: widget.controller.currentPage > 1
               ? () => setState(() {
                     widget.controller.currentPage = 1;
-                    widget.onPageChanged?.call(widget.controller.currentPage);
+                    widget.onPageChanged.call(widget.controller.currentPage);
                   })
               : null,
           icon: const FaIcon(FontAwesomeIcons.anglesLeft),
@@ -64,7 +64,7 @@ class _BasicTablePaginationWidgetState
           onPressed: widget.controller.currentPage > 1
               ? () => setState(() {
                     widget.controller.currentPage--;
-                    widget.onPageChanged?.call(widget.controller.currentPage);
+                    widget.onPageChanged.call(widget.controller.currentPage);
                   })
               : null,
           icon: const FaIcon(FontAwesomeIcons.angleLeft),
@@ -97,7 +97,7 @@ class _BasicTablePaginationWidgetState
 
               setState(() {
                 widget.controller.currentPage = page;
-                widget.onPageChanged?.call(widget.controller.currentPage);
+                widget.onPageChanged.call(widget.controller.currentPage);
               });
             },
           ),
@@ -115,7 +115,7 @@ class _BasicTablePaginationWidgetState
           onPressed: widget.controller.currentPage < widget.totalPages
               ? () => setState(() {
                     widget.controller.currentPage++;
-                    widget.onPageChanged?.call(widget.controller.currentPage);
+                    widget.onPageChanged.call(widget.controller.currentPage);
                   })
               : null,
           icon: const FaIcon(FontAwesomeIcons.angleRight),
@@ -128,7 +128,7 @@ class _BasicTablePaginationWidgetState
           onPressed: widget.controller.currentPage < widget.totalPages
               ? () => setState(() {
                     widget.controller.currentPage = widget.totalPages;
-                    widget.onPageChanged?.call(widget.controller.currentPage);
+                    widget.onPageChanged.call(widget.controller.currentPage);
                   })
               : null,
           icon: const FaIcon(FontAwesomeIcons.anglesRight),
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,11 @@ class BasicTablePaginationController { @@
       ///
       set currentPage(int value) => _controller.text = value.toString();
+      ///
+      ///
+      ///
+      void reset() => _controller.text = '1';
       ///
       ///
       ///
@@ Expand Down @@