@thecb/components 7.8.3-beta.2 → 7.8.4

package/dist/index.d.ts

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

package/dist/index.esm.js

@@ -6665,7 +6665,7 @@ var ClusterInnerWrapper = styled.div.withConfig({
   return childGap;
 });
 
-var _excluded$6 = ["justify", "align", "childGap", "minHeight", "minWidth", "nowrap", "overflow", "justifySelf", "alignSelf", "flexGrow", "extraStyles", "children"];
+var _excluded$6 = ["justify", "align", "childGap", "minHeight", "minWidth", "nowrap", "overflow", "justifySelf", "alignSelf", "flexGrow", "extraStyles", "children", "innerWrapperAs"];
 /*
   Cluster components suit any groups of elements that differ in
   length and are liable to wrap. Buttons that appear together at the
@@ -6689,6 +6689,8 @@ var Cluster = function Cluster(_ref) {
       flexGrow = _ref.flexGrow,
       extraStyles = _ref.extraStyles,
       children = _ref.children,
+      _ref$innerWrapperAs = _ref.innerWrapperAs,
+      innerWrapperAs = _ref$innerWrapperAs === void 0 ? "div" : _ref$innerWrapperAs,
       rest = _objectWithoutProperties(_ref, _excluded$6);
 
   return /*#__PURE__*/React.createElement(ClusterWrapper, _extends({
@@ -6704,7 +6706,8 @@ var Cluster = function Cluster(_ref) {
     childGap: childGap,
     minHeight: minHeight,
     minWidth: minWidth,
-    $nowrap: nowrap
+    $nowrap: nowrap,
+    as: innerWrapperAs
   }, safeChildren(children, /*#__PURE__*/React.createElement(Fragment$1, null))));
 };
 
