@thecb/components 7.8.2-beta.3 → 7.8.2-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "7.8.2-beta.3",
+  "version": "7.8.2-beta.5",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",

package/src/components/atoms/layouts/Cluster.d.ts

@@ -13,6 +13,7 @@ export interface ClusterProps {
   justifySelf?: string;
   alignSelf?: string;
   flexGrow?: string;
+  innerWrapperAs?: string;
 }
 
 export const Cluster: React.FC<Expand<ClusterProps> &

package/src/components/molecules/pagination/Pagination.js

@@ -68,19 +68,23 @@ export const getPagesPanel = (page, pagesCount) => {
   const space = page === 1 ? PAGING_INIT_SPACE : PAGING_SPACE;
   const pages = [{ index: 1, isButton: true }];
   if (page > space + 1) {
-    pages.push({ isDelimiter: true });
+    pages.push({ isDelimiter: true, id: "first-delimiter" });
   }
   for (
     let j = Math.max(1, page - space) + 1;
     j < Math.min(lastPageNumber, page + space);
     j++
   ) {
-    pages.push({ index: j, isButton: true });
+    pages.push({ index: j, isButton: true, id: `page-${j}` });
   }
   if (page < lastPageNumber - space) {
-    pages.push({ isDelimiter: true });
+    pages.push({ isDelimiter: true, id: "last-delimiter" });
   }
-  pages.push({ index: lastPageNumber, isButton: true });
+  pages.push({
+    index: lastPageNumber,
+    isButton: true,
+    id: `page-${lastPageNumber}`
+  });
   const activePage = pages.find(p => p.index === page);
   if (activePage) {
     activePage.active = true;
@@ -103,6 +107,7 @@ const Pagination = ({
   pageNext,
   pagePrevious,
   setCurrentPage,
+  ariaLabel,
   themeValues
 }) => {
   const { isMobile } = useContext(ThemeContext);
@@ -144,7 +149,9 @@ const Pagination = ({
       childGap={childGap}
       overflow={true}
       as="nav"
+      role="navigation"
       innerWrapperAs="ul"
+      aria-label={ariaLabel}
       extraStyles="> ul { padding: 0px; > li { list-style-type: none; } };"
     >
       {currentPage > 1 ? (
@@ -187,10 +194,10 @@ const Pagination = ({
                 padding="0"
                 extraStyles={`max-height: ${buttonHeight};`}
                 as="li"
+                key={item.id}
               >
                 <ButtonWithAction
                   variant="ghost"
-                  key={item.index}
                   text={item.index}
                   disabled={item.active}
                   extraDisabledStyles={extraDisabledStyles}
@@ -211,10 +218,9 @@ const Pagination = ({
                 </ButtonWithAction>
               </Box>
             ) : (
-              <Box padding="0 10px">
+              <Box padding="0 10px" as="li" key={item.id}>
                 <Cluster justify="flex-end">
                   <Text
-                    key={index}
                     variant="pXL"
                     weight={fontWeight}
                     color={numberColor ?? themeValues.numberColor}

package/src/components/molecules/pagination/index.d.ts

@@ -14,6 +14,7 @@ export interface PaginationProps {
   fontWeight?: string;
   numberColor?: string;
   pageCount: number;
+  ariaLabel?: string;
   pageNext: () => void;
   pagePrevious: () => void;
   setCurrentPage: ({ currentPage: number }) => void;