@deque/cauldron-react 7.6.0-canary.0419668f → 7.6.0-canary.17caea31

package/lib/components/TreeView/helpers.d.ts

@@ -14,15 +14,6 @@ interface CascadeOptions {
     cascadeSelect: boolean;
     cascadeDeselect: boolean;
 }
-/**
- * Toggle a single node, applying cascade per the options (multiple mode only):
- * - selecting + `cascadeSelect`: also selects all (non-disabled) descendants.
- * - deselecting + `cascadeDeselect`: also deselects all descendants.
- *
- * In `single` mode only the clicked node is selected (clicking it again clears
- * it); cascade does not apply.
- */
-export declare function toggleSelection(nodes: TreeViewNode[], previous: Set<Key>, key: Key, selectionMode: 'single' | 'multiple', { cascadeSelect, cascadeDeselect }: CascadeOptions): Set<Key>;
 /**
  * Apply react-aria's proposed selection while enforcing cascade. Each key
  * react-aria added cascades to its descendants when `cascadeSelect` is set; each

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

@@ -11,6 +11,8 @@ export declare const ROW_GAP = 2;
 export declare const LIST_PADDING = 4;
 type TreeViewProps = Cauldron.LabelProps & Omit<React.HTMLAttributes<HTMLDivElement>, 'children' | 'role' | 'dangerouslySetInnerHTML'> & {
     items: TreeViewNode[];
+    /** Runs when an item is activated by a click, Space or Enter. Each of these
+     *  also toggles the item's selection. Without selection, Space does not act. */
     onAction?: (key: string) => void;
     selectionMode?: 'none' | 'single' | 'multiple';
     /** When true (multiple selection only), selecting a parent also selects all

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
@@ -5604,45 +5606,6 @@ function collectDescendantKeys(node) {
 function collectDisabledKeys(nodes) {
     return nodes.flatMap(function (node) { return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read((node.disabled ? [node.id] : [])), false), tslib.__read((node.children ? collectDisabledKeys(node.children) : [])), false); });
 }
-/**
- * Toggle a single node, applying cascade per the options (multiple mode only):
- * - selecting + `cascadeSelect`: also selects all (non-disabled) descendants.
- * - deselecting + `cascadeDeselect`: also deselects all descendants.
- *
- * In `single` mode only the clicked node is selected (clicking it again clears
- * it); cascade does not apply.
- */
-function toggleSelection(nodes, previous, key, selectionMode, _a) {
-    var cascadeSelect = _a.cascadeSelect, cascadeDeselect = _a.cascadeDeselect;
-    if (selectionMode === 'single') {
-        var result_1 = new Set();
-        if (!previous.has(key)) {
-            result_1.add(key);
-        }
-        return result_1;
-    }
-    var result = new Set(previous);
-    var node = findNode(nodes, key);
-    var descendants = node ? collectDescendantKeys(node) : [];
-    var disabled = new Set(collectDisabledKeys(nodes));
-    if (!previous.has(key)) {
-        result.add(key);
-        if (cascadeSelect) {
-            descendants.forEach(function (k) {
-                if (!disabled.has(k)) {
-                    result.add(k);
-                }
-            });
-        }
-    }
-    else {
-        result.delete(key);
-        if (cascadeDeselect) {
-            descendants.forEach(function (k) { return result.delete(k); });
-        }
-    }
-    return result;
-}
 /**
  * Apply react-aria's proposed selection while enforcing cascade. Each key
  * react-aria added cascades to its descendants when `cascadeSelect` is set; each
@@ -5690,6 +5653,7 @@ var ROW_GAP = 2;
 var LIST_PADDING = 4;
 var TreeView = React.forwardRef(function (_a, ref) {
     var items = _a.items, onAction = _a.onAction, _b = _a.selectionMode, selectionMode = _b === void 0 ? 'none' : _b, _c = _a.cascadeSelect, cascadeSelect = _c === void 0 ? false : _c, _d = _a.cascadeDeselect, cascadeDeselect = _d === void 0 ? false : _d, defaultExpandedKeys = _a.defaultExpandedKeys, _e = _a.virtualized, virtualized = _e === void 0 ? false : _e, height = _a.height, className = _a.className, style = _a.style, other = tslib.__rest(_a, ["items", "onAction", "selectionMode", "cascadeSelect", "cascadeDeselect", "defaultExpandedKeys", "virtualized", "height", "className", "style"]);
+    var treeRef = useSharedRef(ref);
     var _f = tslib.__read(React.useState(new Set()), 2), selectedKeys = _f[0], setSelectedKeys = _f[1];
     var cascade = { cascadeSelect: cascadeSelect, cascadeDeselect: cascadeDeselect };
     // Cascade only applies to multiple selection.
@@ -5704,16 +5668,48 @@ var TreeView = React.forwardRef(function (_a, ref) {
                 : selection;
         });
     };
-    // When `onAction` is set, react-aria treats a row press as an action rather
-    // than a selection, so we toggle selection here ourselves.
-    var handleAction = function (key) {
-        if (selectionMode !== 'none') {
-            setSelectedKeys(function (prev) {
-                return toggleSelection(items, toKeySet(prev, items), key, selectionMode, cascade);
-            });
-        }
-        onAction === null || onAction === void 0 ? void 0 : onAction(key);
-    };
+    // react-aria only reports a press as an action while nothing is selected, so
+    // activation is driven here and react-aria is left to own selection. Click,
+    // Space and Enter all do the same thing: toggle the checkbox and run the action.
+    // Without selection react-aria handles the action itself (see the Tree props).
+    React.useEffect(function () {
+        var node = treeRef.current;
+        if (!node || !onAction || selectionMode === 'none')
+            return;
+        var rowKey = function (target) {
+            var _a;
+            var row = (_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '[role="row"][data-key]');
+            if (!row || row.getAttribute('aria-disabled') === 'true')
+                return null;
+            return row.getAttribute('data-key');
+        };
+        var handleKeyDown = function (event) {
+            if (event.key !== 'Enter' && event.key !== ' ')
+                return;
+            if (event.repeat || event.defaultPrevented)
+                return;
+            var key = rowKey(event.target);
+            if (key)
+                onAction(key);
+        };
+        var handleClick = function (event) {
+            var _a;
+            var target = event.target;
+            // The chevron expands rather than activates, and a click on the
+            // checkbox box or label is re-dispatched on the checkbox itself.
+            if ((_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '.TreeView__chevron, label[for], .Checkbox__overlay'))
+                return;
+            var key = rowKey(target);
+            if (key)
+                onAction(key);
+        };
+        node.addEventListener('keydown', handleKeyDown);
+        node.addEventListener('click', handleClick);
+        return function () {
+            node.removeEventListener('keydown', handleKeyDown);
+            node.removeEventListener('click', handleClick);
+        };
+    }, [onAction, selectionMode, virtualized]);
     // Disabled nodes are non-selectable; react-aria disables them via disabledKeys.
     var disabledKeys = React.useMemo(function () { return collectDisabledKeys(items); }, [items]);
     // Always control selection: react-aria's own state is lost if the tree
@@ -5725,9 +5721,11 @@ var TreeView = React.forwardRef(function (_a, ref) {
     // The `height` prop outranks `style.height`, but only when it is actually
     // set — spreading an undefined `height` would wipe the caller's own.
     var mergedStyle = virtualized && height !== undefined ? tslib.__assign(tslib.__assign({}, style), { height: height }) : style;
-    var tree = (React__default["default"].createElement(reactAriaComponents.Tree, tslib.__assign({ ref: ref, className: classNames__default["default"]('TreeView', className, {
+    var tree = (React__default["default"].createElement(reactAriaComponents.Tree, tslib.__assign({ ref: treeRef, className: classNames__default["default"]('TreeView', className, {
             'TreeView--virtualized': virtualized
-        }), selectionMode: selectionMode, defaultExpandedKeys: defaultExpandedKeys }, (disabledKeys.length > 0 ? { disabledKeys: disabledKeys } : {}), (onAction ? { onAction: handleAction } : {}), selectionProps, other, { style: mergedStyle }), items.map(function (item) { return (React__default["default"].createElement(TreeViewItem, tslib.__assign({ key: item.id }, item))); })));
+        }), selectionMode: selectionMode, defaultExpandedKeys: defaultExpandedKeys }, (disabledKeys.length > 0 ? { disabledKeys: disabledKeys } : {}), (onAction && selectionMode === 'none'
+        ? { onAction: function (key) { return onAction(String(key)); } }
+        : {}), selectionProps, other, { style: mergedStyle }), items.map(function (item) { return (React__default["default"].createElement(TreeViewItem, tslib.__assign({ key: item.id }, item))); })));
     // Rows are absolutely positioned here, so the list layout owns their spacing
     // rather than `.TreeView`'s flex `gap`/`padding`.
     if (virtualized) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "7.6.0-canary.0419668f",
+  "version": "7.6.0-canary.17caea31",
   "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",