@@ -46550,6 +46553,7 @@ var PrevNextPlaceholder = function PrevNextPlaceholder(_ref) {
 
 var PrevNextButton = function PrevNextButton(_ref2) {
   var action = _ref2.action,
+      ariaLabel = _ref2.ariaLabel,
       arrowColor = _ref2.arrowColor,
       borderRadius = _ref2.borderRadius,
       buttonHeight = _ref2.buttonHeight,
@@ -46559,12 +46563,14 @@ var PrevNextButton = function PrevNextButton(_ref2) {
   return /*#__PURE__*/React.createElement(Box, {
     padding: "0",
     minHeight: buttonHeight,
-    extraStyles: "max-height: ".concat(buttonHeight, ";")
+    extraStyles: "max-height: ".concat(buttonHeight, ";"),
+    as: "li"
   }, /*#__PURE__*/React.createElement(ButtonWithAction, {
     action: action,
     contentOverride: true,
     dataQa: type,
-    extraStyles: "\n        background-color: ".concat(numberColor, ";\n        border-color: ").concat(numberColor, ";\n        border-radius: ").concat(borderRadius, ";\n        margin: 0;\n        max-height: ").concat(buttonHeight, ";\n        min-height: 100%;\n        min-width: ").concat(buttonWidth, ";\n        padding: 0;\n        &:focus {\n          outline: none\n        }\n      ")
+    "aria-label": ariaLabel,
+    extraStyles: "\n        background-color: ".concat(numberColor, ";\n        border-color: ").concat(numberColor, ";\n        border-radius: ").concat(borderRadius, ";\n        margin: 0;\n        max-height: ").concat(buttonHeight, ";\n        min-height: 100%;\n        min-width: ").concat(buttonWidth, ";\n        padding: 0;\n      ")
   }, /*#__PURE__*/React.createElement(Box, {
     padding: "0",
     extraStyles: type === "prev" && "transform: scaleX(-1)"
@@ -46588,26 +46594,30 @@ var getPagesPanel = function getPagesPanel(page, pagesCount) {
 
   if (page > space + 1) {
     pages.push({
-      isDelimiter: true
+      isDelimiter: true,
+      id: "first-delimiter"
     });
   }
 
   for (var j = Math.max(1, page - space) + 1; j < Math.min(lastPageNumber, page + space); j++) {
     pages.push({
       index: j,
-      isButton: true
+      isButton: true,
+      id: "page-".concat(j)
     });
   }
 
   if (page < lastPageNumber - space) {
     pages.push({
-      isDelimiter: true
+      isDelimiter: true,
+      id: "last-delimiter"
     });
   }
 
   pages.push({
     index: lastPageNumber,
-    isButton: true
+    isButton: true,
+    id: "page-".concat(lastPageNumber)
   });
   var activePage = pages.find(function (p) {
     return p.index === page;
@@ -46642,18 +46652,26 @@ var Pagination = function Pagination(_ref3) {
       pageNext = _ref3.pageNext,
       pagePrevious = _ref3.pagePrevious,
       setCurrentPage = _ref3.setCurrentPage,
+      ariaLabel = _ref3.ariaLabel,
       themeValues = _ref3.themeValues;
 
   var _useContext = useContext(ThemeContext),
       isMobile = _useContext.isMobile;
 
-  var extraStyles = "\n    min-width: ".concat(buttonWidth, "; min-height: 100%; padding: 0;\n    border-radius: ").concat(borderRadius, ";\n    &:hover, &:focus {\n      text-decoration: none;\n      > * > span {\n        text-decoration: none;\n      }\n    }\n    > * > span {\n      color: ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor, "\n    }\n    margin: 0;\n    &:hover {\n        background-color: ").concat(themeValues.hoverBackgroundColor, "\n    }\n    &:focus {\n      outline: none\n    }\n  ");
-  var extraDisabledStyles = "\n    border: ".concat(activeBorderWidth, " solid ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor, ";\n    color: ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.activeColor, ";\n    background-color: ").concat(themeValues.activeBackgroundColor, ";\n    &:focus {\n      box-shadow: none;\n    }\n    &:hover {\n      background-color: initial;\n    }\n  ");
+  var extraStyles = "\n    min-width: ".concat(buttonWidth, "; min-height: 100%; padding: 0;\n    border-radius: ").concat(borderRadius, ";\n    &:hover, &:focus {\n      text-decoration: none;\n      > * > span {\n        text-decoration: none;\n      }\n    }\n    > * > span {\n      color: ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor, "\n    }\n    margin: 0;\n    &:hover {\n        background-color: ").concat(themeValues.hoverBackgroundColor, "\n    }\n  ");
+  var currentPageStyles = "\n    border: ".concat(activeBorderWidth, " solid ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor, ";\n    color: ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.activeColor, ";\n    background-color: ").concat(themeValues.activeBackgroundColor, ";\n    &:focus {\n      box-shadow: none;\n    }\n    &:hover {\n      background-color: initial;\n      border: ").concat(activeBorderWidth, " solid ").concat(numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor, ";\n      background-color: ").concat(themeValues.activeBackgroundColor, ";\n    }\n  ");
   return /*#__PURE__*/React.createElement(Cluster, {
     justify: "center",
-    childGap: childGap
+    childGap: childGap,
+    overflow: true,
+    as: "nav",
+    role: "navigation",
+    innerWrapperAs: "ul",
+    "aria-label": ariaLabel,
+    extraStyles: "> ul { padding: 0px; > li { list-style-type: none; } };"
   }, currentPage > 1 ? /*#__PURE__*/React.createElement(PrevNextButton, {
     action: pagePrevious,
+    ariaLabel: "Previous Page",
     arrowColor: arrowColor !== null && arrowColor !== void 0 ? arrowColor : themeValues.arrowColor,
     borderRadius: borderRadius,
     buttonHeight: buttonHeight,
@@ -46675,33 +46693,37 @@ var Pagination = function Pagination(_ref3) {
   }, "".concat(currentPage, " of ").concat(pageCount)))) : getPagesPanel(currentPage, pageCount).map(function (item, index) {
     return item.isButton ? /*#__PURE__*/React.createElement(Box, {
       padding: "0",
-      extraStyles: "max-height: ".concat(buttonHeight, ";")
+      extraStyles: "max-height: ".concat(buttonHeight, ";"),
+      as: "li",
+      key: item.id
     }, /*#__PURE__*/React.createElement(ButtonWithAction, {
       variant: "ghost",
-      key: item.index,
       text: item.index,
-      disabled: item.active,
-      extraDisabledStyles: extraDisabledStyles,
+      "aria-current": item.active ? "page" : undefined,
+      "aria-label": "".concat(item.index == pageCount ? "Last Page, " : "", "page ").concat(item.index),
       action: !item.active ? function () {
         return setCurrentPage({
           pageNumber: item.index
         });
       } : noop,
       textExtraStyles: "font-size: ".concat(fontSize, "; font-weight: ").concat(fontWeight, ";"),
-      extraStyles: extraStyles,
+      extraStyles: "".concat(extraStyles).concat(item.active ? currentPageStyles : ""),
       dataQa: index
     }, item.index)) : /*#__PURE__*/React.createElement(Box, {
-      padding: "0 10px"
+      padding: "0 10px",
+      as: "li",
+      key: item.id
     }, /*#__PURE__*/React.createElement(Cluster, {
       justify: "flex-end"
     }, /*#__PURE__*/React.createElement(Text$1, {
-      key: index,
       variant: "pXL",
       weight: fontWeight,
-      color: numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor
-    }, "...")));
+      color: numberColor !== null && numberColor !== void 0 ? numberColor : themeValues.numberColor,
+      role: "presentation"
+    }, "…")));
   }), currentPage < pageCount ? /*#__PURE__*/React.createElement(PrevNextButton, {
     action: pageNext,
+    ariaLabel: "Next Page",
     arrowColor: arrowColor !== null && arrowColor !== void 0 ? arrowColor : themeValues.arrowColor,
     borderRadius: borderRadius,
     buttonHeight: buttonHeight,