@deque/cauldron-react 7.6.0-canary.a7eb9452 → 7.6.0-canary.c6d1784a

package/lib/index.js

@@ -517,7 +517,7 @@ var Accordion = function (_a) {
     var panelProps = panelElement.props;
     return (React__default["default"].createElement("div", tslib.__assign({ className: "Accordion" }, props),
         React__default["default"].createElement(ExpandCollapsePanel, tslib.__assign({ id: panelProps.id || "".concat(elementId, "-panel"), open: open, onToggle: onToggle, animationTiming: animationTiming }, panelProps),
-            React__default["default"].createElement(PanelTrigger$1, tslib.__assign({ iconCollapsed: "triangle-right", iconExpanded: "triangle-down", className: classNames__default["default"]('Accordion__trigger', trigger.props.className), "aria-controls": panelProps.id || "".concat(elementId, "-panel"), heading: trigger.props.heading }, trigger.props), trigger),
+            React__default["default"].createElement(PanelTrigger$1, tslib.__assign({ iconCollapsed: "triangle-right", iconExpanded: "triangle-down", "aria-controls": panelProps.id || "".concat(elementId, "-panel"), heading: trigger.props.heading }, trigger.props, { className: classNames__default["default"]('Accordion__trigger', trigger.props.className) }), trigger),
             panelElement)));
 };
 Accordion.displayName = 'Accordion';
@@ -1420,7 +1420,7 @@ function createFocusTrap(targetElement, initialFocusElement) {
         suspended: false
     };
     var focusListener = function (event) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         var eventTarget = event.target;
         var elementContainsTarget = elementContains(targetElement, eventTarget);
         if (focusTrapMetadata.suspended) {
@@ -1438,24 +1438,26 @@ function createFocusTrap(targetElement, initialFocusElement) {
             return;
         }
         var focusableElements = Array.from((targetElement === null || targetElement === void 0 ? void 0 : targetElement.querySelectorAll(focusable__default["default"])) || []);
+        // Tab stops such as contenteditable and video[controls] can report tabIndex -1 without a tabindex attribute.
+        var wrapTargets = focusableElements.filter(function (element) { return !(element.hasAttribute('tabindex') && element.tabIndex < 0); });
         // If focus reaches the trap guards, we need to wrap focus around to the leading
         // or trailing focusable element depending on which guard obtained focus
-        if (focusableElements.length && eventTarget === startGuard) {
-            (_a = focusableElements.reverse()[0]) === null || _a === void 0 ? void 0 : _a.focus();
+        if (wrapTargets.length && eventTarget === startGuard) {
+            wrapTargets[wrapTargets.length - 1].focus();
             return;
         }
-        else if (focusableElements.length && eventTarget === endGuard) {
-            (_b = focusableElements[0]) === null || _b === void 0 ? void 0 : _b.focus();
+        else if (wrapTargets.length && eventTarget === endGuard) {
+            wrapTargets[0].focus();
             return;
         }
         // If focus somehow escaped the trap, we need to try to restore focus to
         // to a suitable focusable element within the focus trap target. Otherwise
         // we'll need to focus on an alternative within the container.
         if (elementContains(targetElement, focusTrapMetadata.lastFocusedElement)) {
-            (_c = focusTrapMetadata.lastFocusedElement) === null || _c === void 0 ? void 0 : _c.focus();
+            (_a = focusTrapMetadata.lastFocusedElement) === null || _a === void 0 ? void 0 : _a.focus();
         }
         else if (focusableElements.length) {
-            (_d = focusableElements[0]) === null || _d === void 0 ? void 0 : _d.focus();
+            (_b = focusableElements[0]) === null || _b === void 0 ? void 0 : _b.focus();
         }
         else {
             // if there are no focusable elements, just focus the container

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "7.6.0-canary.a7eb9452",
+  "version": "7.6.0-canary.c6d1784a",
   "license": "MPL-2.0",
   "description": "Fully accessible react components library for Deque Cauldron",
   "homepage": "https://cauldron.dequelabs.com/",
@@ -37,7 +37,7 @@
     "@rollup/plugin-typescript": "^11.1.2",
     "@svgr/rollup": "^6.1.2",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^7.0.0",
+    "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.6.7",
     "@types/classnames": "^2.2.10",