Merge pull request #74 from Dash-Kit/paginated-state-fix

fix empty state
Dash-Kit · Aug 14, 2024 · f65d58d · f65d58d
2 parents e3898ae + 657c9c3
commit f65d58d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/src/loadable/loadable_list_view.dart b/lib/src/loadable/loadable_list_view.dart
@@ -42,6 +42,8 @@ class LoadableListView extends StatefulWidget {
 class LoadableListViewState extends State<LoadableListView> {
   LoadableListViewModel get viewModel => widget.viewModel;
 
+  int get actualItemsCount => viewModel.itemCount;
+
   @override
   void initState() {
     super.initState();
@@ -111,7 +113,7 @@ class LoadableListViewState extends State<LoadableListView> {
         sliver: SliverList(
           delegate: SliverChildBuilderDelegate(
             sliverDelegateBuilder,
-            childCount: _computeActualChildCount(viewModel.itemCount),
+            childCount: _computeActualChildCount(actualItemsCount),
           ),
         ),
       ),

diff --git a/lib/src/loadable/loadable_paginated_list_view.dart b/lib/src/loadable/loadable_paginated_list_view.dart
@@ -26,9 +26,12 @@ class LoadablePaginatedListState extends LoadableListViewState {
   LoadablePaginatedListViewModel get viewModel =>
       widget.viewModel as LoadablePaginatedListViewModel;
 
+  @override
+  int get actualItemsCount => viewModel.itemCount + 1;
+
   @override
   Widget buildListItem(int index) {
-    return index == viewModel.itemCount - 1
+    return index == actualItemsCount - 1
         // ignore: avoid-returning-widgets
         ? buildLastItem(viewModel.getPaginationState())
         : super.buildListItem(index);
@@ -85,7 +88,7 @@ class LoadablePaginatedListViewModel extends LoadableListViewModel {
     required super.errorWidget,
     required super.emptyStateWidget,
     required super.loadListRequestState,
-    required int itemCount,
+    required super.itemCount,
     required this.loadPageRequestState,
     required this.errorPageWidget,
     required this.isAllItemsLoaded,
@@ -96,7 +99,7 @@ class LoadablePaginatedListViewModel extends LoadableListViewModel {
     super.footer,
     this.loadPage,
     super.key,
-  }) : super(itemCount: itemCount + 1);
+  });
 
   final VoidCallback? loadPage;
   final Widget errorPageWidget;