fix: Always provide firstIndex and totalItemsCount in collection resu…

…lt (#72)
cloudscape-design · Apr 18, 2024 · 57b9bf6 · 57b9bf6
1 parent a13450a
commit 57b9bf6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/__tests__/use-collection.test.tsx b/src/__tests__/use-collection.test.tsx
@@ -576,4 +576,15 @@ describe('total items count and page range', () => {
  const { getTotalItemsCount } = render(<App />);
  expect(getTotalItemsCount()).toEqual('4');
  });
+
+ test('should return first index and totalItems when no pagination', () => {
+ const allItems = generateItems(4);
+ function App() {
+ const result = useCollection<Item>(allItems, {});
+ return <Demo {...result} />;
+ }
+ const { getRowIndices, getTotalItemsCount } = render(<App />);
+ expect(getRowIndices()).toEqual(['1', '2', '3', '4']);
+ expect(getTotalItemsCount()).toEqual('4');
+ });
 });
diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -96,8 +96,8 @@ interface UseCollectionResultBase<T> {
  };
  trackBy?: string | ((item: T) => string);
  ref: React.RefObject<CollectionRef>;
- totalItemsCount?: number;
- firstIndex?: number;
+ totalItemsCount: number;
+ firstIndex: number;
  };
  filterProps: {
  disabled?: boolean;

diff --git a/src/utils.ts b/src/utils.ts
@@ -215,9 +215,10 @@ export function createSyncProps<T>(
  }
  : {}),
  ref: collectionRef,
+ firstIndex: 1,
+ totalItemsCount: allPageItems.length,
  ...(options.pagination?.pageSize
  ? {
- totalItemsCount: allPageItems.length,
  firstIndex: ((actualPageIndex ?? currentPageIndex) - 1) * options.pagination.pageSize + 1,
  }
  : {}),