@deque/cauldron-react 6.4.2-canary.eaeac9f4 → 6.4.2-canary.eb0a056f

package/lib/components/Dialog/index.d.ts

@@ -35,6 +35,9 @@ export default class Dialog extends React.Component<DialogProps, DialogState> {
     close(): void;
     handleClickOutside(): void;
     focusHeading(): void;
+    private handleEscape;
+    private attachEventListeners;
+    private removeEventListeners;
 }
 interface DialogAlignmentProps {
     align?: 'left' | 'center' | 'right';

package/lib/components/Pagination/Pagination.d.ts

@@ -5,6 +5,7 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
     totalItems: number;
     itemsPerPage?: number;
     currentPage?: number;
+    hideStartEndPagination?: boolean;
     statusLabel?: ContentNode;
     firstPageLabel?: ContentNode;
     previousPageLabel?: ContentNode;

package/lib/index.js

@@ -1386,6 +1386,9 @@ var AriaIsolate = /** @class */ (function () {
     return AriaIsolate;
 }());
 
+var isEscape = function (event) {
+    return event.key === 'Escape' || event.key === 'Esc' || event.keyCode === 27;
+};
 var noop = function () {
     //not empty
 };
@@ -1397,24 +1400,29 @@ var Dialog = /** @class */ (function (_super) {
         _this.close = _this.close.bind(_this);
         _this.focusHeading = _this.focusHeading.bind(_this);
         _this.handleClickOutside = _this.handleClickOutside.bind(_this);
+        _this.handleEscape = _this.handleEscape.bind(_this);
         _this.state = {};
         return _this;
     }
     Dialog.prototype.componentDidMount = function () {
         var _this = this;
         if (this.props.show) {
+            this.attachEventListeners();
             this.attachIsolator(function () { return setTimeout(_this.focusHeading); });
         }
     };
     Dialog.prototype.componentWillUnmount = function () {
         var isolator = this.state.isolator;
         isolator === null || isolator === void 0 ? void 0 : isolator.deactivate();
+        this.removeEventListeners();
     };
     Dialog.prototype.componentDidUpdate = function (prevProps) {
         if (!prevProps.show && this.props.show) {
             this.attachIsolator(this.focusHeading);
+            this.attachEventListeners();
         }
         else if (prevProps.show && !this.props.show) {
+            this.removeEventListeners();
             this.close();
         }
     };
@@ -1438,8 +1446,7 @@ var Dialog = /** @class */ (function (_super) {
             : 2);
         var Dialog = (React__default["default"].createElement(FocusTrap__default["default"], { focusTrapOptions: {
                 allowOutsideClick: true,
-                onDeactivate: this.close,
-                escapeDeactivates: !forceAction,
+                escapeDeactivates: false,
                 fallbackFocus: '.Dialog__heading'
             } },
             React__default["default"].createElement(ClickOutsideListener, { onClickOutside: this.handleClickOutside },
@@ -1481,6 +1488,24 @@ var Dialog = /** @class */ (function (_super) {
         }
         (_a = this.state.isolator) === null || _a === void 0 ? void 0 : _a.activate();
     };
+    Dialog.prototype.handleEscape = function (keyboardEvent) {
+        if (!keyboardEvent.defaultPrevented && isEscape(keyboardEvent)) {
+            this.close();
+        }
+    };
+    Dialog.prototype.attachEventListeners = function () {
+        var forceAction = this.props.forceAction;
+        if (!forceAction) {
+            var portal = this.props.portal || document.body;
+            var targetElement = portal instanceof HTMLElement ? portal : portal.current;
+            targetElement === null || targetElement === void 0 ? void 0 : targetElement.addEventListener('keyup', this.handleEscape);
+        }
+    };
+    Dialog.prototype.removeEventListeners = function () {
+        var portal = this.props.portal || document.body;
+        var targetElement = portal instanceof HTMLElement ? portal : portal.current;
+        targetElement === null || targetElement === void 0 ? void 0 : targetElement.removeEventListener('keyup', this.handleEscape);
+    };
     Dialog.defaultProps = {
         onClose: noop,
         forceAction: false,
@@ -1733,6 +1758,7 @@ function Tooltip(_a) {
             if (event.key === 'Escape' ||
                 event.key === 'Esc' ||
                 event.keyCode === 27) {
+                event.preventDefault();
                 setShowTooltip(false);
             }
         };
@@ -2906,7 +2932,7 @@ var AddressCityStateZip = function (_a) {
 AddressCityStateZip.displayName = 'AddressCityStateZip';
 
 var Pagination = React__default["default"].forwardRef(function (_a, ref) {
-    var totalItems = _a.totalItems, _b = _a.itemsPerPage, itemsPerPage = _b === void 0 ? 10 : _b, _c = _a.currentPage, currentPage = _c === void 0 ? 1 : _c, statusLabel = _a.statusLabel, _d = _a.firstPageLabel, firstPageLabel = _d === void 0 ? 'First page' : _d, _e = _a.previousPageLabel, previousPageLabel = _e === void 0 ? 'Previous page' : _e, _f = _a.nextPageLabel, nextPageLabel = _f === void 0 ? 'Next page' : _f, _g = _a.lastPageLabel, lastPageLabel = _g === void 0 ? 'Last page' : _g, _h = _a.tooltipPlacement, tooltipPlacement = _h === void 0 ? 'bottom' : _h, onNextPageClick = _a.onNextPageClick, onPreviousPageClick = _a.onPreviousPageClick, onFirstPageClick = _a.onFirstPageClick, onLastPageClick = _a.onLastPageClick, className = _a.className, _j = _a.thin, thin = _j === void 0 ? false : _j, other = tslib.__rest(_a, ["totalItems", "itemsPerPage", "currentPage", "statusLabel", "firstPageLabel", "previousPageLabel", "nextPageLabel", "lastPageLabel", "tooltipPlacement", "onNextPageClick", "onPreviousPageClick", "onFirstPageClick", "onLastPageClick", "className", "thin"]);
+    var totalItems = _a.totalItems, _b = _a.itemsPerPage, itemsPerPage = _b === void 0 ? 10 : _b, _c = _a.currentPage, currentPage = _c === void 0 ? 1 : _c, _d = _a.hideStartEndPagination, hideStartEndPagination = _d === void 0 ? false : _d, statusLabel = _a.statusLabel, _e = _a.firstPageLabel, firstPageLabel = _e === void 0 ? 'First page' : _e, _f = _a.previousPageLabel, previousPageLabel = _f === void 0 ? 'Previous page' : _f, _g = _a.nextPageLabel, nextPageLabel = _g === void 0 ? 'Next page' : _g, _h = _a.lastPageLabel, lastPageLabel = _h === void 0 ? 'Last page' : _h, _j = _a.tooltipPlacement, tooltipPlacement = _j === void 0 ? 'bottom' : _j, onNextPageClick = _a.onNextPageClick, onPreviousPageClick = _a.onPreviousPageClick, onFirstPageClick = _a.onFirstPageClick, onLastPageClick = _a.onLastPageClick, className = _a.className, _k = _a.thin, thin = _k === void 0 ? false : _k, other = tslib.__rest(_a, ["totalItems", "itemsPerPage", "currentPage", "hideStartEndPagination", "statusLabel", "firstPageLabel", "previousPageLabel", "nextPageLabel", "lastPageLabel", "tooltipPlacement", "onNextPageClick", "onPreviousPageClick", "onFirstPageClick", "onLastPageClick", "className", "thin"]);
     var itemStart = currentPage * itemsPerPage - itemsPerPage + 1;
     var itemEnd = Math.min(itemStart + itemsPerPage - 1, totalItems);
     var isLastPage = itemEnd === totalItems;
@@ -2915,8 +2941,8 @@ var Pagination = React__default["default"].forwardRef(function (_a, ref) {
             'Pagination--thin': thin
         }) }, other),
         React__default["default"].createElement("ul", null,
-            React__default["default"].createElement("li", null,
-                React__default["default"].createElement(IconButton, { icon: "chevron-double-left", tooltipProps: { placement: tooltipPlacement }, label: firstPageLabel, "aria-disabled": isFirstPage, onClick: isFirstPage ? undefined : onFirstPageClick })),
+            !hideStartEndPagination && (React__default["default"].createElement("li", null,
+                React__default["default"].createElement(IconButton, { icon: "chevron-double-left", tooltipProps: { placement: tooltipPlacement }, label: firstPageLabel, "aria-disabled": isFirstPage, onClick: isFirstPage ? undefined : onFirstPageClick }))),
             React__default["default"].createElement("li", null,
                 React__default["default"].createElement(IconButton, { icon: "chevron-left", tooltipProps: { placement: tooltipPlacement }, label: previousPageLabel, "aria-disabled": isFirstPage, onClick: isFirstPage ? undefined : onPreviousPageClick })),
             React__default["default"].createElement("li", null,
@@ -2930,8 +2956,8 @@ var Pagination = React__default["default"].forwardRef(function (_a, ref) {
                     React__default["default"].createElement("strong", null, totalItems))))),
             React__default["default"].createElement("li", null,
                 React__default["default"].createElement(IconButton, { icon: "chevron-right", tooltipProps: { placement: tooltipPlacement }, label: nextPageLabel, "aria-disabled": isLastPage, onClick: isLastPage ? undefined : onNextPageClick })),
-            React__default["default"].createElement("li", null,
-                React__default["default"].createElement(IconButton, { icon: "chevron-double-right", tooltipProps: { placement: tooltipPlacement }, label: lastPageLabel, "aria-disabled": isLastPage, onClick: isLastPage ? undefined : onLastPageClick })))));
+            !hideStartEndPagination && (React__default["default"].createElement("li", null,
+                React__default["default"].createElement(IconButton, { icon: "chevron-double-right", tooltipProps: { placement: tooltipPlacement }, label: lastPageLabel, "aria-disabled": isLastPage, onClick: isLastPage ? undefined : onLastPageClick }))))));
 });
 Pagination.displayName = 'Pagination';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "6.4.2-canary.eaeac9f4",
+  "version": "6.4.2-canary.eb0a056f",
   "license": "MPL-2.0",
   "description": "Fully accessible react components library for Deque Cauldron",
   "homepage": "https://cauldron.dequelabs.com/",